diff --git a/src/lib/elements/selectSearchItem.svelte b/src/lib/elements/selectSearchItem.svelte
index ce13a3355..cd2b6f5c4 100644
--- a/src/lib/elements/selectSearchItem.svelte
+++ b/src/lib/elements/selectSearchItem.svelte
@@ -9,7 +9,7 @@
class="/*u-flex-basis-140*/ u-flex-shrink-0 u-text-start u-trim-start u-x-small u-color-text-gray">
- {#if data.length}
+ {#if data?.length}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
index 93dd9ac0e..33ab04d03 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
@@ -28,7 +28,7 @@
collectionId,
data.key,
data.required,
- data.default ? data.default : undefined
+ data.default ? data.default : null
);
}
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 e26bcb20f..9f6a808e3 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
@@ -10,6 +10,7 @@
import { sdk } from '$lib/stores/sdk';
import { Dependencies } from '$lib/constants';
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+ import type { Models } from '@appwrite.io/console';
export let showDelete = false;
export let selectedAttribute: Attributes;
@@ -41,8 +42,12 @@
}
}
+ function isRelationship(attr: Attributes): attr is Models.AttributeRelationship {
+ return attr.type === 'relationship';
+ }
+
$: isDeleteBtnDisabled =
- selectedAttribute?.type === 'relationship' && selectedAttribute?.twoWay && !checked;
+ isRelationship(selectedAttribute) && selectedAttribute?.twoWay && !checked;
"{selectedAttribute?.key}" from "{$collection?.name}"?
- {#if selectedAttribute?.type === 'relationship' && selectedAttribute?.twoWay}
+ {#if isRelationship(selectedAttribute) && selectedAttribute?.twoWay}
Are you sure you want to delete {
- console.log(
- JSON.stringify(selectedAttribute),
- currentAttr,
- JSON.stringify(selectedAttribute) === currentAttr
- );
- return JSON.stringify(selectedAttribute) === currentAttr;
- })();
- // $: console.log(updateButtonDisabled, JSON.stringify(selectedAttribute), currentAttr);
{#if selectedAttribute}
@@ -101,7 +90,7 @@
-
+
{/if}
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 67449b34e..70f18682e 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
@@ -29,7 +29,7 @@
collectionId,
data.key,
data.required,
- data.default ? data.default : undefined
+ data.default ? data.default : null
);
}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
index 02a56a19f..e320ddb0e 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
@@ -30,7 +30,7 @@
data.key,
data.elements,
data.required,
- data.default ? data.default : undefined
+ data.default ? data.default : null
);
}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
index 8dcbe2e5a..3cc232862 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
@@ -32,7 +32,7 @@
data.required,
data.min,
data.max,
- typeof data.default === 'number' ? data.default : undefined
+ typeof data.default === 'number' ? data.default : null
);
}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
index eeee48f51..77e90ff7f 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
@@ -32,7 +32,7 @@
data.required,
data.min,
data.max,
- typeof data.default === 'number' ? data.default : undefined
+ typeof data.default === 'number' ? data.default : null
);
}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
index 1209da703..185826802 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
@@ -27,7 +27,7 @@
collectionId,
data.key,
data.required,
- data.default ? data.default : undefined
+ data.default ? data.default : null
);
}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
index 2964b86e1..c94c9a5a8 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
@@ -29,7 +29,7 @@
collectionId,
data.key,
data.required,
- data.default ? (data.default as string) : undefined
+ data.default ? (data.default as string) : null
);
}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
index 29f34328c..d8e659ad0 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
@@ -28,7 +28,7 @@
collectionId,
data.key,
data.required,
- data.default ? data.default : undefined
+ data.default ? data.default : null
);
}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
index e0c3e567e..e45584c4c 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
@@ -13,7 +13,7 @@
export let showCreate = false;
export let selectedOption: string = null;
const databaseId = $page.params.database;
- const collectionId = $page.params.collection;
+ $: collectionId = $page.params.collection;
let key: string = null;
let data: Partial = {
@@ -26,8 +26,8 @@
async function submit() {
try {
await $option.create(databaseId, collectionId, key, data);
- // await invalidate(Dependencies.COLLECTION);
- await Promise.allSettled([invalidate(Dependencies.COLLECTION)]);
+ await invalidate(Dependencies.COLLECTION);
+ // await Promise.allSettled([invalidate(Dependencies.COLLECTION)]);
if (!$page.url.pathname.includes('attributes')) {
await goto(
`${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
index bd5e0bca7..2af53d8f6 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
@@ -1,6 +1,6 @@
-{#if editing && isArray && relatedList.length > 0}
-
+{#if editing && isArray && total > 0}
+
{:else if isArray}
@@ -184,7 +195,7 @@
{label}
- {#if relatedList.length === 0}
+ {#if total === 0}