From f55e355fd4e9343c396b0551dfd8284cd0601451 Mon Sep 17 00:00:00 2001 From: chavda-bhavik Date: Tue, 16 Jul 2024 15:47:20 +0530 Subject: [PATCH] feat: Updated review to consider default delimiter if not available --- .../src/app/review/usecases/do-review/base-review.usecase.ts | 1 - apps/api/src/app/review/usecases/do-review/do-review.usecase.ts | 2 +- .../src/app/review/usecases/do-review/re-review-data.usecase.ts | 2 +- apps/widget/src/hooks/Phase3/usePhase3.tsx | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts b/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts index 1023c7f10..25dd92943 100644 --- a/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts +++ b/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts @@ -283,7 +283,6 @@ export class BaseReview { if (numberColumnHeadings.has(heading) && val !== '' && !isNaN(val)) val = Number(val); if (typeof val === 'string') val = val.trim(); - if (multiSelectColumnHeadings[heading]) acc.checkRecord[heading] = !val ? [] : val.split(multiSelectColumnHeadings[heading]); else acc.checkRecord[heading] = val; diff --git a/apps/api/src/app/review/usecases/do-review/do-review.usecase.ts b/apps/api/src/app/review/usecases/do-review/do-review.usecase.ts index 52758d32a..3dae120e8 100644 --- a/apps/api/src/app/review/usecases/do-review/do-review.usecase.ts +++ b/apps/api/src/app/review/usecases/do-review/do-review.usecase.ts @@ -48,7 +48,7 @@ export class DoReview extends BaseReview { const numberColumnHeadings = new Set(); (columns as ITemplateSchemaItem[]).forEach((column) => { if (column.type === ColumnTypesEnum.SELECT && column.allowMultiSelect) - multiSelectColumnHeadings[column.key] = column.delimiter; + multiSelectColumnHeadings[column.key] = column.delimiter || ','; if (column.type === ColumnTypesEnum.NUMBER || column.type === ColumnTypesEnum.DOUBLE) numberColumnHeadings.add(column.key); }); diff --git a/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts b/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts index 862b389b0..ff05ea15e 100644 --- a/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts +++ b/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts @@ -67,7 +67,7 @@ export class DoReReview extends BaseReview { const multiSelectColumnHeadings: Record = {}; (columns as ITemplateSchemaItem[]).forEach((column) => { if (column.type === ColumnTypesEnum.SELECT && column.allowMultiSelect) - multiSelectColumnHeadings[column.key] = column.delimiter; + multiSelectColumnHeadings[column.key] = column.delimiter || ','; }); uniqueFieldData.forEach((item) => { diff --git a/apps/widget/src/hooks/Phase3/usePhase3.tsx b/apps/widget/src/hooks/Phase3/usePhase3.tsx index 56d2a0d0b..facbf2dbd 100644 --- a/apps/widget/src/hooks/Phase3/usePhase3.tsx +++ b/apps/widget/src/hooks/Phase3/usePhase3.tsx @@ -92,7 +92,7 @@ export function usePhase3({ onNext }: IUsePhase3Props) { case ColumnTypesEnum.SELECT: columnItem.type = 'text'; columnItem.renderer = 'custom'; - columnItem.delimiter = column.delimiter; + columnItem.delimiter = column.delimiter || ','; columnItem.selectOptions = column.selectValues; columnItem.editor = column.allowMultiSelect ? MultiSelectEditor : SelectEditor; break;