From cfca6d67f1ea701dfe2e5e8589863df827d54aef Mon Sep 17 00:00:00 2001 From: James Date: Wed, 23 Feb 2022 08:16:13 -0500 Subject: [PATCH] chore: type cleanup --- .../forms/field-types/Relationship/createRelationMap.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/admin/components/forms/field-types/Relationship/createRelationMap.ts b/src/admin/components/forms/field-types/Relationship/createRelationMap.ts index c32ee834f6..ecb0994a23 100644 --- a/src/admin/components/forms/field-types/Relationship/createRelationMap.ts +++ b/src/admin/components/forms/field-types/Relationship/createRelationMap.ts @@ -20,9 +20,8 @@ export const createRelationMap: CreateRelationMap = ({ const relationMap: RelationMap = {}; const add = (relation: string, id: unknown) => { - if (typeof relationMap[relation] === 'undefined') relationMap[relation] = []; - - if (id !== 'null' && id !== null) { + if (((typeof id === 'string' && id !== 'null') || typeof id === 'number') && typeof relation === 'string') { + if (typeof relationMap[relation] === 'undefined') relationMap[relation] = []; relationMap[relation].push(id); } }; @@ -35,9 +34,9 @@ export const createRelationMap: CreateRelationMap = ({ add(relationTo, val); } }); - } else if (hasMultipleRelations && value) { + } else if (hasMultipleRelations) { const valueWithRelation = value as ValueWithRelation; - add(valueWithRelation.relationTo, valueWithRelation.value); + add(valueWithRelation?.relationTo, valueWithRelation?.value); } else { add(relationTo, value); }