From 78335be26a789d0a09a5d338ef36b8d9470ca62d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 10 Oct 2023 14:20:26 +0200 Subject: [PATCH] Clean --- packages/server/src/utilities/schema.ts | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts index 79c797ab00..4e1b726cfd 100644 --- a/packages/server/src/utilities/schema.ts +++ b/packages/server/src/utilities/schema.ts @@ -196,33 +196,22 @@ function isValidBBReference( switch (columnSubtype) { case FieldSubtype.USER: case FieldSubtype.USERS: - if (!columnData) { - // Empty columns are valid by default - return true - } - if (typeof columnData !== "string") { return false } - - const castedData = parseCsvExport(columnData) - - if (!Array.isArray(castedData)) { - // It must be an array field + const userArray = parseCsvExport<{ _id: string }[]>(columnData) + if (columnSubtype === FieldSubtype.USER && userArray.length > 1) { return false } - if (columnSubtype === FieldSubtype.USER && castedData.length > 1) { + if (!Array.isArray(columnData)) { return false } - for (const d of castedData) { - if (!db.isGlobalUserID(d._id)) { - return false - } - } - - return true + const constainsWrongId = userArray.find( + user => !db.isGlobalUserID(user._id) + ) + return !constainsWrongId default: throw utils.unreachable(columnSubtype)