Appwrite/console
1
0
Fork 0
mirror of https://github.com/appwrite/console.git synced 2026-06-06 19:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat-resend-adapter

Browse Source
This commit is contained in:
Chirag Aggarwal
2025-10-25 19:11:09 +05:30
parent e6e64732e5 141ad8bd2c
commit badc824105
29 changed files with 250 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -52,7 +52,7 @@
"@eslint/js": "^9.31.0",
"@melt-ui/pp": "^0.3.2",
"@melt-ui/svelte": "^0.86.5",
"@playwright/test": "^1.56.1",
"@playwright/test": "^1.55.1",
"@sveltejs/adapter-static": "^3.0.8",
"@sveltejs/kit": "^2.42.1",
"@sveltejs/vite-plugin-svelte": "^5.0.3",
pnpm-lock.yaml
Generated
+1 -1
View File
@@ -97,7 +97,7 @@ importers:
specifier: ^0.86.5
version: 0.86.5(svelte@5.25.3)
'@playwright/test':
specifier: ^1.56.1
specifier: ^1.55.1
version: 1.56.1
'@sveltejs/adapter-static':
specifier: ^3.0.8
src/lib/components/csvImportBox.svelte
+1 -1
View File
@@ -169,7 +169,7 @@
migrations.migrations.forEach(updateOrAddItem);
});
return sdk.forConsoleIn(page.params.region).client.subscribe('console', (response) => {
return sdk.forConsoleIn(page.params.region).realtime.subscribe('console', (response) => {
if (!response.channels.includes(`projects.${getProjectId()}`)) return;
if (response.events.includes('migrations.*')) {
updateOrAddItem(response.payload as Payload);
src/lib/stores/sdk.ts
+9 -2
View File
@@ -21,7 +21,8 @@ import {
Sites,
Tokens,
TablesDB,
Domains
Domains,
Realtime
} from '@appwrite.io/console';
import { Billing } from '../sdk/billing';
import { Backups } from '../sdk/backups';
@@ -90,7 +91,8 @@ function createConsoleSdk(client: Client) {
sources: new Sources(client),
sites: new Sites(client),
domains: new Domains(client),
storage: new Storage(client)
storage: new Storage(client),
realtime: new Realtime(client)
};
}
@@ -185,6 +187,11 @@ export enum RuleTrigger {
MANUAL = 'manual'
}
/**
* Some type imports are broken on the SDK, this works correctly for the time being!
*/
export type AppwriteRealtimeSubscription = Awaited<ReturnType<Realtime['subscribe']>>;
export const createAdminClient = () => {
return new Client().setEndpoint(getApiEndpoint()).setMode('admin').setProject(getProjectId());
};
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
+6 -17
View File
@@ -38,6 +38,9 @@
<script lang="ts">
import { InputSelect } from '$lib/elements/forms';
import { createConservative } from '$lib/helpers/stores';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let editing = false;
export let data: Partial<Models.ColumnBoolean> = {
required: false,
@@ -45,9 +48,6 @@
default: null
};
import { createConservative } from '$lib/helpers/stores';
import { Selector } from '@appwrite.io/pink-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -67,6 +67,7 @@
array: false,
...data
});
$: listen(data);
$: handleDefaultState($required || $array);
@@ -83,17 +84,5 @@
{ label: 'False', value: false }
]}
bind:value={data.default} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
+4 -17
View File
@@ -42,13 +42,12 @@
<script lang="ts">
import { InputDateTime } from '$lib/elements/forms';
import { createConservative } from '$lib/helpers/stores';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let editing = false;
export let data: Partial<Models.ColumnDatetime>;
import { createConservative } from '$lib/helpers/stores';
import { Selector } from '@appwrite.io/pink-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -80,17 +79,5 @@
bind:value={data.default}
disabled={data.required || data.array}
nullable={!data.required && !data.array} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte
+5 -17
View File
@@ -38,13 +38,12 @@
<script lang="ts">
import { InputEmail } from '$lib/elements/forms';
import { createConservative } from '$lib/helpers/stores';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let editing = false;
export let data: Partial<Models.ColumnEmail>;
import { createConservative } from '$lib/helpers/stores';
import { Selector } from '@appwrite.io/pink-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -64,6 +63,7 @@
array: false,
...data
});
$: listen(data);
$: handleDefaultState($required || $array);
@@ -76,17 +76,5 @@
bind:value={data.default}
disabled={data.required || data.array}
nullable={!data.required && !data.array} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
+6 -18
View File
@@ -39,15 +39,15 @@
</script>
<script lang="ts">
import { createConservative } from '$lib/helpers/stores';
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
import { InputSelect, InputTags } from '$lib/elements/forms';
import { Icon, Tooltip, Typography } from '@appwrite.io/pink-svelte';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let editing = false;
export let data: Partial<Models.ColumnEnum>;
import { createConservative } from '$lib/helpers/stores';
import { Icon, Selector, Tooltip, Typography } from '@appwrite.io/pink-svelte';
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -107,17 +107,5 @@
placeholder="Select a value"
{options}
bind:value={data.default} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte
+5 -17
View File
@@ -41,7 +41,10 @@
</script>
<script lang="ts">
import { Layout } from '@appwrite.io/pink-svelte';
import { InputNumber } from '$lib/elements/forms';
import { createConservative } from '$lib/helpers/stores';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let editing = false;
export let data: Partial<Models.ColumnFloat> = {
@@ -52,9 +55,6 @@
array: false
};
import { createConservative } from '$lib/helpers/stores';
import { Layout, Selector } from '@appwrite.io/pink-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -105,17 +105,5 @@
disabled={data.required || data.array}
nullable={!data.required && !data.array}
step={0.1} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
+5 -17
View File
@@ -41,7 +41,10 @@
</script>
<script lang="ts">
import { Layout } from '@appwrite.io/pink-svelte';
import { InputNumber } from '$lib/elements/forms';
import { createConservative } from '$lib/helpers/stores';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let editing = false;
@@ -53,9 +56,6 @@
array: false
};
import { createConservative } from '$lib/helpers/stores';
import { Layout, Selector } from '@appwrite.io/pink-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -103,17 +103,5 @@
bind:value={data.default}
disabled={data.required || data.array}
nullable={!data.required && !data.array} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
+5 -17
View File
@@ -37,13 +37,12 @@
<script lang="ts">
import { InputText } from '$lib/elements/forms';
import { createConservative } from '$lib/helpers/stores';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let editing = false;
export let data: Partial<Models.ColumnIp>;
import { createConservative } from '$lib/helpers/stores';
import { Selector } from '@appwrite.io/pink-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -63,6 +62,7 @@
array: false,
...data
});
$: listen(data);
$: handleDefaultState($required || $array);
@@ -75,17 +75,5 @@
bind:value={data.default}
disabled={data.required || data.array}
nullable={!data.required && !data.array} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/requiredArrayCheckboxes.svelte
+50
View File
@@ -0,0 +1,50 @@
<script lang="ts">
import { Selector, Tooltip } from '@appwrite.io/pink-svelte';
let {
required = $bindable(false),
array = $bindable(false),
editing = false
}: {
required: boolean;
array: boolean;
editing: boolean;
} = $props();
</script>
<Tooltip disabled={!array} maxWidth="275px" placement="bottom-start">
<div style:width="fit-content">
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={required}
disabled={array}
description="Indicate whether this column is required." />
</div>
<svelte:fragment slot="tooltip">
Required cannot be selected because array columns may contain more than one value.
</svelte:fragment>
</Tooltip>
<Tooltip disabled={!(required || editing)} maxWidth="275px" placement="bottom-start">
<div style:width="fit-content">
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={array}
disabled={required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
</div>
<svelte:fragment slot="tooltip">
{#if editing}
Array cannot be selected to avoid data incompatibility.
{:else}
Array cannot be selected because required columns must be populated in all rows with a
single value.
{/if}
</svelte:fragment>
</Tooltip>
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte
+2 -15
View File
@@ -44,6 +44,7 @@
import { currentPlan } from '$lib/stores/organization';
import { createConservative } from '$lib/helpers/stores';
import { ActionMenu, Selector } from '@appwrite.io/pink-svelte';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
import { InputNumber, InputText, InputTextarea } from '$lib/elements/forms';
import { Popover, Layout, Tag, Typography, Link } from '@appwrite.io/pink-svelte';
@@ -105,21 +106,7 @@
disabled={data.required || data.array}
nullable={!data.required && !data.array} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required." />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
<Layout.Stack gap="xs" direction="column">
<div
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte
+5 -17
View File
@@ -38,13 +38,12 @@
<script lang="ts">
import { InputURL } from '$lib/elements/forms';
import { createConservative } from '$lib/helpers/stores';
import RequiredArrayCheckboxes from './requiredArrayCheckboxes.svelte';
export let data: Partial<Models.ColumnUrl>;
export let editing = false;
import { createConservative } from '$lib/helpers/stores';
import { Selector } from '@appwrite.io/pink-svelte';
let savedDefault = data.default;
function handleDefaultState(hideDefault: boolean) {
@@ -64,6 +63,7 @@
array: false,
...data
});
$: listen(data);
$: handleDefaultState($required || $array);
@@ -76,17 +76,5 @@
bind:value={data.default}
disabled={data.required || data.array}
nullable={!data.required && !data.array} />
<Selector.Checkbox
size="s"
id="required"
label="Required"
bind:checked={data.required}
disabled={data.array}
description="Indicate whether this column is required" />
<Selector.Checkbox
size="s"
id="array"
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this column is an array. Defaults to an empty array." />
<RequiredArrayCheckboxes {editing} bind:array={data.array} bind:required={data.required} />
src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte
+1 -1
View File
@@ -16,7 +16,7 @@
export let data;
onMount(() => {
return sdk.forConsole.client.subscribe('console', (response) => {
return sdk.forConsole.realtime.subscribe('console', (response) => {
if (response.events.includes('functions.*.executions.*')) {
invalidate(Dependencies.EXECUTIONS);
}
src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte
+13 -10
View File
@@ -17,7 +17,7 @@
import { Card } from '$lib/components';
import { page } from '$app/state';
import { onMount } from 'svelte';
import { sdk } from '$lib/stores/sdk';
import { type AppwriteRealtimeSubscription, sdk } from '$lib/stores/sdk';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { addNotification } from '$lib/stores/notifications';
import { fade } from 'svelte/transition';
@@ -81,17 +81,20 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.
}
onMount(() => {
const unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
unsubscribe();
}
});
let subscription: AppwriteRealtimeSubscription;
sdk.forConsole.realtime
.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
subscription?.close();
}
})
.then((realtime) => (subscription = realtime));
return () => {
unsubscribe();
subscription?.close();
resetPlatformStore();
};
});
src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte
+13 -10
View File
@@ -18,7 +18,7 @@
import { Card } from '$lib/components';
import { page } from '$app/state';
import { onMount } from 'svelte';
import { sdk } from '$lib/stores/sdk';
import { type AppwriteRealtimeSubscription, sdk } from '$lib/stores/sdk';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { addNotification } from '$lib/stores/notifications';
import { fade } from 'svelte/transition';
@@ -90,17 +90,20 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj
}
onMount(() => {
const unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
unsubscribe();
}
});
let subscription: AppwriteRealtimeSubscription;
sdk.forConsole.realtime
.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
subscription?.close();
}
})
.then((realtime) => (subscription = realtime));
return () => {
unsubscribe();
subscription?.close();
resetPlatformStore();
};
});
src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte
+13 -10
View File
@@ -18,7 +18,7 @@
import { Card } from '$lib/components';
import { page } from '$app/state';
import { onMount } from 'svelte';
import { sdk } from '$lib/stores/sdk';
import { type AppwriteRealtimeSubscription, sdk } from '$lib/stores/sdk';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { addNotification } from '$lib/stores/notifications';
import { fade } from 'svelte/transition';
@@ -156,17 +156,20 @@
}
onMount(() => {
const unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
unsubscribe();
}
});
let subscription: AppwriteRealtimeSubscription;
sdk.forConsole.realtime
.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
subscription?.close();
}
})
.then((realtime) => (subscription = realtime));
return () => {
unsubscribe();
subscription?.close();
resetPlatformStore();
};
});
src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte
+13 -10
View File
@@ -18,7 +18,7 @@
import { Card } from '$lib/components';
import { page } from '$app/state';
import { onMount } from 'svelte';
import { sdk } from '$lib/stores/sdk';
import { type AppwriteRealtimeSubscription, sdk } from '$lib/stores/sdk';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { addNotification } from '$lib/stores/notifications';
import { fade } from 'svelte/transition';
@@ -117,17 +117,20 @@ EXPO_PUBLIC_APPWRITE_ENDPOINT=${sdk.forProject(page.params.region, page.params.p
}
onMount(() => {
const unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
unsubscribe();
}
});
let subscription: AppwriteRealtimeSubscription;
sdk.forConsole.realtime
.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
subscription?.close();
}
})
.then((realtime) => (subscription = realtime));
return () => {
unsubscribe();
subscription?.close();
resetPlatformStore();
};
});
src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte
+13 -10
View File
@@ -28,7 +28,7 @@
} from '@appwrite.io/pink-icons-svelte';
import { page } from '$app/state';
import { onMount } from 'svelte';
import { sdk } from '$lib/stores/sdk';
import { type AppwriteRealtimeSubscription, sdk } from '$lib/stores/sdk';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { addNotification } from '$lib/stores/notifications';
import { fade } from 'svelte/transition';
@@ -202,18 +202,21 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p
}
onMount(() => {
const unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
unsubscribe();
}
});
let subscription: AppwriteRealtimeSubscription;
sdk.forConsole.realtime
.subscribe('console', (response) => {
if (response.events.includes(`projects.${projectId}.ping`)) {
connectionSuccessful = true;
invalidate(Dependencies.ORGANIZATION);
invalidate(Dependencies.PROJECT);
subscription?.close();
}
})
.then((realtime) => (subscription = realtime));
return () => {
unsubscribe();
resetPlatformStore();
subscription?.close();
};
});
</script>
src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte
+2 -1
View File
@@ -25,6 +25,7 @@
import { sdk } from '$lib/stores/sdk';
import { capitalize } from '$lib/helpers/string';
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
import type { Snippet } from 'svelte';
let {
deployment,
@@ -216,7 +217,7 @@
<Divider />
</span>
<Layout.Stack direction="row-reverse">
{@render footer()}
{@render footer?.()}
</Layout.Stack>
{/if}
</Layout.Stack>
src/routes/(console)/project-[region]-[project]/sites/+page.svelte
+1 -1
View File
@@ -49,7 +49,7 @@
$updateCommandGroupRanks({ sites: 1000 });
onMount(() => {
return sdk.forConsole.client.subscribe('console', (response) => {
return sdk.forConsole.realtime.subscribe('console', (response) => {
if (response.events.includes('sites.*')) {
invalidate(Dependencies.SITES);
}
src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte
+26 -20
View File
@@ -1,42 +1,48 @@
<script lang="ts">
import { Wizard } from '$lib/layout';
import { base } from '$app/paths';
import { base, resolve } from '$app/paths';
import { page } from '$app/state';
import { Fieldset, Card, Layout, Tag, Typography } from '@appwrite.io/pink-svelte';
import Button from '$lib/elements/forms/button.svelte';
import Aside from '../aside.svelte';
import Logs from '../../(components)/logs.svelte';
import { Copy, SvgIcon } from '$lib/components';
import { sdk } from '$lib/stores/sdk';
import { type AppwriteRealtimeSubscription, sdk } from '$lib/stores/sdk';
import { goto } from '$app/navigation';
import { onMount } from 'svelte';
import { getFrameworkIcon } from '$lib/stores/sites';
import type { Models, RealtimeResponseEvent } from '@appwrite.io/console';
let { data } = $props();
let deployment = $state(data.deployment);
onMount(() => {
return sdk
.forConsoleIn(page.params.region)
.client.subscribe(
'console',
async (response: RealtimeResponseEvent<Models.Deployment>) => {
if (
response.events.includes(
`sites.${data.site.$id}.deployments.${data.deployment.$id}.update`
)
) {
deployment = response.payload;
if (response.payload.status === 'ready') {
goto(
`${base}/project-${page.params.region}-${page.params.project}/sites/create-site/finish?site=${data.site.$id}`
);
}
let subscription: AppwriteRealtimeSubscription;
sdk.forConsoleIn(page.params.region)
.realtime.subscribe('console', async (response) => {
if (
response.events.includes(
`sites.${data.site.$id}.deployments.${data.deployment.$id}.update`
)
) {
deployment = response.payload;
if (response.payload.status === 'ready') {
const resolvedUrl = resolve(
'/(console)/project-[region]-[project]/sites/create-site/finish',
{
region: page.params.region,
project: page.params.project
}
);
await goto(`${resolvedUrl}?site=${data.site.$id}`);
}
}
);
})
.then((realtime) => (subscription = realtime));
return () => {
subscription?.close();
};
});
</script>
src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte
+23 -20
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { base } from '$app/paths';
import { resolve } from '$app/paths';
import { page } from '$app/state';
import { Wizard } from '$lib/layout';
import { Layout, Typography, Icon, Lights, Step, Card } from '@appwrite.io/pink-svelte';
@@ -18,13 +18,23 @@
import { ConnectRepoModal } from '$lib/components/git';
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
export let data;
import type { PageProps } from './$types';
let showOpenOnMobile = false;
let showConnectRepository = false;
let showInviteCollaborator = false;
const { data }: PageProps = $props();
const siteURL = data.proxyRuleList.rules[0].domain;
let showOpenOnMobile = $state(false);
let showConnectRepository = $state(false);
let showInviteCollaborator = $state(false);
const siteURL = $derived(data.proxyRuleList.rules[0].domain);
const siteRedirectHref = $derived.by(() => {
return resolve('/(console)/project-[region]-[project]/sites/site-[site]', {
region: page.params.region,
project: page.params.project,
site: data.site.$id
});
});
onMount(() => {
if (
@@ -54,16 +64,15 @@
providerRepositoryId: selectedRepository,
providerBranch: 'main'
});
invalidate(Dependencies.SITE);
await invalidate(Dependencies.SITE);
} catch {
return;
}
}
</script>
<Wizard
column
href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}>
<Wizard column href={siteRedirectHref}>
<!-- Creating a new stack -->
<Layout.Stack gap="xxxl">
<div style:position="relative" style="z-index: 6;">
@@ -83,9 +92,9 @@
deployment={data.deployment}
proxyRuleList={data.proxyRuleList}
hideQRCode>
<svelte:fragment slot="footer">
{#snippet footer()}
<Button href={`${$regionalProtocol}${siteURL}`} external>Visit site</Button>
</svelte:fragment>
{/snippet}
</SiteCard>
</Layout.Stack>
</div>
@@ -127,7 +136,7 @@
source: 'sites_create_finish'
});
}}
href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}/domains`}>
href={`${siteRedirectHref}/domains`}>
<Layout.Stack gap="s" style="height: 100%">
<Layout.Stack
direction="row"
@@ -191,13 +200,7 @@
</Layout.Stack>
<svelte:fragment slot="footer">
<Button
size="s"
fullWidthMobile
secondary
href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}>
Go to dashboard
</Button>
<Button size="s" fullWidthMobile secondary href={siteRedirectHref}>Go to dashboard</Button>
</svelte:fragment>
</Wizard>
src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.svelte
+3 -3
View File
@@ -19,7 +19,7 @@
let showRollback = false;
onMount(() => {
return sdk.forConsole.client.subscribe('console', (response) => {
return sdk.forConsole.realtime.subscribe('console', (response) => {
if (response.events.includes(`sites.${page.params.site}.deployments.*`)) {
invalidate(Dependencies.SITE);
}
@@ -31,7 +31,7 @@
<Layout.Stack gap="xxxl">
{#if data?.deployment && data.deployment.status === 'ready'}
<SiteCard deployment={data.deployment} proxyRuleList={data.proxyRuleList}>
<svelte:fragment slot="footer">
{#snippet footer()}
{#if data.proxyRuleList.total}
<Button
external
@@ -53,7 +53,7 @@
active.
</span>
</Tooltip>
</svelte:fragment>
{/snippet}
</SiteCard>
{:else if data.deployment?.status === 'building'}
<Card.Base padding="none">
src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte
+1 -1
View File
@@ -13,7 +13,7 @@
onMount(() => {
let previousStatus: string = null;
return sdk.forConsole.client.subscribe<Models.Deployment>('console', (message) => {
return sdk.forConsole.realtime.subscribe<Models.Deployment>('console', (message) => {
if (message.payload.status !== 'ready' && previousStatus === message.payload.status) {
return;
}
src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte
+1 -1
View File
@@ -36,7 +36,7 @@
showConnectRepo = true;
}
return sdk.forConsole.client.subscribe('console', (response) => {
return sdk.forConsole.realtime.subscribe('console', (response) => {
if (response.events.includes('sites.*.deployments.*')) {
invalidate(Dependencies.DEPLOYMENTS);
}
src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte
+21 -18
View File
@@ -1,8 +1,7 @@
<script lang="ts">
import { Container } from '$lib/layout';
import { sdk } from '$lib/stores/sdk';
import { type AppwriteRealtimeSubscription, sdk } from '$lib/stores/sdk';
import { onMount } from 'svelte';
import type { Models, RealtimeResponseEvent } from '@appwrite.io/console';
import SiteCard from '../../../(components)/siteCard.svelte';
import Logs, { badgeTypeDeployment } from '../../../(components)/logs.svelte';
import Card from '$lib/components/card.svelte';
@@ -20,7 +19,9 @@
import { page } from '$app/state';
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
let { data } = $props();
import type { PageProps } from './$types';
let { data }: PageProps = $props();
let deployment = $derived(data.deployment);
@@ -30,26 +31,28 @@
let showCancel = $state(false);
onMount(() => {
return sdk
.forConsoleIn(page.params.region)
.client.subscribe(
'console',
async (response: RealtimeResponseEvent<Models.Deployment>) => {
if (
response.events.includes(
`sites.${page.params.site}.deployments.${page.params.deployment}.update`
)
) {
await invalidate(Dependencies.DEPLOYMENT);
}
let subscription: AppwriteRealtimeSubscription;
sdk.forConsoleIn(page.params.region)
.realtime.subscribe('console', async (response) => {
if (
response.events.includes(
`sites.${page.params.site}.deployments.${page.params.deployment}.update`
)
) {
await invalidate(Dependencies.DEPLOYMENT);
}
);
})
.then((realtime) => (subscription = realtime));
return () => {
subscription?.close();
};
});
</script>
<Container>
<SiteCard {deployment} proxyRuleList={data.proxyRuleList}>
<svelte:fragment slot="footer">
{#snippet footer()}
{#if deployment?.status === 'ready' && data.proxyRuleList?.total}
<Button
external
@@ -78,7 +81,7 @@
bind:showDelete
bind:showCancel
activeDeployment={data.site.deploymentId} />
</svelte:fragment>
{/snippet}
</SiteCard>
<Card padding="s">
<Accordion
src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.svelte
+1 -1
View File
@@ -13,7 +13,7 @@
export let data;
onMount(() => {
return sdk.forConsole.client.subscribe('console', (response) => {
return sdk.forConsole.realtime.subscribe('console', (response) => {
if (response.events.includes('sites.*.executions.*')) {
invalidate(Dependencies.EXECUTIONS);
}