From 67f5225e189f70d7d0344a02f691c180e174c358 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:31:43 +0000 Subject: [PATCH 001/105] feat: notification transitions --- src/lib/layout/notification.svelte | 5 ++++- src/lib/layout/notifications.svelte | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/lib/layout/notification.svelte b/src/lib/layout/notification.svelte index 877283cc1..8d386c59e 100644 --- a/src/lib/layout/notification.svelte +++ b/src/lib/layout/notification.svelte @@ -1,5 +1,7 @@ {#if $notifications}
From 07f2580d1fd3b9d7d25677ba065f92818749660a Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Thu, 16 Feb 2023 21:08:32 +0000 Subject: [PATCH 002/105] fix: fix auth services alert message & abstract oauth update function --- .../project-[project]/auth/appleOAuth.svelte | 44 +++++----------- .../project-[project]/auth/auth0OAuth.svelte | 38 ++++---------- .../auth/authentikOAuth.svelte | 38 ++++---------- .../project-[project]/auth/gitlabOAuth.svelte | 38 ++++---------- .../project-[project]/auth/mainOAuth.svelte | 38 ++++---------- .../auth/microsoftOAuth.svelte | 38 ++++---------- .../project-[project]/auth/oktaOAuth.svelte | 48 +++++------------ .../project-[project]/auth/updateOAuth.ts | 51 +++++++++++++++++++ 8 files changed, 122 insertions(+), 211 deletions(-) create mode 100644 src/routes/console/project-[project]/auth/updateOAuth.ts diff --git a/src/routes/console/project-[project]/auth/appleOAuth.svelte b/src/routes/console/project-[project]/auth/appleOAuth.svelte index d741025cc..681e3a06e 100644 --- a/src/routes/console/project-[project]/auth/appleOAuth.svelte +++ b/src/routes/console/project-[project]/auth/appleOAuth.svelte @@ -1,14 +1,13 @@ diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte index 41dc6f1b2..8b0f4a376 100644 --- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte +++ b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte @@ -1,14 +1,11 @@ @@ -25,13 +28,18 @@ let client = Client() Before sending any API calls to your new Appwrite project, make sure your device or emulator has network access to your Appwrite project's hostname or IP address.

-
- - For self-hosted solutions - When connecting to a locally hosted Appwrite project from an emulator or a mobile device, - you should use the private IP of the device running your Appwrite project as the hostname - of the endpoint instead of localhost. You can also use a service like ngrok to proxy the - Appwrite server. - -
+ {#if !dismissedAlert} +
+ (dismissedAlert = true)}> + For self-hosted solutions + When connecting to a locally hosted Appwrite project from an emulator or a mobile device, + you should use the private IP of the device running your Appwrite project as the hostname + of the endpoint instead of localhost. You can also use a service like ngrok to proxy + the Appwrite server. + +
+ {/if}
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte index 6f46f657d..cac8f77ef 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte @@ -2,6 +2,7 @@ import { Alert, Code } from '$lib/components'; import { WizardStep } from '$lib/layout'; import { sdkForProject } from '$lib/stores/sdk'; + import { Mode, MODE } from '$lib/system'; const { endpoint, project } = sdkForProject.client.config; const code = `import 'package:appwrite/appwrite.dart'; @@ -11,6 +12,8 @@ client .setEndpoint('${endpoint}') .setProject('${project}') .setSelfSigned(status: true); // For self signed certificates, only use for development`; + + let dismissedAlert = false; @@ -26,13 +29,18 @@ client Before sending any API calls to your new Appwrite project, make sure your device or emulator has network access to your Appwrite project's hostname or IP address.

-
- - For self-hosted solutions - When connecting to a locally hosted Appwrite project from an emulator or a mobile device, - you should use the private IP of the device running your Appwrite project as the hostname - of the endpoint instead of localhost. You can also use a service like ngrok to proxy the - Appwrite server. - -
+ {#if !dismissedAlert} +
+ (dismissedAlert = true)}> + For self-hosted solutions + When connecting to a locally hosted Appwrite project from an emulator or a mobile device, + you should use the private IP of the device running your Appwrite project as the hostname + of the endpoint instead of localhost. You can also use a service like ngrok to proxy + the Appwrite server. + +
+ {/if}
From 7bcb0c7a5f14e0a86519c37d1fca9e46887d67fe Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Feb 2023 18:03:19 +0530 Subject: [PATCH 005/105] feat: lr for cloud --- package-lock.json | 6 ++++++ package.json | 1 + src/lib/elements/table/cell.svelte | 3 ++- src/lib/elements/table/cellLink.svelte | 2 +- src/lib/elements/table/cellText.svelte | 3 ++- src/lib/system.ts | 6 ++++-- src/routes/+layout.svelte | 16 +++++++++++++--- src/routes/+layout.ts | 6 ++++++ .../auth/user-[user]/dangerZone.svelte | 4 ++-- .../auth/user-[user]/updateName.svelte | 2 +- .../auth/user-[user]/updateStatus.svelte | 4 ++-- 11 files changed, 40 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21a276c80..61530ef93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "@sentry/tracing": "^7.36.0", "analytics": "^0.8.1", "echarts": "^5.4.1", + "logrocket": "^3.0.1", "pretty-bytes": "^6.1.0", "prismjs": "^1.29.0", "tippy.js": "^6.3.7", @@ -6261,6 +6262,11 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/logrocket": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/logrocket/-/logrocket-3.0.1.tgz", + "integrity": "sha512-jOWG+jEzobKVxGytzZ+4KGm2kiMQMRTHab2uDWQyVZcHfEF38BlCH1yjQVY4LCmuQUwZitP9biMzJZnyUQ0dtQ==" + }, "node_modules/loupe": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", diff --git a/package.json b/package.json index c468dff23..0d0865856 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "@sentry/tracing": "^7.36.0", "analytics": "^0.8.1", "echarts": "^5.4.1", + "logrocket": "^3.0.1", "pretty-bytes": "^6.1.0", "prismjs": "^1.29.0", "tippy.js": "^6.3.7", diff --git a/src/lib/elements/table/cell.svelte b/src/lib/elements/table/cell.svelte index 4c778d31a..b8353646a 100644 --- a/src/lib/elements/table/cell.svelte +++ b/src/lib/elements/table/cell.svelte @@ -11,6 +11,7 @@ class:u-overflow-visible={showOverflow} class:is-only-desktop={onlyDesktop} data-title={title} - role="cell"> + role="cell" + data-private> diff --git a/src/lib/elements/table/cellLink.svelte b/src/lib/elements/table/cellLink.svelte index 17892db57..839949f73 100644 --- a/src/lib/elements/table/cellLink.svelte +++ b/src/lib/elements/table/cellLink.svelte @@ -3,6 +3,6 @@ export let title: string; -
+
diff --git a/src/lib/elements/table/cellText.svelte b/src/lib/elements/table/cellText.svelte index 59dcba6e4..e2fb71b6d 100644 --- a/src/lib/elements/table/cellText.svelte +++ b/src/lib/elements/table/cellText.svelte @@ -10,6 +10,7 @@ class:is-only-desktop={onlyDesktop} class:u-overflow-visible={showOverflow} data-title={title} - role="cell"> + role="cell" + data-private>
diff --git a/src/lib/system.ts b/src/lib/system.ts index 596e4faca..9c08603eb 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,3 +1,5 @@ +import { dev } from '$app/environment'; + export enum Mode { CLOUD = 'cloud', SELF_HOSTED = 'self-hosted' @@ -14,8 +16,8 @@ export const VARS = { }; export const ENV = { - DEV: import.meta.env.DEV, - PROD: import.meta.env.PROD, + DEV: dev, + PROD: !dev, PREVIEW: VARS.VERCEL_ENV === 'preview', TEST: !!import.meta.env?.VITEST }; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 65fc7b03d..cefc6eef2 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,5 +1,5 @@ -
+
{#if $user.email || $user.phone} {#if $user.name} @@ -92,7 +92,7 @@
-
+
{#if $user.email}

{$user.email}

{/if} From 407c9a86a618329a0b0bef6b6438d2ab56802099 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Feb 2023 18:05:55 +0530 Subject: [PATCH 006/105] fix: respect dnt --- src/lib/actions/analytics.ts | 2 +- src/routes/+layout.svelte | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 0d00ef17c..c33302f87 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -88,7 +88,7 @@ function sendEventToGrowth(event: string, path: string, data: object = null): vo }); } -function isTrackingAllowed() { +export function isTrackingAllowed() { if (ENV.TEST) { return; } diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index cefc6eef2..4c8074bdc 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -3,7 +3,7 @@ import { afterNavigate, goto } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { trackPageView } from '$lib/actions/analytics'; + import { isTrackingAllowed, trackPageView } from '$lib/actions/analytics'; import { reportWebVitals } from '$lib/helpers/vitals'; import { Notifications, Progress } from '$lib/layout'; import { app } from '$lib/stores/app'; @@ -45,7 +45,7 @@ }); } - if (isCloud) { + if (isCloud && isTrackingAllowed()) { LogRocket.init('rgthvf/appwrite', { dom: { inputSanitizer: true From fbb91b588b31de66a8b275738abc414a33f91520 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Feb 2023 20:47:21 +0530 Subject: [PATCH 007/105] remove unused import --- src/lib/system.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/system.ts b/src/lib/system.ts index 9c08603eb..596e4faca 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,5 +1,3 @@ -import { dev } from '$app/environment'; - export enum Mode { CLOUD = 'cloud', SELF_HOSTED = 'self-hosted' @@ -16,8 +14,8 @@ export const VARS = { }; export const ENV = { - DEV: dev, - PROD: !dev, + DEV: import.meta.env.DEV, + PROD: import.meta.env.PROD, PREVIEW: VARS.VERCEL_ENV === 'preview', TEST: !!import.meta.env?.VITEST }; From 2e198c72625bb949977832be11f9d7e8c90fcc4e Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 27 Feb 2023 10:09:38 +0000 Subject: [PATCH 008/105] refactor: change variable names --- .../overview/platforms/wizard/apple/step3.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte index d66e95903..167bc53e8 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte @@ -12,7 +12,7 @@ let client = Client() .setProject("${project}") .setSelfSigned(status: true) // For self signed certificates, only use for development`; - let dismissedAlert = false; + let showAlert = true; @@ -28,12 +28,12 @@ let client = Client() Before sending any API calls to your new Appwrite project, make sure your device or emulator has network access to your Appwrite project's hostname or IP address.

- {#if !dismissedAlert} + {#if showAlert}
(dismissedAlert = true)}> + on:dismiss={() => (showAlert = false)}> For self-hosted solutions When connecting to a locally hosted Appwrite project from an emulator or a mobile device, you should use the private IP of the device running your Appwrite project as the hostname From 25247b0b8e92a49711dd7be9e58c9f8818959fba Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:53:39 +0000 Subject: [PATCH 009/105] refactor: change auth update message --- .../console/project-[project]/auth/settings/+page.svelte | 4 +--- src/routes/console/project-[project]/auth/updateOAuth.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte index 78786f524..f9f7a8f28 100644 --- a/src/routes/console/project-[project]/auth/settings/+page.svelte +++ b/src/routes/console/project-[project]/auth/settings/+page.svelte @@ -25,9 +25,7 @@ await sdkForConsole.projects.updateAuthStatus(projectId, box.method, box.value); addNotification({ type: 'success', - message: `${box.label} authentication has been ${ - box.value ? 'enabled' : 'disabled' - }` + message: `${box.label} authentication has been updated` }); trackEvent(Submit.AuthStatusUpdate, { method: box.method, diff --git a/src/routes/console/project-[project]/auth/updateOAuth.ts b/src/routes/console/project-[project]/auth/updateOAuth.ts index 39b5a50e1..284d73a51 100644 --- a/src/routes/console/project-[project]/auth/updateOAuth.ts +++ b/src/routes/console/project-[project]/auth/updateOAuth.ts @@ -35,7 +35,7 @@ export async function updateOAuth({ ); addNotification({ type: 'success', - message: `${provider.name} authentication has been ${enabled ? 'enabled' : 'disabled'}` + message: `${provider.name} authentication has been updated` }); trackEvent(Submit.ProviderUpdate, { provider, From b9132761510e1e68fe8f05515f9b7a82167a8d5d Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 1 Mar 2023 20:14:19 +0000 Subject: [PATCH 010/105] refactor: change variable names --- .../overview/platforms/wizard/flutter/step3.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte index cac8f77ef..ef97d30cb 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte @@ -13,7 +13,7 @@ client .setProject('${project}') .setSelfSigned(status: true); // For self signed certificates, only use for development`; - let dismissedAlert = false; + let showAlert = true; @@ -29,12 +29,12 @@ client Before sending any API calls to your new Appwrite project, make sure your device or emulator has network access to your Appwrite project's hostname or IP address.

- {#if !dismissedAlert} + {#if showAlert}
(dismissedAlert = true)}> + on:dismiss={() => (showAlert = false)}> For self-hosted solutions When connecting to a locally hosted Appwrite project from an emulator or a mobile device, you should use the private IP of the device running your Appwrite project as the hostname From 7a5c326adaa4c5f231fd654d3b93a5ef6e171bbe Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:39:32 +0000 Subject: [PATCH 011/105] feat: new sidebar draft --- package-lock.json | 8 +- package.json | 2 +- src/lib/layout/navigation.svelte | 178 +++++++++++++++++++++---------- 3 files changed, 127 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21a276c80..7f06084ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "0.0.6-rc.2", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", @@ -146,9 +146,9 @@ "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, "node_modules/@appwrite.io/pink": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.4.tgz", - "integrity": "sha512-pCXxBqSikG5PpBb2y84tTRH6cAMUYbROlQN8LuGoY2J+vTWMT+HQ7+RAAwRWU1Dlle4FgOFFCKmqU95g6X2a6g==", + "version": "0.0.6-rc.2", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.2.tgz", + "integrity": "sha512-PR2TVhLgRwXfdrB+0w9pZv7X2n6WOawArSJXq8jsRF58EzWcl4nf8XkjTsJ9BSU+in9fkmhxNIBywM707jqUcg==", "dependencies": { "@appwrite.io/pink-icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index c468dff23..374ad0c21 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "0.0.6-rc.2", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index f7deb321f..27934cf2d 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -5,80 +5,146 @@ $: project = $page.params.project; $: path = `${base}/console/project-${project}`; + + let narrow = true; From 605c5bae60fd82518210d089a6b1c72ca54a4b2d Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:04:41 +0000 Subject: [PATCH 043/105] refactor: new sidebar anim --- src/lib/layout/navigation.svelte | 7 +++++-- src/lib/layout/shell.svelte | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index 161300059..68e39d4fd 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -30,7 +30,7 @@ -
+
{#if project}
@@ -157,7 +157,10 @@
{#if subNavigation} -
+
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index aad0da6e0..612bec616 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -81,9 +81,15 @@ .main-side { z-index: 25; } + @media (max-width: 550.99px), (min-width: 551px) and (max-width: 1198.99px) { .main-side { top: 4.5rem; } } + @media (min-width: 1199px) { + .grid-with-side { + grid-template-columns: auto 1fr !important; + } + } From b201fc8aa9b9652e7b0d71cc95b646ad8dadaa2f Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:11:05 +0000 Subject: [PATCH 044/105] refactor: revert back animation --- src/lib/layout/navigation.svelte | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index cd2ae9c7d..a87b575ec 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -140,7 +140,7 @@
{/if} - {#if !subNavigation} + {#if subNavigation} - {:else} - {member.roles} - {/if} - - + {/if} +
From e108b9ac1bc1e8345aa3c436d962a91e9cbf59df Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 15 Mar 2023 20:34:15 +0000 Subject: [PATCH 054/105] refactor: make table sticky scroll only when overflowing --- src/lib/elements/table/tableScroll.svelte | 24 +++++++++++++++++-- src/lib/layout/shell.svelte | 5 ++++ .../[[page]]/+page.svelte | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/lib/elements/table/tableScroll.svelte b/src/lib/elements/table/tableScroll.svelte index d2dd9c53e..814fe00e5 100644 --- a/src/lib/elements/table/tableScroll.svelte +++ b/src/lib/elements/table/tableScroll.svelte @@ -1,10 +1,30 @@
-
- +
(isOverflowing = v)}> +
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index aad0da6e0..a0c589970 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -81,9 +81,14 @@ .main-side { z-index: 25; } + @media (max-width: 550.99px), (min-width: 551px) and (max-width: 1198.99px) { .main-side { top: 4.5rem; } } + + .main-content { + overflow: hidden; + } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte index 14e3aa5c3..3fe33f0bd 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte @@ -91,7 +91,7 @@ {#if data.documents.total} - Document ID + Document ID {#each columns as column} {column.title} {/each} From 3c4e4955c14a0c6bb6e4d52c038a09dd46c55483 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 17 Mar 2023 12:05:34 +0100 Subject: [PATCH 055/105] fix: wrong heading max file size --- .../storage/bucket-[bucket]/settings/updateMaxFileSize.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte index 4e6347186..d87a22cf7 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte @@ -24,7 +24,7 @@ - Update Maximum File Size + Update Maximum File Size

Set the maximum file size allowed in the bucket.

    From c14ce7e16a965613edc3a2803e0f62391b105e54 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:25:34 +0000 Subject: [PATCH 056/105] refactor: rename buttons --- src/lib/components/permissions/custom.svelte | 2 +- src/lib/components/permissions/team.svelte | 2 +- src/lib/components/permissions/user.svelte | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/permissions/custom.svelte b/src/lib/components/permissions/custom.svelte index aecd66068..8530edeba 100644 --- a/src/lib/components/permissions/custom.svelte +++ b/src/lib/components/permissions/custom.svelte @@ -44,6 +44,6 @@ - + diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index d8d636401..fb7312e17 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -144,6 +144,6 @@ {/if} - + diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index d5468b47d..0697c6184 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.svelte @@ -163,6 +163,6 @@ {/if} - + From 5c0cec6ed7494f3347fa8e8a1a46122872b2f6bc Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:28:05 +0000 Subject: [PATCH 057/105] feat: input count dynamic color --- src/lib/elements/forms/inputTextarea.svelte | 29 ++++++++++++++++- .../attributes/string.svelte | 31 +++++++++++++------ 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/lib/elements/forms/inputTextarea.svelte b/src/lib/elements/forms/inputTextarea.svelte index 7285b6f24..51feff2e2 100644 --- a/src/lib/elements/forms/inputTextarea.svelte +++ b/src/lib/elements/forms/inputTextarea.svelte @@ -12,6 +12,8 @@ export let readonly = false; export let autofocus = false; export let maxlength: number = null; + export let optionalText: string | undefined = undefined; + export let tooltip: string = null; let element: HTMLTextAreaElement; let error: string; @@ -37,7 +39,7 @@ -
{#if error} {error} {/if} + + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte index e6655f95e..49750c8ea 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte @@ -1,5 +1,6 @@ - +{#if attribute.size > 64} + +{:else} + +{/if} From 2c2b4ce28acc4349dc9c23480b6331e003360e07 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 20 Mar 2023 13:15:18 +0100 Subject: [PATCH 058/105] fix: some other forms --- src/routes/console/onboarding/+page.svelte | 6 +----- .../createProject.svelte | 13 ++----------- .../indexes/createIndex.svelte | 13 ++++--------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte index 747972848..7f8cffad3 100644 --- a/src/routes/console/onboarding/+page.svelte +++ b/src/routes/console/onboarding/+page.svelte @@ -15,11 +15,9 @@ let name: string; let id: string; let showCustomId = false; - let loading = false; async function createProject() { try { - loading = true; const org = await createOrganization(); const project = await sdk.forConsole.projects.create( id ?? ID.unique(), @@ -34,7 +32,6 @@ teamId: org.$id }); } catch (error) { - loading = false; addNotification({ message: error.message, type: 'error' @@ -57,7 +54,6 @@ label="Project name" placeholder="First Appwrite Project" required - disabled={loading} bind:value={name} /> {#if !showCustomId}
@@ -70,7 +66,7 @@ {:else} {/if} - diff --git a/src/routes/console/organization-[organization]/createProject.svelte b/src/routes/console/organization-[organization]/createProject.svelte index 04d8aaf7b..1caa4ed6a 100644 --- a/src/routes/console/organization-[organization]/createProject.svelte +++ b/src/routes/console/organization-[organization]/createProject.svelte @@ -18,11 +18,9 @@ let name: string; let showCustomId = false; let error: string; - let isCreating = false; async function create() { try { - isCreating = true; const project = await sdk.forConsole.projects.create( id ?? ID.unique(), name, @@ -40,7 +38,6 @@ }); await goto(`/console/project-${project.$id}`); } catch (e) { - isCreating = false; error = e.message; trackError(e, Submit.ProjectCreate); } @@ -50,13 +47,7 @@ Create Project - + {#if !showCustomId}
(showCustomId = !showCustomId)}> @@ -71,6 +62,6 @@ - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index cc8f7c9f1..c1c21e6d1 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -31,8 +31,8 @@ value: attribute.key, label: attribute.key })); + let attributeList = [{ value: '', order: '' }]; - let creating = false; function initialize() { attributeList = externalAttribute @@ -47,8 +47,7 @@ initialize(); } - $: addAttributeDisabled = - !attributeList.at(-1)?.value || !attributeList.at(-1)?.order || creating; + $: addAttributeDisabled = !attributeList.at(-1)?.value || !attributeList.at(-1)?.order; async function create() { if (!(key && selectedType && !addAttributeDisabled)) { @@ -56,8 +55,6 @@ return; } - creating = true; - try { await sdk.forProject.databases.createIndex( databaseId, @@ -81,15 +78,13 @@ type: 'success' }); trackEvent(Submit.IndexCreate); + showCreateIndex = false; } catch (error) { addNotification({ message: error.message, type: 'error' }); trackError(error, Submit.IndexCreate); - } finally { - showCreateIndex = false; - creating = false; } } @@ -156,6 +151,6 @@ - + From 666b9748384180af1ade0fc305f8181c68f93c11 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 20 Mar 2023 13:50:34 +0100 Subject: [PATCH 059/105] tests: add tests for new form --- package-lock.json | 28 +++++++++ src/lib/elements/forms/button.svelte | 2 +- src/lib/mock/form.test.svelte | 11 ++++ tests/unit/elements/form.test.ts | 87 ++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 src/lib/mock/form.test.svelte create mode 100644 tests/unit/elements/form.test.ts diff --git a/package-lock.json b/package-lock.json index 61530ef93..83761e17f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4493,6 +4493,23 @@ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", "dev": true }, + "node_modules/happy-dom": { + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-8.9.0.tgz", + "integrity": "sha512-JZwJuGdR7ko8L61136YzmrLv7LgTh5b8XaEM3P709mLjyQuXJ3zHTDXvUtBBahRjGlcYW0zGjIiEWizoTUGKfA==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "css.escape": "^1.5.1", + "he": "^1.2.0", + "iconv-lite": "^0.6.3", + "node-fetch": "^2.x.x", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0" + } + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -4562,6 +4579,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "optional": true, + "peer": true, + "bin": { + "he": "bin/he" + } + }, "node_modules/html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index 8ce90e094..1dc57636d 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -21,7 +21,7 @@ ? getContext('form').isSubmitting : readable(false); - $: internalDisabled = $isSubmitting || disabled; + $: internalDisabled = (submit && $isSubmitting) || disabled; //allows to add the disabled attribute to tag without throwing an error $: attributes = { internalDisabled } as Record; diff --git a/src/lib/mock/form.test.svelte b/src/lib/mock/form.test.svelte new file mode 100644 index 000000000..c900d26e1 --- /dev/null +++ b/src/lib/mock/form.test.svelte @@ -0,0 +1,11 @@ + + + + + + diff --git a/tests/unit/elements/form.test.ts b/tests/unit/elements/form.test.ts new file mode 100644 index 000000000..5fd9eca75 --- /dev/null +++ b/tests/unit/elements/form.test.ts @@ -0,0 +1,87 @@ +import '@testing-library/jest-dom'; +import { vi } from 'vitest'; +import { render } from '@testing-library/svelte'; +import { Form } from '../../../src/lib/elements/forms'; +import { sleep } from '$lib/helpers/promises'; +import CompleteForm from '../../../src/lib/mock/form.test.svelte'; +import { tick } from 'svelte'; + +test('shows form', () => { + const { container } = render(Form, { + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toBeInTheDocument(); +}); + +test('shows form - no margin', () => { + const { container } = render(Form, { + noMargin: true, + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toBeInTheDocument(); +}); + +test('shows form - no style', () => { + const { container } = render(Form, { + noStyle: true, + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toBeInTheDocument(); +}); + +test('shows form - is modal', () => { + const { container } = render(Form, { + isModal: true, + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toBeInTheDocument(); +}); + +test('shows form - submitting', async () => { + const callback = vi.fn(); + const { container } = render(Form, { + onSubmit: callback + }); + const form = container.querySelector('form'); + form.requestSubmit(); + expect(callback.mock.calls.length).toBe(1); +}); + +test('shows form - submitting promise', async () => { + const callback = vi.fn(); + const { container } = render(Form, { + onSubmit: async () => { + await sleep(100); + callback(); + } + }); + const form = container.querySelector('form'); + form.requestSubmit(); + expect(callback.mock.calls.length).toBe(0); + await sleep(200); + expect(callback.mock.calls.length).toBe(1); +}); + +test('shows form - prevent double submit', async () => { + const { container } = render(CompleteForm, { + onSubmit: async () => { + await sleep(100); + } + }); + const form = container.querySelector('form'); + const submit = container.querySelector('button[type="submit"]'); + const button = container.querySelector('button[type="button"]'); + expect(submit).toBeEnabled(); + expect(button).toBeEnabled(); + form.requestSubmit(); + await tick(); + expect(submit).toBeDisabled(); + expect(button).toBeEnabled(); + await sleep(200); + expect(submit).toBeEnabled(); + expect(button).toBeEnabled(); +}); From a7f56ee41e6fa676ffb4f06c9d09009d2dd8d533 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 20 Mar 2023 14:11:01 +0100 Subject: [PATCH 060/105] tests: fix tests --- tests/unit/elements/form.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/unit/elements/form.test.ts b/tests/unit/elements/form.test.ts index 5fd9eca75..8609df576 100644 --- a/tests/unit/elements/form.test.ts +++ b/tests/unit/elements/form.test.ts @@ -12,6 +12,7 @@ test('shows form', () => { }); const form = container.querySelector('form'); expect(form).toBeInTheDocument(); + expect(form).toHaveClass('form'); }); test('shows form - no margin', () => { @@ -20,7 +21,7 @@ test('shows form - no margin', () => { onSubmit: vi.fn() }); const form = container.querySelector('form'); - expect(form).toBeInTheDocument(); + expect(form).not.toHaveClass('common-section'); }); test('shows form - no style', () => { @@ -29,7 +30,7 @@ test('shows form - no style', () => { onSubmit: vi.fn() }); const form = container.querySelector('form'); - expect(form).toBeInTheDocument(); + expect(form).not.toHaveClass('form'); }); test('shows form - is modal', () => { @@ -39,6 +40,7 @@ test('shows form - is modal', () => { }); const form = container.querySelector('form'); expect(form).toBeInTheDocument(); + expect(form).toHaveClass('modal-form'); }); test('shows form - submitting', async () => { From d218cd577dd9c951f668fd85ac77a762c291af41 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 20 Mar 2023 14:14:09 +0100 Subject: [PATCH 061/105] tests: extend forms tests --- tests/unit/elements/form.test.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/unit/elements/form.test.ts b/tests/unit/elements/form.test.ts index 8609df576..92c8cfc75 100644 --- a/tests/unit/elements/form.test.ts +++ b/tests/unit/elements/form.test.ts @@ -13,6 +13,8 @@ test('shows form', () => { const form = container.querySelector('form'); expect(form).toBeInTheDocument(); expect(form).toHaveClass('form'); + expect(form).toHaveClass('common-section'); + expect(form).not.toHaveClass('modal-form'); }); test('shows form - no margin', () => { @@ -21,7 +23,9 @@ test('shows form - no margin', () => { onSubmit: vi.fn() }); const form = container.querySelector('form'); + expect(form).toHaveClass('form'); expect(form).not.toHaveClass('common-section'); + expect(form).not.toHaveClass('modal-form'); }); test('shows form - no style', () => { @@ -30,7 +34,9 @@ test('shows form - no style', () => { onSubmit: vi.fn() }); const form = container.querySelector('form'); + expect(form).toHaveClass('common-section'); expect(form).not.toHaveClass('form'); + expect(form).not.toHaveClass('modal-form'); }); test('shows form - is modal', () => { @@ -39,7 +45,8 @@ test('shows form - is modal', () => { onSubmit: vi.fn() }); const form = container.querySelector('form'); - expect(form).toBeInTheDocument(); + expect(form).toHaveClass('form'); + expect(form).toHaveClass('common-section'); expect(form).toHaveClass('modal-form'); }); From a7575c0c1686119be3d46739bf01d5757b63615a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 20 Mar 2023 14:58:38 +0100 Subject: [PATCH 062/105] fix: json --- .../functions/function-[function]/execute.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte index 224b91721..5217d07e7 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -18,9 +18,9 @@ let submitting = false; const example = `{ - "firstName": "hello", - "lastName":"world", - "age":"old" + "firstName": "hello", + "lastName": "world", + "age": "old" }`; $: if (selectedFunction && !show) { From 5bb485aeb0e1f384861105e30a44cfb4b041eceb Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 20 Mar 2023 15:05:20 +0100 Subject: [PATCH 063/105] fix: sdk call for collections --- package-lock.json | 28 ------------------- .../collection-[collection]/+layout.ts | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index d5071d74a..7a64d5bd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4493,23 +4493,6 @@ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", "dev": true }, - "node_modules/happy-dom": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-8.9.0.tgz", - "integrity": "sha512-JZwJuGdR7ko8L61136YzmrLv7LgTh5b8XaEM3P709mLjyQuXJ3zHTDXvUtBBahRjGlcYW0zGjIiEWizoTUGKfA==", - "dev": true, - "optional": true, - "peer": true, - "dependencies": { - "css.escape": "^1.5.1", - "he": "^1.2.0", - "iconv-lite": "^0.6.3", - "node-fetch": "^2.x.x", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0" - } - }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -4579,17 +4562,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "optional": true, - "peer": true, - "bin": { - "he": "bin/he" - } - }, "node_modules/html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts index 76d4c0e73..93d275019 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -18,7 +18,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { params.collection ), subNavigation: SubNavigation, - allCollections: await sdkForProject.databases.listCollections(params.database, [ + allCollections: await sdk.forProject.databases.listCollections(params.database, [ Query.orderDesc('$createdAt') ]) }; From 74329a0bb75bd866303b9dc1be37ac1220c4f592 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 20 Mar 2023 15:53:03 +0100 Subject: [PATCH 064/105] feat: query params on users --- src/lib/components/pagination.svelte | 92 ++++++++++--------- src/lib/components/searchQuery.svelte | 18 ++-- .../auth/{[[page]] => }/+page.svelte | 4 +- .../auth/{[[page]] => }/+page.ts | 6 +- 4 files changed, 66 insertions(+), 54 deletions(-) rename src/routes/console/project-[project]/auth/{[[page]] => }/+page.svelte (98%) rename src/routes/console/project-[project]/auth/{[[page]] => }/+page.ts (75%) diff --git a/src/lib/components/pagination.svelte b/src/lib/components/pagination.svelte index 166bdf03e..b857c8b97 100644 --- a/src/lib/components/pagination.svelte +++ b/src/lib/components/pagination.svelte @@ -1,5 +1,5 @@ {#if totalPages > 1} - {@const search = $page.url.search} - + {#key $pageStore.url} + + {/key} {:else}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/+page.ts similarity index 82% rename from src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts rename to src/routes/console/project-[project]/functions/function-[function]/+page.ts index bb1bc9a54..423b096d9 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.ts @@ -4,9 +4,9 @@ import { pageToOffset } from '$lib/helpers/load'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, depends }) => { +export const load: PageLoad = async ({ params, depends, url }) => { depends(Dependencies.DEPLOYMENTS); - const page = Number(params.page); + const page = Number(url.searchParams.get('page')); const offset = pageToOffset(page, PAGE_LIMIT); return { diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte similarity index 92% rename from src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte rename to src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte index 6267e7c2e..a011ffb3c 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte @@ -1,6 +1,5 @@ + + 0}> + {count} + + {max} + + + From 505cfe2cb4856dfa679a3d189088a5f1f8645998 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 20 Mar 2023 19:24:21 +0000 Subject: [PATCH 068/105] refactor: modularize text counter --- src/lib/elements/forms/inputId.svelte | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/elements/forms/inputId.svelte b/src/lib/elements/forms/inputId.svelte index b11c7b7a3..93aaecc55 100644 --- a/src/lib/elements/forms/inputId.svelte +++ b/src/lib/elements/forms/inputId.svelte @@ -1,6 +1,7 @@ - + Upload Variables

Upload multiple variables via a .env file that will be passed to your function at runtime.

- + - +
From 7b38f409af0503ec6dfaaf5d298605a5e3b7edd6 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 21 Mar 2023 14:32:53 +0100 Subject: [PATCH 077/105] fix: attributes and types --- src/lib/components/card.svelte | 25 ++++++++++++++++++++----- src/lib/components/dropListLink.svelte | 5 +---- src/lib/elements/forms/button.svelte | 5 +---- src/lib/elements/pill.svelte | 4 ---- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index 9f1ceebd0..314b629c5 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -1,16 +1,31 @@
  • - + {#if icon} tag without throwing an error - $: attributes = { internalDisabled } as Record; - function track() { if (!event) { return; @@ -40,11 +37,11 @@ {#if href} tag without throwing an error - let attributes = { disabled } as Record; - let element: HTMLButtonElement; const isOverflowing = (elem: HTMLButtonElement, iterator = 1) => { @@ -44,7 +41,6 @@ {#if href} Date: Tue, 21 Mar 2023 14:58:21 +0100 Subject: [PATCH 078/105] fix: variables upload with more than 8192 chars --- .../settings/uploadVariables.svelte | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte index d5caa07e7..acec944d7 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte @@ -28,8 +28,16 @@ throw new Error('No variables found'); } + const entries = Object.entries(uploaded); + + for (const [key, value] of entries) { + if (value.length > 8192) { + throw new Error(`Variable ${key} is longer than 8192 allowed characters`); + } + } + await Promise.all( - Object.entries(uploaded) + entries .filter(([, value]) => !!value) .map(([key, value]) => { const found = $variables.find((variable) => variable.key === key); From dffe268dbf95d0e5256f6fda979701ecc0b7ff9c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 21 Mar 2023 15:17:12 +0100 Subject: [PATCH 079/105] remove max-size --- .../function-[function]/settings/uploadVariables.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte index acec944d7..3da9fbf52 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte @@ -70,7 +70,7 @@ Upload multiple variables via a .env file that will be passed to your function at runtime.

    - + From 9a9e8747e32565d044de4fb0eca94bb2bc9c850c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 21 Mar 2023 15:29:04 +0100 Subject: [PATCH 080/105] fix: force pointer cursor on copy --- src/lib/components/copy.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index c6cc8fe7d..33050e82e 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -33,6 +33,8 @@ setTimeout(() => (content = 'Click to copy'))} From 7bc1d187e0e9bb22f28425f04c75a79ceaa5e00e Mon Sep 17 00:00:00 2001 From: Bhaskar Singh Date: Tue, 21 Mar 2023 21:23:17 +0530 Subject: [PATCH 081/105] Wrapped the SDK call within try catch and showing the correct error on the view --- .../console/project-[project]/+error.svelte | 5 +++- .../auth/usage/[[period]]/+page.ts | 23 +++++++++++------- .../databases/usage/[[period]]/+page.ts | 24 ++++++++++++------- .../usage/[[period]]/+page.ts | 23 +++++++++++------- .../storage/usage/[[period]]/+page.ts | 23 +++++++++++------- 5 files changed, 64 insertions(+), 34 deletions(-) diff --git a/src/routes/console/project-[project]/+error.svelte b/src/routes/console/project-[project]/+error.svelte index eaba0eba1..a2297503a 100644 --- a/src/routes/console/project-[project]/+error.svelte +++ b/src/routes/console/project-[project]/+error.svelte @@ -6,5 +6,8 @@ {$page.status} - {$page.error.message} + +
    +

    {$page.error.message}

    +
    diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts index fbc99f708..807ef821c 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -1,16 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const { period } = params; - const response = await sdkForProject.users.getUsage(period ?? '30d'); - return { - count: response.usersCount as unknown as Models.Metric[], - created: response.usersCreate as unknown as Models.Metric[], - read: response.usersRead as unknown as Models.Metric[], - updated: response.usersUpdate as unknown as Models.Metric[], - deleted: response.usersDelete as unknown as Models.Metric[] - }; + try { + const response = await sdkForProject.users.getUsage(period ?? '30d'); + return { + count: response.usersCount as unknown as Models.Metric[], + created: response.usersCreate as unknown as Models.Metric[], + read: response.usersRead as unknown as Models.Metric[], + updated: response.usersUpdate as unknown as Models.Metric[], + deleted: response.usersDelete as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } }; diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts index 9017a1b24..a01346792 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -1,17 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const { period } = params; - const response = await sdkForProject.databases.getUsage(period ?? '30d'); - - return { - count: response.databasesCount as unknown as Models.Metric[], - created: response.databasesCreate as unknown as Models.Metric[], - read: response.databasesRead as unknown as Models.Metric[], - updated: response.databasesUpdate as unknown as Models.Metric[], - deleted: response.databasesDelete as unknown as Models.Metric[] - }; + try { + const response = await sdkForProject.databases.getUsage(period ?? '30d'); + return { + count: response.databasesCount as unknown as Models.Metric[], + created: response.databasesCreate as unknown as Models.Metric[], + read: response.databasesRead as unknown as Models.Metric[], + updated: response.databasesUpdate as unknown as Models.Metric[], + deleted: response.databasesDelete as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } }; diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts index fcba697b3..139bb7be2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts @@ -1,16 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); - const response = await sdkForProject.functions.getFunctionUsage( - params.function, - params.period ?? '30d' - ); + try { + const response = await sdkForProject.functions.getFunctionUsage( + params.function, + params.period ?? '30d' + ); - return { - count: response.executionsTotal as unknown as Models.Metric[], - errors: response.buildsFailure as unknown as Models.Metric[] - }; + return { + count: response.executionsTotal as unknown as Models.Metric[], + errors: response.buildsFailure as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } }; diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts index 245f790ea..a224ba30c 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts @@ -1,16 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); - const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); + try { + const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); - return { - count: response.bucketsCount as unknown as Models.Metric[], - created: response.bucketsCreate as unknown as Models.Metric[], - read: response.bucketsRead as unknown as Models.Metric[], - updated: response.bucketsUpdate as unknown as Models.Metric[], - deleted: response.bucketsDelete as unknown as Models.Metric[] - }; + return { + count: response.bucketsCount as unknown as Models.Metric[], + created: response.bucketsCreate as unknown as Models.Metric[], + read: response.bucketsRead as unknown as Models.Metric[], + updated: response.bucketsUpdate as unknown as Models.Metric[], + deleted: response.bucketsDelete as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } }; From b0cc129834d418f4c2898276f79b3d8f12e60ff7 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:21:15 +0000 Subject: [PATCH 082/105] refactor: change notification limit --- src/lib/stores/notifications.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/stores/notifications.ts b/src/lib/stores/notifications.ts index 26fa69a28..25ba01968 100644 --- a/src/lib/stores/notifications.ts +++ b/src/lib/stores/notifications.ts @@ -33,7 +33,7 @@ export const addNotification = (notification: Omit) => { const n = { ...defaults, ...notification }; notifications.update((all) => { - return [n, ...all.slice(0, 2)]; + return [n, ...all.slice(0, 4)]; }); if (n.timeout) setTimeout(() => dismissNotification(n.id), n.timeout); From 8f959746c88e9678ed4764e7e3a7407aaa45e02d Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Mar 2023 11:23:45 +0100 Subject: [PATCH 083/105] feat: initial commit --- package-lock.json | 8 ++++---- package.json | 2 +- src/lib/components/card.svelte | 26 +++++++++++++++++++++----- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83761e17f..2cf4b4663 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "^0.0.6-rc.4", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", @@ -147,9 +147,9 @@ "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, "node_modules/@appwrite.io/pink": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.4.tgz", - "integrity": "sha512-pCXxBqSikG5PpBb2y84tTRH6cAMUYbROlQN8LuGoY2J+vTWMT+HQ7+RAAwRWU1Dlle4FgOFFCKmqU95g6X2a6g==", + "version": "0.0.6-rc.4", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.4.tgz", + "integrity": "sha512-vSBq0wB4lQMM8vRPCh0B2M8aWIdrFQSf14X58y8DVjj0djg/gwQ51pwxLojXAol7rwFNhh73NSqTuRC4y+BpxA==", "dependencies": { "@appwrite.io/pink-icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index 0d0865856..e55721402 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "^0.0.6-rc.4", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index 9f1ceebd0..043b7a8c3 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -1,16 +1,31 @@ -
    +
    - -
    - -
    + {#if !hideCopyIcon} +
    + +
    + {/if}
    diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte index 09a4ea17d..dc2f755b2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte @@ -3,7 +3,16 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { Box, CardGrid, DropList, DropListItem, Empty, Output, Secret } from '$lib/components'; + import { + Box, + CardGrid, + DropList, + DropListItem, + Empty, + Output, + PaginationInline, + Secret + } from '$lib/components'; import Heading from '$lib/components/heading.svelte'; import { Roles } from '$lib/components/permissions'; import { Dependencies } from '$lib/constants'; @@ -44,6 +53,7 @@ let functionSchedule: string = null; let permissions: string[] = []; let arePermsDisabled = true; + let offset = 0; onMount(async () => { timeout ??= $func.timeout; @@ -374,19 +384,21 @@ Import .env file
    - {#if data.variables.total} + {@const limit = 10} + {@const sum = data.variables.total} + {#if sum}
    Key - Value + Value - {#each data.variables.variables as variable, i} + {#each data.variables.variables.slice(offset, offset + limit) as variable, i} - + {variable.key} @@ -435,15 +447,14 @@ {/each}
    - +
    +

    Total variables: {sum}

    + +
    {:else} (showVariablesModal = !showVariablesModal)}> diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte index 3da9fbf52..974932a16 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte @@ -70,7 +70,7 @@ Upload multiple variables via a .env file that will be passed to your function at runtime.

    - + From 6c4c7750a744db8389c1c3767d180dad1b49b78b Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 22 Mar 2023 12:45:29 +0100 Subject: [PATCH 085/105] fix: merge leftover --- .../databases/database-[database]/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte index 9a9d81ae3..2997575f6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte @@ -7,7 +7,7 @@ import { Container } from '$lib/layout'; import { cardLimit } from '$lib/stores/layout'; import { createPersistentPagination } from '$lib/stores/pagination'; - import { showCreate } from '../store'; + import { showCreate } from './store'; import type { PageData } from './$types'; export let data: PageData; From e098db6f9dc65d11e364604e2f3f97afb197ddd2 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 22 Mar 2023 13:11:04 +0000 Subject: [PATCH 086/105] refactor: improve notifications mobile styling --- src/lib/layout/notifications.svelte | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/layout/notifications.svelte b/src/lib/layout/notifications.svelte index da64f62d1..3200a1280 100644 --- a/src/lib/layout/notifications.svelte +++ b/src/lib/layout/notifications.svelte @@ -25,8 +25,15 @@ From baefe388ba971210522f99a68c9bf08d43232758 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 22 Mar 2023 15:36:41 +0100 Subject: [PATCH 087/105] feat: add limit option to all views --- src/lib/components/index.ts | 1 + src/lib/components/limit.svelte | 35 ++++++++++ src/lib/elements/forms/inputSelect.svelte | 3 +- src/lib/helpers/load.ts | 19 ++++++ src/lib/layout/activity.svelte | 8 +-- src/lib/stores/preferences.ts | 68 +++++++++++++++++++ .../console/account/activity/+page.svelte | 2 +- src/routes/console/account/activity/+page.ts | 8 +-- .../account/organizations/+page.svelte | 5 +- .../console/account/organizations/+page.ts | 8 +-- .../organization-[organization]/+page.svelte | 4 +- .../organization-[organization]/+page.ts | 8 +-- .../members/+page.svelte | 4 +- .../members/+page.ts | 8 +-- .../project-[project]/auth/+page.svelte | 9 +-- .../console/project-[project]/auth/+page.ts | 10 +-- .../project-[project]/auth/teams/+page.svelte | 11 ++- .../project-[project]/auth/teams/+page.ts | 10 +-- .../teams/team-[team]/activity/+page.svelte | 2 +- .../auth/teams/team-[team]/activity/+page.ts | 9 +-- .../teams/team-[team]/members/+page.svelte | 11 ++- .../auth/teams/team-[team]/members/+page.ts | 10 +-- .../auth/user-[user]/activity/+page.ts | 9 ++- .../project-[project]/databases/+page.svelte | 12 +++- .../project-[project]/databases/+page.ts | 8 +-- .../database-[database]/+page.svelte | 11 ++- .../databases/database-[database]/+page.ts | 8 +-- .../collection-[collection]/+page.svelte | 4 +- .../collection-[collection]/+page.ts | 8 +-- .../activity/+page.svelte | 2 +- .../collection-[collection]/activity/+page.ts | 8 +-- .../document-[document]/activity/+page.svelte | 2 +- .../document-[document]/activity/+page.ts | 8 +-- .../subNavigation.svelte | 2 +- .../project-[project]/functions/+page.svelte | 12 +++- .../project-[project]/functions/+page.ts | 8 +-- .../function-[function]/+page.svelte | 11 ++- .../functions/function-[function]/+page.ts | 8 +-- .../executions/+page.svelte | 4 +- .../function-[function]/executions/+page.ts | 8 +-- .../project-[project]/storage/+page.svelte | 12 +++- .../project-[project]/storage/+page.ts | 8 +-- .../storage/bucket-[bucket]/+page.svelte | 5 +- .../storage/bucket-[bucket]/+page.ts | 10 +-- 44 files changed, 297 insertions(+), 124 deletions(-) create mode 100644 src/lib/components/limit.svelte create mode 100644 src/lib/stores/preferences.ts diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 54b2251a5..bca844571 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -46,3 +46,4 @@ export { default as EventModal } from './eventModal.svelte'; export { default as Status } from './status.svelte'; export { default as Heading } from './heading.svelte'; export { default as Output } from './output.svelte'; +export { default as Limit } from './limit.svelte'; diff --git a/src/lib/components/limit.svelte b/src/lib/components/limit.svelte new file mode 100644 index 000000000..bc4189af4 --- /dev/null +++ b/src/lib/components/limit.svelte @@ -0,0 +1,35 @@ + + +
    + +

    {name} per page. Total results: {sum}

    +
    diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte index 5bfe2220a..ff49b8f80 100644 --- a/src/lib/elements/forms/inputSelect.svelte +++ b/src/lib/elements/forms/inputSelect.svelte @@ -52,7 +52,8 @@ {disabled} bind:this={element} bind:value - on:invalid={handleInvalid}> + on:invalid={handleInvalid} + on:change> {#if placeholder} {/if} diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts index dc7b0c9e7..89349b187 100644 --- a/src/lib/helpers/load.ts +++ b/src/lib/helpers/load.ts @@ -1,7 +1,26 @@ +import { preferences } from '$lib/stores/preferences'; +import type { Page } from '@sveltejs/kit'; + export function pageToOffset(page: number, limit: number): number { return page ? page * limit - limit : 0; } +export function getPage(url: URL): number { + return Number(url.searchParams.get('page')); +} + +export function getLimit(url: URL, route: Page['route'], fallback: number): number { + return Number(url.searchParams.get('limit') ?? preferences.get(route).limit ?? fallback); +} + +export function getView(url: URL, route: Page['route'], fallback: 'table' | 'grid'): string { + return url.searchParams.get('view') ?? preferences.get(route).view ?? fallback; +} + +export function getSearch(url: URL): string | undefined { + return url.searchParams.get('search') ?? undefined; +} + type TabElement = { href: string; title: string; hasChildren?: boolean }; export function isTabSelected( diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte index 41bd711ed..8afec6a43 100644 --- a/src/lib/layout/activity.svelte +++ b/src/lib/layout/activity.svelte @@ -1,5 +1,5 @@ @@ -65,8 +65,8 @@
    -

    Total results: {logs.total}

    - + +
    {:else} diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts new file mode 100644 index 000000000..29982ab78 --- /dev/null +++ b/src/lib/stores/preferences.ts @@ -0,0 +1,68 @@ +import { browser } from '$app/environment'; +import { page } from '$app/stores'; +import type { Page } from '@sveltejs/kit'; +import { get, writable } from 'svelte/store'; +import { sdk } from './sdk'; + +type Preferences = { + limit?: number; + view?: 'table' | 'grid'; +}; +type PreferencesStore = { + [key: string]: { + [key: string]: Preferences; + }; +}; + +function createPreferences() { + const { subscribe, set, update } = writable({}); + if (browser) { + set(JSON.parse(globalThis.localStorage.getItem('preferences') ?? '{}')); + } + return { + subscribe, + get: (route: Page['route']): Preferences => { + let preferences: PreferencesStore; + subscribe((n) => (preferences = n))(); + + return ( + preferences[sdk.forProject.client.config.project]?.[route.id] ?? { + limit: null, + view: null + } + ); + }, + setLimit: (limit: Preferences['limit']) => + update((n) => { + const path = get(page).route.id; + const project = sdk.forProject.client.config.project; + if (!n[project]?.[path]) { + n[project] ??= {}; + n[project][path] ??= {}; + } + + n[project][path].limit = limit; + + return n; + }), + setView: (view: Preferences['view']) => + update((n) => { + const path = get(page).route.id; + const project = sdk.forProject.client.config.project; + if (!n[project]?.[path]) { + n[project] ??= {}; + n[project][path] ??= {}; + } + + n[project][path].view = view; + + return n; + }) + }; +} + +export const preferences = createPreferences(); + +if (browser) { + preferences.subscribe((n) => globalThis.localStorage.setItem('preferences', JSON.stringify(n))); +} diff --git a/src/routes/console/account/activity/+page.svelte b/src/routes/console/account/activity/+page.svelte index c4c7521f1..d3939555d 100644 --- a/src/routes/console/account/activity/+page.svelte +++ b/src/routes/console/account/activity/+page.svelte @@ -5,4 +5,4 @@ export let data: PageData; - + diff --git a/src/routes/console/account/activity/+page.ts b/src/routes/console/account/activity/+page.ts index 13a06a80b..8b6fb15c3 100644 --- a/src/routes/console/account/activity/+page.ts +++ b/src/routes/console/account/activity/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte index c01ac1e9f..99c580f9b 100644 --- a/src/routes/console/account/organizations/+page.svelte +++ b/src/routes/console/account/organizations/+page.svelte @@ -6,7 +6,8 @@ Pagination, AvatarGroup, CardContainer, - Heading + Heading, + Limit } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; @@ -66,7 +67,7 @@
    {/if}
    -

    Total results: {data.organizations.total}

    +
    diff --git a/src/routes/console/account/organizations/+page.ts b/src/routes/console/account/organizations/+page.ts index 90de71ddd..d80bc5036 100644 --- a/src/routes/console/account/organizations/+page.ts +++ b/src/routes/console/account/organizations/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? CARD_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/organization-[organization]/+page.svelte b/src/routes/console/organization-[organization]/+page.svelte index 2a0ee8fbf..888056de7 100644 --- a/src/routes/console/organization-[organization]/+page.svelte +++ b/src/routes/console/organization-[organization]/+page.svelte @@ -1,7 +1,7 @@ @@ -110,7 +111,7 @@
    -

    Total results: {data.users.total}

    +
    {:else if data.search} diff --git a/src/routes/console/project-[project]/auth/+page.ts b/src/routes/console/project-[project]/auth/+page.ts index 0fca0d67f..badf0ca4e 100644 --- a/src/routes/console/project-[project]/auth/+page.ts +++ b/src/routes/console/project-[project]/auth/+page.ts @@ -1,14 +1,14 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const search = getSearch(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); - const search = url.searchParams.get('search') ?? undefined; return { offset, diff --git a/src/routes/console/project-[project]/auth/teams/+page.svelte b/src/routes/console/project-[project]/auth/teams/+page.svelte index 3b00a547b..bc0e643a3 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/+page.svelte @@ -10,7 +10,14 @@ TableCell } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; - import { Empty, EmptySearch, AvatarInitials, Pagination, SearchQuery } from '$lib/components'; + import { + Empty, + EmptySearch, + AvatarInitials, + Pagination, + SearchQuery, + Limit + } from '$lib/components'; import Create from '../createTeam.svelte'; import { goto } from '$app/navigation'; import { toLocaleDateTime } from '$lib/helpers/date'; @@ -62,7 +69,7 @@
    -

    Total results: {data.teams.total}

    +
    {:else if data.search} diff --git a/src/routes/console/project-[project]/auth/teams/+page.ts b/src/routes/console/project-[project]/auth/teams/+page.ts index 7b222a0cc..42b4f5c1c 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/+page.ts @@ -1,14 +1,14 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ url, route }) => { + const page = getPage(url); + const search = getSearch(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); - const search = url.searchParams.get('search') ?? undefined; return { offset, diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte index 4870c8b9b..f805a79f0 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte @@ -5,4 +5,4 @@ export let data: PageData; - + diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts index 173bd4d99..ea9009d74 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts @@ -1,16 +1,17 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ params, url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { offset, + limit, logs: await sdk.forProject.teams.listLogs(params.team, [ Query.limit(limit), Query.offset(offset) diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte index 8fd62a499..f7518114c 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte @@ -1,6 +1,13 @@ - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts index b5c397870..3fb3a619d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ params, url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte index 4870c8b9b..f805a79f0 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte @@ -5,4 +5,4 @@ export let data: PageData; - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts index d24d5e5e9..d11900203 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts @@ -1,12 +1,12 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, url }) => { - const page = Number(url.searchParams.get('page')); - const limit = Number(url.searchParams.get('limit') ?? PAGE_LIMIT); +export const load: PageLoad = async ({ params, url, route }) => { + const page = getPage(url); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); return { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte index c576a7e65..e8f306a60 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte @@ -2,7 +2,7 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { showCreate } from '../store'; - import type { PageData } from './[[page]]/$types'; + import type { PageData } from './$types'; $: data = $page.data as PageData; $: project = $page.params.project; diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte index a7f9f7a6f..1a26cb9ba 100644 --- a/src/routes/console/project-[project]/functions/+page.svelte +++ b/src/routes/console/project-[project]/functions/+page.svelte @@ -1,7 +1,15 @@ diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte new file mode 100644 index 000000000..500e40a03 --- /dev/null +++ b/src/lib/components/viewSelector.svelte @@ -0,0 +1,129 @@ + + + + +{#if !hideColumns && view === View.Table} + {#if $columns?.length} + + + + {#each $columns as column} + + {/each} + + + {/if} +{/if} + +{#if !hideView} +
    +{/if} diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts index 89349b187..6478fcd9f 100644 --- a/src/lib/helpers/load.ts +++ b/src/lib/helpers/load.ts @@ -13,8 +13,19 @@ export function getLimit(url: URL, route: Page['route'], fallback: number): numb return Number(url.searchParams.get('limit') ?? preferences.get(route).limit ?? fallback); } -export function getView(url: URL, route: Page['route'], fallback: 'table' | 'grid'): string { - return url.searchParams.get('view') ?? preferences.get(route).view ?? fallback; +export enum View { + Table = 'table', + Grid = 'grid' +} + +export function getView(url: URL, route: Page['route'], fallback: View): View { + return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid + ? View.Grid + : View.Table ?? fallback; +} + +export function getColumns(route: Page['route'], fallback: string[]): string[] { + return preferences.get(route).columns ?? fallback; } export function getSearch(url: URL): string | undefined { diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index 29982ab78..f1184c7e2 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -1,16 +1,22 @@ import { browser } from '$app/environment'; import { page } from '$app/stores'; +import type { View } from '$lib/helpers/load'; import type { Page } from '@sveltejs/kit'; import { get, writable } from 'svelte/store'; import { sdk } from './sdk'; type Preferences = { limit?: number; - view?: 'table' | 'grid'; + view?: View; + columns?: string[]; }; + type PreferencesStore = { [key: string]: { [key: string]: Preferences; + collections?: { + [key: string]: Preferences['columns']; + }; }; }; @@ -28,10 +34,20 @@ function createPreferences() { return ( preferences[sdk.forProject.client.config.project]?.[route.id] ?? { limit: null, - view: null + view: null, + columns: null } ); }, + getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => { + let preferences: PreferencesStore; + subscribe((n) => (preferences = n))(); + + return ( + preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ?? + null + ); + }, setLimit: (limit: Preferences['limit']) => update((n) => { const path = get(page).route.id; @@ -56,6 +72,33 @@ function createPreferences() { n[project][path].view = view; + return n; + }), + setColumns: (columns: Preferences['columns']) => + update((n) => { + const path = get(page).route.id; + const project = sdk.forProject.client.config.project; + if (!n[project]?.[path]) { + n[project] ??= {}; + n[project][path] ??= {}; + } + + n[project][path].columns = columns; + + return n; + }), + setCustomCollectionColumns: (columns: Preferences['columns']) => + update((n) => { + const current = get(page); + const project = sdk.forProject.client.config.project; + const collection = current.params.collection; + if (!n[project]?.collections?.[collection]) { + n[project] ??= {}; + n[project].collections ??= {}; + } + + n[project].collections[collection] = columns; + return n; }) }; diff --git a/src/routes/console/organization-[organization]/members/+page.svelte b/src/routes/console/organization-[organization]/members/+page.svelte index 03e2564b9..e59e4acd1 100644 --- a/src/routes/console/organization-[organization]/members/+page.svelte +++ b/src/routes/console/organization-[organization]/members/+page.svelte @@ -112,7 +112,7 @@
    - +
    {/if} diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte index 03a6e865b..82708e6fb 100644 --- a/src/routes/console/project-[project]/auth/+page.svelte +++ b/src/routes/console/project-[project]/auth/+page.svelte @@ -112,7 +112,7 @@
    - +
    {:else if data.search} diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/console/project-[project]/databases/+page.svelte index 410810c7a..34348305b 100644 --- a/src/routes/console/project-[project]/databases/+page.svelte +++ b/src/routes/console/project-[project]/databases/+page.svelte @@ -2,21 +2,15 @@ import { page } from '$app/stores'; import { goto } from '$app/navigation'; import { Button } from '$lib/elements/forms'; - import { - Empty, - Copy, - GridItem1, - CardContainer, - Heading, - Pagination, - Limit - } from '$lib/components'; - import { Pill } from '$lib/elements'; + import { Empty, Heading, Pagination, Limit, ViewSelector } from '$lib/components'; import { Container } from '$lib/layout'; import { base } from '$app/paths'; import Create from './create.svelte'; + import Grid from './grid.svelte'; + import Table from './table.svelte'; import type { Models } from '@aw-labs/appwrite-console'; import type { PageData } from './$types'; + import { columns } from './store'; export let data: PageData; @@ -33,30 +27,22 @@
    Databases - +
    + + + +
    {#if data.databases.total} - (showCreate = true)} - event="database"> - {#each data.databases.databases as database} - - {database.name} - - - Database ID - - - {/each} - -

    Create a new database

    -
    -
    + {#if data.view === 'grid'} + + {:else} + + {/if}
    diff --git a/src/routes/console/project-[project]/databases/+page.ts b/src/routes/console/project-[project]/databases/+page.ts index bf09fb764..e83bc2cac 100644 --- a/src/routes/console/project-[project]/databases/+page.ts +++ b/src/routes/console/project-[project]/databases/+page.ts @@ -1,5 +1,5 @@ import { CARD_LIMIT } from '$lib/constants'; -import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, getView, pageToOffset, View } from '$lib/helpers/load'; import { sdk } from '$lib/stores/sdk'; import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; @@ -7,11 +7,13 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ url, route }) => { const page = getPage(url); const limit = getLimit(url, route, CARD_LIMIT); + const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); return { offset, limit, + view, databases: await sdk.forProject.databases.list([ Query.limit(limit), Query.offset(offset), diff --git a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte index 39a870245..769595469 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte @@ -1,67 +1,36 @@
    Collections +
    + - + +
    {#if data.collections.total} - ($showCreate = true)}> - {#each data.collections.collections as collection} - - {collection.name} - - {#if !collection.enabled} - disabled - {/if} - - - Collection ID - - - {/each} - -

    Create a new collection

    -
    -
    + {#if data.view === 'grid'} + + {:else} +
    + {/if}
    -

    Total results: {data.collections.total}

    diff --git a/src/routes/console/project-[project]/databases/database-[database]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/+page.ts index 15d204777..3d646166b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/+page.ts @@ -1,17 +1,19 @@ import { Query } from '@aw-labs/appwrite-console'; import { sdk } from '$lib/stores/sdk'; -import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, getView, pageToOffset, View } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, url, route }) => { const page = getPage(url); const limit = getLimit(url, route, CARD_LIMIT); + const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); return { offset, limit, + view, collections: await sdk.forProject.databases.listCollections(params.database, [ Query.limit(limit), Query.offset(offset), diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte index 71bec4e4d..1656253ac 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte @@ -1,128 +1,53 @@
    Documents - - +
    + + +
    {#if $collection?.attributes?.length} {#if data.documents.total} - - - Document ID - {#each columns as column} - {column.title} - {/each} - - - {#each data.documents.documents as document} - - - - - - - - {#each columns as column} - {@const formatted = formatColumn(document[column.key])} - -
    - {formatted.value} -
    -
    - {/each} -
    - {/each} -
    -
    +
    diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts index fb491e86b..e5adcafdf 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts @@ -1,5 +1,5 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; -import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; +import { getLimit, getPage, getView, pageToOffset, View } from '$lib/helpers/load'; import { sdk } from '$lib/stores/sdk'; import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; @@ -8,11 +8,13 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { depends(Dependencies.DOCUMENTS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); + const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); return { offset, limit, + view, documents: await sdk.forProject.databases.listDocuments( params.database, params.collection, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts index 65c00bd63..5c00adeea 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts @@ -1,6 +1,7 @@ import { page } from '$app/stores'; +import type { Column } from '$lib/components/viewSelector.svelte'; import type { Models } from '@aw-labs/appwrite-console'; -import { derived } from 'svelte/store'; +import { derived, writable } from 'svelte/store'; export type Attributes = | Models.AttributeBoolean @@ -22,3 +23,4 @@ export const attributes = derived( ($page) => $page.data.collection.attributes as Attributes[] ); export const indexes = derived(page, ($page) => $page.data.collection.indexes as Models.Index[]); +export const columns = writable([]); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte index e8f306a60..efb46a2e4 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte @@ -31,7 +31,7 @@ {#if data?.allCollections?.total}
    + + {#each $columns as column} + {#if column.show} + {column.title} + {/if} + {/each} + + + {#each data.collections.collections as collection} + + {#each $columns as column} + {#if column.show} + {#if column.id === '$id'} + {#key $columns} + + + + + + + {/key} + {:else if column.id === 'name'} + + {collection.name} + + {:else} + + {toLocaleDateTime(collection[column.id])} + + {/if} + {/if} + {/each} + + {/each} + +
    diff --git a/src/routes/console/project-[project]/databases/grid.svelte b/src/routes/console/project-[project]/databases/grid.svelte new file mode 100644 index 000000000..1efa0fbed --- /dev/null +++ b/src/routes/console/project-[project]/databases/grid.svelte @@ -0,0 +1,25 @@ + + + (showCreate = true)} event="database"> + {#each data.databases.databases as database} + + {database.name} + + + Database ID + + + {/each} + +

    Create a new database

    +
    +
    diff --git a/src/routes/console/project-[project]/databases/store.ts b/src/routes/console/project-[project]/databases/store.ts new file mode 100644 index 000000000..d0435fc06 --- /dev/null +++ b/src/routes/console/project-[project]/databases/store.ts @@ -0,0 +1,9 @@ +import type { Column } from '$lib/components/viewSelector.svelte'; +import { writable } from 'svelte/store'; + +export const columns = writable([ + { id: '$id', title: 'Database ID', show: true, width: 50 }, + { id: 'name', title: 'Name', show: true, width: 120 }, + { id: '$createdAt', title: 'Created', show: true, width: 120 }, + { id: '$updatedAt', title: 'Updated', show: true, width: 120 } +]); diff --git a/src/routes/console/project-[project]/databases/table.svelte b/src/routes/console/project-[project]/databases/table.svelte new file mode 100644 index 000000000..ffbc21e78 --- /dev/null +++ b/src/routes/console/project-[project]/databases/table.svelte @@ -0,0 +1,62 @@ + + + + + {#each $columns as column} + {#if column.show} + {column.title} + {/if} + {/each} + + + {#each data.databases.databases as database} + + {#each $columns as column} + {#if column.show} + {#if column.id === '$id'} + {#key $columns} + + + + + + + {/key} + {:else if column.id === 'name'} + + {database.name} + + {:else} + + {toLocaleDateTime(database[column.id])} + + {/if} + {/if} + {/each} + + {/each} + +
    From 12afcba1ec2edd2705f381450a6ccaea3e75ede8 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Thu, 23 Mar 2023 12:39:02 +0000 Subject: [PATCH 094/105] fix: status code check on feedback submit --- .gitpod.yml | 9 +++++++++ src/lib/stores/app.ts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 000000000..3c1848749 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,9 @@ +# This configuration file was automatically generated by Gitpod. +# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml) +# and commit this file to your remote git repository to share the goodness with others. + +# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart + +tasks: + - init: npm install && npm run build + command: npm run dev diff --git a/src/lib/stores/app.ts b/src/lib/stores/app.ts index 4ddd2e08a..66946f3f1 100644 --- a/src/lib/stores/app.ts +++ b/src/lib/stores/app.ts @@ -74,7 +74,7 @@ function createFeedbackStore() { customFields: value ? [{ id: '40655', value }] : undefined }) }); - if (response.status !== 200) { + if (response.status >= 400) { throw new Error('Failed to submit feedback'); } } From 7201a9e899500800e9658973e96e28d9eb66291c Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Thu, 23 Mar 2023 12:40:10 +0000 Subject: [PATCH 095/105] fix: status code check on feedback submit --- .gitpod.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 3c1848749..000000000 --- a/.gitpod.yml +++ /dev/null @@ -1,9 +0,0 @@ -# This configuration file was automatically generated by Gitpod. -# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml) -# and commit this file to your remote git repository to share the goodness with others. - -# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart - -tasks: - - init: npm install && npm run build - command: npm run dev From aaa934c5b7c20d90adb4f4643c80ed1162c3f9ea Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 23 Mar 2023 16:05:21 +0100 Subject: [PATCH 096/105] fix: overflow and output component --- src/lib/components/copy.svelte | 2 +- src/lib/components/output.svelte | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index 33050e82e..d7294aa75 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -9,6 +9,7 @@ export let event: string = null; export let eventContext = 'click_id_tag'; export let appendTo: Parameters['1']['appendTo'] = undefined; + export let fitToContent = false; let content = 'Click to copy'; @@ -33,7 +34,6 @@ -
    +
    {#if !hideCopyIcon}
    From 45c799bfad229d029bee8db5b363d9c06d512e26 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 23 Mar 2023 16:06:22 +0100 Subject: [PATCH 097/105] remove unused param --- src/lib/components/copy.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index d7294aa75..fc69483f6 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -9,7 +9,6 @@ export let event: string = null; export let eventContext = 'click_id_tag'; export let appendTo: Parameters['1']['appendTo'] = undefined; - export let fitToContent = false; let content = 'Click to copy'; From 80e6783740697bdde8a573ee003a1f97eea76927 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 23 Mar 2023 16:17:27 +0100 Subject: [PATCH 098/105] fix: table --- package.json | 1 - .../database-[database]/collection-[collection]/table.svelte | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 03e8982b0..63f6d764e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "@appwrite/console", - "version": "0.0.1", "engines": { "node": ">=16" }, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index ebbbc12e5..14b20e189 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -61,7 +61,7 @@ - Document ID + Document ID {#each $columns.filter((n) => n.show) as column} {#if column.show} {column.title} @@ -72,7 +72,7 @@ {#each data.documents.documents as document} - +