@xuda.io/runtime-bundle 1.0.717 → 1.0.719

package/js/xuda-runtime-slim.js

@@ -2899,7 +2899,7 @@ func.datasource.create = async function (
   rowIdP,
   jobNoP,
   calling_trigger_prop,
-  parameters_raw_obj,
+  screen_param,
   NA_isInitP,
   NA_callingSourceP,
   calling_jobP,
@@ -2932,7 +2932,6 @@ func.datasource.create = async function (
       parameters_obj_inP,
       static_refreshP,
       worker_id,
-      parameters_raw_obj,
     };
 
     var IS_DATASOURCE_REFRESH = null;
@@ -3068,7 +3067,7 @@ func.datasource.create = async function (
         args.rowIdP,
         args.jobNoP,
         args.calling_trigger_prop,
-        args.parameters_raw_obj,
+        null,
         null,
         null,
         args.calling_jobP,
@@ -3109,7 +3108,7 @@ func.datasource.create = async function (
     return done(SESSION_ID, jsonP.dsSession, true);
   });
 };
-func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, parentDataSourceNoP, containerIdP, rowIdP, jobNoP, calling_trigger_prop, parameters_raw_obj, NA_isInitP, callingSourceP, calling_jobP, NA_screen_dsP, is_panelP, parameters_obj_inP, static_refreshP, run_atP, worker_id) {
+func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, parentDataSourceNoP, containerIdP, rowIdP, jobNoP, calling_trigger_prop, NA_screen_param, NA_isInitP, callingSourceP, calling_jobP, NA_screen_dsP, is_panelP, parameters_obj_inP, static_refreshP, run_atP, worker_id) {
   const set_parameters = async function () {
     var _session = SESSION_OBJ[SESSION_ID];
     const get_Out_parameters = async function (fieldIdP, located_field_param_idxP, param_row_idP) {
@@ -3238,7 +3237,6 @@ func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, pa
     static_refreshP,
     run_atP,
     worker_id,
-    parameters_raw_obj,
   };
 
   var dataSourceSession = null;
@@ -3860,8 +3858,8 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
       }
 
       // initiated with Update but no rows found
-      if (tree_obj.crudMode === 'U' && tree_obj.allowCreate && !_ds?.data_feed?.rows?.length) {
-        // if (tree_obj.crudMode === 'U' && tree_obj.allowCreate && !_raw_data_rows?.length) {
+      // if (tree_obj.crudMode === 'U' && tree_obj.allowCreate && !_ds?.data_feed?.rows?.length) {
+      if (tree_obj.crudMode === 'U' && tree_obj.allowCreate && !_raw_data_rows?.length) {
         _ds.set_mode = 'C';
         // _raw_data_rows[glb.newRecord] = [{ _ROWID: "newRecord" }];
 
@@ -4157,7 +4155,7 @@ func.datasource.run_events_functions = async function (SESSION_ID, dataSourceSes
                   clearInterval(interval);
                   resolve(job_num);
                 }
-                if (i > 50) {
+                if (i > 20) {
                   console.error('deadlock detected');
                   clearInterval(interval);
                   resolve(job_num);
@@ -4895,18 +4893,6 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
 
                 if (!fields_changed.includes(field_id)) {
                   fields_changed.push(field_id);
-
-                  ///// REFRESH PARAMETERS IN
-                  // for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
-                  //   if (_ds.args.parameters_raw_obj) {
-                  //     for (const [key, exp] of Object.entries(_ds.args.parameters_raw_obj)) {
-                  //       if (exp.includes(field_id)) {
-                  //         let ret = await func.expression.get(SESSION_ID, exp, _dsSession, 'parameters');
-                  //         _ds.in_parameters[key].value = ret.result;
-                  //       }
-                  //     }
-                  //   }
-                  // }
                 }
                 if (!datasource_changed.includes(dataSource)) {
                   datasource_changed.push(dataSource);
@@ -4953,19 +4939,6 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
           datasource_changed[0], // refresh the current datasource only
         );
       }
-      // ///// REFRESH PARAMETERS IN
-      // if (fields_changed.length) {
-      //   for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
-      //     if (_ds.args.parameters_raw_obj) {
-      //       for (const [key, val] of Object.entries(_ds.args.parameters_raw_obj)) {
-      //         if (fields_changed.includes(val)) {
-      //           let ret = await func.expression.get(SESSION_ID, '@' + val, _dsSession, 'parameters');
-      //           _ds.in_parameters[val].value = ret.result;
-      //         }
-      //       }
-      //     }
-      //   }
-      // }
     }
     resolve();
   });
@@ -11189,7 +11162,7 @@ func.expression.secure_eval = async function (SESSION_ID, sourceP, val, job_id,
   }
 };
  func.UI.screen = {};
-func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callingDataSource_objP, $callingContainerP, triggerIdP, rowIdP, jobNoP, is_panelP, parameters_obj_inP, source_functionP, call_screen_propertiesP, refreshed_ds, parameters_raw_obj) {
+func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callingDataSource_objP, $callingContainerP, triggerIdP, rowIdP, jobNoP, is_panelP, parameters_obj_inP, source_functionP, call_screen_propertiesP, refreshed_ds) {
   if (!prog_id) return console.error('program is empty');
   let screen_ret = await func.utils.get_screen_obj(SESSION_ID, prog_id);
   if (!screen_ret) return console.error('program is not a screen object');
@@ -11242,7 +11215,6 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     screenInfo,
     call_screen_propertiesP,
     parentDataSourceNoP: _session.DS_GLB?.[callingDataSource_objP?.dsSession]?.dsSession || callingDataSource_objP?.parentDataSourceNo || 0,
-    parameters_raw_obj,
   };
 
   switch (screen_type) {
@@ -11409,7 +11381,7 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     rowIdP,
     jobNoP,
     null,
-    parameters_raw_obj,
+    null,
     null,
     null,
     null,
@@ -12016,200 +11988,212 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
   }
 };
 
-func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
-  // check the main program
-  if (fields_changed_datasource) {
-    const _session = SESSION_OBJ[SESSION_ID];
-    const _ds = _session.DS_GLB[fields_changed_datasource];
-    const prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, _ds.prog_id);
-    const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
-    for (const field_id of fields_changed_arr || []) {
-    }
-  }
+// func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
+//   // check the main program
+//   if (fields_changed_datasource) {
+//     const _session = SESSION_OBJ[SESSION_ID];
+//     const _ds = _session.DS_GLB[fields_changed_datasource];
+//     const prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, _ds.prog_id);
+//     const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
+//     for (const field_id of fields_changed_arr || []) {
 
-  const panels_obj = await func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $(SESSION_OBJ[SESSION_ID].root_element), false);
+//     }
+//   }
 
-  for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
-    const progDataSource_str = JSON.stringify(panel_val.prog_doc.progDataSource);
+//   const panels_obj = await func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $(SESSION_OBJ[SESSION_ID].root_element), false);
 
-    var found, refresh_reason, refresh_details;
-    if (fields_changed_arr) {
-      if (fields_changed_datasource && panel_val._ds.dsSession <= Number(fields_changed_datasource)) {
-        continue;
-      }
-      for (const field_id of fields_changed_arr) {
-        // get panel attributes
-        const _attributes = panel_val?.panelXuAttributes || {};
+//   for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
+//     const progDataSource_str = JSON.stringify(panel_val.prog_doc.progDataSource);
 
-        // detect if program changed
-        found = _attributes['xu-exp:program']?.includes('@' + field_id);
+//     var found, refresh_reason, refresh_details;
+//     if (fields_changed_arr) {
+//       if (fields_changed_datasource && panel_val._ds.dsSession <= Number(fields_changed_datasource)) {
+//         continue;
+//       }
+//       for (const field_id of fields_changed_arr) {
+//         // get panel attributes
+//         const _attributes = panel_val?.panelXuAttributes || {};
 
-        if (found) {
-          refresh_reason = `program ${_attributes['xu-exp:program']} ${field_id} changed `;
-          refresh_details = _attributes;
-          break;
-        }
+//         // detect if program changed
+//         found = _attributes['xu-exp:program']?.includes('@' + field_id);
 
-        // _attributes holds also info of parameters in code_in: @code
-        // search field changed in panel call send parameters exp
-        for (const [attr, value] of Object.entries(_attributes)) {
-          const pattern = /xu-exp:(\w+)/;
-          const match = attr.match(pattern);
+//         if (found) {
+//           refresh_reason = `program ${_attributes['xu-exp:program']} ${field_id} changed `;
+//           refresh_details = _attributes;
+//           break;
+//         }
 
-          if (!match) {
-            // continue if attribute is not expression
-            continue;
-          }
-          // code_in
-          const parameter_in_field_id = match?.[1];
-          // @code
-          if (value.includes(field_id)) {
-            // search parameter in field in the target program's progDataSource
-            found = progDataSource_str?.includes('@' + parameter_in_field_id);
+//         // _attributes holds also info of parameters in code_in: @code
+//         // search field changed in panel call send parameters exp
+//         for (const [attr, value] of Object.entries(_attributes)) {
+//           const pattern = /xu-exp:(\w+)/;
+//           const match = attr.match(pattern);
 
-            if (found) {
-              refresh_reason = `field ${field_id} in progDataSource parameter_in changed`;
-              refresh_details = panel_val?.prog_doc?.progDataSource;
+//           if (!match) {
+//             // continue if attribute is not expression
+//             continue;
+//           }
+//           // code_in
+//           const parameter_in_field_id = match?.[1];
+//           // @code
+//           if (value.includes(field_id)) {
+//             // search parameter in field in the target program's progDataSource
+//             found = progDataSource_str?.includes('@' + parameter_in_field_id);
 
-              break;
-            }
+//             if (found) {
+//               refresh_reason = `field ${field_id} in progDataSource parameter_in changed`;
+//               refresh_details = panel_val?.prog_doc?.progDataSource;
 
-            // found = find_field_in_progUi(prog_doc.progUi, parameter_in_field_id, 'xu-for');
-            found = func.UI.find_field_in_progUi_attributes(panel_val.prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
+//               break;
+//             }
 
-            if (found) {
-              refresh_reason = `field ${field_id} in progUi xu-for parameter_in changed`;
-              refresh_details = found;
+//             // found = find_field_in_progUi(prog_doc.progUi, parameter_in_field_id, 'xu-for');
+//             found = func.UI.find_field_in_progUi_attributes(panel_val.prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
 
-              break;
-            }
-          }
-        }
+//             if (found) {
+//               refresh_reason = `field ${field_id} in progUi xu-for parameter_in changed`;
+//               refresh_details = found;
 
-        if (found) break;
+//               break;
+//             }
+//           }
+//         }
 
-        // search field changed in the target program's progDataSource  // @code
-        found = progDataSource_str?.includes('@' + field_id);
-        if (found) {
-          refresh_reason = `field ${field_id} in progDataSource changed`;
-          refresh_details = panel_val?.prog_doc?.progDataSource;
+//         if (found) break;
 
-          break;
-        }
+//         // search field changed in the target program's progDataSource  // @code
+//         found = progDataSource_str?.includes('@' + field_id);
+//         if (found) {
+//           refresh_reason = `field ${field_id} in progDataSource changed`;
+//           refresh_details = panel_val?.prog_doc?.progDataSource;
 
-        found = func.UI.find_field_in_progUi_attributes(panel_val.prog_doc.progUi, field_id, 'xu-for').length;
-        if (found) {
-          refresh_reason = `field ${field_id} in progUi xu-for changed`;
-          refresh_details = found;
+//           break;
+//         }
 
-          break;
-        }
+//         found = func.UI.find_field_in_progUi_attributes(panel_val.prog_doc.progUi, field_id, 'xu-for').length;
+//         if (found) {
+//           refresh_reason = `field ${field_id} in progUi xu-for changed`;
+//           refresh_details = found;
 
-        if (found) {
-          break;
-        }
-      }
-    }
+//           break;
+//         }
 
-    if (datasource_changed) {
-      if (panel_val._ds.dsSession == datasource_changed) {
-        refresh_reason = `panel datasource ${datasource_changed} changed`;
-        refresh_details = '';
+//         if (found) {
+//           break;
+//         }
+//       }
+//     }
 
-        found = true;
-      }
-    }
-    if (found) {
-      const _session = SESSION_OBJ[SESSION_ID];
-      if (_session.engine_mode === 'live_preview') {
-        console.info('========= refresh info ==============');
-        console.info('reason:', refresh_reason);
-        console.info('details:', refresh_details);
-        console.info('panel:', panel_val);
-        console.info('=====================================');
-      }
-      const $div_elm = panel_val.$panel_div;
-      const wrapper_data = $div_elm.data();
+//     if (datasource_changed) {
+//       if (panel_val._ds.dsSession == datasource_changed) {
+//         refresh_reason = `panel datasource ${datasource_changed} changed`;
+//         refresh_details = '';
 
-      if (_.isEmpty(wrapper_data)) continue;
+//         found = true;
+//       }
+//     }
+//     if (found) {
+//       const _session = SESSION_OBJ[SESSION_ID];
+//       if (_session.engine_mode === 'live_preview') {
+//         console.info('========= refresh info ==============');
+//         console.info('reason:', refresh_reason);
+//         console.info('details:', refresh_details);
+//         console.info('panel:', panel_val);
+//         console.info('=====================================');
+//       }
+//       const $div_elm = panel_val.$panel_div;
+//       const wrapper_data = $div_elm.data();
 
-      try {
-        const ts = Date.now();
-        // remove old panel content
-        $.each(panel_val.ids, async function (key, val) {
-          $("[xu-ui-id='" + val + "']")
-            .attr('xu-ui-id', val + ts)
-            .removeData();
-        });
+//       if (_.isEmpty(wrapper_data)) continue;
 
-        let refreshed_ds;
-        // check if ds exist and deleted by garbage collector
+//       try {
+//         const ts = Date.now();
+//         // remove old panel content
+//         $.each(panel_val.ids, async function (key, val) {
+//           $("[xu-ui-id='" + val + "']")
+//             .attr('xu-ui-id', val + ts)
+//             .removeData();
+//         });
 
-        if (_session.DS_GLB[panel_val._ds.dsSession]) {
-          refreshed_ds = panel_val._ds.dsSession;
-        }
-        for await (const item of wrapper_data.xuData.node_org.children) {
-          if (item.tagName !== 'xu-panel') continue;
+//         let refreshed_ds;
+//         // check if ds exist and deleted by garbage collector
 
-          const new_$div = await func.UI.screen.render_ui_tree(
-            SESSION_ID,
-            $div_elm, // the wrapper
-            _.cloneDeep(item), // _.cloneDeep(wrapper_data.xuData.node_org.children[0]), // the xu-panel node
-            {},
-            wrapper_data.xuData.paramsP, // the wrapper params
-            null,
-            null,
-            wrapper_data.xuData.key, // the wrapper key
-            refreshed_ds, // the refreshed_ds
-            wrapper_data.xuData.parent_node, // the wrapper parent node
-            null,
-            wrapper_data.xuData.$root_container, // the wrapper root container
-          );
-        }
+//         if (_session.DS_GLB[panel_val._ds.dsSession]) {
+//           refreshed_ds = panel_val._ds.dsSession;
+//         }
+//         for await (const item of wrapper_data.xuData.node_org.children) {
+//           if (item.tagName !== 'xu-panel') continue;
 
-        // remove old panel content
-        $.each(panel_val.ids, async function (key, val) {
-          $("[xu-ui-id='" + val + ts + "']").remove();
-        });
-      } catch (error) {
-        debugger;
-      }
-      // continue;
-    }
-  }
-};
+//           const new_$div = await func.UI.screen.render_ui_tree(
+//             SESSION_ID,
+//             $div_elm, // the wrapper
+//             _.cloneDeep(item), // _.cloneDeep(wrapper_data.xuData.node_org.children[0]), // the xu-panel node
+//             {},
+//             wrapper_data.xuData.paramsP, // the wrapper params
+//             null,
+//             null,
+//             wrapper_data.xuData.key, // the wrapper key
+//             refreshed_ds, // the refreshed_ds
+//             wrapper_data.xuData.parent_node, // the wrapper parent node
+//             null,
+//             wrapper_data.xuData.$root_container, // the wrapper root container
+//           );
+//         }
+
+//         // remove old panel content
+//         $.each(panel_val.ids, async function (key, val) {
+//           $("[xu-ui-id='" + val + ts + "']").remove();
+//         });
+//       } catch (error) {
+//         debugger;
+//       }
+//       // continue;
+//     }
+//   }
+// };
 
 const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession) {
   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
   if (!_prog) return;
 
   // get in parameters
-  let params_res = {},
-    params_raw = {};
+  var params_obj = {};
   if (_prog?.properties?.progParams) {
     for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
       if (!['in', 'out'].includes(val.data.dir)) continue;
 
       if (nodeP.attributes) {
         if (nodeP.attributes[val.data.parameter]) {
-          params_res[val.data.parameter] = nodeP.attributes[val.data.parameter];
+          params_obj[val.data.parameter] = nodeP.attributes[val.data.parameter];
         } else if (nodeP.attributes[`xu-exp:${val.data.parameter}`]) {
           if (val.data.dir == 'out') {
             // only reference
-            params_res[val.data.parameter] = nodeP.attributes[`xu-exp:${val.data.parameter}`].replaceAll('@', '');
+            params_obj[val.data.parameter] = nodeP.attributes[`xu-exp:${val.data.parameter}`].replaceAll('@', '');
           } else {
             // in parameter
             let ret = await func.expression.get(SESSION_ID, nodeP.attributes[`xu-exp:${val.data.parameter}`], dsSession, 'parameters');
-            params_res[val.data.parameter] = ret.result;
-            params_raw[val.data.parameter] = nodeP.attributes[`xu-exp:${val.data.parameter}`];
+            params_obj[val.data.parameter] = ret.result;
           }
         }
+
+        // if (parameters_obj_inP?.[val.data.parameter].fx) {
+        //   let ret = await func.expression.get(
+        //     SESSION_ID,
+        //     parameters_obj_inP?.[val.data.parameter].fx,
+        //     dsSession,
+        //     "parameters"
+        //   );
+        //   params_obj[val.data.parameter] = ret.result;
+        // } else {
+        //   params_obj[val.data.parameter] =
+        //     parameters_obj_inP?.[val.data.parameter].value;
+        // }
         continue;
       }
       console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
     }
   }
-  return { params_res, params_raw };
+  return params_obj;
 };
 
 func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, xu_func, $elm, val, is_init, refreshed_ds) {
@@ -12226,8 +12210,8 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         const init_program = async function () {
           async function render_panel() {
             const prog_id = val.value?.prog || val.value;
-            const params_obj = await get_params_obj_new(SESSION_ID, prog_id, nodeP, paramsP.dsSessionP);
-            let ret_panel = await func.UI.screen.init(SESSION_ID, prog_id, paramsP.screenId, _ds, $elm, null, _ds.currentRecordId, null, true, params_obj.params_res, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds, params_obj.params_raw);
+            const param_obj = await get_params_obj_new(SESSION_ID, prog_id, nodeP, paramsP.dsSessionP);
+            let ret_panel = await func.UI.screen.init(SESSION_ID, prog_id, paramsP.screenId, _ds, $elm, null, _ds.currentRecordId, null, true, param_obj, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds);
             ret = { $new_div: ret_panel };
             $container.data().xuData.xuPanelProps = $elm.data().xuAttributes;
             $container.data().xuData.xuPanelData = ret_panel.data();
@@ -12276,8 +12260,8 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
             const program = val.value?.prog || val.value;
             var $wrapper = $('<div>');
             var $div = func.UI.screen.create_container(SESSION_ID, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, nodeP.attributes, null, null, null, $wrapper, '');
-            const params_obj = await get_params_obj_new(SESSION_ID, program, nodeP, paramsP.dsSessionP);
-            let ret_init = await func.UI.screen.init(SESSION_ID, program, paramsP.screenId, _ds, $div, null, _ds.currentRecordId, jobNoP, true, params_obj.params_res, 'alterXu_panel', undefined, undefined, params_obj.params_raw);
+            const param_obj = await get_params_obj_new(SESSION_ID, program, nodeP, paramsP.dsSessionP);
+            let ret_init = await func.UI.screen.init(SESSION_ID, program, paramsP.screenId, _ds, $div, null, _ds.currentRecordId, jobNoP, true, param_obj, 'alterXu_panel');
             ret = {
               $new_div: ret_init,
               abort: true,