fix: File generation issue with older excels and empty selecttion (#…

…578)
implerhq · May 29, 2024 · 53dd69e · 53dd69e
2 parents 944aeab + 635b4ab
commit 53dd69e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/apps/api/src/app/shared/services/file/file.service.ts b/apps/api/src/app/shared/services/file/file.service.ts
@@ -36,12 +36,11 @@ export class ExcelFileService {
         .slice(0, 25) // exceljs don't allow heading more than 30 characters
     );
   }
-  addSelectSheet(wb: ExcelJS.Workbook, heading: IExcelFileHeading): string {
+  addSelectSheet(wb: any, heading: IExcelFileHeading): string {
     const name = this.formatName(heading.key);
-    const companies = wb.addWorksheet(name);
-    const companyHeadings = [heading.key];
-    companies.addRow(companyHeadings);
-    heading.selectValues.forEach((value) => companies.addRow([value]));
+    const addedSheet = wb.addSheet(name);
+    addedSheet.cell('A1').value(heading.key);
+    heading.selectValues.forEach((value, index) => addedSheet.cell(`A${index + 2}`).value(value));
 
     return name;
   }
@@ -110,11 +109,12 @@ export class ExcelFileService {
 
     headings.forEach((heading, index) => {
       if (heading.type === ColumnTypesEnum.SELECT) {
+        const keyName = this.addSelectSheet(workbook, heading);
         const columnName = this.getExcelColumnNameFromIndex(index + 1);
         worksheet.range(`${columnName}2:${columnName}9999`).dataValidation({
           type: 'list',
           allowBlank: !heading.isRequired,
-          formula1: `"${heading.selectValues.join(',')}"`,
+          formula1: `${keyName}!$A$2:$A$9999`,
           ...(!heading.allowMultiSelect
             ? {
                 showErrorMessage: true,

diff --git a/apps/widget/src/hooks/Phase1/usePhase1.ts b/apps/widget/src/hooks/Phase1/usePhase1.ts
@@ -8,7 +8,7 @@ import { useAPIState } from '@store/api.context';
 import { useAppState } from '@store/app.context';
 import { IFormvalues, IUploadValues } from '@types';
 import { useImplerState } from '@store/impler.context';
-import { ColumnTypesEnum, IErrorObject, IOption, ITemplate, IUpload } from '@impler/shared';
+import { ColumnTypesEnum, IErrorObject, IOption, ISchemaItem, ITemplate, IUpload } from '@impler/shared';
 import { FileMimeTypesEnum, IImportConfig, downloadFile } from '@impler/shared';
 import { downloadFileFromURL, getFileNameFromUrl, notifier, ParentWindow } from '@util';
 
@@ -165,9 +165,14 @@ export function usePhase1({ goNext }: IUsePhase1Props) {
     }
 
     const foundTemplate = findTemplate();
+    let parsedSchema: ISchemaItem[] | undefined = undefined;
+    try {
+      if (schema) parsedSchema = JSON.parse(schema);
+    } catch (error) {}
+
     if (foundTemplate && ((Array.isArray(data) && data.length > variables.baseIndex) || schema)) {
-      const isMultiSelect = Array.isArray(schema)
-        ? schema.some((schemaItem) => schemaItem.type === ColumnTypesEnum.SELECT && schemaItem.allowMultiSelect)
+      const isMultiSelect = Array.isArray(parsedSchema)
+        ? parsedSchema.some((schemaItem) => schemaItem.type === ColumnTypesEnum.SELECT && schemaItem.allowMultiSelect)
         : foundTemplate.sampleFileUrl?.endsWith('xlsm');
       downloadSample([foundTemplate._id, foundTemplate.name, !!isMultiSelect]);
     } else if (foundTemplate && foundTemplate.sampleFileUrl) {

diff --git a/apps/widget/src/hooks/Phase3/MultiSelectEditor.ts b/apps/widget/src/hooks/Phase3/MultiSelectEditor.ts
@@ -15,7 +15,7 @@ export class MultiSelectEditor extends BaseEditor {
     if (this.timer) this.hot.rootWindow.clearTimeout(this.timer);
   }
   getValue() {
-    return [...this.value].join(',');
+    return this.value.size ? [...this.value].join(',') : undefined;
   }
   setValue(value: string) {
     this.value = new Set(value ? value.split(',') : []);