-
@@ -167,18 +167,18 @@
- You can only select {$currentPlan?.projects} projects. Please deselect others to continue.
+
+ {#if loading}
+
-
- {@html formatProjectsToArchive()}
- will be archived.
-
-
+ {:else if projectsLoadingError}
+ {projectsLoadingError}
+ {:else}
+ {#if error}
+ {error}
+ {/if}
+
+
+
+ Project Name
+ Created
+
+ {#each projects as project}
+
+ {project.name}
+ {toLocaleDateTime(project.$createdAt)}
+
+ {/each}
+
+
+ {#if selectedProjects.length > $currentPlan?.projects}
+
+
+ {@html formatProjectsToArchive()}
+ will be archived.
+
+
+ {/if}
{/if}
(showSelectProject = false)}
@@ -115,3 +164,13 @@
>Save
+
+
diff --git a/src/lib/components/billing/paymentModal.svelte b/src/lib/components/billing/paymentModal.svelte
index 72accfd10..92aec21a8 100644
--- a/src/lib/components/billing/paymentModal.svelte
+++ b/src/lib/components/billing/paymentModal.svelte
@@ -42,7 +42,7 @@
const card = await submitStripeCard(name, page?.params?.organization ?? null);
if (card && Object.hasOwn(card, 'id')) {
- if ((card as PaymentMethod).card.country === 'US') {
+ if ((card as PaymentMethod).card?.country === 'US') {
paymentMethod = card as PaymentMethod;
showState = true;
return;
diff --git a/src/lib/components/billing/planSelection.svelte b/src/lib/components/billing/planSelection.svelte
index 846a887f2..900fbe3d3 100644
--- a/src/lib/components/billing/planSelection.svelte
+++ b/src/lib/components/billing/planSelection.svelte
@@ -9,8 +9,8 @@
import { page } from '$app/state';
export let billingPlan: Tier;
- export let anyOrgFree = false;
export let isNewOrg = false;
+ export let anyOrgFree = false;
export let selfService = true;
$: plans = Object.values(page.data.plans.plans) as Plan[];
diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte
index da4bfd5c0..e2ecda32f 100644
--- a/src/lib/components/breadcrumbs.svelte
+++ b/src/lib/components/breadcrumbs.svelte
@@ -22,7 +22,9 @@
import { base } from '$app/paths';
import { currentPlan, newOrgModal } from '$lib/stores/organization';
import { Click, trackEvent } from '$lib/actions/analytics';
- import type { Models } from '@appwrite.io/console';
+ import { type Models, Query } from '@appwrite.io/console';
+ import { sdk } from '$lib/stores/sdk';
+ import { page } from '$app/state';
type Organization = {
name: string;
@@ -63,15 +65,15 @@
}
} = createMenu();
- let isLoadingProjects = true;
+ let isLoadingProjects = false;
let loadedProjects: Models.ProjectList = { total: 0, projects: [] };
export let organizations: Organization[] = [];
export let currentProject: Models.Project | null = null;
- export let projects: Promise = Promise.resolve(loadedProjects);
let projectsBottomSheetOpen = false;
let organisationBottomSheetOpen = false;
+ let projectsBottomSheet: Promise = null;
function createOrg() {
trackEvent(Click.OrganizationClickCreate, { source: 'breadcrumbs' });
@@ -99,13 +101,25 @@
}
};
- async function createProjectsBottomSheet(organization: Organization): Promise {
+ async function createProjectsBottomSheet(
+ organization: Organization
+ ): Promise {
+ if (!isOnProjects) return null;
+
isLoadingProjects = true;
+
// null on non-org/project path like `onboarding`.
- loadedProjects = (await projects) ?? loadedProjects;
+ loadedProjects =
+ (await sdk.forConsole.projects.list([
+ Query.equal('teamId', organizationId ?? page.data.currentOrgId),
+ Query.limit(5),
+ Query.orderDesc('$updatedAt')
+ ])) ?? loadedProjects;
+
for (const project of loadedProjects.projects) {
project.region ??= 'default';
}
+
isLoadingProjects = false;
const createProjectItem = {
@@ -185,8 +199,6 @@
$: selectedOrg = organizations.find((org) => org.isSelected);
- $: projectsBottomSheet = createProjectsBottomSheet(selectedOrg);
-
$: organizationsBottomSheet = createOrganizationBottomSheet(selectedOrg);
$: correctPlanName =
@@ -198,6 +210,20 @@
: selectedOrg?.tierName; // fallback
$: derivedKey = `${selectedOrg?.$id}-${currentProject?.$id}`;
+
+ $: organizationId = currentProject?.teamId;
+
+ $: isOnProjects = page.route.id.includes('project-[region]-[project]');
+
+ $: shouldReloadProjects = isLoadingProjects
+ ? false
+ : currentProject && loadedProjects.projects.length
+ ? loadedProjects.projects[0].teamId != currentProject.teamId
+ : !loadedProjects.projects.length;
+
+ $: if (shouldReloadProjects) {
+ projectsBottomSheet = createProjectsBottomSheet(selectedOrg);
+ }
diff --git a/src/lib/helpers/regions.ts b/src/lib/helpers/regions.ts
index 82010ee0a..ce3d4e27e 100644
--- a/src/lib/helpers/regions.ts
+++ b/src/lib/helpers/regions.ts
@@ -15,8 +15,15 @@ export function filterRegions(regions: Models.ConsoleRegion[]): RegionOption[] {
return regions
.filter((region) => region.$id !== 'default')
.sort((a, b) => {
- if (a.disabled && !b.disabled) return 1;
- if (!a.disabled && b.disabled) return -1;
+ // Check if regions are truly available (not disabled and available)
+ const aAvailable = !a.disabled && a.available;
+ const bAvailable = !b.disabled && b.available;
+
+ // Prioritize truly available regions
+ if (aAvailable && !bAvailable) return -1;
+ if (!aAvailable && bAvailable) return 1;
+
+ // Within the same availability group, sort alphabetically
return a.name.localeCompare(b.name);
})
.map((region) => ({
diff --git a/src/lib/helpers/templateSource.ts b/src/lib/helpers/templateSource.ts
new file mode 100644
index 000000000..d24b67e77
--- /dev/null
+++ b/src/lib/helpers/templateSource.ts
@@ -0,0 +1,26 @@
+import type { Models } from '@appwrite.io/console';
+
+/**
+ * Build VCS repo URL from the template response model.
+ * Example (GitHub): https://github.com/appwrite/templates-for-sites
+ */
+export function getTemplateSourceUrl(
+ t: Models.TemplateSite | Models.TemplateFunction
+): string | null {
+ const owner = t.providerOwner;
+ const repo = t.providerRepositoryId;
+ const provider = t.vcsProvider; // e.g., "github"
+
+ if (!owner || !repo || !provider) return null;
+
+ // Map provider → host (extend if needed)
+ const hostMap: Record = {
+ github: 'github.com',
+ gitlab: 'gitlab.com',
+ bitbucket: 'bitbucket.org'
+ };
+
+ const host = hostMap[provider.toLowerCase()] ?? provider; // fallback
+
+ return `https://${host}/${owner}/${repo}`;
+}
diff --git a/src/lib/images/promos/auto-increment-dark.png b/src/lib/images/promos/auto-increment-dark.png
deleted file mode 100644
index b63c3891c..000000000
Binary files a/src/lib/images/promos/auto-increment-dark.png and /dev/null differ
diff --git a/src/lib/images/promos/auto-increment-light.png b/src/lib/images/promos/auto-increment-light.png
deleted file mode 100644
index b2c174fc4..000000000
Binary files a/src/lib/images/promos/auto-increment-light.png and /dev/null differ
diff --git a/src/lib/images/promos/timestamp-overrides-dark.png b/src/lib/images/promos/timestamp-overrides-dark.png
new file mode 100644
index 000000000..569abb8e0
Binary files /dev/null and b/src/lib/images/promos/timestamp-overrides-dark.png differ
diff --git a/src/lib/images/promos/timestamp-overrides-light.png b/src/lib/images/promos/timestamp-overrides-light.png
new file mode 100644
index 000000000..adf0c88ec
Binary files /dev/null and b/src/lib/images/promos/timestamp-overrides-light.png differ
diff --git a/src/lib/layout/createProject.svelte b/src/lib/layout/createProject.svelte
index 2199f0a4b..f8302245c 100644
--- a/src/lib/layout/createProject.svelte
+++ b/src/lib/layout/createProject.svelte
@@ -50,6 +50,30 @@
{#if showTitle}
Create your project
{/if}
+
+ {#if projectsLimited}
+ {#if isProPlan}
+
+ You've reached your limit of 2 projects included on the Pro plan. Each extra
+ project costs $15/month.
+
+ {:else}
+
+ Extra projects are available on paid plans for an additional fee
+
+
+
+
+ {/if}
+ {/if}
+
@@ -72,27 +96,6 @@
- {#if projectsLimited}
- {#if isProPlan}
-
- You've reached your limit of 2 projects included on the Pro plan. Each extra
- project costs $15/month.
-
- {:else}
-
- Extra projects are available on paid plans for an additional fee
-
-
-
-
- {/if}
- {/if}
-
{#if isCloud && regions.length > 0}
@@ -23,7 +23,6 @@
direction="row"
alignItems="center"
gap={$isSmallViewport ? 'm' : 'l'}
- inline={$isTabletViewport}
justifyContent="flex-start">
ⓒ {currentYear} Appwrite. All rights reserved.
@@ -54,63 +53,37 @@
- {#if isCloud && $isSmallViewport}
-
- {#if isCloud}
- {#if !$isSmallViewport}
+ alignItems="center"
+ wrap={$isSmallViewport ? 'wrap' : 'normal'}>
+ {#if !$isSmallViewport}
+ {#if isCloud}
- Version {$version}
-
-
-
+ Version {$version}
+
+
+
+ Version {$version}
+
+ {#if isCloud}
+
@@ -180,7 +179,4 @@
margin-inline-end: 2rem;
}
}
- .extra-margin {
- margin-block-start: var(--space-2, 4px);
- }
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index fb23bceac..790643c29 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -22,7 +22,6 @@
export let showFooter = true;
export let showSideNavigation = false;
export let selectedProject: Models.Project = null;
- export let projects: Promise = undefined;
let yOnMenuOpen: number;
let showContentTransition = false;
@@ -104,8 +103,6 @@
};
}),
- projects: projects,
-
currentProject: selectedProject
};
diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte
index 9d1afcb2b..b5fe495ea 100644
--- a/src/lib/layout/unauthenticated.svelte
+++ b/src/lib/layout/unauthenticated.svelte
@@ -10,6 +10,7 @@
import type { Campaign } from '$lib/stores/campaigns';
import { Typography, Layout, Avatar } from '@appwrite.io/pink-svelte';
import { getCampaignImageUrl } from '$routes/(public)/card/helpers';
+ import { isSmallViewport } from '$lib/stores/viewport';
export const imgLight = LoginLight;
export const imgDark = LoginDark;
@@ -44,7 +45,7 @@
@@ -159,7 +160,6 @@
+
+
+ Project Name
+ Created
+
+
+ {#each Array.from({ length: 5 }) as _}
+
+
+
+
+
+
+ {/each}
+
- {/if}
- {#if selectedProjects.length === $currentPlan?.projects}
-
+ You can only select {$currentPlan?.projects} projects. Please deselect others to continue.
+
+ {/if}
+
+ {#if selectedProjects.length === $currentPlan?.projects}
+
-
- {#if $version}
- {#if isCloud}
-
- Version {$version}
-
-
-
-
- {/if}
+
@@ -167,7 +169,7 @@
- {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > 2 && $canWriteProjects}
+ {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > $currentPlan.projects && $canWriteProjects}
- Served by Appwrite
+
+ {:else if record.lock && isCAARecord}
+
+
+
{:else}
-
+
+ Client
+ Location
+ IP
+
+ {#each data.sessions.sessions as session}
+ {@const browser = getBrowser(session.clientCode)}
+
+
+
+ {session.clientType}
- {session.countryName}
- {session.ip}
-
-
-
-
- {/each}
-
-
+
+ {session.clientName}
+ {session.clientVersion} on {session.osName}
+ {session.osVersion}
+
+ {#if session.current}
+
+
+
+ {#if session.countryCode !== '--'}
+ {session.countryName}
+ {:else}
+ Unknown
+ {/if}
+
+
+ {session.ip}
+
+
+
+
+
+ {/each}
+
{:else}
2. Open the file
+ >2. Open the file
{#if isPlatformCreated}
-
- {#if browser}
- .toString()})
- {:else}
-
- {/if}
-
- - {session.clientName} - {session.clientVersion} on {session.osName} - {session.osVersion} -
- {#if session.current} -
+ {#if browser}
+
+ {:else}
+
-
-
-
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
index da920f4e7..f1eb3eb44 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
@@ -123,16 +123,12 @@
// Reactive statements
$: collections = collectionList?.collections?.filter((n) => n.$id !== $collection.$id) ?? [];
- $: if (editing) {
- way = data.twoWay ? 'two' : 'one';
- } else {
- if (way === 'two') {
- data.twoWay = true;
- if (!data.twoWayKey) {
- data.twoWayKey = camelize($collection.name);
- }
- } else {
- data.twoWay = false;
+ $: if (!editing && way) {
+ data.twoWay = way === 'two';
+ if (way === 'two' && !data.twoWayKey) {
+ data.twoWayKey = camelize($collection.name);
+ } else if (way === 'one') {
+ data.twoWayKey = undefined;
}
}
@@ -158,6 +154,7 @@
bind:group={way}
name="one"
value="one"
+ disabled={editing}
icon={IconArrowSmRight}>
One Relation attribute within this collection
@@ -166,6 +163,7 @@
bind:group={way}
name="two"
value="two"
+ disabled={editing}
icon={IconSwitchHorizontal}>
One Relation attribute within this collection and another within the related collection
@@ -178,6 +176,7 @@
placeholder="Select a collection"
bind:value={data.relatedCollection}
on:change={updateKeyName}
+ disabled={editing}
options={collections?.map((n) => ({ value: n.$id, label: `${n.name} (${n.$id})` })) ?? []} />
{#if data?.relatedCollection}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
index 1d6858eac..297cb1381 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
@@ -14,8 +14,6 @@
import { type Attributes, collection, indexes } from '../store';
import { Icon, Layout } from '@appwrite.io/pink-svelte';
import { IconPlus } from '@appwrite.io/pink-icons-svelte';
- import { flags } from '$lib/flags';
-
export let showCreateIndex = false;
export let externalAttribute: Attributes = null;
@@ -39,8 +37,6 @@
let attributeList = [{ value: '', order: '', length: null }];
- const showLengths = flags.showIndexLengths(page.data);
-
function generateIndexKey() {
let indexKeys = $indexes.map((index) => index.key);
@@ -152,7 +148,7 @@
placeholder="Select Order" />
- {#if selectedType === IndexType.Key && showLengths}
+ {#if selectedType === IndexType.Key}
@@ -43,14 +39,12 @@
id={`value-${selectedIndex.orders[i]}`}
value={selectedIndex.orders[i]}
readonly />
- {#if showLengths}
-
{/each}
{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/store.ts
index 3e36a4f57..b99f1c12b 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/store.ts
@@ -3,6 +3,13 @@ import { writable } from 'svelte/store';
export const columns = writable([
{ id: '$id', title: 'Execution ID', type: 'string', width: { min: 200, max: 250 } },
+ {
+ id: 'deploymentId',
+ title: 'Deployment ID',
+ type: 'string',
+ width: { min: 210 },
+ hide: true
+ },
{
id: 'requestPath',
title: 'Path',
@@ -10,7 +17,6 @@ export const columns = writable([
width: { min: 200 },
format: 'string'
},
-
{
id: 'trigger',
title: 'Trigger',
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
index f54637771..1df28df61 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
@@ -84,6 +84,8 @@
{#key column.id}
{log.$id}
{/key}
+ {:else if column.id === 'deploymentId'}
+ {log.deploymentId}
{:else if column.id === '$createdAt'}
-
-