@steedos-labs/plugin-workflow 3.0.23 → 3.0.24

package/main/default/manager/uuflow_manager.js

@@ -165,9 +165,10 @@ UUFlowManager.getSpaceUser = async function (space_id, user_id, options = {}) {
  * @throws {Error} If flow not found
  */
 UUFlowManager.getFlow = async function (flow_id, options = {}) {
+    let now;
     UUFlowManager.stats.getFlow++;
     if (process.env.STEEDOS_DEBUG) {
-        const now = new Date().toISOString();
+        now = new Date().toISOString();
         console.time('UUFlowManager.getFlow' + now);
     }
     
@@ -4264,6 +4265,7 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
                 submitter: 1,
                 traces: 1,
                 form: 1,
+                form_version: 1,
                 flow_version: 1,
                 space: 1,
                 flow: 1
@@ -4342,6 +4344,65 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
         }
     }
 
+    // Convert date/datetime field values from ISO strings to Date objects
+    // Fetch form to check field types and get name formula
+    // For draft save, always use current form version (not historys which could be very large)
+    const form = await db.forms.findOne(
+        { _id: form_id },
+        { projection: { 'current._id': 1, 'current.fields': 1, 'current.name_forumla': 1 } }
+    );
+    
+    // Draft save always uses current form version
+    const formVersion = form?.current;
+    
+    // Convert date strings to Date objects for proper MongoDB storage
+    if (formVersion && formVersion.fields && values) {
+        const convertFieldValue = (field, value) => {
+            if (!value) return value;
+            
+            // Handle date and datetime fields - convert ISO strings to Date objects
+            if (field.type === 'date' || field.type === 'datetime') {
+                // Check if value is a string (ISO date format from frontend)
+                if (typeof value === 'string') {
+                    const dateObj = new Date(value);
+                    // Validate it's a valid date
+                    if (!isNaN(dateObj.getTime())) {
+                        return dateObj;
+                    }
+                }
+            }
+            // Handle table fields (subforms)
+            else if (field.type === 'table' && Array.isArray(value) && field.fields) {
+                return value.map(row => {
+                    const convertedRow = {...row};
+                    field.fields.forEach(subField => {
+                        if (row[subField.code] !== undefined) {
+                            convertedRow[subField.code] = convertFieldValue(subField, row[subField.code]);
+                        }
+                    });
+                    return convertedRow;
+                });
+            }
+            
+            return value;
+        };
+        
+        // Process all form fields
+        formVersion.fields.forEach(field => {
+            if (field.type === 'section' && field.fields) {
+                // Process section's child fields
+                field.fields.forEach(sectionField => {
+                    if (values[sectionField.code] !== undefined) {
+                        values[sectionField.code] = convertFieldValue(sectionField, values[sectionField.code]);
+                    }
+                });
+            } else if (values[field.code] !== undefined) {
+                // Process regular fields
+                values[field.code] = convertFieldValue(field, values[field.code]);
+            }
+        });
+    }
+
     setObj[key_str + 'values'] = values;
     setObj[key_str + 'description'] = description;
     setObj[key_str + 'judge'] = 'submitted';
@@ -4352,11 +4413,6 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
     }
 
     // Calculate instance name
-    const form = await db.forms.findOne(
-        { _id: form_id },
-        { projection: { 'current.name_forumla': 1 } }
-    );
-
     if (form?.current?.name_forumla) {
         setObj.name = await UUFlowManager.getInstanceName(ins, values);
         if(result !== 'upgraded'){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.23",
+  "version": "3.0.24",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {