From 32714fcfa579c05fc5f9bbe67d82c0d2788539f3 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 02:34:13 +0000 Subject: [PATCH 01/33] update password history limit component --- src/lib/actions/analytics.ts | 1 + .../auth/security/+page.svelte | 2 + .../security/updatePasswordHistory.svelte | 64 +++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 357b5ff55..501da65d5 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -141,6 +141,7 @@ export enum Submit { TeamUpdateName = 'submit_team_update_name', AuthLimitUpdate = 'submit_auth_limit_update', AuthStatusUpdate = 'submit_auth_status_update', + AuthPasswordHistoryUpdate = 'submit_auth_password_history_limit_update', SessionsLengthUpdate = 'submit_sessions_length_update', SessionsLimitUpdate = 'submit_sessions_limit_update', SessionDelete = 'submit_session_delete', diff --git a/src/routes/console/project-[project]/auth/security/+page.svelte b/src/routes/console/project-[project]/auth/security/+page.svelte index beea9ce44..904d7a71f 100644 --- a/src/routes/console/project-[project]/auth/security/+page.svelte +++ b/src/routes/console/project-[project]/auth/security/+page.svelte @@ -1,5 +1,6 @@ + +
+ + Password History +

+ Maximum nubmer of password history to save for a user. 0 for disabling the password + history. +

+ +
    + +
+
+ + + + +
+
From 42f484db57bd308e264bdea5f10888024cad782b Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 09:18:38 +0545 Subject: [PATCH 02/33] remove unused code --- .../auth/security/updatePasswordHistory.svelte | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte index 1bd239ff9..f4496612a 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte @@ -3,15 +3,12 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { CardGrid, Heading } from '$lib/components'; import { Dependencies } from '$lib/constants'; - import { Button, Form, InputNumber, InputSelect } from '$lib/elements/forms'; - import { createTimeUnitPair } from '$lib/helpers/unit'; + import { Button, Form, InputNumber } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import { project } from '../../store'; const projectId = $project.$id; - const { value, unit, baseValue, units } = createTimeUnitPair($project.authDuration); - const options = units.map((v) => ({ label: v.name, value: v.name })); let passwordHistory = $project.authPasswordHistory ?? 0; async function updatePasswordHistoryLimit() { From a2020ca25f8ba5b18beaac0df23a6acbdcebbc72 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 09:31:35 +0545 Subject: [PATCH 03/33] password dictonary UI --- src/lib/actions/analytics.ts | 1 + .../auth/security/+page.svelte | 2 + .../security/updatePasswordDictionary.svelte | 68 +++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 501da65d5..397e0d60d 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -142,6 +142,7 @@ export enum Submit { AuthLimitUpdate = 'submit_auth_limit_update', AuthStatusUpdate = 'submit_auth_status_update', AuthPasswordHistoryUpdate = 'submit_auth_password_history_limit_update', + AuthPasswordDictionaryUpdate = 'submit_auth_password_dictionary_update', SessionsLengthUpdate = 'submit_sessions_length_update', SessionsLimitUpdate = 'submit_sessions_limit_update', SessionDelete = 'submit_session_delete', diff --git a/src/routes/console/project-[project]/auth/security/+page.svelte b/src/routes/console/project-[project]/auth/security/+page.svelte index 904d7a71f..c9c411910 100644 --- a/src/routes/console/project-[project]/auth/security/+page.svelte +++ b/src/routes/console/project-[project]/auth/security/+page.svelte @@ -1,5 +1,6 @@ + +
+ + Password Dictionary + + + + +

+ When enabled it checks the user's password against the dictionary of most commonly + used password. It uses 10 K most common passwords list. +

+
+ + + + +
+
From e3cad8e5106a9ad1642ebdc5a1cf2849cf705472 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 10:43:22 +0545 Subject: [PATCH 04/33] Update src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte Co-authored-by: Carla --- .../auth/security/updatePasswordHistory.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte index f4496612a..2471c24e0 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte @@ -45,7 +45,7 @@ Password History

- Maximum nubmer of password history to save for a user. 0 for disabling the password + Maximum number of passwords saved per user. Use 0 to disable the password history.

From 09898293997a02048e97eb554b545a93cef0b59d Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 08:40:41 +0000 Subject: [PATCH 05/33] review feedbacks --- .../security/updatePasswordDictionary.svelte | 9 ++++++-- .../security/updatePasswordHistory.svelte | 21 ++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte index 95c826f50..839b0f2fe 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte @@ -6,10 +6,15 @@ import { Button, Form, FormList, InputNumber, InputSwitch } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; + import { onMount } from 'svelte'; import { project } from '../../store'; const projectId = $project.$id; - let passwordDictionary = $project.authPasswordDictionary ?? 0; + let passwordDictionary = $project.authPasswordDictionary ?? false; + + onMount(() => { + passwordDictionary = $project.authPasswordDictionary ?? false; + }); async function updatePasswordDictionary() { try { @@ -56,7 +61,7 @@ used password. It uses 10 K most common passwords list. + >10K most common passwords list.

diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte index 2471c24e0..dcd1b9da6 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte @@ -4,13 +4,19 @@ import { CardGrid, Heading } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Button, Form, InputNumber } from '$lib/elements/forms'; + import FormList from '$lib/elements/forms/formList.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; + import { onMount } from 'svelte'; import { project } from '../../store'; const projectId = $project.$id; let passwordHistory = $project.authPasswordHistory ?? 0; + onMount(() => { + passwordHistory = $project.authPasswordHistory ?? 0; + }); + async function updatePasswordHistoryLimit() { try { const path = '/projects/' + projectId + '/auth/password-history'; @@ -44,14 +50,19 @@
Password History -

- Maximum number of passwords saved per user. Use 0 to disable the password +

+ Maximum number of passwords saved per user. Maximum is 20. Use 0 to disable the password history.

-
    - -
+ + +
From 3fc32ccc9f1aa765cfd3c55d8a0d12eb171852af Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 14:40:00 +0545 Subject: [PATCH 06/33] update link --- .../auth/security/updatePasswordDictionary.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte index 839b0f2fe..755afe6c7 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte @@ -58,7 +58,9 @@

When enabled it checks the user's password against the dictionary of most commonly - used password. It uses 10K most common passwords list. From c72fd1e2f8c73f056c4f30ac2639c1e43462a278 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 14:40:39 +0545 Subject: [PATCH 07/33] remove unused import --- .../auth/security/updatePasswordDictionary.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte index 755afe6c7..ba64f6b80 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte @@ -3,7 +3,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { CardGrid, Heading } from '$lib/components'; import { Dependencies } from '$lib/constants'; - import { Button, Form, FormList, InputNumber, InputSwitch } from '$lib/elements/forms'; + import { Button, Form, FormList, InputSwitch } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import { onMount } from 'svelte'; From f8e46aaeaa11e989f44ce349f150c4d473c206eb Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 14:43:52 +0545 Subject: [PATCH 08/33] remove on mount not required --- .../auth/security/updatePasswordDictionary.svelte | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte index ba64f6b80..458504f2b 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte @@ -6,16 +6,11 @@ import { Button, Form, FormList, InputSwitch } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import { onMount } from 'svelte'; import { project } from '../../store'; const projectId = $project.$id; let passwordDictionary = $project.authPasswordDictionary ?? false; - onMount(() => { - passwordDictionary = $project.authPasswordDictionary ?? false; - }); - async function updatePasswordDictionary() { try { const path = '/projects/' + projectId + '/auth/password-dictionary'; From 4d7070124562047aa210917de51b48687b8244c8 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 Feb 2023 14:44:04 +0545 Subject: [PATCH 09/33] remove on mount not required --- .../auth/security/updatePasswordHistory.svelte | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte index dcd1b9da6..8d5cca34f 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte @@ -7,16 +7,11 @@ import FormList from '$lib/elements/forms/formList.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import { onMount } from 'svelte'; import { project } from '../../store'; const projectId = $project.$id; let passwordHistory = $project.authPasswordHistory ?? 0; - onMount(() => { - passwordHistory = $project.authPasswordHistory ?? 0; - }); - async function updatePasswordHistoryLimit() { try { const path = '/projects/' + projectId + '/auth/password-history'; From 0d3aec91f175bc357987f23a44645e79c16878d5 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 28 Feb 2023 10:52:37 +0545 Subject: [PATCH 10/33] update ui and copy --- .../security/updatePasswordDictionary.svelte | 6 ++--- .../security/updatePasswordHistory.svelte | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte index 458504f2b..734817ad0 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte @@ -52,13 +52,13 @@ label="Password Dictionary" />

- When enabled it checks the user's password against the dictionary of most commonly - used password. It uses 10K most common passwords list. + >10k most commonly used passwords.

diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte index 8d5cca34f..09f8b8be0 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte @@ -3,7 +3,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { CardGrid, Heading } from '$lib/components'; import { Dependencies } from '$lib/constants'; - import { Button, Form, InputNumber } from '$lib/elements/forms'; + import { Button, Form, InputNumber, InputSwitch } from '$lib/elements/forms'; import FormList from '$lib/elements/forms/formList.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; @@ -11,9 +11,13 @@ const projectId = $project.$id; let passwordHistory = $project.authPasswordHistory ?? 0; + let passwordHistoryEnabled = ($project.authPasswordHistory ?? 0) != 0; async function updatePasswordHistoryLimit() { try { + if (!passwordHistoryEnabled) { + passwordHistory = 0; + } const path = '/projects/' + projectId + '/auth/password-history'; const uri = new URL(sdkForConsole.client.config.endpoint + path); await sdkForConsole.client.call( @@ -45,17 +49,27 @@ Password History -

- Maximum number of passwords saved per user. Maximum is 20. Use 0 to disable the password - history. -

+ + + +

+ Enabling this option prevents users from reusing recent passwords by comparing the + new password with their password history. +

+

+ Set the maximum number of passwords saved per user. Maximum 20 passwords. +

From 15215537d19ced2840999e168a8af713bb8bf025 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 1 Mar 2023 11:04:03 +0545 Subject: [PATCH 11/33] design fix and sdk updated --- package-lock.json | 20 ++++++------- package.json | 2 +- src/lib/actions/analytics.ts | 2 +- src/lib/components/permissions/row.svelte | 2 +- src/lib/components/permissions/team.svelte | 2 +- src/lib/components/permissions/user.svelte | 2 +- src/lib/layout/activity.svelte | 2 +- src/lib/layout/logs.svelte | 2 +- src/lib/layout/usage.svelte | 2 +- src/lib/stores/auth-methods.ts | 2 +- src/lib/stores/logs.ts | 2 +- src/lib/stores/oauth-providers.ts | 2 +- src/lib/stores/organization.ts | 2 +- src/lib/stores/project-services.ts | 2 +- src/lib/stores/projects.ts | 2 +- src/lib/stores/sdk.ts | 2 +- src/lib/stores/uploader.ts | 2 +- src/lib/stores/user.ts | 2 +- src/routes/auth/magic-url/+page.svelte | 2 +- .../account/activity/[[page]]/+page.ts | 2 +- .../account/organizations/[[page]]/+page.ts | 2 +- .../account/sessions/[[page]]/+page.svelte | 2 +- src/routes/console/createOrganization.svelte | 2 +- src/routes/console/onboarding/+page.svelte | 2 +- .../[[page]]/+page.ts | 2 +- .../createProject.svelte | 2 +- .../deleteMember.svelte | 2 +- .../members/[[page]]/+page.svelte | 2 +- .../members/[[page]]/+page.ts | 2 +- .../auth/[[page]]/+page.svelte | 2 +- .../project-[project]/auth/[[page]]/+page.ts | 2 +- .../project-[project]/auth/createTeam.svelte | 2 +- .../project-[project]/auth/createUser.svelte | 2 +- .../security/updatePasswordDictionary.svelte | 16 +++------- .../security/updatePasswordHistory.svelte | 29 ++++++++----------- .../auth/teams/[[page]]/+page.svelte | 2 +- .../auth/teams/[[page]]/+page.ts | 2 +- .../team-[team]/activity/[[page]]/+page.ts | 2 +- .../teams/team-[team]/deleteMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteTeam.svelte | 2 +- .../team-[team]/members/[[page]]/+page.svelte | 2 +- .../team-[team]/members/[[page]]/+page.ts | 2 +- .../auth/teams/team-[team]/store.ts | 2 +- .../auth/usage/[[period]]/+page.ts | 2 +- .../user-[user]/activity/[[page]]/+page.ts | 2 +- .../auth/user-[user]/deleteMembership.svelte | 2 +- .../memberships/[[page]]/+page.svelte | 2 +- .../auth/user-[user]/store.ts | 2 +- .../databases/[[page]]/+page.svelte | 2 +- .../databases/[[page]]/+page.ts | 2 +- .../project-[project]/databases/create.svelte | 2 +- .../database-[database]/[[page]]/+page.svelte | 2 +- .../database-[database]/[[page]]/+page.ts | 2 +- .../collection-[collection]/[[page]]/+page.ts | 2 +- .../activity/[[page]]/+page.ts | 2 +- .../attributes/boolean.svelte | 2 +- .../attributes/datetime.svelte | 2 +- .../attributes/email.svelte | 2 +- .../attributes/enum.svelte | 2 +- .../attributes/float.svelte | 2 +- .../attributes/integer.svelte | 2 +- .../attributes/ip.svelte | 2 +- .../attributes/string.svelte | 2 +- .../attributes/url.svelte | 2 +- .../createDocument.svelte | 2 +- .../activity/[[page]]/+page.ts | 2 +- .../document-[document]/attribute.svelte | 2 +- .../attributes/boolean.svelte | 2 +- .../attributes/datetime.svelte | 2 +- .../attributes/enum.svelte | 2 +- .../attributes/integer.svelte | 2 +- .../attributes/string.svelte | 2 +- .../document-[document]/attributes/url.svelte | 2 +- .../document-[document]/document.svelte | 2 +- .../document-[document]/store.ts | 2 +- .../indexes/+page.svelte | 2 +- .../indexes/deleteIndex.svelte | 2 +- .../indexes/overviewIndex.svelte | 2 +- .../collection-[collection]/store.ts | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../database-[database]/create.svelte | 2 +- .../databases/database-[database]/store.ts | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../databases/usage/[[period]]/+page.ts | 2 +- .../functions/[[page]]/+page.ts | 2 +- .../functions/createFunction.svelte | 2 +- .../functions/createVariable.svelte | 2 +- .../function-[function]/[[page]]/+page.svelte | 2 +- .../function-[function]/[[page]]/+page.ts | 2 +- .../function-[function]/activate.svelte | 2 +- .../function-[function]/delete.svelte | 2 +- .../function-[function]/execute.svelte | 2 +- .../executions/[[page]]/+page.svelte | 2 +- .../executions/[[page]]/+page.ts | 2 +- .../function-[function]/settings/+page.svelte | 2 +- .../functions/function-[function]/store.ts | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../functions/wizard/step5.svelte | 2 +- .../functions/wizard/store.ts | 2 +- .../project-[project]/overview/+layout.svelte | 2 +- .../overview/keys/[key]/store.ts | 2 +- .../overview/keys/wizard/store.ts | 2 +- .../overview/platforms/[platform]/store.ts | 2 +- .../overview/platforms/wizard/store.ts | 2 +- .../project-[project]/overview/store.ts | 2 +- .../settings/domains/[[page]]/+page.svelte | 2 +- .../settings/domains/delete.svelte | 2 +- .../settings/domains/wizard/store.ts | 2 +- .../settings/webhooks/[webhook]/store.ts | 2 +- .../settings/webhooks/wizard/store.ts | 2 +- .../storage/[[page]]/+page.svelte | 2 +- .../storage/[[page]]/+page.ts | 2 +- .../bucket-[bucket]/[[page]]/+page.svelte | 2 +- .../storage/bucket-[bucket]/[[page]]/+page.ts | 2 +- .../storage/bucket-[bucket]/create.svelte | 2 +- .../storage/bucket-[bucket]/deleteFile.svelte | 2 +- .../bucket-[bucket]/file-[file]/store.ts | 2 +- .../bucket-[bucket]/settings/+page.svelte | 2 +- .../storage/bucket-[bucket]/store.ts | 2 +- .../bucket-[bucket]/usage/[[period]]/+page.ts | 2 +- .../project-[project]/storage/create.svelte | 2 +- .../storage/usage/[[period]]/+page.ts | 2 +- src/routes/console/project-[project]/store.ts | 2 +- src/routes/register/+page.svelte | 2 +- 124 files changed, 147 insertions(+), 160 deletions(-) diff --git a/package-lock.json b/package-lock.json index e62b412ee..059554800 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", + "@appwrite.io/console": "^0.0.2-preview-0.0", "@appwrite.io/pink": "^0.0.4", - "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", "@sentry/tracing": "^7.36.0", @@ -145,6 +145,15 @@ "resolved": "https://registry.npmjs.org/@analytics/type-utils/-/type-utils-0.6.0.tgz", "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, + "node_modules/@appwrite.io/console": { + "version": "0.0.2-preview-0.0", + "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.0.2-preview-0.0.tgz", + "integrity": "sha512-to9Kvrqd1HY17fzTIODtlImsVNev3sPTETZ5BL3IhrjLJH0sh9u36gnm5MMJ9kKX8WGb3S6x8jFbZI1Fr2pXmA==", + "dependencies": { + "cross-fetch": "3.1.5", + "isomorphic-form-data": "2.0.0" + } + }, "node_modules/@appwrite.io/pink": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.4.tgz", @@ -160,15 +169,6 @@ "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.0.3.tgz", "integrity": "sha512-GFOodekDck6xX7OAZuI1mo7F87ThEZ9Gt0xMsgTR79zkWcnBRq0+J89pFWRPAtFNEVMPQLVHuu6s8S4UleHwtQ==" }, - "node_modules/@aw-labs/appwrite-console": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-13.1.0.tgz", - "integrity": "sha512-1FyKke5b3vx+D3VfNYd3YnFhzUOlsj9bD+KTRLWA4WRItb55thFVZJMWQQ4XnZtDiLPuJAn2XjbMSfMr+9XYwg==", - "dependencies": { - "cross-fetch": "3.1.5", - "isomorphic-form-data": "2.0.0" - } - }, "node_modules/@babel/code-frame": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", diff --git a/package.json b/package.json index 5bcbe6ed6..95d3605c7 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "@analytics/google-analytics": "^1.0.5", "@appwrite.io/pink": "^0.0.4", - "@aw-labs/appwrite-console": "^13.1.0", + "@appwrite.io/console": "^0.0.2-preview-0.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", "@sentry/tracing": "^7.36.0", diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 397e0d60d..3d9c8b63a 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -3,7 +3,7 @@ import googleAnalytics from '@analytics/google-analytics'; import { get } from 'svelte/store'; import { page } from '$app/stores'; import { user } from '$lib/stores/user'; -import { AppwriteException } from '@aw-labs/appwrite-console'; +import { AppwriteException } from '@appwrite.io/console'; import { ENV, MODE, VARS } from '$lib/system'; const analytics = Analytics({ diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index e4d369af2..28e355852 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -1,7 +1,7 @@ @@ -54,54 +23,7 @@
- - - - Update Name - - -
    - -
-
- - - - -
- - - -
- Danger Zone -
- -

- The team will be permanently deleted, including all data associated with this team. This - action is irreversible. -

- - - - - - -
{$team.name}
- {$team.total} Members -
-
-
- - - - -
+ + + - diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/dangerZone.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/dangerZone.svelte new file mode 100644 index 000000000..ada467333 --- /dev/null +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/dangerZone.svelte @@ -0,0 +1,35 @@ + + + +
+ Danger Zone +
+ +

+ The team will be permanently deleted, including all data associated with this team. This + action is irreversible. +

+ + + + + + +
{$team.name}
+ {$team.total} Members +
+
+
+ + + + +
+ diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte new file mode 100644 index 000000000..5fcc3b14a --- /dev/null +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte @@ -0,0 +1,57 @@ + + +
+ + Update Name + + +
    + +
+
+ + + + +
+
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte new file mode 100644 index 000000000..135660eb8 --- /dev/null +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte @@ -0,0 +1,135 @@ + + +
+ + Team Preferences +

+ You can update your team's preferences by storing shared information on the teams's + objects so they can easily be shared across members. +

+ + +
    + {#if prefs} + {#each prefs as [key, value], index} +
  • +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
  • + {/each} + {/if} +
+ + +
+ + + + +
+ From 47d3a2b393fef916143ac1a4667d026ce4306f3e Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Mar 2023 12:23:00 +0100 Subject: [PATCH 17/33] feat: create paginator component --- src/lib/components/index.ts | 1 + src/lib/components/paginator.svelte | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 src/lib/components/paginator.svelte diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 54b2251a5..acffa839f 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -1,6 +1,7 @@ export { default as Modal } from './modal.svelte'; export { default as Pagination } from './pagination.svelte'; export { default as PaginationInline } from './paginationInline.svelte'; +export { default as Paginator } from './paginator.svelte'; export { default as Card } from './card.svelte'; export { default as CardGrid } from './cardGrid.svelte'; export { default as CardContainer } from './cardContainer.svelte'; diff --git a/src/lib/components/paginator.svelte b/src/lib/components/paginator.svelte new file mode 100644 index 000000000..a22673377 --- /dev/null +++ b/src/lib/components/paginator.svelte @@ -0,0 +1,19 @@ + + +
+ +
+ +
+

Total results: {items?.length}

+ +
From 33739017281071ca18e9f95e7c5f0b9bec6c4b5d Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Mar 2023 13:16:12 +0100 Subject: [PATCH 18/33] refactor: use new component --- src/lib/components/paginator.svelte | 4 +- src/lib/components/permissions/team.svelte | 70 +++++++------- src/lib/components/permissions/user.svelte | 104 ++++++++++----------- 3 files changed, 87 insertions(+), 91 deletions(-) diff --git a/src/lib/components/paginator.svelte b/src/lib/components/paginator.svelte index a22673377..b1634d47f 100644 --- a/src/lib/components/paginator.svelte +++ b/src/lib/components/paginator.svelte @@ -9,9 +9,7 @@ $: paginatedItems = items.slice(offset, offset + limit); -
- -
+

Total results: {items?.length}

diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index 86670c14b..6c638d205 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -3,7 +3,7 @@ import { createEventDispatcher } from 'svelte'; import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@aw-labs/appwrite-console'; - import { AvatarInitials, EmptySearch, Modal, PaginationInline } from '..'; + import { AvatarInitials, EmptySearch, Modal, PaginationInline, Paginator } from '..'; import type { Writable } from 'svelte/store'; import type { Permission } from './permissions.svelte'; @@ -74,41 +74,39 @@ placeholder="Search by name or ID" bind:value={search} /> {#if results?.teams?.length} -
- - - {#each results.teams as team (team.$id)} - {@const role = `team:${team.$id}`} - {@const exists = $groups.has(role)} - - - - - {/each} - -
- onSelection(event, role)} /> - - -
-
-
-

Total results: {results?.total}

- -
+ +
+ + + {#each paginatedItems as team (team.$id)} + {@const role = `team:${team.$id}`} + {@const exists = $groups.has(role)} + + + + + {/each} + +
+ onSelection(event, role)} /> + + +
+
+
{:else if search}
diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index c074af4fd..c2668fb56 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.svelte @@ -1,7 +1,7 @@ From 38a47f1041d1b33f74c0363b6f97abb237151683 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Mar 2023 15:27:30 +0100 Subject: [PATCH 21/33] feat: sdk for 1.3.x --- package-lock.json | 29 +++++++++---------- package.json | 4 +-- src/lib/actions/analytics.ts | 2 +- src/lib/components/permissions/row.svelte | 6 ++-- src/lib/components/permissions/team.svelte | 4 +-- src/lib/components/permissions/user.svelte | 2 +- src/lib/layout/activity.svelte | 2 +- src/lib/layout/logs.svelte | 2 +- src/lib/layout/usage.svelte | 2 +- src/lib/sdk/project.ts | 2 +- src/lib/sdk/service.ts | 2 +- src/lib/stores/auth-methods.ts | 2 +- src/lib/stores/logs.ts | 2 +- src/lib/stores/oauth-providers.ts | 2 +- src/lib/stores/organization.ts | 9 ++++-- src/lib/stores/project-services.ts | 2 +- src/lib/stores/projects.ts | 2 +- src/lib/stores/sdk.ts | 2 +- src/lib/stores/uploader.ts | 2 +- src/lib/stores/user.ts | 2 +- src/routes/auth/magic-url/+page.svelte | 2 +- src/routes/console/account/activity/+page.ts | 2 +- .../console/account/organizations/+page.ts | 2 +- .../console/account/sessions/+page.svelte | 2 +- src/routes/console/createOrganization.svelte | 2 +- src/routes/console/onboarding/+page.svelte | 2 +- .../organization-[organization]/+page.ts | 2 +- .../createMember.svelte | 4 ++- .../createProject.svelte | 2 +- .../deleteMember.svelte | 2 +- .../members/+page.svelte | 6 ++-- .../members/+page.ts | 2 +- .../settings/+page.svelte | 2 +- .../console/project-[project]/+layout.svelte | 14 ++------- .../project-[project]/auth/+page.svelte | 2 +- .../console/project-[project]/auth/+page.ts | 2 +- .../project-[project]/auth/createTeam.svelte | 2 +- .../project-[project]/auth/createUser.svelte | 2 +- .../project-[project]/auth/teams/+page.svelte | 4 +-- .../project-[project]/auth/teams/+page.ts | 2 +- .../auth/teams/team-[team]/activity/+page.ts | 2 +- .../teams/team-[team]/createMembership.svelte | 4 ++- .../teams/team-[team]/deleteMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteTeam.svelte | 4 +-- .../teams/team-[team]/members/+page.svelte | 2 +- .../auth/teams/team-[team]/members/+page.ts | 2 +- .../auth/teams/team-[team]/store.ts | 7 +++-- .../auth/teams/team-[team]/updateName.svelte | 4 +-- .../auth/teams/team-[team]/updatePrefs.svelte | 12 ++++---- .../auth/usage/[[period]]/+page.ts | 2 +- .../auth/user-[user]/activity/+page.ts | 2 +- .../auth/user-[user]/deleteMembership.svelte | 2 +- .../auth/user-[user]/memberships/+page.svelte | 2 +- .../auth/user-[user]/store.ts | 2 +- .../project-[project]/databases/+page.svelte | 2 +- .../project-[project]/databases/+page.ts | 2 +- .../project-[project]/databases/create.svelte | 2 +- .../database-[database]/+layout.svelte | 2 +- .../databases/database-[database]/+page.ts | 2 +- .../collection-[collection]/+layout.ts | 2 +- .../collection-[collection]/+page.ts | 2 +- .../collection-[collection]/activity/+page.ts | 2 +- .../attributes/boolean.svelte | 2 +- .../attributes/datetime.svelte | 2 +- .../attributes/email.svelte | 2 +- .../attributes/enum.svelte | 2 +- .../attributes/float.svelte | 2 +- .../attributes/integer.svelte | 2 +- .../attributes/ip.svelte | 2 +- .../attributes/string.svelte | 2 +- .../attributes/url.svelte | 2 +- .../createDocument.svelte | 2 +- .../document-[document]/activity/+page.ts | 2 +- .../document-[document]/attribute.svelte | 2 +- .../attributes/boolean.svelte | 2 +- .../attributes/datetime.svelte | 2 +- .../attributes/enum.svelte | 2 +- .../attributes/integer.svelte | 2 +- .../attributes/string.svelte | 2 +- .../document-[document]/attributes/url.svelte | 2 +- .../document-[document]/document.svelte | 2 +- .../document-[document]/store.ts | 2 +- .../indexes/+page.svelte | 2 +- .../indexes/deleteIndex.svelte | 2 +- .../indexes/overviewIndex.svelte | 2 +- .../collection-[collection]/store.ts | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../createCollection.svelte | 2 +- .../databases/database-[database]/store.ts | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../databases/usage/[[period]]/+page.ts | 2 +- .../project-[project]/functions/+page.ts | 2 +- .../functions/createFunction.svelte | 4 +-- .../functions/createVariable.svelte | 2 +- .../function-[function]/+page.svelte | 2 +- .../functions/function-[function]/+page.ts | 2 +- .../function-[function]/activate.svelte | 2 +- .../function-[function]/delete.svelte | 2 +- .../function-[function]/execute.svelte | 2 +- .../executions/+page.svelte | 2 +- .../function-[function]/executions/+page.ts | 2 +- .../function-[function]/settings/+page.svelte | 2 +- .../function-[function]/settings/store.ts | 2 +- .../functions/function-[function]/store.ts | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../functions/wizard/step5.svelte | 2 +- .../functions/wizard/store.ts | 2 +- .../project-[project]/overview/+layout.svelte | 2 +- .../overview/keys/[key]/store.ts | 2 +- .../overview/keys/wizard/store.ts | 2 +- .../overview/platforms/[platform]/store.ts | 2 +- .../overview/platforms/wizard/store.ts | 2 +- .../project-[project]/overview/store.ts | 2 +- .../settings/domains/+page.svelte | 2 +- .../settings/domains/delete.svelte | 2 +- .../settings/domains/wizard/store.ts | 2 +- .../settings/webhooks/[webhook]/store.ts | 2 +- .../settings/webhooks/wizard/store.ts | 2 +- .../project-[project]/storage/+page.svelte | 2 +- .../project-[project]/storage/+page.ts | 2 +- .../storage/bucket-[bucket]/+page.svelte | 2 +- .../storage/bucket-[bucket]/+page.ts | 2 +- .../storage/bucket-[bucket]/create.svelte | 2 +- .../storage/bucket-[bucket]/deleteFile.svelte | 2 +- .../bucket-[bucket]/file-[file]/store.ts | 2 +- .../bucket-[bucket]/settings/+page.svelte | 2 +- .../storage/bucket-[bucket]/store.ts | 2 +- .../bucket-[bucket]/usage/[[period]]/+page.ts | 2 +- .../project-[project]/storage/create.svelte | 2 +- .../storage/usage/[[period]]/+page.ts | 2 +- src/routes/console/project-[project]/store.ts | 2 +- src/routes/register/+page.svelte | 2 +- 132 files changed, 177 insertions(+), 172 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6ab303f0..0587a5006 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,11 +6,10 @@ "packages": { "": { "name": "@appwrite/console", - "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.6-rc.4", - "@aw-labs/appwrite-console": "^13.1.0", + "@appwrite.io/console": "0.1.0-preview-0.0", + "@appwrite.io/pink": "0.0.6-rc.2", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", @@ -147,10 +146,19 @@ "resolved": "https://registry.npmjs.org/@analytics/type-utils/-/type-utils-0.6.0.tgz", "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, + "node_modules/@appwrite.io/console": { + "version": "0.1.0-preview-0.0", + "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.1.0-preview-0.0.tgz", + "integrity": "sha512-ROCZICle2N/76UMXRm40fIDhjPrxplqa8SCuiCSDu68P4x54lybOw/8ecpwHspq/yIxlQ5LYsyJ4U8Fw76JyIg==", + "dependencies": { + "cross-fetch": "3.1.5", + "isomorphic-form-data": "2.0.0" + } + }, "node_modules/@appwrite.io/pink": { - "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==", + "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", @@ -162,15 +170,6 @@ "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.0.5.tgz", "integrity": "sha512-Ej9usq4C9pwrqCvSNvRnFJ1jPF1+iXq2+edBbuttF1f30jFlOXol/Z7gkDR1ofwtWUBFs2X+181dIPLJHICq+A==" }, - "node_modules/@aw-labs/appwrite-console": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-13.1.0.tgz", - "integrity": "sha512-1FyKke5b3vx+D3VfNYd3YnFhzUOlsj9bD+KTRLWA4WRItb55thFVZJMWQQ4XnZtDiLPuJAn2XjbMSfMr+9XYwg==", - "dependencies": { - "cross-fetch": "3.1.5", - "isomorphic-form-data": "2.0.0" - } - }, "node_modules/@babel/code-frame": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", diff --git a/package.json b/package.json index 5448a07e5..08fedc508 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.6-rc.4", - "@aw-labs/appwrite-console": "^13.1.0", + "@appwrite.io/console": "0.1.0-preview-0.0", + "@appwrite.io/pink": "0.0.6-rc.2", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index c4324b970..45ba11413 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { user } from '$lib/stores/user'; import { ENV, MODE, VARS } from '$lib/system'; import googleAnalytics from '@analytics/google-analytics'; -import { AppwriteException } from '@aw-labs/appwrite-console'; +import { AppwriteException } from '@appwrite.io/console'; import Analytics from 'analytics'; import { get } from 'svelte/store'; diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index 778cc4ae5..01596a35e 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte index 82708e6fb..8bb981257 100644 --- a/src/routes/console/project-[project]/auth/+page.svelte +++ b/src/routes/console/project-[project]/auth/+page.svelte @@ -25,7 +25,7 @@ import { base } from '$app/paths'; import { goto } from '$app/navigation'; import Create from './createUser.svelte'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; export let data: PageData; diff --git a/src/routes/console/project-[project]/auth/+page.ts b/src/routes/console/project-[project]/auth/+page.ts index badf0ca4e..97b6ad3d3 100644 --- a/src/routes/console/project-[project]/auth/+page.ts +++ b/src/routes/console/project-[project]/auth/+page.ts @@ -1,4 +1,4 @@ -import { Query } from '@aw-labs/appwrite-console'; +import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; diff --git a/src/routes/console/project-[project]/auth/createTeam.svelte b/src/routes/console/project-[project]/auth/createTeam.svelte index 0875e522c..9215d6349 100644 --- a/src/routes/console/project-[project]/auth/createTeam.svelte +++ b/src/routes/console/project-[project]/auth/createTeam.svelte @@ -5,7 +5,7 @@ import { InputText, Button, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { ID } from '@aw-labs/appwrite-console'; + import { ID } from '@appwrite.io/console'; import { createEventDispatcher } from 'svelte'; export let showCreate = false; diff --git a/src/routes/console/project-[project]/auth/createUser.svelte b/src/routes/console/project-[project]/auth/createUser.svelte index bbd280f66..0a9aaea08 100644 --- a/src/routes/console/project-[project]/auth/createUser.svelte +++ b/src/routes/console/project-[project]/auth/createUser.svelte @@ -12,7 +12,7 @@ } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { ID } from '@aw-labs/appwrite-console'; + import { ID } from '@appwrite.io/console'; import { createEventDispatcher } from 'svelte'; export let showCreate = false; diff --git a/src/routes/console/project-[project]/auth/teams/+page.svelte b/src/routes/console/project-[project]/auth/teams/+page.svelte index bc0e643a3..ff50845f9 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/+page.svelte @@ -23,7 +23,7 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { base } from '$app/paths'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; export let data: PageData; @@ -31,7 +31,7 @@ let showCreate = false; const project = $page.params.project; - const teamCreated = async (event: CustomEvent) => { + const teamCreated = async (event: CustomEvent>>) => { await goto(`${base}/console/project-${project}/auth/teams/team-${event.detail.$id}`); }; diff --git a/src/routes/console/project-[project]/auth/teams/+page.ts b/src/routes/console/project-[project]/auth/teams/+page.ts index 42b4f5c1c..e54ff32e6 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/+page.ts @@ -1,4 +1,4 @@ -import { Query } from '@aw-labs/appwrite-console'; +import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; 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 ea9009d74..4fb5bf0f9 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,4 +1,4 @@ -import { Query } from '@aw-labs/appwrite-console'; +import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte index fb6e9fe49..f1e4e305b 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte @@ -21,9 +21,11 @@ try { const user = await sdk.forProject.teams.createMembership( teamId, - email, roles, url, + email, + undefined, + undefined, name ); addNotification({ diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte index 34ff901db..fef2f8440 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte @@ -7,7 +7,7 @@ import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import { createEventDispatcher } from 'svelte'; const dispatch = createEventDispatcher(); diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte index bf99459eb..a4ca41f10 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte @@ -7,10 +7,10 @@ import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; export let showDelete = false; - export let team: Models.Team; + export let team: Models.Team>; const deleteTeam = async () => { try { 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 f7518114c..5e3db52ae 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 @@ -19,7 +19,7 @@ } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import { invalidate } from '$app/navigation'; import { base } from '$app/paths'; import { toLocaleDateTime } from '$lib/helpers/date'; diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts index e8e342b84..2350d7f61 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts @@ -1,4 +1,4 @@ -import { Query } from '@aw-labs/appwrite-console'; +import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/store.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/store.ts index 5b81e517e..4da496a1d 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/store.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/store.ts @@ -1,5 +1,8 @@ import { derived } from 'svelte/store'; import { page } from '$app/stores'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; -export const team = derived(page, ($page) => $page.data.team as Models.Team); +export const team = derived( + page, + ($page) => $page.data.team as Models.Team> +); diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte index 31ce4ef6d..9b21635f7 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte @@ -18,7 +18,7 @@ async function updateName() { try { - await sdk.forProject.teams.update($page.params.team, teamName); + await sdk.forProject.teams.updateName($page.params.team, teamName); invalidate(Dependencies.TEAM); addNotification({ message: 'Name has been updated', @@ -35,7 +35,7 @@ } -
+ Name diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte index 135660eb8..3c13d5d4a 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte @@ -5,12 +5,12 @@ import { Dependencies } from '$lib/constants'; import { Button, Form } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { team } from './store'; $: if (prefs) { - if (JSON.stringify(prefs) !== JSON.stringify(Object.entries({}))) { + if (JSON.stringify(prefs) !== JSON.stringify(Object.entries($team.prefs))) { if (!!prefs[prefs.length - 1][0] && !!prefs[prefs.length - 1][1]) { arePrefsDisabled = false; } else { @@ -25,7 +25,7 @@ let arePrefsDisabled = true; onMount(async () => { - prefs = Object.entries({}); + prefs = Object.entries($team.prefs); if (!prefs?.length) { prefs.push(['', '']); } @@ -33,9 +33,9 @@ async function updatePrefs() { try { - // let updatedPrefs = Object.fromEntries(prefs); + let updatedPrefs = Object.fromEntries(prefs); - // await sdkForProject.users.updatePrefs($user.$id, updatedPrefs); + await sdk.forProject.teams.updatePrefs($team.$id, updatedPrefs); invalidate(Dependencies.TEAM); arePrefsDisabled = true; @@ -54,7 +54,7 @@ } - + Team Preferences

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 d95c76432..6ba6fec31 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -1,4 +1,4 @@ -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; import { error } from '@sveltejs/kit'; diff --git a/src/routes/console/project-[project]/auth/user-[user]/activity/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/activity/+page.ts index 168f3add5..103be41a4 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/activity/+page.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/activity/+page.ts @@ -1,4 +1,4 @@ -import { Query } from '@aw-labs/appwrite-console'; +import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte index d02d963c7..bb198398d 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte @@ -8,7 +8,7 @@ import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; export let showDelete = false; export let selectedMembership: Models.Membership; diff --git a/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte index a477b1a3b..680c8ef36 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte @@ -14,7 +14,7 @@ import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import DeleteMembership from '../deleteMembership.svelte'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; import { trackEvent } from '$lib/actions/analytics'; import { toLocaleDateTime } from '$lib/helpers/date'; diff --git a/src/routes/console/project-[project]/auth/user-[user]/store.ts b/src/routes/console/project-[project]/auth/user-[user]/store.ts index f1ffab21e..787647b42 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/store.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/store.ts @@ -1,6 +1,6 @@ import { derived } from 'svelte/store'; import { page } from '$app/stores'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; export const user = derived( page, diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/console/project-[project]/databases/+page.svelte index 34348305b..ee49ba16d 100644 --- a/src/routes/console/project-[project]/databases/+page.svelte +++ b/src/routes/console/project-[project]/databases/+page.svelte @@ -8,7 +8,7 @@ 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 { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; import { columns } from './store'; diff --git a/src/routes/console/project-[project]/databases/+page.ts b/src/routes/console/project-[project]/databases/+page.ts index e83bc2cac..2a9e3446a 100644 --- a/src/routes/console/project-[project]/databases/+page.ts +++ b/src/routes/console/project-[project]/databases/+page.ts @@ -1,7 +1,7 @@ import { CARD_LIMIT } from '$lib/constants'; import { getLimit, getPage, getView, pageToOffset, View } from '$lib/helpers/load'; import { sdk } from '$lib/stores/sdk'; -import { Query } from '@aw-labs/appwrite-console'; +import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ url, route }) => { diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/console/project-[project]/databases/create.svelte index ca42e67b1..e548f7b6c 100644 --- a/src/routes/console/project-[project]/databases/create.svelte +++ b/src/routes/console/project-[project]/databases/create.svelte @@ -5,7 +5,7 @@ import { Button, InputText, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { ID } from '@aw-labs/appwrite-console'; + import { ID } from '@appwrite.io/console'; import { createEventDispatcher } from 'svelte'; export let showCreate = false; diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte b/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte index 730daa660..0663ea0f6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte @@ -1,6 +1,6 @@ @@ -92,7 +84,7 @@ - + diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte index 4f94efea8..00e4bbeee 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'android' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte index a18076503..c5315392c 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-ios' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte index fb64591dd..dc3d8d3f0 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-macos' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte index 2b4c722f7..fb8d87591 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte @@ -26,7 +26,7 @@ $platform.store, $platform.hostname ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-tvos' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte index 8fba6454a..41cdaa2ea 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-watchos' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte index 6e5b95d36..fc5793332 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-android' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte index 4b105a5c1..160946076 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-linux' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte index d93964922..c5e9457d2 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-macos' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte index 607b3d88c..73227f999 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-windows' }); diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte index e9526e816..4236ff459 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte @@ -25,7 +25,7 @@ $platform.store || undefined, hostname ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); addNotification({ type: 'success', message: 'Platform Hostname has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte index 2ed2b4860..793e92dbc 100644 --- a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte @@ -13,9 +13,9 @@ async function onFinish() { if ($onboarding) { - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); } - invalidate(Dependencies.PLATFORMS); + await invalidate(Dependencies.PLATFORMS); createPlatform.reset(); wizard.hide(); } diff --git a/src/routes/console/project-[project]/overview/platforms/createApple.svelte b/src/routes/console/project-[project]/overview/platforms/createApple.svelte index 52d6b5208..3af703616 100644 --- a/src/routes/console/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createApple.svelte @@ -13,9 +13,9 @@ async function onFinish() { if ($onboarding) { - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); } - invalidate(Dependencies.PLATFORMS); + await invalidate(Dependencies.PLATFORMS); createPlatform.reset(); wizard.hide(); } diff --git a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte index 8e9d5a152..1d5d9d343 100644 --- a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte @@ -13,9 +13,9 @@ async function onFinish() { if ($onboarding) { - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); } - invalidate(Dependencies.PLATFORMS); + await invalidate(Dependencies.PLATFORMS); createPlatform.reset(); wizard.hide(); } diff --git a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte index 57eb2b89c..e65723c19 100644 --- a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte @@ -13,9 +13,9 @@ async function onFinish() { if ($onboarding) { - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); } - invalidate(Dependencies.PLATFORMS); + await invalidate(Dependencies.PLATFORMS); createPlatform.reset(); wizard.hide(); } diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte index 4691bea04..5b5981f98 100644 --- a/src/routes/console/project-[project]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/+page.svelte @@ -29,7 +29,7 @@ updating = true; try { await sdk.forConsole.projects.update($project.$id, name); - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); addNotification({ type: 'success', message: 'Project name has been updated' @@ -57,7 +57,7 @@ service.method, service.value ); - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); addNotification({ type: 'success', message: `${service.label} service has been ${ diff --git a/src/routes/console/project-[project]/settings/domains/+page.svelte b/src/routes/console/project-[project]/settings/domains/+page.svelte index 49ae903c9..3311870c8 100644 --- a/src/routes/console/project-[project]/settings/domains/+page.svelte +++ b/src/routes/console/project-[project]/settings/domains/+page.svelte @@ -42,11 +42,11 @@ isVerifying[domainId] = true; if (domain.verification) { - invalidate(Dependencies.DOMAINS); + await invalidate(Dependencies.DOMAINS); return; } await sdk.forConsole.projects.updateDomainVerification(projectId, domainId); - invalidate(Dependencies.DOMAINS); + await invalidate(Dependencies.DOMAINS); trackEvent(Submit.DomainUpdateVerification); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/settings/domains/create.svelte b/src/routes/console/project-[project]/settings/domains/create.svelte index 97ede49de..694b6a607 100644 --- a/src/routes/console/project-[project]/settings/domains/create.svelte +++ b/src/routes/console/project-[project]/settings/domains/create.svelte @@ -19,8 +19,8 @@ wizard.hide(); }); - function onFinish() { - invalidate(Dependencies.DOMAINS); + async function onFinish() { + await invalidate(Dependencies.DOMAINS); wizard.hide(); } diff --git a/src/routes/console/project-[project]/settings/domains/delete.svelte b/src/routes/console/project-[project]/settings/domains/delete.svelte index 651ebad9f..59e90a6b7 100644 --- a/src/routes/console/project-[project]/settings/domains/delete.svelte +++ b/src/routes/console/project-[project]/settings/domains/delete.svelte @@ -15,7 +15,7 @@ const deleteDomain = async () => { try { await sdk.forConsole.projects.deleteDomain($project.$id, selectedDomain.$id); - invalidate(Dependencies.DOMAINS); + await invalidate(Dependencies.DOMAINS); showDelete = false; addNotification({ type: 'success', diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte index 1dd0588f2..17076da34 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte @@ -15,7 +15,7 @@ async function regenerate() { try { await sdk.forConsole.projects.updateWebhookSignature(projectId, $webhook.$id); - invalidate(Dependencies.WEBHOOK); + await invalidate(Dependencies.WEBHOOK); show = false; addNotification({ type: 'success', diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte index d7ca2c826..1f9eadd84 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte @@ -35,7 +35,7 @@ $webhook.httpUser || undefined, $webhook.httpPass || undefined ); - invalidate(Dependencies.WEBHOOK); + await invalidate(Dependencies.WEBHOOK); areEventsDisabled = true; addNotification({ type: 'success', diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte index 668f414c6..5a6c97887 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte @@ -29,7 +29,7 @@ $webhook.httpUser || undefined, $webhook.httpPass || undefined ); - invalidate(Dependencies.WEBHOOK); + await invalidate(Dependencies.WEBHOOK); addNotification({ type: 'success', message: 'Webhook name has been updated' diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte index 81cf42db7..f0e9f2217 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte @@ -40,7 +40,7 @@ httpUser || undefined, httpPass || undefined ); - invalidate(Dependencies.WEBHOOK); + await invalidate(Dependencies.WEBHOOK); addNotification({ type: 'success', message: 'Webhook security has been updated' diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte index 558d3345a..47e3abf37 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte @@ -29,7 +29,7 @@ $webhook.httpUser || undefined, $webhook.httpPass || undefined ); - invalidate(Dependencies.WEBHOOK); + await invalidate(Dependencies.WEBHOOK); addNotification({ type: 'success', message: 'Webhook url has been updated' diff --git a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte index 55457b699..3ed20d181 100644 --- a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte @@ -26,7 +26,7 @@ $createWebhook.httpUser || undefined, $createWebhook.httpPass || undefined ); - invalidate(Dependencies.WEBHOOKS); + await invalidate(Dependencies.WEBHOOKS); addNotification({ message: 'Webhook has been created', type: 'success' diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index bc31f37f9..a3384e2c0 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -50,22 +50,22 @@ const getPreview = (fileId: string) => sdk.forProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; - function fileCreated() { + async function fileCreated() { showCreate = false; - invalidate(Dependencies.FILES); + await invalidate(Dependencies.FILES); } - function fileDeleted(event: CustomEvent) { + async function fileDeleted(event: CustomEvent) { showDelete = false; uploader.removeFile(event.detail); - invalidate(Dependencies.FILES); + await invalidate(Dependencies.FILES); } async function deleteFile(file: Models.File) { try { await sdk.forProject.storage.deleteFile(file.bucketId, file.$id); uploader.removeFile(file); - invalidate(Dependencies.FILES); + await invalidate(Dependencies.FILES); trackEvent(Submit.FileDelete); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index d1703d0cd..10228c0ff 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -48,7 +48,7 @@ async function updatePermissions() { try { await sdk.forProject.storage.updateFile($file.bucketId, $file.$id, filePermissions); - invalidate(Dependencies.FILE); + await invalidate(Dependencies.FILE); arePermsDisabled = true; addNotification({ message: 'Permissions have been updated', diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte index ba89665a1..bf356b214 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -28,7 +28,7 @@ values.antivirus ); - invalidate(Dependencies.BUCKET); + await invalidate(Dependencies.BUCKET); if (misc.arePermsDisabled !== undefined) { arePermsDisabled.set(misc.arePermsDisabled); From fc324aec2132e4b8ebd0cbf1f462f9dc9b3c1647 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 27 Mar 2023 16:24:50 +0200 Subject: [PATCH 25/33] refactor: arrow functions to normal functions --- src/routes/console/account/+page.svelte | 1 + src/routes/console/account/delete.svelte | 4 ++-- src/routes/console/account/sessions/+page.svelte | 13 +++++++------ src/routes/console/createOrganization.svelte | 4 ++-- .../organization-[organization]/createMember.svelte | 4 ++-- .../deleteOrganization.svelte | 4 ++-- .../console/project-[project]/auth/updateOAuth.ts | 3 ++- .../auth/user-[user]/deleteAllSessions.svelte | 4 ++-- .../auth/user-[user]/deleteMembership.svelte | 5 ++--- .../auth/user-[user]/deleteSession.svelte | 4 ++-- .../databases/database-[database]/+layout.svelte | 2 +- .../attributes/deleteAttribute.svelte | 4 ++-- .../collection-[collection]/indexes/+page.svelte | 4 ++-- .../settings/deleteCollection.svelte | 6 +++--- .../functions/createFunction.svelte | 1 + .../functions/function-[function]/+page.svelte | 4 ++-- .../functions/function-[function]/delete.svelte | 4 ++-- .../function-[function]/settings/+page.svelte | 6 ++---- .../overview/platforms/[platform]/android.svelte | 4 ++-- .../overview/platforms/[platform]/appleIOS.svelte | 4 ++-- .../overview/platforms/[platform]/appleMacOS.svelte | 4 ++-- .../overview/platforms/[platform]/appleTvOS.svelte | 4 ++-- .../platforms/[platform]/appleWatchOS.svelte | 4 ++-- .../overview/platforms/[platform]/delete.svelte | 6 +++--- .../overview/platforms/[platform]/flutterIOS.svelte | 6 +++--- .../platforms/[platform]/flutterLinux.svelte | 4 ++-- .../platforms/[platform]/flutterMacOS.svelte | 4 ++-- .../platforms/[platform]/flutterWindows.svelte | 4 ++-- .../overview/platforms/[platform]/web.svelte | 4 ++-- .../console/project-[project]/settings/+page.svelte | 10 +--------- .../project-[project]/settings/domains/+page.svelte | 4 ++-- .../settings/domains/delete.svelte | 4 ++-- .../settings/webhooks/createWebhook.svelte | 4 ++-- .../storage/bucket-[bucket]/+page.svelte | 2 +- src/routes/login/+page.svelte | 6 ++---- src/routes/register/+page.svelte | 6 ++---- src/routes/register/invite/[slug]/+page.svelte | 6 ++---- 37 files changed, 77 insertions(+), 90 deletions(-) diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte index 99a2f262d..9e799fa8f 100644 --- a/src/routes/console/account/+page.svelte +++ b/src/routes/console/account/+page.svelte @@ -41,6 +41,7 @@ trackError(error, Submit.AccountUpdateName); } } + async function updateEmail() { try { await sdk.forConsole.account.updateEmail(email, emailPassword); diff --git a/src/routes/console/account/delete.svelte b/src/routes/console/account/delete.svelte index 6c0eb816d..c8b8a50c2 100644 --- a/src/routes/console/account/delete.svelte +++ b/src/routes/console/account/delete.svelte @@ -9,7 +9,7 @@ export let showDelete = false; - const deleteAccount = async () => { + async function deleteAccount() { try { await sdk.forConsole.account.updateStatus(); showDelete = false; @@ -26,7 +26,7 @@ }); trackError(error, Submit.AccountDelete); } - }; + } diff --git a/src/routes/console/account/sessions/+page.svelte b/src/routes/console/account/sessions/+page.svelte index fc6c03938..25bf18d39 100644 --- a/src/routes/console/account/sessions/+page.svelte +++ b/src/routes/console/account/sessions/+page.svelte @@ -22,24 +22,25 @@ export let data: PageData; - const getBrowser = (clientCode: string) => { + function getBrowser(clientCode: string) { return sdk.forConsole.avatars.getBrowser(clientCode, 40, 40); - }; + } - const logout = async (session: Models.Session) => { + async function logout(session: Models.Session) { await sdk.forConsole.account.deleteSession(session.$id); trackEvent(Submit.AccountDeleteSession); if (session.current) { await goto(`${base}/login`); } invalidate(Dependencies.ACCOUNT_SESSIONS); - }; - const logoutAll = async () => { + } + + async function logoutAll() { await sdk.forConsole.account.deleteSessions(); trackEvent(Submit.AccountDeleteAllSessions); await goto(`${base}/login`); invalidate(Dependencies.ACCOUNT_SESSIONS); - }; + } diff --git a/src/routes/console/createOrganization.svelte b/src/routes/console/createOrganization.svelte index 3f3dab4f9..bff7bc945 100644 --- a/src/routes/console/createOrganization.svelte +++ b/src/routes/console/createOrganization.svelte @@ -19,7 +19,7 @@ const dispatch = createEventDispatcher(); - const create = async () => { + async function create() { try { const org = await sdk.forConsole.teams.create(id ?? ID.unique(), name); await invalidate(Dependencies.ACCOUNT); @@ -39,7 +39,7 @@ error = e.message; trackError(e, Submit.OrganizationCreate); } - }; + } diff --git a/src/routes/console/organization-[organization]/createMember.svelte b/src/routes/console/organization-[organization]/createMember.svelte index 663b5a878..c32f67cbc 100644 --- a/src/routes/console/organization-[organization]/createMember.svelte +++ b/src/routes/console/organization-[organization]/createMember.svelte @@ -17,7 +17,7 @@ let email: string, name: string, error: string; const url = `${$page.url.origin}/invite`; - const create = async () => { + async function create() { try { const team = await sdk.forConsole.teams.createMembership( $organization.$id, @@ -40,7 +40,7 @@ error = e.message; trackError(e, Submit.MemberCreate); } - }; + } $: if (!showCreate) { error = null; diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte index 49b3ebc5f..8b7a4aaa3 100644 --- a/src/routes/console/organization-[organization]/deleteOrganization.svelte +++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte @@ -11,7 +11,7 @@ export let showDelete = false; - const deleteOrg = async () => { + async function deleteOrg() { try { await sdk.forConsole.teams.delete($organization.$id); addNotification({ @@ -34,7 +34,7 @@ }); trackError(error, Submit.OrganizationDelete); } - }; + } diff --git a/src/routes/console/project-[project]/auth/updateOAuth.ts b/src/routes/console/project-[project]/auth/updateOAuth.ts index a4e365fbe..8e7f3272e 100644 --- a/src/routes/console/project-[project]/auth/updateOAuth.ts +++ b/src/routes/console/project-[project]/auth/updateOAuth.ts @@ -33,6 +33,8 @@ export async function updateOAuth({ secret || undefined, enabled ); + await invalidate(Dependencies.PROJECT); + addNotification({ type: 'success', message: `${provider.name} authentication has been updated` @@ -41,7 +43,6 @@ export async function updateOAuth({ provider, enabled }); - await invalidate(Dependencies.PROJECT); return { status: 'success' }; } catch (e) { diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte index fe31673b5..f5067f8e2 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte @@ -11,7 +11,7 @@ export let showDeleteAll = false; - const deleteAllSessions = async () => { + async function deleteAllSessions() { try { await sdk.forProject.users.deleteSessions($page.params.user); await invalidate(Dependencies.SESSIONS); @@ -28,7 +28,7 @@ }); trackError(error, Submit.SessionDeleteAll); } - }; + } diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte index e914a8fee..50b3ef50c 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte @@ -13,7 +13,7 @@ export let showDelete = false; export let selectedMembership: Models.Membership; - const deleteMembership = async () => { + async function deleteMembership() { try { await sdk.forProject.teams.deleteMembership( selectedMembership.teamId, @@ -21,7 +21,6 @@ ); await invalidate(Dependencies.MEMBERSHIPS); showDelete = false; - addNotification({ type: 'success', message: `Membership has been deleted` @@ -37,7 +36,7 @@ }); trackError(error, Submit.MemberDelete); } - }; + } diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte index 4d1b6cc45..306feb2d4 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte @@ -11,7 +11,7 @@ export let showDelete = false; export let selectedSessionId: string; - const deleteSession = async () => { + async function deleteSession() { try { await sdk.forProject.users.deleteSession($page.params.user, selectedSessionId); await invalidate(Dependencies.SESSIONS); @@ -27,7 +27,7 @@ }); trackError(error, Submit.SessionDelete); } - }; + } diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte b/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte index 75f43b229..0663ea0f6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte @@ -12,7 +12,7 @@ async function handleCreate(event: CustomEvent) { $showCreate = false; - await await invalidate(Dependencies.DATABASE); + await invalidate(Dependencies.DATABASE); await goto( `${base}/console/project-${project}/databases/database-${databaseId}/collection-${event.detail.$id}` ); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte index 654f8b7f3..5b8028ea3 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte @@ -15,7 +15,7 @@ export let selectedAttribute: Attributes; const databaseId = $page.params.database; - const handleDelete = async () => { + async function handleDelete() { try { await sdk.forProject.databases.deleteAttribute( databaseId, @@ -39,7 +39,7 @@ }); trackError(error, Submit.AttributeDelete); } - }; + } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index a4fa311d3..0d64e92f7 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -28,9 +28,9 @@ let showDelete = false; let showCreateAttribute = false; - const handleDelete = async () => { + async function handleDelete() { invalidate(Dependencies.COLLECTION); - }; + } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte index 2cfe1d2ed..a9d7fd08f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte @@ -14,16 +14,16 @@ const databaseId = $page.params.database; - const handleDelete = async () => { + async function handleDelete() { try { await sdk.forProject.databases.deleteCollection(databaseId, $collection.$id); + await invalidate(Dependencies.DATABASE); showDelete = false; addNotification({ type: 'success', message: `${$collection.name} has been deleted` }); trackEvent(Submit.CollectionDelete); - await invalidate(Dependencies.DATABASE); await goto( `${base}/console/project-${$page.params.project}/databases/database-${$page.params.database}` ); @@ -34,7 +34,7 @@ }); trackError(error, Submit.CollectionDelete); } - }; + } diff --git a/src/routes/console/project-[project]/functions/createFunction.svelte b/src/routes/console/project-[project]/functions/createFunction.svelte index 9d756ea10..142fa98bb 100644 --- a/src/routes/console/project-[project]/functions/createFunction.svelte +++ b/src/routes/console/project-[project]/functions/createFunction.svelte @@ -23,6 +23,7 @@ async function onFinish() { await invalidate(Dependencies.FUNCTIONS); } + async function create() { try { const response = await sdk.forProject.functions.create( diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte index dcc23d622..e8adb6b15 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -50,9 +50,9 @@ let selectedDeployment: Models.Deployment = null; - const handleActivate = () => { + function handleActivate() { invalidate(Dependencies.DEPLOYMENTS); - }; + } $: activeDeployment = data.deployments.deployments.find((d) => d.$id === $func?.deployment); diff --git a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte index d9c34210d..a3c49b124 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte @@ -11,7 +11,7 @@ export let showDelete = false; export let selectedDeployment: Models.Deployment = null; - const handleSubmit = async () => { + async function handleSubmit() { try { await sdk.forProject.functions.deleteDeployment( selectedDeployment.resourceId, @@ -31,7 +31,7 @@ }); trackError(error, Submit.DeploymentDelete); } - }; + } 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 8525a8769..94aadbc6c 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 @@ -126,7 +126,6 @@ $func.enabled ); await invalidate(Dependencies.FUNCTION); - addNotification({ type: 'success', message: 'Cron Schedule has been updated' @@ -152,7 +151,6 @@ timeout, $func.enabled ); - await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', @@ -173,8 +171,8 @@ try { await sdk.forProject.functions.createVariable(functionId, variable.key, variable.value); - showVariablesModal = false; await invalidate(Dependencies.VARIABLES); + showVariablesModal = false; addNotification({ type: 'success', message: `${$func.name} variables have been updated` @@ -198,9 +196,9 @@ variable.key, variable.value ); + await invalidate(Dependencies.VARIABLES); selectedVar = null; showVariablesModal = false; - await invalidate(Dependencies.VARIABLES); addNotification({ type: 'success', message: `${$func.name} variables have been updated` diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte index 00e4bbeee..92b912b4e 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + }

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte index c5315392c..717e74d58 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte index dc3d8d3f0..d3ee9f781 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte index fb8d87591..b003d7167 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte index 41cdaa2ea..1f2874532 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte index b4469a227..673e43387 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte @@ -12,16 +12,16 @@ export let showDelete = false; - const handleDelete = async () => { + async function handleDelete() { try { await sdk.forConsole.projects.deletePlatform($project.$id, $platform.$id); + await invalidate(Dependencies.PLATFORMS); showDelete = false; addNotification({ type: 'success', message: `${$platform.name} has been deleted` }); trackEvent(Submit.PlatformDelete); - await invalidate(Dependencies.PLATFORMS); await goto(`${base}/console/project-${$project.$id}/overview/platforms`); } catch (error) { addNotification({ @@ -30,7 +30,7 @@ }); trackError(error, Submit.PlatformDelete); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte index 80e687b40..ceddc2018 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -26,7 +26,7 @@ $platform.store || undefined, $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-ios' }); @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte index 160946076..a6587085c 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte index c5e9457d2..e3b842650 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte index 73227f999..0c20e127e 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte @@ -16,7 +16,7 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte index 4236ff459..34aafe9b9 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte @@ -15,7 +15,7 @@ hostname ??= $platform.hostname; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, @@ -36,7 +36,7 @@ message: error.message }); } - }; + } diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte index 5b5981f98..ccce2b50b 100644 --- a/src/routes/console/project-[project]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/+page.svelte @@ -17,7 +17,6 @@ let name: string = null; let showDelete = false; - let updating = false; const endpoint = sdk.forConsole.client.config.endpoint; const projectId = $page.params.project; @@ -26,7 +25,6 @@ }); async function updateName() { - updating = true; try { await sdk.forConsole.projects.update($project.$id, name); await invalidate(Dependencies.PROJECT); @@ -44,12 +42,6 @@ } } - $: { - // When project name is updated, finalize the updating flow - $project.name; - updating = false; - } - async function serviceUpdate(service: Service) { try { await sdk.forConsole.projects.updateServiceStatus( @@ -116,7 +108,7 @@ - + diff --git a/src/routes/console/project-[project]/settings/domains/+page.svelte b/src/routes/console/project-[project]/settings/domains/+page.svelte index 3311870c8..5df64b189 100644 --- a/src/routes/console/project-[project]/settings/domains/+page.svelte +++ b/src/routes/console/project-[project]/settings/domains/+page.svelte @@ -36,7 +36,7 @@ wizard.start(Create); }; - const refreshDomain = async (domain: Models.Domain) => { + async function refreshDomain(domain: Models.Domain) { const domainId = domain.$id; try { isVerifying[domainId] = true; @@ -57,7 +57,7 @@ } finally { isVerifying[domainId] = false; } - }; + } diff --git a/src/routes/console/project-[project]/settings/domains/delete.svelte b/src/routes/console/project-[project]/settings/domains/delete.svelte index 59e90a6b7..f0b16bae4 100644 --- a/src/routes/console/project-[project]/settings/domains/delete.svelte +++ b/src/routes/console/project-[project]/settings/domains/delete.svelte @@ -12,7 +12,7 @@ export let showDelete = false; export let selectedDomain: Models.Domain; - const deleteDomain = async () => { + async function deleteDomain() { try { await sdk.forConsole.projects.deleteDomain($project.$id, selectedDomain.$id); await invalidate(Dependencies.DOMAINS); @@ -29,7 +29,7 @@ }); trackError(error, Submit.DomainDelete); } - }; + } diff --git a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte index 3ed20d181..5424172c7 100644 --- a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte @@ -15,7 +15,7 @@ import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; const projectId = $page.params.project; - const create = async () => { + async function create() { try { await sdk.forConsole.projects.createWebhook( projectId, @@ -42,7 +42,7 @@ }); trackError(error, Submit.WebhookCreate); } - }; + } onDestroy(() => { $createWebhook = { diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index a3384e2c0..321a24432 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -64,8 +64,8 @@ async function deleteFile(file: Models.File) { try { await sdk.forProject.storage.deleteFile(file.bucketId, file.$id); - uploader.removeFile(file); await invalidate(Dependencies.FILES); + uploader.removeFile(file); trackEvent(Submit.FileDelete); } catch (error) { addNotification({ diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index edac58515..9206e5b6d 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -15,11 +15,10 @@ import { Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - let mail: string, pass: string, disabled: boolean; + let mail: string, pass: string; async function login() { try { - disabled = true; await sdk.forConsole.account.createEmailSession(mail, pass); await invalidate(Dependencies.ACCOUNT); addNotification({ @@ -29,7 +28,6 @@ trackEvent(Submit.AccountCreate); await goto(`${base}/console`); } catch (error) { - disabled = false; addNotification({ type: 'error', message: error.message @@ -64,7 +62,7 @@ showPasswordButton={true} bind:value={pass} /> - + diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index 49d48a5d2..9a3283dd7 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -18,19 +18,17 @@ import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { ID } from '@appwrite.io/console'; - let name: string, mail: string, pass: string, disabled: boolean; + let name: string, mail: string, pass: string; let terms = false; async function register() { try { - disabled = true; await sdk.forConsole.account.create(ID.unique(), mail, pass, name ?? ''); await sdk.forConsole.account.createEmailSession(mail, pass); await invalidate(Dependencies.ACCOUNT); await goto(`${base}/console`); trackEvent(Submit.AccountCreate); } catch (error) { - disabled = false; addNotification({ type: 'error', message: error.message @@ -83,7 +81,7 @@ rel="noopener noreferrer">General Terms of Use. - + diff --git a/src/routes/register/invite/[slug]/+page.svelte b/src/routes/register/invite/[slug]/+page.svelte index c36a6c6bc..346f737c0 100644 --- a/src/routes/register/invite/[slug]/+page.svelte +++ b/src/routes/register/invite/[slug]/+page.svelte @@ -48,13 +48,12 @@ } }); - let name: string, mail: string, pass: string, code: string, disabled: boolean; + let name: string, mail: string, pass: string, code: string; let title = 'Sign up'; let terms = false; async function invite() { try { - disabled = true; const res = await fetch(`${sdk.forConsole.client.config.endpoint}/account/invite`, { method: 'POST', headers: { @@ -78,7 +77,6 @@ trackEvent('submit_account_create', { code: code }); } } catch (error) { - disabled = false; addNotification({ type: 'error', message: error.message @@ -136,7 +134,7 @@ rel="noopener noreferrer">General Terms of Use. - + From 80407d84b834d652efd65c9e523ebc28d192e5ba Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 28 Mar 2023 08:15:03 +0000 Subject: [PATCH 26/33] fixes --- .../auth/security/updatePasswordDictionary.svelte | 6 +++--- .../auth/security/updatePasswordHistory.svelte | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte index 4eabe6a44..436dc7d70 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputSwitch } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../store'; const projectId = $project.$id; @@ -13,7 +13,7 @@ async function updatePasswordDictionary() { try { - await sdkForConsole.projects.updateAuthPasswordDictionary( + await sdk.forConsole.projects.updateAuthPasswordDictionary( projectId, passwordDictionary ); @@ -33,7 +33,7 @@ } -
+ Password Dictionary diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte index 3461c0782..57c155ad9 100644 --- a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte +++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte @@ -6,7 +6,7 @@ import { Button, Form, InputNumber, InputSwitch } from '$lib/elements/forms'; import FormList from '$lib/elements/forms/formList.svelte'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../store'; const projectId = $project.$id; @@ -16,7 +16,7 @@ async function updatePasswordHistoryLimit() { try { - await sdkForConsole.projects.updateAuthPasswordHistory( + await sdk.forConsole.projects.updateAuthPasswordHistory( projectId, passwordHistoryEnabled ? passwordHistory : 0 ); @@ -37,7 +37,7 @@ } - + Password History From de99e840ebf9bf00c539113dd8d73b8f1c23fad3 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 28 Mar 2023 14:25:57 +0545 Subject: [PATCH 27/33] Update src/lib/actions/analytics.ts --- src/lib/actions/analytics.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 4ca6fbe02..04d74c94a 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -1,6 +1,5 @@ import { page } from '$app/stores'; import { user } from '$lib/stores/user'; -import { AppwriteException } from '@appwrite.io/console'; import { ENV, MODE, VARS } from '$lib/system'; import googleAnalytics from '@analytics/google-analytics'; import { AppwriteException } from '@appwrite.io/console'; From eb46a9fcf8d4502a3a7867d528b224107b81eb10 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 28 Mar 2023 10:49:13 +0200 Subject: [PATCH 28/33] update other parts --- src/routes/console/account/delete.svelte | 2 +- src/routes/console/account/sessions/+page.svelte | 4 ++-- .../organization-[organization]/deleteOrganization.svelte | 3 +-- .../auth/teams/team-[team]/createMembership.svelte | 4 ++-- .../collection-[collection]/createDocument.svelte | 2 +- .../document-[document]/document.svelte | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/routes/console/account/delete.svelte b/src/routes/console/account/delete.svelte index c8b8a50c2..906e5ac87 100644 --- a/src/routes/console/account/delete.svelte +++ b/src/routes/console/account/delete.svelte @@ -12,8 +12,8 @@ async function deleteAccount() { try { await sdk.forConsole.account.updateStatus(); - showDelete = false; await invalidate(Dependencies.ACCOUNT); + showDelete = false; addNotification({ type: 'success', message: `Account was deleted ` diff --git a/src/routes/console/account/sessions/+page.svelte b/src/routes/console/account/sessions/+page.svelte index 25bf18d39..afdacfb34 100644 --- a/src/routes/console/account/sessions/+page.svelte +++ b/src/routes/console/account/sessions/+page.svelte @@ -28,18 +28,18 @@ async function logout(session: Models.Session) { await sdk.forConsole.account.deleteSession(session.$id); + invalidate(Dependencies.ACCOUNT_SESSIONS); trackEvent(Submit.AccountDeleteSession); if (session.current) { await goto(`${base}/login`); } - invalidate(Dependencies.ACCOUNT_SESSIONS); } async function logoutAll() { await sdk.forConsole.account.deleteSessions(); + invalidate(Dependencies.ACCOUNT_SESSIONS); trackEvent(Submit.AccountDeleteAllSessions); await goto(`${base}/login`); - invalidate(Dependencies.ACCOUNT_SESSIONS); } diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte index 8b7a4aaa3..0dd56ba3a 100644 --- a/src/routes/console/organization-[organization]/deleteOrganization.svelte +++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte @@ -14,16 +14,15 @@ async function deleteOrg() { try { await sdk.forConsole.teams.delete($organization.$id); + await invalidate(Dependencies.ACCOUNT); addNotification({ type: 'success', message: `${$organization.name} has been deleted` }); trackEvent(Submit.OrganizationDelete); if ($organizationList?.total > 1) { - await invalidate(Dependencies.ACCOUNT); goto(`${base}/console/`); } else { - await invalidate(Dependencies.ACCOUNT); goto(`${base}/console/onboarding`); } showDelete = false; diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte index 9937888a4..cc52a3bd4 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte @@ -15,7 +15,7 @@ let name: string, email: string, roles: string[]; let error: string; - const create = async () => { + async function create() { const url = `${$page.url.origin}/console/project-${$page.params.project}/auth/teams/team-${$page.params.team}/members`; try { @@ -41,7 +41,7 @@ error = e.message; trackError(e, Submit.MemberCreate); } - }; + } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte index 0c00ce220..20660049f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte @@ -40,6 +40,7 @@ $createDocument.document, $createDocument.permissions ); + await invalidate(Dependencies.DOCUMENTS); addNotification({ message: 'Document has been created', @@ -48,7 +49,6 @@ trackEvent(Submit.DocumentCreate, { customId: !!$createDocument.id }); - await invalidate(Dependencies.DOCUMENTS); createDocument.reset(); wizard.hide(); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte index 134a6c477..c2a85e9a5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte @@ -59,9 +59,9 @@ $work, $work.$permissions ); + await invalidate(Dependencies.DOCUMENT); currentDoc = JSON.stringify($work); - await invalidate(Dependencies.DOCUMENT); trackEvent(Submit.DocumentUpdate); disableUpdate = true; addNotification({ From 9626437436f57210753259254e542b065443feb7 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 28 Mar 2023 14:02:02 +0200 Subject: [PATCH 29/33] fix: adapt to review --- src/routes/console/account/sessions/+page.svelte | 4 ++-- .../auth/security/updateUsersLimit.svelte | 6 +----- .../collection-[collection]/indexes/+page.svelte | 8 +------- .../indexes/deleteIndex.svelte | 12 ++++++------ .../overview/platforms/createAndroid.svelte | 8 ++++---- .../overview/platforms/createApple.svelte | 8 ++++---- .../overview/platforms/createFlutter.svelte | 8 ++++---- .../overview/platforms/createWeb.svelte | 8 ++++---- 8 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/routes/console/account/sessions/+page.svelte b/src/routes/console/account/sessions/+page.svelte index afdacfb34..c27dee318 100644 --- a/src/routes/console/account/sessions/+page.svelte +++ b/src/routes/console/account/sessions/+page.svelte @@ -28,7 +28,7 @@ async function logout(session: Models.Session) { await sdk.forConsole.account.deleteSession(session.$id); - invalidate(Dependencies.ACCOUNT_SESSIONS); + await invalidate(Dependencies.ACCOUNT_SESSIONS); trackEvent(Submit.AccountDeleteSession); if (session.current) { await goto(`${base}/login`); @@ -37,7 +37,7 @@ async function logoutAll() { await sdk.forConsole.account.deleteSessions(); - invalidate(Dependencies.ACCOUNT_SESSIONS); + await invalidate(Dependencies.ACCOUNT_SESSIONS); trackEvent(Submit.AccountDeleteAllSessions); await goto(`${base}/login`); } diff --git a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte index f3aa98b46..e04fec71c 100644 --- a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte +++ b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte @@ -14,11 +14,9 @@ let isLimited = $project.authLimit !== 0; let newLimit = isLimited ? $project.authLimit : 100; - let submitting = false; $: btnDisabled = (function isBtnDisabled() { if ( - submitting || (!isLimited && $project.authLimit === 0) || (isLimited && $project.authLimit === newLimit) ) { @@ -29,10 +27,9 @@ })(); async function updateLimit() { - submitting = true; try { await sdk.forConsole.projects.updateAuthLimit(projectId, isLimited ? newLimit : 0); - await invalidate(Dependencies.PROJECT).then(() => (submitting = false)); + await invalidate(Dependencies.PROJECT); addNotification({ type: 'success', message: 'Updated project users limit successfully' @@ -43,7 +40,6 @@ type: 'error', message: error.message }); - submitting = false; trackError(error, Submit.AuthLimitUpdate); } } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index 0d64e92f7..5ce8e8660 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -17,8 +17,6 @@ import Overview from './overviewIndex.svelte'; import CreateAttribute from '../createAttribute.svelte'; import type { Models } from '@appwrite.io/console'; - import { invalidate } from '$app/navigation'; - import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; let showDropdown = []; @@ -27,10 +25,6 @@ let showOverview = false; let showDelete = false; let showCreateAttribute = false; - - async function handleDelete() { - invalidate(Dependencies.COLLECTION); - } @@ -135,7 +129,7 @@ {#if selectedIndex} - + {/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte index 480224f21..99b1c62d2 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte @@ -5,29 +5,29 @@ import { collection } from '../store'; import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; - import { createEventDispatcher } from 'svelte'; import { page } from '$app/stores'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { invalidate } from '$app/navigation'; + import { Dependencies } from '$lib/constants'; export let showDelete = false; export let selectedIndex: Models.Index; + const databaseId = $page.params.database; - const dispatch = createEventDispatcher(); - - const handleDelete = async () => { + async function handleDelete() { try { await sdk.forProject.databases.deleteIndex( databaseId, $collection.$id, selectedIndex.key ); + await invalidate(Dependencies.COLLECTION); showDelete = false; addNotification({ type: 'success', message: `Index has been deleted` }); - dispatch('deleted'); trackEvent(Submit.IndexDelete); } catch (error) { addNotification({ @@ -36,7 +36,7 @@ }); trackError(error, Submit.IndexDelete); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte index 793e92dbc..6cbb9e9d7 100644 --- a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte @@ -12,10 +12,10 @@ import Step4 from './wizard/step4.svelte'; async function onFinish() { - if ($onboarding) { - await invalidate(Dependencies.PROJECT); - } - await invalidate(Dependencies.PLATFORMS); + await Promise.all([ + $onboarding && invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); createPlatform.reset(); wizard.hide(); } diff --git a/src/routes/console/project-[project]/overview/platforms/createApple.svelte b/src/routes/console/project-[project]/overview/platforms/createApple.svelte index 3af703616..4473938f3 100644 --- a/src/routes/console/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createApple.svelte @@ -12,10 +12,10 @@ import { onboarding } from '../../store'; async function onFinish() { - if ($onboarding) { - await invalidate(Dependencies.PROJECT); - } - await invalidate(Dependencies.PLATFORMS); + await Promise.all([ + $onboarding && invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); createPlatform.reset(); wizard.hide(); } diff --git a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte index 1d5d9d343..cab3673bb 100644 --- a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte @@ -12,10 +12,10 @@ import { onboarding } from '../../store'; async function onFinish() { - if ($onboarding) { - await invalidate(Dependencies.PROJECT); - } - await invalidate(Dependencies.PLATFORMS); + await Promise.all([ + $onboarding && invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); createPlatform.reset(); wizard.hide(); } diff --git a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte index e65723c19..a7f571b65 100644 --- a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte @@ -12,10 +12,10 @@ import { onboarding } from '../../store'; async function onFinish() { - if ($onboarding) { - await invalidate(Dependencies.PROJECT); - } - await invalidate(Dependencies.PLATFORMS); + await Promise.all([ + $onboarding && invalidate(Dependencies.PROJECT), + invalidate(Dependencies.PLATFORMS) + ]); createPlatform.reset(); wizard.hide(); } From 2aaf15fe50eef6f01726381ed8ee9a9a5319b6b0 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:47:33 +0100 Subject: [PATCH 30/33] fix: limit sidenav transition --- src/lib/layout/navigation.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index bd2a9fbae..15790203b 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -163,7 +163,7 @@
{#if subNavigation} -
+
From 0bbb649283332e7f321b0e0a7c44b1f3928a88ee Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:53:03 +0100 Subject: [PATCH 31/33] feat: keep sidenav open on mobile subnav back btn --- src/lib/layout/shell.svelte | 10 +++++----- .../collection-[collection]/subNavigation.svelte | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 059b320e2..0a80b7f84 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -1,17 +1,17 @@