Merge pull request #1557 from rockingrohit9639/fix/boolean-imports

fix(asset-import): fix issue with boolean field while importing
Shelf-nu · Jan 6, 2025 · f3e1790 · f3e1790
2 parents c5c0459 + 4e2267e
commit f3e1790
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/components/assets/custom-fields-inputs.tsx b/app/components/assets/custom-fields-inputs.tsx
@@ -77,7 +77,7 @@ export default function AssetCustomFields({
           name={`cf-${field.id}`}
           disabled={disabled}
           defaultChecked={
-            getCustomFieldVal(field.id) === "true" || field.required
+            getCustomFieldVal(field.id) === "Yes" || field.required
           }
         />
         <label className="font-medium text-gray-700 lg:hidden">

diff --git a/app/utils/csv.server.ts b/app/utils/csv.server.ts
@@ -55,7 +55,7 @@ export const parseCsv = (csvData: ArrayBuffer) => {
   const csv = iconv.decode(Buffer.from(csvData), encoding || "utf-8");
   const delimiter = guessDelimiters(csv, [",", ";"]);
 
-  return new Promise((resolve, reject) => {
+  return new Promise<CSVData>((resolve, reject) => {
     const parser = parse({
       encoding: "utf-8", // Set encoding to utf-8
       delimiter, // Set delimiter
@@ -95,7 +95,7 @@ export const csvDataFromRequest = async ({ request }: { request: Request }) => {
 
     const csvData = await csvFile.arrayBuffer();
 
-    return (await parseCsv(csvData)) as CSVData;
+    return await parseCsv(csvData);
   } catch (cause) {
     throw new ShelfError({
       cause,

diff --git a/app/utils/custom-fields.ts b/app/utils/custom-fields.ts
@@ -168,8 +168,11 @@ export const buildCustomFieldValue = (
     }
 
     switch (def.type) {
-      case "BOOLEAN":
-        return { raw, valueBoolean: Boolean(raw) };
+      case "BOOLEAN": {
+        const finalValue =
+          typeof raw === "string" ? raw === "yes" : Boolean(raw);
+        return { raw, valueBoolean: finalValue };
+      }
       case "DATE": {
         // Store raw date as entered by user
         // But format valueDate as ISO string with UTC midnight to satisfy DB constraint