From 8d52891aa29f82615a0e56191b44b1e231eba0f5 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 13 Sep 2022 13:29:45 +0200 Subject: [PATCH] feat: update console package and implement changes --- package-lock.json | 14 ++-- package.json | 2 +- src/lib/elements/forms/inputSelect.svelte | 2 +- src/lib/helpers/arrayComparison.ts | 4 +- src/lib/stores/sdk.ts | 5 +- .../databases/_create.svelte | 5 +- .../database/[database]/__layout.svelte | 4 +- .../database/[database]/_create.svelte | 4 + .../database/[database]/_delete.svelte | 3 +- .../collection/[collection]/__layout.svelte | 4 +- .../collection/[collection]/_create.svelte | 10 ++- .../[collection]/_createIndex.svelte | 4 + .../collection/[collection]/_delete.svelte | 4 +- .../[collection]/_deleteAttribute.svelte | 9 ++- .../[collection]/_deleteIndex.svelte | 8 +- .../[collection]/attributes/_boolean.svelte | 4 + .../[collection]/attributes/_email.svelte | 6 +- .../[collection]/attributes/_enum.svelte | 7 +- .../[collection]/attributes/_float.svelte | 8 +- .../[collection]/attributes/_integer.svelte | 8 +- .../[collection]/attributes/_ip.svelte | 7 +- .../[collection]/attributes/_string.svelte | 5 ++ .../[collection]/attributes/_url.svelte | 7 +- .../[collection]/document/$create.svelte | 78 ------------------- .../document/[document]/__layout.svelte | 2 +- .../document/[document]/_delete.svelte | 3 + .../document/[document]/_document.svelte | 4 +- .../document/[document]/index.svelte | 3 + .../[collection]/document/[document]/store.ts | 4 +- .../collection/[collection]/index.svelte | 2 +- .../collection/[collection]/indexes.svelte | 5 +- .../collection/[collection]/settings.svelte | 7 +- .../collection/[collection]/store.ts | 24 ++++-- .../database/[database]/index.svelte | 4 +- .../database/[database]/settings.svelte | 3 +- .../databases/database/[database]/store.ts | 17 ++-- 36 files changed, 150 insertions(+), 140 deletions(-) delete mode 100644 src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/$create.svelte diff --git a/package-lock.json b/package-lock.json index 6ba4642be..09c7a0e7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "@appwrite/console", "version": "0.0.1", "dependencies": { - "@aw-labs/appwrite-console": "^1.0.0-0", + "@aw-labs/appwrite-console": "^5.0.1", "@aw-labs/icons": "0.0.0-54", "@aw-labs/ui": "0.0.0-54", "echarts": "^5.3.3", @@ -68,9 +68,9 @@ } }, "node_modules/@aw-labs/appwrite-console": { - "version": "1.0.0-0", - "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-1.0.0-0.tgz", - "integrity": "sha512-qvqCRBhG/LwmIv0Om3c0IWuLfvOCjVdbKel3cAcGadwbmz7vGDZkodgObqUPwi33T+8vnbzxBkhUOLncMF+DZQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-5.0.1.tgz", + "integrity": "sha512-sx9+riLjMYAwaUEqy1NkrgYRPwaD8UduIIpK8ZjtqYJOaFFhA8ubifysQywahvnjUf7B++S51tKgPgACAViUCA==", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" @@ -7659,9 +7659,9 @@ } }, "@aw-labs/appwrite-console": { - "version": "1.0.0-0", - "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-1.0.0-0.tgz", - "integrity": "sha512-qvqCRBhG/LwmIv0Om3c0IWuLfvOCjVdbKel3cAcGadwbmz7vGDZkodgObqUPwi33T+8vnbzxBkhUOLncMF+DZQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-5.0.1.tgz", + "integrity": "sha512-sx9+riLjMYAwaUEqy1NkrgYRPwaD8UduIIpK8ZjtqYJOaFFhA8ubifysQywahvnjUf7B++S51tKgPgACAViUCA==", "requires": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" diff --git a/package.json b/package.json index dca4c74ed..aa92730ff 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "e2e": "playwright test tests/e2e" }, "dependencies": { - "@aw-labs/appwrite-console": "^1.0.0-0", + "@aw-labs/appwrite-console": "^5.0.1", "@aw-labs/icons": "0.0.0-54", "@aw-labs/ui": "0.0.0-54", "echarts": "^5.3.3", diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte index 940b5f1aa..3f4e13f78 100644 --- a/src/lib/elements/forms/inputSelect.svelte +++ b/src/lib/elements/forms/inputSelect.svelte @@ -4,7 +4,7 @@ export let label: string; export let showLabel = true; export let id: string; - export let value: string; + export let value: string | number | boolean; export let placeholder = ''; export let required = false; export let disabled = false; diff --git a/src/lib/helpers/arrayComparison.ts b/src/lib/helpers/arrayComparison.ts index 1f17d9b22..602c886ad 100644 --- a/src/lib/helpers/arrayComparison.ts +++ b/src/lib/helpers/arrayComparison.ts @@ -1,9 +1,9 @@ -export function intersection(arr1: any[], arr2: any[]) { +export function intersection(arr1: unknown[], arr2: unknown[]) { const set = new Set(arr2); const intersection = new Set(arr1.filter((elem) => set.has(elem))); return Array.from(intersection); } -export function difference(arr1: any[], arr2: any[]) { +export function difference(arr1: unknown[], arr2: unknown[]) { const set = new Set(arr2); const intersection = new Set(arr1.filter((elem) => !set.has(elem))); return Array.from(intersection); diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index 39541a4c7..b387a6d44 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -20,7 +20,6 @@ const clientProject = new Client(); clientProject.setEndpoint(endpoint).setMode('admin'); const setProject = (projectId: string): Client => clientProject.setProject(projectId); -const setDatabase = (databaseId: string): void => sdkForProject.databases.setDatabaseId(databaseId); const sdkForConsole = { client: clientConsole, @@ -38,7 +37,7 @@ const sdkForProject = { client: clientProject, account: new Account(clientProject), avatars: new Avatars(clientProject), - databases: new Databases(clientProject, null), + databases: new Databases(clientProject), functions: new Functions(clientProject), health: new Health(clientProject), locale: new Locale(clientProject), @@ -48,4 +47,4 @@ const sdkForProject = { users: new Users(clientProject) }; -export { sdkForConsole, sdkForProject, setProject, setDatabase }; +export { sdkForConsole, sdkForProject, setProject }; diff --git a/src/routes/console/project-[project]/databases/_create.svelte b/src/routes/console/project-[project]/databases/_create.svelte index 4afbbc13d..cbbb66367 100644 --- a/src/routes/console/project-[project]/databases/_create.svelte +++ b/src/routes/console/project-[project]/databases/_create.svelte @@ -3,7 +3,7 @@ import { Pill } from '$lib/elements'; import { Button, InputText, Form, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject, setDatabase } from '$lib/stores/sdk'; + import { sdkForProject } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; export let showCreate = false; @@ -16,8 +16,7 @@ const create = async () => { try { - setDatabase(id ? id : 'unique()'); - const database = await sdkForProject.databases.create(name); + const database = await sdkForProject.databases.create(id ? id : 'unique()', name); name = id = null; showCreate = false; dispatch('created', database); 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 154c7a68e..8e276e82e 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/__layout.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/__layout.svelte @@ -3,7 +3,6 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { updateLayout } from '$lib/stores/layout'; - import { setDatabase } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { database } from './store'; @@ -16,8 +15,7 @@ async function handle(event = null) { if ($database?.$id !== databaseId) { - setDatabase($page.params.database); - await database.load(); + await database.load(databaseId); } updateLayout({ diff --git a/src/routes/console/project-[project]/databases/database/[database]/_create.svelte b/src/routes/console/project-[project]/databases/database/[database]/_create.svelte index 5e1151932..98e3e39da 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/_create.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/_create.svelte @@ -1,4 +1,6 @@ - - - Appwrite - Document - -{#if $doc && $collection} - - - Collection - {$collection.name} - -

Create Document

-
- - -
- - - - -
-
-{:else} -
-{/if} diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte index 4ccb6a246..dd58d34ac 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte @@ -16,7 +16,7 @@ async function handle(event = null) { if ($doc?.$id !== documentId) { - await doc.load(collectionId, documentId); + await doc.load(databaseId, collectionId, documentId); } updateLayout({ diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_delete.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_delete.svelte index b3b354db1..80d570850 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_delete.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_delete.svelte @@ -10,9 +10,12 @@ export let showDelete = false; + const databaseId = $page.params.database; + const handleDelete = async () => { try { await sdkForProject.databases.deleteDocument( + databaseId, $page.params.collection, $page.params.document ); diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte index fce031a53..db4d3b230 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte @@ -11,9 +11,10 @@ let currentDoc: string; let disableUpdate = true; + const databaseId = $page.params.database; onMount(async () => { - await doc.load($collection.$id, $page.params.document); + await doc.load(databaseId, $collection.$id, $page.params.document); currentDoc = JSON.stringify($doc); }); @@ -28,6 +29,7 @@ const updateData = async () => { try { await sdkForProject.databases.updateDocument( + databaseId, $collection.$id, $page.params.document, $doc, diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte index 2911112aa..fb346489d 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte @@ -9,15 +9,18 @@ import Document from './_document.svelte'; import Delete from './_delete.svelte'; import { difference } from '$lib/helpers/arrayComparison'; + import { page } from '$app/stores'; let showDelete = false; let read = $doc?.$read; let write = $doc?.$write; let arePermsDisabled = true; + const databaseId = $page.params.database; async function updatePermissions() { try { await sdkForProject.databases.updateDocument( + databaseId, $doc.collectionId, $doc.$id, $doc.data, diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts index 45398bc7a..942194165 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts @@ -8,8 +8,8 @@ function createDocumentStore() { return { subscribe, set, - load: async (collectionId: string, documentId: string) => - set(await sdkForProject.databases.getDocument(collectionId, documentId)), + load: async (databaseId: string, collectionId: string, documentId: string) => + set(await sdkForProject.databases.getDocument(databaseId, collectionId, documentId)), addAttribute: (attribute: string) => update((n) => { n[attribute].push(null); diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte index 9dc501f02..cb56e1b94 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte @@ -25,7 +25,7 @@ const databaseId = $page.params.database; onMount(async () => { - await documentList.load($collection.$id, [], limit, offset); + await documentList.load(databaseId, $collection.$id, [], limit, offset); }); $: columns = [ diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes.svelte index d47ec8ce2..94916ddd9 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes.svelte @@ -30,9 +30,10 @@ const limit = 5; const collectionId = $page.params.collection; + const databaseId = $page.params.database; const handleDelete = async () => { - await indexList.load(collectionId); + await indexList.load(databaseId, collectionId); }; // $: indexes.load(search); @@ -53,7 +54,7 @@ // }); onMount(async () => { - await indexList.load(collectionId); + await indexList.load(databaseId, collectionId); }); diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte index 6ae378d85..cdd96d22a 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte @@ -11,6 +11,8 @@ import { page } from '$app/stores'; import { difference } from '$lib/helpers/arrayComparison'; + const databaseId = $page.params.database; + let showDelete = false; let showError: false | 'name' | 'size' = false, errorMessage = 'Something went wrong', @@ -23,7 +25,7 @@ arePermsDisabled = true; onMount(async () => { - await collection.load($page.params.collection); + await collection.load(databaseId, $page.params.collection); enabled ??= $collection.enabled; collectionName ??= $collection.name; collectionName ??= $collection.name; @@ -54,6 +56,7 @@ async function togglecollection() { try { await sdkForProject.databases.updateCollection( + databaseId, $collection.$id, $collection.name, $collection.permission, @@ -76,6 +79,7 @@ async function updateName() { try { await sdkForProject.databases.updateCollection( + databaseId, $collection.$id, $collection.name, $collection.permission @@ -93,6 +97,7 @@ async function updatePermissions() { try { await sdkForProject.databases.updateCollection( + databaseId, $collection.$id, $collection.name, collectionPermissions, 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 aa6ef6ca8..2320c99d5 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 @@ -25,9 +25,12 @@ function createCollection() { return { subscribe, set, - load: async (collectionId: string) => { + load: async (databaseId: string, collectionId: string) => { set( - (await sdkForProject.databases.getCollection(collectionId)) as unknown as Collection + (await sdkForProject.databases.getCollection( + databaseId, + collectionId + )) as unknown as Collection ); }, addAttribute: (attribute: Attributes) => @@ -59,8 +62,15 @@ function createDocumentListStore() { return { subscribe, set, - load: async (collectionId: string, queries: [], limit: number, offset: number) => { + load: async ( + databaseId: string, + collectionId: string, + queries: [], + limit: number, + offset: number + ) => { const response = await sdkForProject.databases.listDocuments( + databaseId, collectionId, queries, limit, @@ -77,8 +87,8 @@ function createIndexListStore() { return { subscribe, set, - load: async (collectionId: string) => { - const response = await sdkForProject.databases.listIndexes(collectionId); + load: async (databaseId: string, collectionId: string) => { + const response = await sdkForProject.databases.listIndexes(databaseId, collectionId); set(response); } }; @@ -90,8 +100,8 @@ function createAttributeListStore() { return { subscribe, set, - load: async (collectionId: string) => { - const response = await sdkForProject.databases.listAttributes(collectionId); + load: async (databaseId: string, collectionId: string) => { + const response = await sdkForProject.databases.listAttributes(databaseId, collectionId); set(response); } }; diff --git a/src/routes/console/project-[project]/databases/database/[database]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/index.svelte index 0b6757d10..6c294fda6 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/index.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/index.svelte @@ -24,7 +24,7 @@ ); }; - $: collections.load(search, limit, offset ?? 0); + $: collections.load(databaseId, search, limit, offset ?? 0); $: if (search) offset = 0; @@ -46,7 +46,7 @@ - {#await collections.total(collection.$id)} + {#await collections.total(databaseId, collection.$id)} N Documents {:then n} {n[collection.$id] ? n[collection.$id] : 'NO'} Documents diff --git a/src/routes/console/project-[project]/databases/database/[database]/settings.svelte b/src/routes/console/project-[project]/databases/database/[database]/settings.svelte index b3df56814..3b0a62ae7 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/settings.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/settings.svelte @@ -9,6 +9,7 @@ import Delete from './_delete.svelte'; import { onMount } from 'svelte'; + const databaseId = $page.params.database; const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 48, 48).toString(); let showDelete = false; @@ -18,7 +19,7 @@ let databaseName: string = null; onMount(async () => { - await database.load(); + await database.load(databaseId); databaseName ??= $database.name; }); 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 305e3c984..7a4b3fa3e 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/store.ts +++ b/src/routes/console/project-[project]/databases/database/[database]/store.ts @@ -10,14 +10,19 @@ function createCollectionStore() { return { subscribe, set, - load: async (search: string, limit: number, offset: number) => { - const response = await sdkForProject.databases.listCollections(search, limit, offset); + load: async (databaseId: string, search: string, limit: number, offset: number) => { + const response = await sdkForProject.databases.listCollections( + databaseId, + search, + limit, + offset + ); set(response); }, - total: async (id: string) => { + total: async (databaseId: string, id: string) => { let total = {}; total = browser ? JSON.parse(sessionStorage.getItem('collectionTotal')) ?? {} : {}; - const response = await sdkForProject.databases.listDocuments(id); + const response = await sdkForProject.databases.listDocuments(databaseId, id); total[id] = response.total; sessionStorage?.setItem('collectionTotal', JSON.stringify(total)); return total; @@ -31,8 +36,8 @@ function createDatabase() { return { subscribe, set, - load: async () => { - set(await sdkForProject.databases.get()); + load: async (databaseId: string) => { + set(await sdkForProject.databases.get(databaseId)); } }; }