+
Documents
-
-
Total results: {response.total}
-
-
- {:else}
-
-
-
-
-
-
-
Crate your first document to get started
-
-
-
-
+
+
+
Total results: {$documentList.total}
+
+
+
+
+
+
+
Crate your first document to get started
-
- {/if}
- {/await}
+
+
+
+
Indexes
-
- {#if $collection.indexes.length}
+
+
+
+
+
+ {#if $indexList?.total}
- Status
Key
Type
Attributes
-
+ Asc/Desc
+
- {#each $collection.indexes as index}
+ {#each $indexList.indexes as index, i}
- {index.status}
- {index.key}
+
+
+
{index.key}
+ {#if index.status !== 'available'}
+
+ {index.status}
+
+ {/if}
+
- {:else}
+
+
Total results: {$indexList?.total}
+
+
+
Sorry, we couldn’t find ‘{search}’
+
+
There are no indexes that match your search.
+
+
+
+
+
+
Total results: {$indexList?.total}
+
+
+
+
+
+
+
Create your first attribute to get started
+
+
+
+
+
+
+
+
+
+
Create your first index to get started
+
+
+
+
+
Settings
-
+
+
+
+ {$collection.name}
+
+ Last Updated: {toLocaleDateTime($collection.$updatedAt)}
+
+
+
+
+
+
+
+ {/if}
+
+
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 036d9fa6e7..57a1cd7b0e 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,8 +1,8 @@
import { sdkForProject } from '$lib/stores/sdk';
import type { Models } from '@aw-labs/appwrite-console';
-import { writable } from 'svelte/store';
+import { cachedStore } from '$lib/helpers/cache';
-type Attributes =
+export type Attributes =
| Models.AttributeBoolean
| Models.AttributeEmail
| Models.AttributeEnum
@@ -16,37 +16,111 @@ type Collection = Omit & {
attributes: Array;
};
-function createCollection() {
- const { subscribe, set, update } = writable();
-
+export const collection = cachedStore<
+ Collection,
+ {
+ load: (databaseId: string, collectionId: string) => Promise;
+ addAttribute: (attribute: Attributes) => void;
+ updateAttribute: (attribute: Attributes) => void;
+ removeAttribute: (attribute: Attributes) => void;
+ }
+>('collection', function ({ set, update }) {
return {
- subscribe,
- set,
- load: async (collectionId: string) => {
+ load: async (databaseId, collectionId) => {
set(
- (await sdkForProject.databases.getCollection(collectionId)) as unknown as Collection
+ (await sdkForProject.databases.getCollection(
+ databaseId,
+ collectionId
+ )) as unknown as Collection
);
},
- addAttribute: (attribute: Attributes) =>
+ addAttribute: (attribute) =>
update((n) => {
- n.attributes.push(attribute);
+ if (!n.attributes.some((a) => a.key === attribute.key)) {
+ n.attributes.push(attribute);
+ }
return n;
}),
- updateAttribute: (attribute: Attributes) =>
+ updateAttribute: (attribute) =>
update((n) => {
const index = n.attributes.findIndex((a) => a.key === attribute.key);
- n.attributes[index] = attribute;
+ if (index !== -1) {
+ n.attributes[index] = attribute;
+ }
return n;
}),
- removeAttribute: (attribute: Attributes) =>
+ removeAttribute: (attribute) =>
update((n) => {
n.attributes = n.attributes.filter((a) => a.key !== attribute.key);
return n;
})
};
-}
+});
+
+export const documentList = cachedStore<
+ Models.DocumentList,
+ {
+ load: (
+ databaseId: string,
+ collectionId: string,
+ queries: [],
+ limit: number,
+ offset: number
+ ) => Promise;
+ }
+>('documentList', function ({ set }) {
+ return {
+ load: async (databaseId, collectionId, queries, limit, offset) => {
+ const response = await sdkForProject.databases.listDocuments(
+ databaseId,
+ collectionId,
+ queries,
+ limit,
+ offset
+ );
+ set(response);
+ }
+ };
+});
+
+export const indexList = cachedStore<
+ Models.IndexList,
+ {
+ load: (databaseId: string, collectionId: string) => Promise;
+ }
+>('indexList', function ({ set }) {
+ return {
+ load: async (databaseId: string, collectionId: string) => {
+ const response = await sdkForProject.databases.listIndexes(databaseId, collectionId);
+ set(response);
+ }
+ };
+});
+
+/**
+ * TODO: Mock proper types until the SKD is fixed.
+ */
+export type AttributeResponse = Omit & {
+ attributes: Attributes[];
+};
-export const collection = createCollection();
+export const attributeList = cachedStore<
+ AttributeResponse,
+ {
+ load: (databaseId: string, collectionId: string) => Promise;
+ }
+>('attributeList', function ({ set }) {
+ return {
+ load: async (databaseId, collectionId) => {
+ const response: unknown = await sdkForProject.databases.listAttributes(
+ databaseId,
+ collectionId
+ );
+
+ set(response as AttributeResponse);
+ }
+ };
+});
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 b96e21511a..6c294fda6d 100644
--- a/src/routes/console/project-[project]/databases/database/[database]/index.svelte
+++ b/src/routes/console/project-[project]/databases/database/[database]/index.svelte
@@ -1,26 +1,30 @@
@@ -30,31 +34,85 @@
-
Total results: {response.total}
-
+
+ {#if $collections?.total}
+
3 ? '22rem' : '25rem'};`}>
+ {#each $collections.collections as collection}
+
+
+ {#await collections.total(databaseId, collection.$id)}
+ N Documents
+ {:then n}
+ {n[collection.$id] ? n[collection.$id] : 'NO'} Documents
+ {/await}
+ {collection.name}
+
+ {#if !collection.enabled}
+ disabled
+ {/if}
+
+
+ Collection ID
+
+
+ {/each}
+ {#if ($collections.total % 2 !== 0 || $collections.total % 4 === 0) && $collections.total - offset <= limit}
+
(showCreate = true)}>
+
+
+
+
+
Create a new collection
+
+ {/if}
+
+
+
+
Total results: {$collections.total}
+
+
+ {:else if search}
+
+
+
Sorry, we couldn’t find ‘{search}’
+
+
There are no collections that match your search.
+
+
+
+
+
+
Total results: {$collections?.total}
+
+
+ {:else}
+
+
+
+
+
+
+
Create your first collection to get started
+
+
+
+
+
+ {/if}
-
+
+
diff --git a/src/routes/console/project-[project]/databases/database/[database]/settings.svelte b/src/routes/console/project-[project]/databases/database/[database]/settings.svelte
new file mode 100644
index 0000000000..3b0a62ae7e
--- /dev/null
+++ b/src/routes/console/project-[project]/databases/database/[database]/settings.svelte
@@ -0,0 +1,116 @@
+
+
+{#if $database}
+
+
+
+
+
+
Created: TO IMPLEMENT
+
Last Updated: TO IMPLEMENT
+
+
Update Name
+
+
+
+
+ {#if showError === 'name'}
+ {errorMessage}
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
Danger Zone
+
+
+
+ The database will be permanently deleted, including all data associated with this
+ team. This action is irreversible.
+
+
+
+
+
+
+
+ {$database.name}
+ Last Updated: TO IMPLEMENT
+
+
+
+
+
+
+
+
+
+
+{/if}
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 02d460453e..7c3b3efcbe 100644
--- a/src/routes/console/project-[project]/databases/database/[database]/store.ts
+++ b/src/routes/console/project-[project]/databases/database/[database]/store.ts
@@ -1,17 +1,45 @@
import { sdkForProject } from '$lib/stores/sdk';
-import { writable } from 'svelte/store';
import type { Models } from '@aw-labs/appwrite-console';
+import { browser } from '$app/env';
+import { cachedStore } from '$lib/helpers/cache';
-function createDatabase() {
- const { subscribe, set } = writable
();
-
+export const collections = cachedStore<
+ Models.CollectionList,
+ {
+ load: (databaseId: string, search: string, limit: number, offset: number) => Promise;
+ total: (databaseId: string, id: string) => Promise>;
+ }
+>('collections', function ({ set }) {
return {
- subscribe,
- set,
- load: async () => {
- set(await sdkForProject.databases.get());
+ load: async (databaseId, search, limit, offset) => {
+ const response = await sdkForProject.databases.listCollections(
+ databaseId,
+ search,
+ limit,
+ offset
+ );
+ set(response);
+ },
+ total: async (databaseId, id) => {
+ let total = {};
+ total = browser ? JSON.parse(sessionStorage.getItem('collectionTotal')) ?? {} : {};
+ const response = await sdkForProject.databases.listDocuments(databaseId, id);
+ total[id] = response.total;
+ sessionStorage?.setItem('collectionTotal', JSON.stringify(total));
+ return total;
}
};
-}
+});
-export const database = createDatabase();
+export const database = cachedStore<
+ Models.Database,
+ {
+ load: (databaseId: string) => Promise;
+ }
+>('database', function ({ set }) {
+ return {
+ load: async (databaseId) => {
+ set(await sdkForProject.databases.get(databaseId));
+ }
+ };
+});
diff --git a/src/routes/console/project-[project]/databases/index.svelte b/src/routes/console/project-[project]/databases/index.svelte
index f86139d2bc..a45485191d 100644
--- a/src/routes/console/project-[project]/databases/index.svelte
+++ b/src/routes/console/project-[project]/databases/index.svelte
@@ -1,62 +1,88 @@
- Databases
-
-
-
-
- {#await request}
-
- {:then response}
- {#if response.total}
- {response.total} databases found
-
- {#each response.databases as database}
-
- {/each}
-
-
-
- {:else if search}
-
-
- No results found for {search}
-
-
- {:else}
-
- No Databases Found
- You haven't created any database for your project yet.
-
- {/if}
- {/await}
-
-
+
+
Databases
+
+
+
+
+ {#if $databaseList?.total}
+ 3 ? '22rem' : '25rem'};`}>
+ {#each $databaseList.databases as database}
+
+ X Collections
+ {database.name}
+
+
+ Database ID
+
+
+ {/each}
+ {#if ($databaseList.total % 2 !== 0 || $databaseList.total % 4 === 0) && $databaseList.total - offset <= limit}
+
(showCreate = true)}>
+
+
+
+
+
Create a new database
+
+ {/if}
+
+
Total results: {$databaseList.total}
+
+
+
+
+
+
+
Create your first Database to get started
+
+
+
+
+
Usage
+
+
+
diff --git a/src/routes/console/project-[project]/storage/bucket/[bucket]/index.svelte b/src/routes/console/project-[project]/storage/bucket/[bucket]/index.svelte
index 11ff83303d..ba201bce01 100644
--- a/src/routes/console/project-[project]/storage/bucket/[bucket]/index.svelte
+++ b/src/routes/console/project-[project]/storage/bucket/[bucket]/index.svelte
@@ -162,8 +162,7 @@
icon="pencil">Update
{
- e.preventDefault();
+ on:click={() => {
selectedFile = file;
showDelete = true;
}}>Delete
diff --git a/tests/unit/elements/inputSelect.test.ts b/tests/unit/elements/inputSelect.test.ts
index c2766f180c..51853fdef4 100644
--- a/tests/unit/elements/inputSelect.test.ts
+++ b/tests/unit/elements/inputSelect.test.ts
@@ -34,6 +34,17 @@ test('shows options', () => {
});
});
+test('shows placeholder', () => {
+ const { getByText } = render(InputSelect, {
+ id: 'select',
+ label: 'select',
+ options,
+ placeholder: 'placeholder'
+ });
+
+ expect(getByText('placeholder')).toBeInTheDocument();
+});
+
test('shows select input - required', () => {
const { getByLabelText } = render(InputSelect, {
id: 'select',