From e51be1b2f29f704df1a9d2c7f04a50df09c8c33c Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 1 Dec 2022 11:36:48 +0530 Subject: [PATCH] fix(gui): year validation correction Signed-off-by: Pranav C --- .../composables/useMultiSelect/convertCellData.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/nc-gui/composables/useMultiSelect/convertCellData.ts b/packages/nc-gui/composables/useMultiSelect/convertCellData.ts index 5168efab21..7e4626aeaf 100644 --- a/packages/nc-gui/composables/useMultiSelect/convertCellData.ts +++ b/packages/nc-gui/composables/useMultiSelect/convertCellData.ts @@ -46,15 +46,17 @@ export default function convertCellData(args: { from: UITypes; to: UITypes; valu return parsedTime.format(dateFormat) } case UITypes.Year: { + if (/^\d+$/.test(value)) { + return +value + } + const parsedDate = dayjs(value) - if (!parsedDate.isValid()) { + if (parsedDate.isValid()) { return parsedDate.format('YYYY') } - if (/^\d+$/.test(value)) { - throw new Error('Not a valid year value') - } - return value + + throw new Error('Not a valid year value') } case UITypes.Attachment: { let parsedVal