From 3aab5581af2e18f611b13ed106db90f66e853738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 12 Apr 2023 08:48:30 +0200 Subject: [PATCH 1/2] Fix relations message --- .../attributes/relationship.svelte | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte index 51e93815c..b0e1d77e9 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte @@ -234,21 +234,26 @@ {data.key} -
-

- {camelize($collection.name)} can contain {data.relationType && - !['oneToOne', 'oneToMany'].includes(data.relationType) - ? 'many' - : 'one'} - {data.key} -

-

- {camelize($collection.name)} can belong to {isToMany - ? 'many' - : 'one'} - {data.key} -

-
+ {#if data.relationType} +
+

+ {camelize($collection.name)} can contain {[ + 'oneToOne', + 'manyToOne' + ].includes(data.relationType) + ? 'one' + : 'many'} + {camelize(data.key)} +

+

+ {camelize(data.key)} + can belong to {['oneToOne', 'oneToMany'].includes(data.relationType) + ? 'one' + : 'many'} + {camelize($collection.name)} +

+
+ {/if} Date: Wed, 12 Apr 2023 08:55:01 +0200 Subject: [PATCH 2/2] Fix failing test --- .../collection-[collection]/attributes/relationship.svelte | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte index b0e1d77e9..f847e0ebd 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte @@ -44,7 +44,6 @@ import arrowTwo from './arrow-two.svg'; import { camelize } from '$lib/helpers/string'; import { SelectSearchItem } from '$lib/elements'; - import { isRelationshipToMany } from '../document-[document]/attributes/store'; // Props export let data: Models.AttributeRelationship; @@ -102,7 +101,6 @@ $: getCollections(search).then((res) => (collectionList = res)); $: collections = collectionList?.collections?.filter((n) => n.$id !== $collection.$id) ?? []; - $: isToMany = isRelationshipToMany(data); $: if (editing) { way = data.twoWay ? 'two' : 'one';