From af2d84e52376ad5e05944f06082ec20842f0f96c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 2 Nov 2022 12:09:37 +0100 Subject: [PATCH 01/12] fix: realtime --- src/lib/constants.ts | 1 + .../collection-[collection]/+layout.svelte | 23 +++++++++++++++++++ .../indexes/+page.svelte | 11 ++++++++- .../indexes/createIndex.svelte | 12 ++-------- .../function-[function]/+layout.svelte | 20 ++++++++++++++++ .../executions/[[page]]/+page.svelte | 21 +++++++++++++++-- .../executions/[[page]]/+page.ts | 5 ++-- 7 files changed, 78 insertions(+), 15 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 5c2ecc465..c6089a6c6 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -25,6 +25,7 @@ export enum Dependencies { FUNCTIONS = 'functions', VARIABLES = 'variables', DEPLOYMENTS = 'deployments', + EXECUTIONS = 'executions', PLATFORM = 'platform', PLATFORMS = 'platforms', KEY = 'key', diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte index 3a2840920..1eeef5a38 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte @@ -1,5 +1,28 @@ diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index 377c17561..0613707cb 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -1,5 +1,5 @@ +
+ Indexes + + +
{#if data.indexes.total} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index c8f444c73..f76d90eba 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -2,7 +2,6 @@ import { Modal } from '$lib/components'; import { Button, InputText, FormList, InputSelect } from '$lib/elements/forms'; import { collection } from '../store'; - import { onMount } from 'svelte'; import { sdkForProject } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { page } from '$app/stores'; @@ -11,7 +10,6 @@ import { Dependencies } from '$lib/constants'; export let showCreateIndex = false; - export let externalAttribute: Attributes = null; const databaseId = $page.params.database; @@ -23,7 +21,7 @@ ]; let newAttr = false; let selectedType = ''; - let attributeOptions = $collection.attributes.map((attribute: Attributes) => ({ + $: attributeOptions = $collection.attributes.map((attribute: Attributes) => ({ value: attribute.key, label: attribute.key })); @@ -32,12 +30,6 @@ let selectedAttribute = ''; let selectedOrder = ''; - onMount(() => { - if (externalAttribute) { - attributeList = [{ value: externalAttribute.key, order: 'ASC' }]; - } - }); - $: if (showCreateIndex) { attributeList = []; selectedType = selectedOrder = selectedAttribute = ''; @@ -130,7 +122,7 @@
+
+ {#if data.indexes.total}
From 80641249f4afc3cc6208e595cfbc9f782cd9dfa4 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 2 Nov 2022 17:12:39 +0100 Subject: [PATCH 07/12] fix: data for attributes and indexes --- src/lib/constants.ts | 2 -- .../collection-[collection]/+layout.ts | 2 +- .../attributes/+page.svelte | 11 ++++------- .../attributes/+page.ts | 19 ------------------- .../attributes/createAttribute.svelte | 2 +- .../attributes/deleteAttribute.svelte | 2 +- .../indexes/+page.svelte | 16 +++++++--------- .../collection-[collection]/indexes/+page.ts | 12 ------------ .../indexes/createIndex.svelte | 2 +- .../collection-[collection]/store.ts | 1 + 10 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.ts delete mode 100644 src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.ts diff --git a/src/lib/constants.ts b/src/lib/constants.ts index c6089a6c6..1c011ef74 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -16,8 +16,6 @@ export enum Dependencies { COLLECTION = 'collection', DOCUMENT = 'document', DOCUMENTS = 'documents', - ATTRIBUTES = 'attributes', - INDEXES = 'indexes', BUCKET = 'bucket', FILE = 'file', FILES = 'files', diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts index 65447fe19..4cff24c2d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -6,8 +6,8 @@ import Header from './header.svelte'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.COLLECTION); + await parent(); try { return { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 2714091da..e63615b09 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -10,16 +10,13 @@ } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; import { DropList, DropListItem, Empty, Heading } from '$lib/components'; - import type { Attributes } from '../store'; + import { attributes, type Attributes } from '../store'; import { Container } from '$lib/layout'; import { Pill } from '$lib/elements'; import Create from './createAttribute.svelte'; import CreateIndex from '../indexes/createIndex.svelte'; import Delete from './deleteAttribute.svelte'; import Overview from './overview.svelte'; - import type { PageData } from './$types'; - - export let data: PageData; let showDropdown = []; let selectedAttribute: Attributes = null; @@ -39,7 +36,7 @@ - {#if data.attributes.total} + {#if $attributes.length}
Key @@ -48,7 +45,7 @@ - {#each data.attributes.attributes as attribute, index} + {#each $attributes as attribute, index}
@@ -110,7 +107,7 @@
-

Total results: {data.attributes.total}

+

Total results: {$attributes.length}

{:else} (showCreate = true)}> diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.ts deleted file mode 100644 index 565b2e3c8..000000000 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { sdkForProject } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants'; -import type { PageLoad } from './$types'; -import type { Attributes } from '../store'; - -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); - depends(Dependencies.ATTRIBUTES); - - return { - attributes: (await sdkForProject.databases.listAttributes( - params.database, - params.collection - )) as unknown as { - total: number; - attributes: Attributes[]; - } - }; -}; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte index 0d36d76c8..f234f1040 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte @@ -12,7 +12,7 @@ let submitted = false; const created = async () => { - invalidate(Dependencies.ATTRIBUTES); + invalidate(Dependencies.COLLECTION); showCreate = false; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte index f3227e6f6..b866f01ec 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte @@ -21,7 +21,7 @@ $collection.$id, selectedAttribute.key ); - invalidate(Dependencies.ATTRIBUTES); + invalidate(Dependencies.COLLECTION); showDelete = false; await goto( `${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${$page.params.collection}/attributes` diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index 0613707cb..f5d2c9548 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -11,18 +11,15 @@ TableRow } from '$lib/elements/table'; import { Container } from '$lib/layout'; - import { collection } from '../store'; + import { indexes } from '../store'; import Delete from './deleteIndex.svelte'; import Create from './createIndex.svelte'; import Overview from './overviewIndex.svelte'; import type { Models } from '@aw-labs/appwrite-console'; - import type { PageData } from './$types'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; - export let data: PageData; - let showDropdown = []; let selectedIndex: Models.Index = null; let showCreateIndex = false; @@ -30,7 +27,7 @@ let showDelete = false; const handleDelete = async () => { - invalidate(Dependencies.INDEXES); + invalidate(Dependencies.COLLECTION); }; @@ -43,7 +40,7 @@ Create index - {#if data.indexes.total} + {#if $indexes.length} Key @@ -53,7 +50,7 @@ - {#each data.indexes.indexes as index, i} + {#each $indexes as index, i}
@@ -108,9 +105,9 @@
-

Total results: {data.indexes.total}

+

Total results: {$indexes.length}

- {:else if $collection.indexes?.length} + {:else if $indexes?.length} (showCreateIndex = true)}>

Create your first attribute to get started

@@ -122,6 +119,7 @@
+ {#if selectedIndex} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.ts deleted file mode 100644 index 48cb2571d..000000000 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { sdkForProject } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants'; -import type { PageLoad } from './$types'; - -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); - depends(Dependencies.INDEXES); - - return { - indexes: await sdkForProject.databases.listIndexes(params.database, params.collection) - }; -}; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index eb59fe3ad..d87c1e4aa 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -57,7 +57,7 @@ attributeList.map((a) => a.value), attributeList.map((a) => a.order) ); - invalidate(Dependencies.INDEXES); + invalidate(Dependencies.COLLECTION); addNotification({ message: 'Index created!', 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 ee7b13498..6d30597ee 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 @@ -21,3 +21,4 @@ export const attributes = derived( page, ($page) => $page.data.collection.attributes as Attributes[] ); +export const indexes = derived(page, ($page) => $page.data.collection.indexes as Models.Index[]); From 0dca33b98183c03fa75f8bb4d5c18ffda1ff8d11 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 2 Nov 2022 17:13:40 +0100 Subject: [PATCH 08/12] typo fix --- .../function-[function]/executions/[[page]]/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte index 55ce97ab9..b0d11a087 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte @@ -37,7 +37,7 @@ Status Trigger Type - Execution Time + Duration {#each data.executions.executions as execution} From d231e9c15b7bdc8b32a94590d7915a376e2c9426 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 3 Nov 2022 10:24:19 +0100 Subject: [PATCH 09/12] feat: add missing notification messages --- .../console/project-[project]/databases/_create.svelte | 6 +++++- .../attributes/createAttribute.svelte | 5 +++++ .../attributes/deleteAttribute.svelte | 4 ++++ .../document-[document]/delete.svelte | 4 ++++ .../collection-[collection]/indexes/createIndex.svelte | 2 +- .../collection-[collection]/indexes/deleteIndex.svelte | 4 ++++ .../settings/deleteCollection.svelte | 4 ++++ .../databases/database-[database]/delete.svelte | 4 ++++ .../project-[project]/functions/createFunction.svelte | 2 +- .../storage/bucket-[bucket]/_deleteBucket.svelte | 4 ++++ .../storage/bucket-[bucket]/_deleteFile.svelte | 4 ++++ .../project-[project]/storage/bucket-[bucket]/create.svelte | 5 +++++ .../storage/bucket-[bucket]/file-[file]/deleteFile.svelte | 4 ++++ src/routes/console/project-[project]/storage/create.svelte | 5 +++++ 14 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/databases/_create.svelte b/src/routes/console/project-[project]/databases/_create.svelte index eed9550f6..8c9dac6da 100644 --- a/src/routes/console/project-[project]/databases/_create.svelte +++ b/src/routes/console/project-[project]/databases/_create.svelte @@ -17,9 +17,13 @@ const create = async () => { try { const database = await sdkForProject.databases.create(id ? id : 'unique()', name); - name = id = null; showCreate = false; dispatch('created', database); + addNotification({ + type: 'success', + message: `${name} has been created` + }); + name = id = null; } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte index 0d36d76c8..8d760b070 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte @@ -4,6 +4,7 @@ import { Button, InputText, FormList, InputSelect } from '$lib/elements/forms'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; + import { addNotification } from '$lib/stores/notifications'; export let showCreate = false; @@ -14,6 +15,10 @@ const created = async () => { invalidate(Dependencies.ATTRIBUTES); showCreate = false; + addNotification({ + type: 'success', + message: `Attribute has been created` + }); }; $: if (selectedOption) { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte index f3227e6f6..820e857e8 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte @@ -23,6 +23,10 @@ ); invalidate(Dependencies.ATTRIBUTES); showDelete = false; + addNotification({ + type: 'success', + message: `Attribute has been deleted` + }); await goto( `${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${$page.params.collection}/attributes` ); 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 7fcc6a4c4..e69daa4c5 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 @@ -20,6 +20,10 @@ $page.params.document ); showDelete = false; + addNotification({ + type: 'success', + message: `Document has been deleted` + }); await goto( `${base}/console/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}` ); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index c8f444c73..2053b24cd 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -59,7 +59,7 @@ ); invalidate(Dependencies.INDEXES); addNotification({ - message: 'Index created!', + message: 'Index has been created', type: 'success' }); } catch (error) { 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 f4b59ec44..f33c28a36 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 @@ -22,6 +22,10 @@ selectedIndex.key ); showDelete = false; + addNotification({ + type: 'success', + message: `Index has been deleted` + }); dispatch('deleted'); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte index b5b57fc07..ed3246c05 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte @@ -16,6 +16,10 @@ try { await sdkForProject.databases.deleteCollection(databaseId, $collection.$id); showDelete = false; + addNotification({ + type: 'success', + message: `${$collection.name} has been deleted` + }); await goto( `${base}/console/project-${$page.params.project}/databases/database/${$page.params.database}` ); diff --git a/src/routes/console/project-[project]/databases/database-[database]/delete.svelte b/src/routes/console/project-[project]/databases/database-[database]/delete.svelte index a82be62a9..2bbe8e69a 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/delete.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/delete.svelte @@ -15,6 +15,10 @@ try { await sdkForProject.databases.delete(databaseId); showDelete = false; + addNotification({ + type: 'success', + message: `${$database.name} has been deleted` + }); await goto(`${base}/console/project-${$page.params.project}/databases`); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/functions/createFunction.svelte b/src/routes/console/project-[project]/functions/createFunction.svelte index 96a756337..e2402afb3 100644 --- a/src/routes/console/project-[project]/functions/createFunction.svelte +++ b/src/routes/console/project-[project]/functions/createFunction.svelte @@ -37,7 +37,7 @@ await invalidate(Dependencies.FUNCTIONS); addNotification({ - message: 'Function has been created', + message: `${$createFunction.name} has been created`, type: 'success' }); wizard.hide(); diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/_deleteBucket.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/_deleteBucket.svelte index 3952d0d5c..3a205bc74 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/_deleteBucket.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/_deleteBucket.svelte @@ -14,6 +14,10 @@ try { await sdkForProject.storage.deleteBucket($bucket.$id); showDelete = false; + addNotification({ + type: 'success', + message: `${$bucket.name} has been deleted` + }); await goto(`${base}/console/project-${$page.params.project}/storage`); } catch (error) { addNotification({ 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 c8f934069..1d5cf7604 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/_deleteFile.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/_deleteFile.svelte @@ -16,6 +16,10 @@ await sdkForProject.storage.deleteFile(file.bucketId, file.$id); showDelete = false; dispatch('deleted', file); + addNotification({ + type: 'success', + message: `${file.name} has been deleted` + }); } catch (error) { addNotification({ type: 'error', 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 3a1fee89b..a529a4e1c 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte @@ -9,6 +9,7 @@ import { bucket } from './store'; import { calculateSize } from '$lib/helpers/sizeConvertion'; import { Permissions } from '$lib/components/permissions'; + import { addNotification } from '$lib/stores/notifications'; export let showCreate = false; @@ -34,6 +35,10 @@ showCustomId = false; uploader.addFile(file); dispatch('created'); + addNotification({ + type: 'success', + message: `${file.name} has been created` + }); } catch ({ message }) { error = message; } diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte index 3b8286a38..8ea385fa1 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte @@ -17,6 +17,10 @@ await goto( `${base}/console/project-${$page.params.project}/storage/bucket-${$file.bucketId}` ); + addNotification({ + type: 'success', + message: `${$file.name} has been deleted` + }); } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/project-[project]/storage/create.svelte b/src/routes/console/project-[project]/storage/create.svelte index 0dda02bba..8125ba1aa 100644 --- a/src/routes/console/project-[project]/storage/create.svelte +++ b/src/routes/console/project-[project]/storage/create.svelte @@ -2,6 +2,7 @@ import { Modal, CustomId } from '$lib/components'; import { Pill } from '$lib/elements'; import { Button, InputText, FormList } from '$lib/elements/forms'; + import { addNotification } from '$lib/stores/notifications'; import { sdkForProject } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; @@ -20,6 +21,10 @@ name = null; showCreate = false; dispatch('created', bucket); + addNotification({ + type: 'success', + message: `${name} has been created` + }); } catch ({ message }) { error = message; } From 24eb342fcd7f57c97ddd29e4138f071da0b9b94d Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 3 Nov 2022 10:51:14 +0100 Subject: [PATCH 10/12] feat: create component for activity page --- src/lib/layout/activity.svelte | 101 +++++++++++++++++ src/lib/layout/index.ts | 1 + .../account/activity/[[page]]/+page.svelte | 102 +----------------- .../activity/[[page]]/+page.svelte | 96 +---------------- .../activity/[[page]]/+page.svelte | 94 +--------------- .../activity/[[page]]/+page.svelte | 96 +---------------- .../activity/[[page]]/+page.svelte | 96 +---------------- 7 files changed, 117 insertions(+), 469 deletions(-) create mode 100644 src/lib/layout/activity.svelte diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte new file mode 100644 index 000000000..802a63a76 --- /dev/null +++ b/src/lib/layout/activity.svelte @@ -0,0 +1,101 @@ + + + + {#if logs.total} + + + Client + Event + Location + IP + Date + + + {#each logs.logs as log} + + + {#if log.clientName} +
+
+ {log.clientName} +
+ + {log.clientName} + {log.clientVersion} + on {log.osName} + {log.osVersion} + +
+ {:else} +
+ +

Unknown

+
+ {/if} +
+ {log.event} + + + {#if log.countryCode !== '--'} + {log.countryName} + {:else} + Unknown + {/if} + + {log.ip} + {toLocaleDateTime(log.time)} +
+ {/each} +
+
+ {:else} + +
+
+

No logs available

+
+
+ +
+
+
+ {/if} +
+

Total results: {logs.total}

+ +
+
diff --git a/src/lib/layout/index.ts b/src/lib/layout/index.ts index 227e9b8da..629bd3588 100644 --- a/src/lib/layout/index.ts +++ b/src/lib/layout/index.ts @@ -13,3 +13,4 @@ export { default as WizardStep } from './wizardStep.svelte'; export { default as Breadcrumbs } from './breadcrumbs.svelte'; export { default as Unauthenticated } from './unauthenticated.svelte'; export { default as Usage, type UsagePeriods } from './usage.svelte'; +export { default as Activity } from './activity.svelte'; diff --git a/src/routes/console/account/activity/[[page]]/+page.svelte b/src/routes/console/account/activity/[[page]]/+page.svelte index cce632015..c7f2c38da 100644 --- a/src/routes/console/account/activity/[[page]]/+page.svelte +++ b/src/routes/console/account/activity/[[page]]/+page.svelte @@ -1,105 +1,9 @@ - - {#if data.logs.total} - - - Date - Event - Client - Location - IP - - - {#each data.logs.logs as log} - - {toLocaleDateTime(log.time)} - {log.event} - - - {#if log.clientName} -
-
- {log.clientName} -
-

- {log.clientName} - {log.clientVersion} - on {log.osName} - {log.osVersion} -

-
- {:else} -
- -

Unknown

-
- {/if} -
- - - {#if log.countryCode !== '--'} - {log.countryName} - {:else} - Unknown - {/if} - - {log.ip} -
- {/each} -
-
- {:else} - -
-
-

No logs available

-
-
- -
-
-
- {/if} -
-

Total results: {data.logs.total}

- -
-
+ diff --git a/src/routes/console/project-[project]/authentication/teams/team-[team]/activity/[[page]]/+page.svelte b/src/routes/console/project-[project]/authentication/teams/team-[team]/activity/[[page]]/+page.svelte index b624f59d9..6dfde400f 100644 --- a/src/routes/console/project-[project]/authentication/teams/team-[team]/activity/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/authentication/teams/team-[team]/activity/[[page]]/+page.svelte @@ -1,100 +1,10 @@ - - {#if data.logs.total} - - - Client - Event - Location - IP - Date - - - {#each data.logs.logs as log} - - - {#if log.clientName} -
-
- {log.clientName} -
-

- {log.clientName} - {log.clientVersion} - on {log.osName} - {log.osVersion} -

-
- {:else} -
-

- - Unknown -

-
- {/if} -
- {log.event} - - {#if log.countryCode !== '--'} - {log.countryName} - {:else} - Unknown - {/if} - - {log.ip} - {toLocaleDateTime(log.time)} -
- {/each} -
-
- {:else} - -
-
-

No logs available

-
-
- -
-
-
- {/if} -
-

Total results: {data.logs.total}

- -
-
+ diff --git a/src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.svelte b/src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.svelte index cf8154ed6..529766497 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/authentication/user-[user]/activity/[[page]]/+page.svelte @@ -1,98 +1,10 @@ - - {#if data.logs.total} - - - Client - Event - Location - IP - Date - - - {#each data.logs.logs as log} - - - {#if log.clientName} -
-
- {log.clientName} -
-

- {log.clientName} - {log.clientVersion} - on {log.osName} - {log.osVersion} -

-
- {:else} -
-

- - - Unknown -

-
- {/if} -
- {log.event} - - - {#if log.countryCode !== '--'} - {log.countryName} - {:else} - Unknown - {/if} - - {log.ip} - {toLocaleDateTime(log.time)} -
- {/each} -
-
- {:else} - -

No logs available

- -
- {/if} -
-

Total results: {data.logs.total}

- -
-
+ diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.svelte index 9426dfff0..e7d9fb947 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.svelte @@ -1,100 +1,10 @@ - - {#if data.logs.total} - - - Client - Event - Location - IP - Date - - - {#each data.logs.logs as log} - - - {#if log.clientName} -
-
- {log.clientName} -
-

- {log.clientName} - {log.clientVersion} - on {log.osName} - {log.osVersion} -

-
- {:else} -
-

- - Unknown -

-
- {/if} -
- {log.event} - - {#if log.countryCode !== '--'} - {log.countryName} - {:else} - Unknown - {/if} - - {log.ip} - {toLocaleDateTime(log.time)} -
- {/each} -
-
- {:else} - -
-
-

No logs available

-
-
- -
-
-
- {/if} -
-

Total results: {data.logs.total}

- -
-
+ diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.svelte index 9426dfff0..e7d9fb947 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.svelte @@ -1,100 +1,10 @@ - - {#if data.logs.total} - - - Client - Event - Location - IP - Date - - - {#each data.logs.logs as log} - - - {#if log.clientName} -
-
- {log.clientName} -
-

- {log.clientName} - {log.clientVersion} - on {log.osName} - {log.osVersion} -

-
- {:else} -
-

- - Unknown -

-
- {/if} -
- {log.event} - - {#if log.countryCode !== '--'} - {log.countryName} - {:else} - Unknown - {/if} - - {log.ip} - {toLocaleDateTime(log.time)} -
- {/each} -
-
- {:else} - -
-
-

No logs available

-
-
- -
-
-
- {/if} -
-

Total results: {data.logs.total}

- -
-
+ From e843aab8d8d724ebab7a06d43aff18bef8459566 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 3 Nov 2022 11:47:41 +0100 Subject: [PATCH 11/12] fix: code snippets --- src/lib/components/code.svelte | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte index 707fd5e87..24debe415 100644 --- a/src/lib/components/code.svelte +++ b/src/lib/components/code.svelte @@ -10,7 +10,6 @@ import 'prismjs/plugins/autoloader/prism-autoloader'; import 'prismjs/plugins/custom-class/prism-custom-class'; import 'prismjs/plugins/line-numbers/prism-line-numbers'; - import 'prismjs/plugins/line-numbers/prism-line-numbers.css'; import { afterUpdate } from 'svelte'; import { Copy } from '.'; @@ -49,13 +48,13 @@ {/if} -
-        {code}
-    
+
{code}