zet-lib 3.3.4 → 3.3.6

package/lib/Form.js

@@ -508,7 +508,9 @@ Form.field = (obj) => {
       });
       value = value || [];
       value.map((item, index) => {
-        leftButtons += `<li><button class="btn btn-primary boxy" type="button">${obj.dataObject[item]}<input type="hidden" name='${obj.name}[]' value="${item}"></button></li>`;
+        if (obj.dataObject && item in obj.dataObject) {
+          leftButtons += `<li><button class="btn btn-primary boxy" type="button">${obj.dataObject[item]}<input type="hidden" name='${obj.name}[]' value="${item}"></button></li>`;
+        }
       });
 
       displayForm += `<div id="dragdrop_${obj.id}" class="row contentfields">

package/lib/zRoute.js

@@ -205,12 +205,52 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
 
       case "dragdrop":
         let cleaning2;
-        if (Array.isArray(post[routeName][key])) {
-          cleaning2 = post[routeName][key]
-              ? post[routeName][key].filter((item) => item)
-              : null;
+        let dragdropValue = post[routeName] && post[routeName][key] !== undefined ? post[routeName][key] : null;
+
+        // Helper function to convert object with numeric keys to array
+        const convertToArray = (value) => {
+          if (Array.isArray(value)) {
+            return value;
+          }
+          if (value && typeof value === 'object' && !Array.isArray(value)) {
+            // Check if it's an object with numeric keys (like {"0":"111","1":"138"})
+            const keys = Object.keys(value);
+            const numericKeys = keys.filter(k => /^\d+$/.test(k));
+            if (numericKeys.length === keys.length && numericKeys.length > 0) {
+              // Convert object with numeric keys to array
+              return numericKeys.map(k => value[k]).filter(item => item !== null && item !== undefined && item !== '');
+            }
+          }
+          return null;
+        };
+
+        // Handle case where value might be string (JSON) or already an array
+        if (dragdropValue === null || dragdropValue === undefined) {
+          cleaning2 = null;
+        } else if (typeof dragdropValue === 'string') {
+          try {
+            dragdropValue = JSON.parse(dragdropValue);
+            let arr = convertToArray(dragdropValue);
+            if (arr) {
+              cleaning2 = arr.filter((item) => item !== null && item !== undefined && item !== '');
+            } else {
+              cleaning2 = dragdropValue ? [dragdropValue] : null;
+            }
+          } catch (e) {
+            // If not valid JSON, treat as single value array
+            cleaning2 = dragdropValue ? [dragdropValue] : null;
+          }
+        } else if (Array.isArray(dragdropValue)) {
+          cleaning2 = dragdropValue.filter((item) => item !== null && item !== undefined && item !== '');
+        } else if (dragdropValue && typeof dragdropValue === 'object') {
+          // Handle object with numeric keys (converted by qs.parse for large arrays)
+          let arr = convertToArray(dragdropValue);
+          cleaning2 = arr ? arr.filter((item) => item !== null && item !== undefined && item !== '') : null;
+        } else {
+          // Single value, convert to array
+          cleaning2 = dragdropValue ? [dragdropValue] : null;
         }
-        post[routeName][key] = cleaning2 ? JSON.stringify(cleaning2) : null;
+        post[routeName][key] = cleaning2 && cleaning2.length > 0 ? JSON.stringify(cleaning2) : null;
         break;
 
       case "lexical":
@@ -5321,22 +5361,26 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
         data: data,
       });
       //save to history
-      connection.insert({
-        table: "zhistory",
-        data: {
-          module_id: result.id,
-          module: MYMODEL.table,
-          data_1: JSON.stringify(result),
-          data_2: JSON.stringify(myresult),
-          data_1_date: result.updated_at,
-          data_2_date: data.updated_at,
-          created_by: userId,
-          updated_by: userId,
-          created_at: Util.now(),
-          updated_at: Util.now(),
-          company_id: res.locals.companyId,
-        },
-      });
+      try {
+        connection.insert({
+          table: "zhistory",
+          data: {
+            module_id: result.id,
+            module: MYMODEL.table,
+            data_1: JSON.stringify(result),
+            data_2: JSON.stringify(myresult),
+            data_1_date: result.updated_at,
+            data_2_date: data.updated_at,
+            created_by: userId,
+            updated_by: userId,
+            created_at: Util.now(),
+            updated_at: Util.now(),
+            company_id: res.locals.companyId,
+          },
+        });
+      } catch (e) {
+        console.log(e)
+      }
       zRoute.modelsCacheRenew(table, res.locals.companyId);
       return myresult;
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "3.3.4",
+  "version": "3.3.6",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"