From e80f228111aeb457e65c9741917209d02ea036fb Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 6 Apr 2023 14:07:53 +0200 Subject: [PATCH] fix: QA from steven isRelationshipToMany func --- .../collection-[collection]/attributes/relationship.svelte | 5 ++--- .../document-[document]/attributes/store.ts | 7 ++++--- 2 files changed, 6 insertions(+), 6 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 9525add43..dbc894378 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 @@ -103,6 +103,7 @@ $: 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'; @@ -235,9 +236,7 @@

- {camelize($collection.name)} has {isRelationshipToMany(data) - ? 'many' - : 'one'} + {camelize($collection.name)} has {isToMany ? 'many' : 'one'} {data.key}

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts index c7e4ac77e..fd777eb54 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts @@ -4,10 +4,11 @@ import type { Attributes } from '../../store'; //TODO: remove `side` after SDK update export function isRelationshipToMany(attribute: Models.AttributeRelationship & { side: string }) { if (!attribute) return false; - if (attribute?.side === 'parent') { - return !['oneToOne', 'manyToOne'].includes(attribute?.relationType); - } else { + if (!attribute?.relationType) return false; + if (attribute?.side === 'child') { return !['oneToOne', 'oneToMany'].includes(attribute?.relationType); + } else { + return !['oneToOne', 'manyToOne'].includes(attribute?.relationType); } }