diff --git a/package.json b/package.json index fd30ea7e5..5df98a274 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@2cf27e0", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed", "@faker-js/faker": "^9.9.0", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 47cf8cf38..3557840e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed(svelte@5.25.3) '@faker-js/faker': specifier: ^9.9.0 version: 9.9.0 @@ -284,8 +284,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3719,7 +3719,7 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed(svelte@5.25.3)': dependencies: '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3) '@floating-ui/dom': 1.6.13 diff --git a/src/lib/components/dropList.svelte b/src/lib/components/dropList.svelte index 1b6d3edb7..4ef0542e1 100644 --- a/src/lib/components/dropList.svelte +++ b/src/lib/components/dropList.svelte @@ -14,6 +14,10 @@ export let wrapperFullWidth = false; export let position: 'relative' | 'static' = 'relative'; export let noMaxWidthList = false; + export let paddingBlock: string = undefined; + export let paddingInline: string = undefined; + export let resetListPadding: boolean = false; + export let gap: string = undefined; let classes: string = ''; export { classes as class }; @@ -34,14 +38,20 @@ class="drop is-no-arrow {classes}" class:u-max-width-100-percent={fullWidth} style:--drop-width-size-desktop={width ? `${width}rem` : ''} + style:margin-block-start={gap} style:position> {#if $$slots.list}
-
diff --git a/src/lib/layout/displaySettingsModal.svelte b/src/lib/layout/displaySettingsModal.svelte index 77f2568e3..325901029 100644 --- a/src/lib/layout/displaySettingsModal.svelte +++ b/src/lib/layout/displaySettingsModal.svelte @@ -35,7 +35,7 @@ {#if !hideColumns && $columns?.length} Columns - + {#snippet children(toggle, selectedColumnsNumber)} {title}
- +
diff --git a/src/lib/layout/responsiveContainerHeader.svelte b/src/lib/layout/responsiveContainerHeader.svelte index e84caf048..0f5358a02 100644 --- a/src/lib/layout/responsiveContainerHeader.svelte +++ b/src/lib/layout/responsiveContainerHeader.svelte @@ -112,7 +112,7 @@ {#if hasDisplaySettings} - + {/if} {#if children} {@render children()} diff --git a/src/lib/system.ts b/src/lib/system.ts index b9dab34d5..0e3408872 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -39,3 +39,12 @@ export function isMultiRegionSupported(url: URL): boolean { return false; } } + +// there can be multiple internal cloud instances. +export function isProductionCloud(url: URL): boolean { + try { + return url.hostname === 'cloud.appwrite.io'; + } catch { + return false; + } +} diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte index 4251c80e9..4e98e3d80 100644 --- a/src/routes/(console)/organization-[organization]/domains/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte @@ -49,7 +49,7 @@ - + diff --git a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte index 1f2dc4423..b58953779 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte @@ -59,7 +59,7 @@ - +
- +
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte index 28cdbeec4..7774be57f 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte @@ -33,7 +33,7 @@
- +
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte index a8ab5335a..67681bddc 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte @@ -52,6 +52,7 @@ -
+
{#if !isDisabled}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte index 9df266290..d340d0f75 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte @@ -2,9 +2,11 @@ import { DropList } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { IconInfo, IconPlus } from '@appwrite.io/pink-icons-svelte'; - import { Badge, Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; + import { Badge, Icon, Layout, Tag, Typography } from '@appwrite.io/pink-svelte'; import { goto } from '$app/navigation'; import { upgradeURL } from '$lib/stores/billing'; + import { BillingPlan } from '$lib/constants'; + import { organization } from '$lib/stores/organization'; export let isFlex = true; export let title: string; @@ -39,13 +41,32 @@ {#if title === 'Policies' && policiesCreated >= maxPolicies}
- - (showDropdown = true)}> - - + + {#if $organization?.billingPlan === BillingPlan.PRO} + (showDropdown = true)}> + + {policiesCreated}/{maxPolicies} created + + {:else} + (showDropdown = true)}> + + + {/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte index e4af56e16..e4ccd8b91 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte @@ -198,7 +198,7 @@
-
+
Previous @@ -225,7 +225,7 @@
-
+
Next diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts index dd4b9c133..43cc2552d 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts @@ -30,8 +30,8 @@ export const presetPolicies = writable([ export const columns = writable([ { id: 'backups', title: 'Backups', type: 'string', width: { min: 180 } }, - { id: 'size', title: 'Size', type: 'integer', width: { min: 163 } }, + { id: 'size', title: 'Size', type: 'integer', width: { min: 100 } }, { id: 'status', title: 'Status', type: 'enum', width: { min: 163 } }, - { id: 'policy', title: 'Policy', type: 'string', width: { min: 163 } }, - { id: 'actions', title: '', type: 'string', width: 48 } + { id: 'policy', title: 'Policy', type: 'string', width: { min: 100 } }, + { id: 'actions', title: '', type: 'string', width: 64 } ]); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte index 1603ca8f4..689afe74f 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte @@ -205,7 +205,7 @@ -
+
{policy?.name || 'Manual'} @@ -217,51 +217,53 @@
- - - - - - {#if backup.status === 'completed'} + +
+ + + + + {#if backup.status === 'completed'} + { + toggle(e); + showRestore = true; + selectedBackup = backup; + showDropdown[index] = false; + trackEvent(Click.BackupRestoreClick); + }}> + Restore + + {/if} { toggle(e); - showRestore = true; + copy(backup.$id); + showDropdown[index] = false; + trackEvent(Click.BackupCopyIdClick); + }}> + Copy ID + + { + toggle(e); + showDelete = true; selectedBackup = backup; showDropdown[index] = false; - trackEvent(Click.BackupRestoreClick); + trackEvent(Click.BackupDeleteClick); }}> - Restore + Delete - {/if} - { - toggle(e); - copy(backup.$id); - showDropdown[index] = false; - trackEvent(Click.BackupCopyIdClick); - }}> - Copy ID - - { - toggle(e); - showDelete = true; - selectedBackup = backup; - showDropdown[index] = false; - trackEvent(Click.BackupDeleteClick); - }}> - Delete - - - - + + + +
{/each} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte index a0d751d08..076e08f1c 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte @@ -52,7 +52,7 @@ import EditColumn from './columns/edit.svelte'; import RowActivity from './rows/activity.svelte'; import EditRowPermissions from './rows/editPermissions.svelte'; - import { Dialog, Layout, Typography } from '@appwrite.io/pink-svelte'; + import { Dialog, Layout, Typography, Selector } from '@appwrite.io/pink-svelte'; import { Button, Seekbar } from '$lib/elements/forms'; import { generateFakeRecords, generateColumns } from '$lib/helpers/faker'; import { addNotification } from '$lib/stores/notifications'; @@ -70,6 +70,7 @@ let createIndex: CreateIndex; let createColumn: CreateColumn; let selectedOption: Option['name'] = 'String'; + let createMoreColumns = false; /** * adding a lot of fake data will trigger the realtime below @@ -327,6 +328,10 @@ spreadsheetRenderKey.set(hash(rowIds)); } + + $: if (!$showCreateColumnSheet.show) { + createMoreColumns = false; + } @@ -336,20 +341,27 @@ { - await createColumn?.submit(); - }, + onClick: async () => await createColumn?.submit(), disabled: !selectedOption }}> + {#snippet footer()} + + + + {/snippet} void; } = $props(); @@ -148,12 +150,19 @@ message: `Column ${key ?? data?.key} has been created` }); trackEvent(Submit.ColumnCreate); + + if (createMore) { + init(); + return true; // keep sheet open + } + return false; // close sheet } catch (e) { addNotification({ type: 'error', message: e.message }); trackError(e, Submit.ColumnCreate); + return true; // keep open on error } } diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts index 01a7a633b..d5b08e19f 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts @@ -40,7 +40,8 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) => 'totalSize', 'buildDuration', 'status', - 'type' + 'type', + 'resourceId' ]), ...parsedQueries.values() ] diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte index 8aed8a13b..85b132238 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte @@ -29,7 +29,7 @@ - + {#if $canWriteProviders}