drapcode-utility 2.5.2-preview → 2.5.3

package/build/utils/util.js

@@ -408,21 +408,19 @@ const parseJsonString = (str) => {
 exports.parseJsonString = parseJsonString;
 const parseValueFromData = (data, fieldName) => {
     let value = "";
-    let valueIndex = "";
-    let valueIndexFieldName = "";
     if (fieldName && fieldName.includes(".")) {
         let fullNameParts = fieldName.split(".");
         let prefix = "";
-        let stack = data || {};
+        let stack = data || "";
         for (let k = 0; k < fullNameParts.length; k++) {
             prefix = fullNameParts[k];
-            if (stack && Array.isArray(stack)) {
+            if (Array.isArray(stack)) {
                 stack[prefix] = stack.map((item) => {
                     if (item[prefix])
                         return item[prefix];
                 });
             }
-            if (stack && !stack[prefix]) {
+            if (stack && stack[prefix] === undefined) {
                 stack[prefix] = "";
             }
             stack = stack[prefix];
@@ -432,57 +430,14 @@ const parseValueFromData = (data, fieldName) => {
             value = value.filter(() => true);
         }
     }
-    else if (fieldName && fieldName.includes("[")) {
-        //Todo: Need to Refactor
-        let fullNameParts = fieldName.split("[");
-        let prefix = "";
-        let stack = data || {};
-        for (let k = 0; k < fullNameParts.length - 1; k++) {
-            const cValue = fullNameParts[k];
-            const nValue = fullNameParts[k + 1];
-            prefix = cValue ? (!cValue.includes("]") ? cValue : "") : "";
-            valueIndex = nValue
-                ? nValue.includes("]")
-                    ? nValue.split("]")[0]
-                    : nValue
-                : "";
-            if (stack && Array.isArray(stack)) {
-                stack[prefix] = stack.map((item) => {
-                    if (item[prefix])
-                        return item[prefix];
-                });
-            }
-            if (stack && !stack[prefix]) {
-                stack[prefix] = "";
-            }
-            stack = valueIndex ? stack[prefix][valueIndex] : stack[prefix];
-            if (fieldName.includes("]:")) {
-                valueIndexFieldName = nValue.split("]:")[1];
-                if (valueIndexFieldName) {
-                    stack = stack[valueIndexFieldName];
-                }
-            }
-        }
-        value = stack ? stack : "";
-        if (Array.isArray(value)) {
-            value = value.filter(() => true);
-        }
-    }
     else {
         value = data ? data[fieldName] : "";
     }
-    if (value && Array.isArray(value) && value.length === 1)
-        return value[0];
     if (value && Array.isArray(value) && typeof value[0] === "string") {
-        return value.join(",");
+        return value.join(", ");
     }
-    if (!value || value == "undefined" || value === "undefined") {
-        if (value === 0) {
-            value = "0";
-        }
-        else {
-            value = "";
-        }
+    if (typeof value !== undefined && typeof value === "number") {
+        return value.toString();
     }
     return value;
 };
@@ -640,12 +595,22 @@ const fillDefaultValues = (collection, itemdata) => {
         !fieldTypesToSkip.includes(field.type));
     allFields.forEach((field) => {
         const fieldName = field.fieldName;
+        const currentValue = filledItemData[fieldName];
+        const isEmptyArray = Array.isArray(currentValue) && currentValue.length === 0;
         if (!(fieldName in filledItemData) ||
             filledItemData[fieldName] === "" ||
             filledItemData[fieldName] === 0 ||
-            filledItemData[fieldName] === false) {
+            filledItemData[fieldName] === false ||
+            isEmptyArray) {
             const formattedField = JSON.parse(JSON.stringify(field));
-            if (field.extraFieldSetting &&
+            console.log("These are the field types: ", field.type, typeof field.type);
+            if (field.type === "static_option") {
+                if (formattedField.extraFieldSetting?.staticDefaultValue?.length > 0) {
+                    filledItemData[fieldName] =
+                        formattedField.extraFieldSetting.staticDefaultValue[0];
+                }
+            }
+            else if (field.extraFieldSetting &&
                 "defaultValue" in formattedField.extraFieldSetting) {
                 filledItemData[fieldName] = assignFieldValue(formattedField, field, fieldName, filledItemData);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.5.2-preview",
+  "version": "2.5.3",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,9 +42,9 @@
     "axios": "^1.1.2",
     "date-fns": "^4.1.0",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^2.0.3-preview",
-    "drapcode-logger": "^1.3.5-preview",
-    "drapcode-redis": "^1.5.0-preview",
+    "drapcode-constant": "^2.0.3",
+    "drapcode-logger": "^1.3.5",
+    "drapcode-redis": "^1.5.0",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",