diff --git a/package-lock.json b/package-lock.json index 18386ca48..a24b6ce9f 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/console": "0.1.0-preview-0.1", "@appwrite.io/pink": "0.0.6-rc.2", - "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", @@ -147,6 +146,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.1.0-preview-0.1", + "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.1.0-preview-0.1.tgz", + "integrity": "sha512-908URjvRoQ87zLJXW7UD0zOgy9DvShgs/YKQBgA9mdNbNmFIzls1XwtbUeNWWLBnx0EVTMjyWiaSou+QIZnXfA==", + "dependencies": { + "cross-fetch": "3.1.5", + "isomorphic-form-data": "2.0.0" + } + }, "node_modules/@appwrite.io/pink": { "version": "0.0.6-rc.2", "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.2.tgz", @@ -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 63f6d764e..8097f98d6 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", + "@appwrite.io/console": "0.1.0-preview-0.1", "@appwrite.io/pink": "0.0.6-rc.2", - "@aw-labs/appwrite-console": "^13.1.0", "@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..04d74c94a 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'; @@ -141,6 +141,8 @@ 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', + AuthPasswordDictionaryUpdate = 'submit_auth_password_dictionary_update', SessionsLengthUpdate = 'submit_sessions_length_update', SessionsLimitUpdate = 'submit_sessions_limit_update', SessionDelete = 'submit_session_delete', diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 637523f5e..5608f512d 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..36849247a --- /dev/null +++ b/src/lib/components/paginator.svelte @@ -0,0 +1,18 @@ + + + + +
+

Total results: {total}

+ +
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/account/organizations/+page.ts b/src/routes/console/account/organizations/+page.ts index d80bc5036..f3cef11bb 100644 --- a/src/routes/console/account/organizations/+page.ts +++ b/src/routes/console/account/organizations/+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 { CARD_LIMIT } from '$lib/constants'; diff --git a/src/routes/console/account/sessions/+page.svelte b/src/routes/console/account/sessions/+page.svelte index b67215de8..c27dee318 100644 --- a/src/routes/console/account/sessions/+page.svelte +++ b/src/routes/console/account/sessions/+page.svelte @@ -15,31 +15,32 @@ import { sdk } from '$lib/stores/sdk'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; import { Submit, trackEvent } from '$lib/actions/analytics'; import { base } from '$app/paths'; 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); + await invalidate(Dependencies.ACCOUNT_SESSIONS); 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(); + await invalidate(Dependencies.ACCOUNT_SESSIONS); 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 ab3c4ee22..bff7bc945 100644 --- a/src/routes/console/createOrganization.svelte +++ b/src/routes/console/createOrganization.svelte @@ -8,7 +8,7 @@ import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { ID } from '@aw-labs/appwrite-console'; + import { ID } from '@appwrite.io/console'; export let show = false; @@ -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/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte index 7f8cffad3..be55cba83 100644 --- a/src/routes/console/onboarding/+page.svelte +++ b/src/routes/console/onboarding/+page.svelte @@ -10,7 +10,7 @@ import { Container } from '$lib/layout'; 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'; let name: string; let id: string; diff --git a/src/routes/console/organization-[organization]/+page.ts b/src/routes/console/organization-[organization]/+page.ts index e5b5e6526..279a55084 100644 --- a/src/routes/console/organization-[organization]/+page.ts +++ b/src/routes/console/organization-[organization]/+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 { CARD_LIMIT } from '$lib/constants'; diff --git a/src/routes/console/organization-[organization]/createMember.svelte b/src/routes/console/organization-[organization]/createMember.svelte index 679f82d7d..c32f67cbc 100644 --- a/src/routes/console/organization-[organization]/createMember.svelte +++ b/src/routes/console/organization-[organization]/createMember.svelte @@ -17,16 +17,18 @@ 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, - email, ['owner'], url, - name + email, + undefined, + undefined, + name || undefined ); - invalidate(Dependencies.ACCOUNT); + await invalidate(Dependencies.ACCOUNT); showCreate = false; addNotification({ type: 'success', @@ -38,7 +40,7 @@ error = e.message; trackError(e, Submit.MemberCreate); } - }; + } $: if (!showCreate) { error = null; @@ -51,6 +53,7 @@ Invite Member { + 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; @@ -34,7 +33,7 @@ }); trackError(error, Submit.OrganizationDelete); } - }; + } diff --git a/src/routes/console/organization-[organization]/members/+page.svelte b/src/routes/console/organization-[organization]/members/+page.svelte index e59e4acd1..57ecddbaa 100644 --- a/src/routes/console/organization-[organization]/members/+page.svelte +++ b/src/routes/console/organization-[organization]/members/+page.svelte @@ -19,7 +19,7 @@ import { addNotification } from '$lib/stores/notifications'; import { members, newMemberModal, organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; import Delete from '../deleteMember.svelte'; @@ -33,10 +33,12 @@ try { await sdk.forConsole.teams.createMembership( $organization.$id, - member.userEmail, member.roles, url, - member.userName + member.userEmail, + undefined, + undefined, + member.userName || undefined ); addNotification({ type: 'success', diff --git a/src/routes/console/organization-[organization]/members/+page.ts b/src/routes/console/organization-[organization]/members/+page.ts index 778250c49..a8eb197e6 100644 --- a/src/routes/console/organization-[organization]/members/+page.ts +++ b/src/routes/console/organization-[organization]/members/+page.ts @@ -1,7 +1,7 @@ import { PAGE_LIMIT } from '$lib/constants'; import { getLimit, getPage, pageToOffset } 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, params, route }) => { diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte index 3c49e296d..ec066ada4 100644 --- a/src/routes/console/organization-[organization]/settings/+page.svelte +++ b/src/routes/console/organization-[organization]/settings/+page.svelte @@ -20,7 +20,7 @@ async function updateName() { try { - await sdk.forConsole.teams.update($organization.$id, name); + await sdk.forConsole.teams.updateName($organization.$id, name); await invalidate(Dependencies.ORGANIZATION); addNotification({ message: 'Name has been updated', diff --git a/src/routes/console/project-[project]/+layout.svelte b/src/routes/console/project-[project]/+layout.svelte index eb2816695..1074501c9 100644 --- a/src/routes/console/project-[project]/+layout.svelte +++ b/src/routes/console/project-[project]/+layout.svelte @@ -1,13 +1,11 @@ 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..c00709849 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; @@ -27,10 +27,10 @@ try { const user = await sdk.forProject.users.create( id ?? ID.unique(), - mail, - phone, - pass, - name + mail || undefined, + phone || undefined, + pass || undefined, + name || undefined ); mail = pass = name = ''; showCreate = false; diff --git a/src/routes/console/project-[project]/auth/security/+page.svelte b/src/routes/console/project-[project]/auth/security/+page.svelte index beea9ce44..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,7 @@ + +
+ + Password Dictionary + + + + +

+ Enabling this option prevent users from setting insecure passwords by comparing the + user's password with the 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 new file mode 100644 index 000000000..e4c48767d --- /dev/null +++ b/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte @@ -0,0 +1,76 @@ + + +
+ + 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. +

+ + + +
+ + + + +
+
diff --git a/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte b/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte index 053fc4fea..298a6d4dc 100644 --- a/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte +++ b/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte @@ -16,7 +16,7 @@ async function updateSessionLength() { try { await sdk.forConsole.projects.updateAuthDuration(projectId, $baseValue); - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); addNotification({ type: 'success', diff --git a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte index f85374284..85aa3acdc 100644 --- a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte +++ b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte @@ -1,6 +1,8 @@ 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]/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte index b7e60e08d..68c4c6298 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte @@ -1,42 +1,11 @@ @@ -54,54 +23,7 @@ - -
- - Name - - -
    - -
-
- - - - -
-
- - -
- Delete Team -
- -

- 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]/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..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,16 +15,18 @@ 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 { const user = await sdk.forProject.teams.createMembership( teamId, - email, roles, url, - name + email || undefined, + undefined, + undefined, + name || undefined ); addNotification({ type: 'success', @@ -39,7 +41,7 @@ error = e.message; trackError(e, Submit.MemberCreate); } - }; + } 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..2ebabf3af --- /dev/null +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/dangerZone.svelte @@ -0,0 +1,35 @@ + + + +
+ Delete Team +
+ +

+ 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]/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 new file mode 100644 index 000000000..8e0f51109 --- /dev/null +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte @@ -0,0 +1,57 @@ + + +
+ + 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..a29aabcdb --- /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} +
+ + +
+ + + + +
+ diff --git a/src/routes/console/project-[project]/auth/updateOAuth.ts b/src/routes/console/project-[project]/auth/updateOAuth.ts index 061d3125e..8e7f3272e 100644 --- a/src/routes/console/project-[project]/auth/updateOAuth.ts +++ b/src/routes/console/project-[project]/auth/updateOAuth.ts @@ -29,10 +29,12 @@ export async function updateOAuth({ await sdk.forConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), - appId, - secret, + appId || undefined, + 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 }); - invalidate(Dependencies.PROJECT); return { status: 'success' }; } catch (e) { 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]/deleteAllSessions.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte index 0ec466683..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,10 +11,10 @@ export let showDeleteAll = false; - const deleteAllSessions = async () => { + async function deleteAllSessions() { try { await sdk.forProject.users.deleteSessions($page.params.user); - invalidate(Dependencies.SESSIONS); + await invalidate(Dependencies.SESSIONS); showDeleteAll = false; addNotification({ type: 'success', @@ -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 d02d963c7..50b3ef50c 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte @@ -8,20 +8,19 @@ 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; - const deleteMembership = async () => { + async function deleteMembership() { try { await sdk.forProject.teams.deleteMembership( selectedMembership.teamId, selectedMembership.$id ); - invalidate(Dependencies.MEMBERSHIPS); + 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 972b4c228..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,10 +11,10 @@ export let showDelete = false; export let selectedSessionId: string; - const deleteSession = async () => { + async function deleteSession() { try { await sdk.forProject.users.deleteSession($page.params.user, selectedSessionId); - invalidate(Dependencies.SESSIONS); + await invalidate(Dependencies.SESSIONS); addNotification({ type: 'success', message: 'Session has been deleted' @@ -27,7 +27,7 @@ }); trackError(error, Submit.SessionDelete); } - }; + } 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]/auth/user-[user]/updateEmail.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte index e35b98a0e..62ff255f8 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte @@ -17,7 +17,7 @@ async function updateEmail() { try { await sdk.forProject.users.updateEmail($user.$id, userEmail); - invalidate(Dependencies.USER); + await invalidate(Dependencies.USER); addNotification({ message: 'Email has been updated', type: 'success' diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte index dbdbf6ec5..74d9db9cc 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte @@ -17,7 +17,7 @@ async function updateName() { try { await sdk.forProject.users.updateName($user.$id, userName); - invalidate(Dependencies.USER); + await invalidate(Dependencies.USER); addNotification({ message: 'Name has been updated', type: 'success' diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte index 2fd01da7f..baeeaea18 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte @@ -17,7 +17,7 @@ async function updatePhone() { try { await sdk.forProject.users.updatePhone($user.$id, userPhone); - invalidate(Dependencies.USER); + await invalidate(Dependencies.USER); addNotification({ message: 'Phone has been updated', type: 'success' diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte index 4a90b0e49..08511efd2 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte @@ -36,7 +36,7 @@ let updatedPrefs = Object.fromEntries(prefs); await sdk.forProject.users.updatePrefs($user.$id, updatedPrefs); - invalidate(Dependencies.USER); + await invalidate(Dependencies.USER); arePrefsDisabled = true; addNotification({ diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte index 25da5891e..34f4c81b0 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte @@ -16,7 +16,7 @@ showVerifcationDropdown = false; try { await sdk.forProject.users.updateEmailVerification($user.$id, !$user.emailVerification); - invalidate(Dependencies.USER); + await invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ $user.emailVerification ? 'unverified' : 'verified' @@ -36,7 +36,7 @@ showVerifcationDropdown = false; try { await sdk.forProject.users.updatePhoneVerification($user.$id, !$user.phoneVerification); - invalidate(Dependencies.USER); + await invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ $user.phoneVerification ? 'unverified' : 'verified' 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 @@ diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte index 3cc221b0c..9cdb2e138 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte @@ -1,5 +1,5 @@ @@ -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 180fbfa9e..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 @@ -4,30 +4,30 @@ import { addNotification } from '$lib/stores/notifications'; import { collection } from '../store'; import { sdk } from '$lib/stores/sdk'; - import type { Models } from '@aw-labs/appwrite-console'; - import { createEventDispatcher } from 'svelte'; + import type { Models } from '@appwrite.io/console'; 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]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte index 6159bd6c0..86f21edd4 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte index 580e72965..6170e6b24 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte @@ -28,7 +28,7 @@ $collection.documentSecurity, $collection.enabled ); - invalidate(Dependencies.COLLECTION); + await invalidate(Dependencies.COLLECTION); addNotification({ message: 'Name has been updated', type: 'success' diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte index c6e489b3d..54f46eead 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte @@ -32,8 +32,7 @@ $collection.documentSecurity, $collection.enabled ); - invalidate(Dependencies.COLLECTION); - arePermsDisabled = true; + await invalidate(Dependencies.COLLECTION); addNotification({ message: 'Permissions have been updated', type: 'success' diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte index 6eff561ad..2d8203585 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte @@ -28,7 +28,7 @@ collectionDocumentSecurity, $collection.enabled ); - invalidate(Dependencies.COLLECTION); + await invalidate(Dependencies.COLLECTION); addNotification({ message: 'Security has been updated', type: 'success' diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte index 2b3cc1c51..70ba7f57f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte @@ -29,7 +29,7 @@ $collection.documentSecurity, enabled ); - invalidate(Dependencies.COLLECTION); + await invalidate(Dependencies.COLLECTION); addNotification({ message: `${$collection.name} has been updated`, type: 'success' diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts index 5c00adeea..0f57a8f03 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts @@ -1,6 +1,6 @@ import { page } from '$app/stores'; import type { Column } from '$lib/components/viewSelector.svelte'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import { derived, writable } from 'svelte/store'; export type Attributes = diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte index efb46a2e4..706d1177e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte @@ -17,7 +17,7 @@
+ href={`${base}/console/project-${project}/databases/database-${databaseId}?openNavbar=true`}> diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts index 7ce5151b6..b67082b4f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/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'; diff --git a/src/routes/console/project-[project]/databases/database-[database]/createCollection.svelte b/src/routes/console/project-[project]/databases/database-[database]/createCollection.svelte index 4ed05e6b5..fa71803f3 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/createCollection.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/createCollection.svelte @@ -7,7 +7,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]/settings/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte index 63c40a6ea..4ca60d8ec 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte @@ -32,7 +32,7 @@ async function updateName() { try { await sdk.forProject.databases.update($page.params.database, databaseName); - invalidate(Dependencies.DATABASE); + await invalidate(Dependencies.DATABASE); addNotification({ message: 'Name has been updated', type: 'success' diff --git a/src/routes/console/project-[project]/databases/database-[database]/store.ts b/src/routes/console/project-[project]/databases/database-[database]/store.ts index 37d1a95e2..5621e8201 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/store.ts @@ -1,6 +1,6 @@ import { page } from '$app/stores'; import type { Column } from '$lib/components/viewSelector.svelte'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import { derived, writable } from 'svelte/store'; export const database = derived(page, ($page) => $page.data.database as Models.Database); diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts index eca33fdee..95b4ff7f2 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/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'; diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts index 3444d0621..5ebb5ac9f 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/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]/functions/+page.ts b/src/routes/console/project-[project]/functions/+page.ts index 39f7bc2b6..21b180c61 100644 --- a/src/routes/console/project-[project]/functions/+page.ts +++ b/src/routes/console/project-[project]/functions/+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 { CARD_LIMIT, Dependencies } from '$lib/constants'; diff --git a/src/routes/console/project-[project]/functions/createFunction.svelte b/src/routes/console/project-[project]/functions/createFunction.svelte index df4085034..142fa98bb 100644 --- a/src/routes/console/project-[project]/functions/createFunction.svelte +++ b/src/routes/console/project-[project]/functions/createFunction.svelte @@ -16,27 +16,29 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { ID } from '@aw-labs/appwrite-console'; + import { ID } from '@appwrite.io/console'; const projectId = $page.params.project; async function onFinish() { await invalidate(Dependencies.FUNCTIONS); } + async function create() { try { const response = await sdk.forProject.functions.create( $createFunction.id ?? ID.unique(), $createFunction.name, - $createFunction.execute, $createFunction.runtime, - $createFunction.events, - $createFunction.schedule, - $createFunction.timeout + $createFunction.execute || undefined, + $createFunction.events || undefined, + $createFunction.schedule || undefined, + $createFunction.timeout || undefined ); - $createFunction.vars.forEach( - async (v) => - await sdk.forProject.functions.createVariable(response.$id, v.key, v.value) + await Promise.all( + $createFunction.vars.map((v) => + sdk.forProject.functions.createVariable(response.$id, v.key, v.value) + ) ); await invalidate(Dependencies.FUNCTIONS); goto(`${base}/console/project-${projectId}/functions/function-${response.$id}`); diff --git a/src/routes/console/project-[project]/functions/createVariable.svelte b/src/routes/console/project-[project]/functions/createVariable.svelte index 5287955b8..dd1252a36 100644 --- a/src/routes/console/project-[project]/functions/createVariable.svelte +++ b/src/routes/console/project-[project]/functions/createVariable.svelte @@ -3,7 +3,7 @@ import { Modal } from '$lib/components'; import { InputText, FormList } from '$lib/elements/forms'; import { createEventDispatcher } from 'svelte'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; export let showCreate = false; export let selectedVar: Partial = null; 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 899c659eb..e8adb6b15 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -30,7 +30,7 @@ import { log } from '$lib/stores/logs'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; import Delete from './delete.svelte'; import Create from './create.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]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/+page.ts index 4b20b9fec..d603dd349 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+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 { Dependencies, PAGE_LIMIT } from '$lib/constants'; diff --git a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte index 292b1f457..15cfc4d3a 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte @@ -4,7 +4,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'; export let showActivate = false; 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 eb00d66f7..a3c49b124 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte @@ -6,12 +6,12 @@ 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 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]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte index 5217d07e7..876ca9ba2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -8,7 +8,7 @@ import { InputTextarea, FormList, InputChoice } 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 selectedFunction: Models.Function = null; diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte index 78a785e3e..7072d2222 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte @@ -21,7 +21,7 @@ import { onDestroy, onMount } from 'svelte'; import { func } from '../store'; import CreateDeployment from '../create.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]/functions/function-[function]/executions/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts index db87d4d94..37aa2cafa 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/+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 { Dependencies, PAGE_LIMIT } from '$lib/constants'; 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 dc2f755b2..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 @@ -23,7 +23,7 @@ import { app } from '$lib/stores/app'; 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 { onMount } from 'svelte'; import Variable from '../../createVariable.svelte'; import { execute, func } from '../store'; @@ -67,13 +67,13 @@ await sdk.forProject.functions.update( functionId, functionName, - $func.execute, - $func.events, - $func.schedule, - $func.timeout, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, $func.enabled ); - invalidate(Dependencies.FUNCTION); + await invalidate(Dependencies.FUNCTION); addNotification({ message: 'Name has been updated', type: 'success' @@ -94,12 +94,12 @@ functionId, $func.name, permissions, - $func.events, - $func.schedule, - $func.timeout, + $func.events || undefined, + $func.schedule || undefined, + $func.timeout || undefined, $func.enabled ); - invalidate(Dependencies.FUNCTION); + await invalidate(Dependencies.FUNCTION); addNotification({ message: 'Permissions have been updated', type: 'success' @@ -119,14 +119,13 @@ await sdk.forProject.functions.update( functionId, $func.name, - $func.execute, - $func.events, + $func.execute || undefined, + $func.events || undefined, functionSchedule, - $func.timeout, + $func.timeout || undefined, $func.enabled ); - invalidate(Dependencies.FUNCTION); - + await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', message: 'Cron Schedule has been updated' @@ -146,14 +145,13 @@ await sdk.forProject.functions.update( functionId, $func.name, - $func.execute, - $func.events, - $func.schedule, + $func.execute || undefined, + $func.events || undefined, + $func.schedule || undefined, timeout, $func.enabled ); - - invalidate(Dependencies.FUNCTION); + await invalidate(Dependencies.FUNCTION); addNotification({ type: 'success', message: 'Timeout has been updated' @@ -173,8 +171,8 @@ try { await sdk.forProject.functions.createVariable(functionId, variable.key, variable.value); + await invalidate(Dependencies.VARIABLES); showVariablesModal = false; - invalidate(Dependencies.VARIABLES); 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; - invalidate(Dependencies.VARIABLES); addNotification({ type: 'success', message: `${$func.name} variables have been updated` @@ -217,7 +215,7 @@ async function handleVariableDeleted(variable: Models.Variable) { try { await sdk.forProject.functions.deleteVariable(variable.functionId, variable.$id); - invalidate(Dependencies.VARIABLES); + await invalidate(Dependencies.VARIABLES); addNotification({ type: 'success', message: `Variable has been deleted` diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/store.ts b/src/routes/console/project-[project]/functions/function-[function]/settings/store.ts index 3f8cf0cea..1307021c3 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/store.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/store.ts @@ -1,6 +1,6 @@ import { page } from '$app/stores'; import { derived } from 'svelte/store'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; export const variables = derived( page, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte index 6975bcb02..9555b7094 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte @@ -32,13 +32,13 @@ await sdk.forProject.functions.update( functionId, $func.name, - $func.execute, + $func.execute || undefined, Array.from($eventSet), - $func.schedule, - $func.timeout, + $func.schedule || undefined, + $func.timeout || undefined, $func.enabled ); - invalidate(Dependencies.FUNCTION); + await invalidate(Dependencies.FUNCTION); addNotification({ message: 'Permissions have been updated', type: 'success' diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte index 974932a16..8fea8103f 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte @@ -52,7 +52,7 @@ }) ); - invalidate(Dependencies.VARIABLES); + await invalidate(Dependencies.VARIABLES); addNotification({ type: 'success', message: 'Variables uploaded' diff --git a/src/routes/console/project-[project]/functions/function-[function]/store.ts b/src/routes/console/project-[project]/functions/function-[function]/store.ts index 0dd72124b..bec6e0718 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/store.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/store.ts @@ -1,6 +1,6 @@ import { page } from '$app/stores'; import { derived, writable, type Writable } from 'svelte/store'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; export const func = derived(page, ($page) => $page.data.function as Models.Function); export const execute: Writable = writable(); diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts index 4a369bfac..ba0a4b097 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts @@ -1,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]/functions/wizard/step5.svelte b/src/routes/console/project-[project]/functions/wizard/step5.svelte index fb728ce4c..33b105007 100644 --- a/src/routes/console/project-[project]/functions/wizard/step5.svelte +++ b/src/routes/console/project-[project]/functions/wizard/step5.svelte @@ -3,7 +3,7 @@ import { createFunction } from './store'; import Create from '../createVariable.svelte'; import { DropList, DropListItem, Secret, Empty, Output } from '$lib/components'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import { Table, TableBody, diff --git a/src/routes/console/project-[project]/functions/wizard/store.ts b/src/routes/console/project-[project]/functions/wizard/store.ts index 078663b97..8bd0a7697 100644 --- a/src/routes/console/project-[project]/functions/wizard/store.ts +++ b/src/routes/console/project-[project]/functions/wizard/store.ts @@ -1,4 +1,4 @@ -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import { writable } from 'svelte/store'; export const createFunction = writable<{ diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 59a78216b..c6f7177a3 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -21,7 +21,7 @@ @@ -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 8acf4eb5f..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $platform.store || undefined, + $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'android' }); @@ -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 ccfa1b36c..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $platform.store || undefined, + $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-ios' }); @@ -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 b4cffc0e0..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $platform.store || undefined, + $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-macos' }); @@ -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 2b4c722f7..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, @@ -26,7 +26,7 @@ $platform.store, $platform.hostname ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-tvos' }); @@ -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 be693b554..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $platform.store || undefined, + $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'apple-watchos' }); @@ -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]/flutterAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte index e5ef00580..fc5793332 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte @@ -23,10 +23,10 @@ $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $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]/flutterIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte index fab1f9d43..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $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 15c55d530..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $platform.store || undefined, + $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-linux' }); @@ -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 b399cf0e8..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $platform.store || undefined, + $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-macos' }); @@ -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 951b42010..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,17 +16,17 @@ key ??= $platform.key; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, key, - $platform.store, - $platform.hostname + $platform.store || undefined, + $platform.hostname || undefined ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); trackEvent(Submit.PlatformUpdate, { type: 'flutter-windows' }); @@ -41,7 +41,7 @@ }); trackError(error, Submit.PlatformUpdate); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts b/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts index cacaef309..6ab5cce41 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts @@ -1,5 +1,5 @@ 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 platform = derived(page, ($page) => $page.data.platform as Models.Platform); 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 99ec1913d..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,17 +15,17 @@ hostname ??= $platform.hostname; }); - const updateHostname = async () => { + async function updateHostname() { try { await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, - $platform.key, - $platform.store, + $platform.key || undefined, + $platform.store || undefined, hostname ); - invalidate(Dependencies.PLATFORM); + await invalidate(Dependencies.PLATFORM); addNotification({ type: 'success', message: 'Platform Hostname has been updated' @@ -36,7 +36,7 @@ message: error.message }); } - }; + } diff --git a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte index 2ed2b4860..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) { - invalidate(Dependencies.PROJECT); - } - 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 52d6b5208..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) { - invalidate(Dependencies.PROJECT); - } - 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 8e9d5a152..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) { - invalidate(Dependencies.PROJECT); - } - 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 57eb2b89c..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) { - invalidate(Dependencies.PROJECT); - } - 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/wizard/android/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte index d67b0d872..755fb2fa1 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte @@ -20,9 +20,9 @@ projectId, $createPlatform.$id, $createPlatform.name, - $createPlatform.key, - $createPlatform.store, - $createPlatform.hostname + $createPlatform.key || undefined, + $createPlatform.store || undefined, + $createPlatform.hostname || undefined ); return; @@ -32,7 +32,7 @@ projectId, 'android', $createPlatform.name, - $createPlatform.key, + $createPlatform.key || undefined, undefined, undefined ); diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts index 229b48459..8a00d0d35 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts +++ b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts @@ -1,7 +1,7 @@ import { writable } from 'svelte/store'; import { sdk } from '$lib/stores/sdk'; import { cachedStore } from '$lib/helpers/cache'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; function createPlatformStore() { const { subscribe, update, set } = writable>({ diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte index 86a32638f..f7149863f 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte @@ -22,9 +22,9 @@ projectId, $createPlatform.$id, $createPlatform.name, - $createPlatform.key, - $createPlatform.store, - $createPlatform.hostname + $createPlatform.key || undefined, + $createPlatform.store || undefined, + $createPlatform.hostname || undefined ); return; @@ -36,7 +36,7 @@ $createPlatform.name, undefined, undefined, - $createPlatform.hostname + $createPlatform.hostname || undefined ); trackEvent(Submit.PlatformCreate, { diff --git a/src/routes/console/project-[project]/overview/store.ts b/src/routes/console/project-[project]/overview/store.ts index 9a5325e3b..466a87d0a 100644 --- a/src/routes/console/project-[project]/overview/store.ts +++ b/src/routes/console/project-[project]/overview/store.ts @@ -1,6 +1,6 @@ import { sdk } from '$lib/stores/sdk'; import { cachedStore } from '$lib/helpers/cache'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import { writable, type Writable } from 'svelte/store'; import { isCloud } from '$lib/system'; diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte index 193148a88..3df967027 100644 --- a/src/routes/console/project-[project]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/+page.svelte @@ -19,7 +19,6 @@ let name: string = null; let showDelete = false; - let updating = false; const endpoint = sdk.forConsole.client.config.endpoint; const projectId = $page.params.project; let showDisableAll = false; @@ -30,10 +29,9 @@ }); async function updateName() { - 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' @@ -58,7 +56,6 @@ return; } - updating = true; try { const path = '/projects/' + $project.$id + '/service/all'; await sdk.forConsole.client.call( @@ -96,7 +93,6 @@ $: { // When project name is updated, finalize the updating flow $project.name; - updating = false; } async function serviceUpdate(service: Service) { @@ -106,7 +102,7 @@ service.method, service.value ); - invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.PROJECT); addNotification({ type: 'success', message: `${service.label} service has been ${ @@ -165,7 +161,7 @@ - + diff --git a/src/routes/console/project-[project]/settings/domains/+page.svelte b/src/routes/console/project-[project]/settings/domains/+page.svelte index 75c8f573b..5df64b189 100644 --- a/src/routes/console/project-[project]/settings/domains/+page.svelte +++ b/src/routes/console/project-[project]/settings/domains/+page.svelte @@ -18,7 +18,7 @@ import { wizard } from '$lib/stores/wizard'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; import Create from './create.svelte'; import Delete from './delete.svelte'; @@ -36,17 +36,17 @@ wizard.start(Create); }; - const refreshDomain = async (domain: Models.Domain) => { + async function refreshDomain(domain: Models.Domain) { const domainId = domain.$id; try { 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({ @@ -57,7 +57,7 @@ } finally { isVerifying[domainId] = false; } - }; + } 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 cf54c45e9..f0b16bae4 100644 --- a/src/routes/console/project-[project]/settings/domains/delete.svelte +++ b/src/routes/console/project-[project]/settings/domains/delete.svelte @@ -6,16 +6,16 @@ import { addNotification } from '$lib/stores/notifications'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; - import type { Models } from '@aw-labs/appwrite-console'; + import type { Models } from '@appwrite.io/console'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; 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); - invalidate(Dependencies.DOMAINS); + await invalidate(Dependencies.DOMAINS); showDelete = false; addNotification({ type: 'success', @@ -29,7 +29,7 @@ }); trackError(error, Submit.DomainDelete); } - }; + } diff --git a/src/routes/console/project-[project]/settings/domains/wizard/store.ts b/src/routes/console/project-[project]/settings/domains/wizard/store.ts index 9c2d5d8d4..aaaa1db08 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/store.ts +++ b/src/routes/console/project-[project]/settings/domains/wizard/store.ts @@ -1,4 +1,4 @@ -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import { writable } from 'svelte/store'; export const domain = writable>({ $id: '', domain: '' }); 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]/store.ts b/src/routes/console/project-[project]/settings/webhooks/[webhook]/store.ts index 4bd28c934..1937e6130 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/store.ts +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/store.ts @@ -1,5 +1,5 @@ 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 webhook = derived(page, ($page) => $page.data.webhook as Models.Webhook); 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 c1a29a4e6..1f9eadd84 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte @@ -32,10 +32,10 @@ Array.from($eventSet), $webhook.url, $webhook.security, - $webhook.httpUser, - $webhook.httpPass + $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 07a515501..5a6c97887 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte @@ -26,10 +26,10 @@ $webhook.events, $webhook.url, $webhook.security, - $webhook.httpUser, - $webhook.httpPass + $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 5d39ade82..f0e9f2217 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte @@ -37,10 +37,10 @@ $webhook.events, $webhook.url, security, - httpUser, - httpPass + 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 62407b486..47e3abf37 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte @@ -26,10 +26,10 @@ $webhook.events, url, $webhook.security, - $webhook.httpUser, - $webhook.httpPass + $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 0c34d9420..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, @@ -23,10 +23,10 @@ $createWebhook.events, $createWebhook.url, $createWebhook.security, - $createWebhook.httpUser, - $createWebhook.httpPass + $createWebhook.httpUser || undefined, + $createWebhook.httpPass || undefined ); - invalidate(Dependencies.WEBHOOKS); + await invalidate(Dependencies.WEBHOOKS); addNotification({ message: 'Webhook has been created', type: 'success' @@ -42,7 +42,7 @@ }); trackError(error, Submit.WebhookCreate); } - }; + } onDestroy(() => { $createWebhook = { diff --git a/src/routes/console/project-[project]/settings/webhooks/wizard/store.ts b/src/routes/console/project-[project]/settings/webhooks/wizard/store.ts index 191c2262c..ce04edac8 100644 --- a/src/routes/console/project-[project]/settings/webhooks/wizard/store.ts +++ b/src/routes/console/project-[project]/settings/webhooks/wizard/store.ts @@ -1,4 +1,4 @@ -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import { writable } from 'svelte/store'; export const createWebhook = writable>({ diff --git a/src/routes/console/project-[project]/storage/+page.svelte b/src/routes/console/project-[project]/storage/+page.svelte index 17f25d642..13c7a95f5 100644 --- a/src/routes/console/project-[project]/storage/+page.svelte +++ b/src/routes/console/project-[project]/storage/+page.svelte @@ -16,7 +16,7 @@ import { Container } from '$lib/layout'; import { base } from '$app/paths'; import { tooltip } from '$lib/actions/tooltip'; - 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]/storage/+page.ts b/src/routes/console/project-[project]/storage/+page.ts index 2ff158b64..08c03c8ec 100644 --- a/src/routes/console/project-[project]/storage/+page.ts +++ b/src/routes/console/project-[project]/storage/+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 { CARD_LIMIT } from '$lib/constants'; 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 2e8f15283..321a24432 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -30,7 +30,7 @@ import { calculateSize } from '$lib/helpers/sizeConvertion'; 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 { uploader } from '$lib/stores/uploader'; import { addNotification } from '$lib/stores/notifications'; import type { PageData } from './$types'; @@ -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); + await invalidate(Dependencies.FILES); uploader.removeFile(file); - invalidate(Dependencies.FILES); trackEvent(Submit.FileDelete); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts index 82a75f0f3..219c82b34 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+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]/storage/bucket-[bucket]/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte index 3e8bac275..2ac2d149b 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte @@ -9,7 +9,7 @@ import { Permissions } from '$lib/components/permissions'; import { addNotification } from '$lib/stores/notifications'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { ID } from '@aw-labs/appwrite-console'; + import { ID } from '@appwrite.io/console'; export let showCreate = false; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte index 8e33c161a..532e6b4bd 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte @@ -4,7 +4,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'; export let file: Models.File; 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]/file-[file]/store.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts index f74e98ea7..7d42b415a 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts @@ -1,5 +1,5 @@ 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 file = derived(page, ($page) => $page.data.file as Models.File); 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 df805836c..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); @@ -72,7 +72,7 @@ import { Container } from '$lib/layout'; 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 { onMount } from 'svelte'; import { get, writable } from 'svelte/store'; import Delete from '../deleteBucket.svelte'; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/store.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/store.ts index 4dafbf36a..55b0aa180 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/store.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/store.ts @@ -1,5 +1,5 @@ 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 bucket = derived(page, ($page) => $page.data.bucket as Models.Bucket); diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts index 3b6668951..2cb8294fa 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts @@ -1,5 +1,5 @@ import { sdk } from '$lib/stores/sdk'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params }) => { diff --git a/src/routes/console/project-[project]/storage/create.svelte b/src/routes/console/project-[project]/storage/create.svelte index 707891928..b0e05e169 100644 --- a/src/routes/console/project-[project]/storage/create.svelte +++ b/src/routes/console/project-[project]/storage/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]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts index f3416ced6..0cc4a9cca 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/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]/store.ts b/src/routes/console/project-[project]/store.ts index 5443d45b6..2c96c8070 100644 --- a/src/routes/console/project-[project]/store.ts +++ b/src/routes/console/project-[project]/store.ts @@ -1,6 +1,6 @@ import { derived, writable } from 'svelte/store'; import { page } from '$app/stores'; -import type { Models } from '@aw-labs/appwrite-console'; +import type { Models } from '@appwrite.io/console'; import type { BarSeriesOption } from 'echarts/charts'; export const project = derived(page, ($page) => $page.data.project as Models.Project); 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 17faeac3a..9a3283dd7 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -16,21 +16,19 @@ import FormList from '$lib/elements/forms/formList.svelte'; import { Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { ID } from '@aw-labs/appwrite-console'; + 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. - + diff --git a/tests/unit/elements/inputDomain.test.ts b/tests/unit/elements/inputDomain.test.ts new file mode 100644 index 000000000..488c03ad5 --- /dev/null +++ b/tests/unit/elements/inputDomain.test.ts @@ -0,0 +1,116 @@ +import '@testing-library/jest-dom'; +import { render } from '@testing-library/svelte'; +import userEvent from '@testing-library/user-event'; +import { InputDomain } from '../../../src/lib/elements/forms'; + +const validStrings = ['example.com', 'i-need.travelersinsurance', 'sub.domain.com']; +const invalidStrings = ['not-a-domain', 'tld-too-short.a', 'tld-too-long.overeighteencharacters']; + +test('shows domain input', () => { + const { getByText, getByLabelText } = render(InputDomain, { id: 'input', label: 'input' }); + const input = getByLabelText('input'); + + expect(getByText('input')).toBeInTheDocument(); + expect(input).toBeInTheDocument(); + expect(input).toHaveAttribute('type', 'text'); +}); + +test('shows domain input - required', () => { + const { getByLabelText } = render(InputDomain, { id: 'input', label: 'input', required: true }); + + expect(getByLabelText('input')).toBeRequired(); +}); + +test('shows domain input - disabled', () => { + const { getByLabelText } = render(InputDomain, { id: 'input', label: 'input', disabled: true }); + + expect(getByLabelText('input')).toBeDisabled(); +}); + +test('shows domain input - autofocus', () => { + const { getByLabelText } = render(InputDomain, { + id: 'input', + label: 'input', + autofocus: true + }); + + expect(getByLabelText('input')).toHaveFocus(); +}); + +test('shows domain input - placeholder', () => { + const { getByPlaceholderText } = render(InputDomain, { + id: 'input', + label: 'input', + placeholder: 'find me' + }); + + expect(getByPlaceholderText('find me')).toBeInTheDocument(); +}); + +test('shows domain input - hide label', () => { + render(InputDomain, { + id: 'input', + label: 'label', + showLabel: false + }); + + const label = document.querySelector('label'); + expect(label).toHaveClass('u-hide'); +}); + +test('shows domain input - autocomplete', () => { + const { getByLabelText } = render(InputDomain, { + id: 'input', + label: 'input', + autocomplete: true + }); + + expect(getByLabelText('input')).toHaveAttribute('autocomplete', 'on'); +}); + +test('shows domain input - maxlength', () => { + const { getByLabelText } = render(InputDomain, { + id: 'input', + label: 'input', + maxlength: 2 + }); + + expect(getByLabelText('input')).toHaveAttribute('maxlength', '2'); +}); + +test('state', async () => { + const { component, getByLabelText } = render(InputDomain, { + id: 'input', + label: 'input', + value: '' + }); + const input = getByLabelText('input'); + + expect(component.value).toEqual(''); + await userEvent.type(input, 'lorem'); + expect(component.value).toEqual('lorem'); +}); + +validStrings.forEach((validString) => { + test(`validates ${validString} as valid`, () => { + const { getByLabelText } = render(InputDomain, { + id: 'input', + label: 'input', + value: validString + }); + const input = getByLabelText('input') as HTMLInputElement; + expect(input.checkValidity()).toBe(true); + }); +}); + +invalidStrings.forEach((invalidString) => { + test(`validates ${invalidString} as invalid`, () => { + const { getByLabelText } = render(InputDomain, { + id: 'input', + label: 'input', + value: invalidString + }); + const input = getByLabelText('input') as HTMLInputElement; + expect(input.checkValidity()).toBe(false); + }); +});