@xuda.io/runtime-bundle 1.0.290 → 1.0.291

package/js/xuda-server-bundle.mjs

@@ -2656,6 +2656,7 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
             await func.datasource.execute_field_init_events(SESSION_ID, dataSourceSession, 'form', 'newRecord');
           }
         }
+        await func.datasource.callback(SESSION_ID, dataSourceSession, args.dataSourceNoP, args.rowIdP, args.jobNoP, null, _ds.prog_id);
       };
       if (!rows) {
         await row_not_found();
@@ -2943,64 +2944,6 @@ func.datasource.render_fields_form = async function (SESSION_ID, dataSourceSessi
   }
 };
 
-// func.datasource.run_rows_form = async function (
-//   SESSION_ID,
-//   dataSourceSession,
-//   rowIdxP,
-//   raw_data_row
-// ) {
-//   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-//   if (!_ds) return;
-//   let _ROWID = raw_data_row.id;
-//   // var val = _ds.data_feed.rows[rowIdxP];
-
-//   var idx = rowIdxP;
-
-//   const find_ROWID_idx_from_raw_data_arr = function (rowId) {
-//     if (!_ds?.v?.raw_data?.rows) {
-//       throw new Error("ds.v.raw_data.rows not found");
-//     }
-
-//     const index = _ds.v.raw_data.rows.findIndex((item) => item.id === rowId);
-//     if (index === -1) {
-//       throw new Error(`item.id "${rowId}" not found`);
-//     }
-//     return index;
-//   };
-
-//   try {
-//     idx = find_ROWID_idx_from_raw_data_arr(raw_data_row.id);
-//   } catch (e) {
-//     _ROWID = "newRecord";
-//     _ds.data_feed.rows.push({ _ROWID });
-//     idx = func.common.find_ROWID_idx(_ds, _ROWID);
-//   }
-
-//   _ds.currentRecordId = _ROWID; // set temporary to allow expression decoder work
-
-//   await func.datasource.render_fields_form(
-//     SESSION_ID,
-//     dataSourceSession,
-//     raw_data_row
-//   );
-//   const init_count = await func.datasource.get_field_init_count(
-//     SESSION_ID,
-//     dataSourceSession,
-//     _ROWID,
-//     false,
-//     _ds.oninit_triggers_to_run
-//   );
-//   if (init_count > 0) {
-//     await func.datasource.execute_field_init_events(
-//       SESSION_ID,
-//       dataSourceSession,
-//       "form",
-//       _ds.data_feed.rows[idx]._ROWID
-//     );
-//   }
-//   // await form_continue();
-// };
-
 func.datasource.execute_field_init_events = async function (SESSION_ID, dataSourceSession, sourceP, rowIdP) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var args = _ds.args;
@@ -3622,11 +3565,6 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
             _ds.currentRecordId = record_id;
           }
         }
-        // if (!_ds.data_feed.rows_changed) {
-        //   _ds.data_feed.rows_changed = [];
-        // }
-        // if (!_ds.data_feed.rows_changed.includes(record_id))
-        //   _ds.data_feed.rows_changed.push(record_id);
       }
     }
 
@@ -3660,234 +3598,6 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
   });
 };
 
-// func.datasource.update = async function (
-//   SESSION_ID,
-//   datasource_changes,
-//   update_local_scope_only
-// ) {
-//   return new Promise(async (resolve, reject) => {
-//     var _session = SESSION_OBJ[SESSION_ID];
-
-//     if (typeof glb.GLOBAL_VARS === "undefined") {
-//       glb.GLOBAL_VARS = (
-//         await func.common.get_module(
-//           SESSION_ID,
-//           "xuda-system-globals-module.mjs"
-//         )
-//       ).system_globals;
-//     }
-
-//     let fieldComputed_datasource_changes = {};
-
-//     const set_fieldComputed_dependencies = async function (dsNo, field_id, parent_ds) {
-
-//       // iterate child ds
-//       for (const [dsSession, _ds] of Object.entries(_session.DS_GLB)) {
-//         if (parent_ds !== null) {
-//           if (_ds.parentDataSourceNo != parent_ds) continue
-//         } else {
-//           if (dsSession != dsNo) continue
-//         }
-//         let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-//         if (tree_ret.menuType === "component" || tree_ret.menuType === "globals") {
-//           // check if field has fieldComputed property
-//           const _progFields = await func.datasource.get_progFields(
-//             SESSION_ID,
-//             dsSession
-//           );
-//           // find if field is computed
-//           let propExpressions
-//           for await (const val of _progFields) {
-
-//             const fieldId = val.data.field_id;
-
-//             if (fieldId !== field_id) continue
-//             if (val.data.type !== "virtual" || !val.props.fieldComputed) break
-
-//             const _propExpressions = val.props?.propExpressions?.fieldValue
-//             if (_propExpressions && JSON.stringify(_propExpressions).includes(field_id)) {
-//               propExpressions = _propExpressions
-//             }
-//           }
-
-//           if (!propExpressions) return
-
-//           if (!fieldComputed_datasource_changes[dsSession]) {
-//             fieldComputed_datasource_changes[dsSession] = {}
-//           }
-//           // iterate ds rows
-//           for (const row of _ds.data_feed?.rows || []) {
-//             // iterate row fields
-//             for (const [key, val] of Object.entries(row)) {
-//               if (key !== field_id) return
-//               try {
-//                 if (!fieldComputed_datasource_changes[dsSession][row._ROWID]) {
-//                   fieldComputed_datasource_changes[dsSession][row._ROWID] = {}
-//                 }
-//                 let ret = await func.expression.get(
-//                   SESSION_ID,
-//                   propExpressions,
-//                   dsNo,
-//                   "update",
-//                   row._ROWID
-//                 );
-//                 fieldComputed_datasource_changes[dsSession][row._ROWID][field_id] = ret.result
-//                 // const row_idx = func.common.find_ROWID_idx(_ds, record_id);
-
-//                 // _ds.data_feed.rows[row_idx][field_id] = ret.result;
-//               } catch (err) {
-//                 console.error(err);
-//               }
-//             }
-//           }
-//         }
-//         await set_fieldComputed_dependencies(dsNo, field_id, dsSession)
-//       }
-//       debugger
-
-//     }
-
-//     var fields_changed = [];
-//     var datasource_changed = [];
-//     let client_datasource_changes={}
-//     // iterate changes datasource
-//     for await (const [dataSource, row_data] of Object.entries(
-//       datasource_changes
-//     )) {
-//       var _ds = _session.DS_GLB[dataSource];
-//       if (!_ds) {
-//         continue;
-//       }
-//       // iterate changes records
-//       for (const [record_id, fields_data] of Object.entries(row_data)) {
-//         // iterate changes fields
-//         for (const [field_id, value] of Object.entries(fields_data)) {
-//           // mechanism to make update directly on the datasource object
-//           if (record_id === "datasource_main") {
-//             _.set(_ds, field_id, value);
-//             continue;
-//           }
-
-//           if (typeof fields_data === "object") {
-//             if (glb.GLOBAL_VARS[field_id]) {
-//               _ds.data_system[field_id] = value;
-
-//               continue;
-//             }
-
-//             try {
-//               const row_idx = func.common.find_ROWID_idx(_ds, record_id);
-//               _ds.data_feed.rows[row_idx][field_id] = value;
-//               await set_fieldComputed_dependencies(dataSource, field_id, null)
-//             } catch (err) {
-//               console.error(err);
-//             }
-
-//             if (!fields_changed.includes(field_id)) {
-//               fields_changed.push(field_id);
-//             }
-//             if (!datasource_changed.includes(dataSource)) {
-//               datasource_changed.push(dataSource);
-//             }
-//           } else if (fields_data === "set") {
-//             _ds.currentRecordId = record_id;
-//           }
-
-//           if (!update_local_scope_only) {
-//             if (glb.IS_WORKER) {
-//               let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-
-//               if (tree_ret.menuType === "globals") {
-
-//                 const _progFields = await func.datasource.get_progFields(
-//                   SESSION_ID,
-//                   dataSource
-//                 );
-//                 let view_field_obj = func.common.find_item_by_key(
-//                   _progFields,
-//                   "field_id",
-//                   field_id
-//                 );
-//                 if (view_field_obj?.data?.serverField) {
-//                   delete datasource_changes[dataSource][record_id][field_id]
-//                 }
-
-//                 if (record_id === "data_system") {
-//                   delete datasource_changes[dataSource][record_id]
-//                 }
-//               }
-//             }
-//           }
-//         }
-//         if (!_ds.data_feed.rows_changed) {
-//           _ds.data_feed.rows_changed = [];
-//         }
-//         if (!_ds.data_feed.rows_changed.includes(record_id))
-//           _ds.data_feed.rows_changed.push(record_id);
-//       }
-
-//       let new_datasource_changes = { ...datasource_changes, ...fieldComputed_datasource_changes }
-
-//       if (!update_local_scope_only) {
-//         if (glb.IS_WORKER) {
-//           let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-
-//           if (_session.IS_API || typeof IS_MASTER_WEBSOCKET !== "undefined" || typeof IS_PROCESS_SERVER !== "undefined") {
-//             continue;
-//           }
-
-//           if (tree_ret.menuType !== "component" && tree_ret.menuType !== "globals") {
-
-//             continue;
-
-//           }
-
-//           // update client
-
-//           func.utils.post_back_to_client(
-//             SESSION_ID,
-//             "update_client_eventChangesResults_from_worker",
-//             _session.worker_id,
-//             new_datasource_changes
-//           );
-//           return resolve();
-//         }
-
-//         if (!glb.IS_WORKER) {
-//           if (_ds._run_at !== "client" || _ds.tree_obj.menuType === "globals") {
-//             // no need to update worker
-//             // return resolve();
-//             // continue;
-//             // }
-
-//             const ret = await func.index.call_worker(SESSION_ID, {
-//               service: "update_datasource_changes_from_client",
-//               data: {
-//                 session_id: SESSION_ID,
-//                 new_datasource_changes,
-//               },
-//               id: _ds.worker_id,
-//             });
-//           }
-//         }
-//       }
-//     }
-//     if (!glb.IS_WORKER) {
-//       ///// REFRESH SCREEN
-//       if (fields_changed.length) {
-//         await func.UI.screen.refresh_xu_attributes(SESSION_ID, fields_changed);
-//         await func.UI.screen.refresh_screen(
-//           SESSION_ID,
-//           fields_changed,
-//           null,
-//           datasource_changed[0] // refresh the current datasource only
-//         );
-//       }
-//     }
-//     return resolve();
-//   });
-// };
-
 func.datasource.callback = async function (SESSION_ID, dsSessionP, na, rowIdP, jobNoP, NA_callingDataSourceP, NA_isInitP, nodeIdP) {
   var _session = SESSION_OBJ[SESSION_ID];
   var _ds = _session.DS_GLB[dsSessionP];

package/js/xuda-worker-bundle.js

@@ -2656,6 +2656,7 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
             await func.datasource.execute_field_init_events(SESSION_ID, dataSourceSession, 'form', 'newRecord');
           }
         }
+        await func.datasource.callback(SESSION_ID, dataSourceSession, args.dataSourceNoP, args.rowIdP, args.jobNoP, null, _ds.prog_id);
       };
       if (!rows) {
         await row_not_found();
@@ -2943,64 +2944,6 @@ func.datasource.render_fields_form = async function (SESSION_ID, dataSourceSessi
   }
 };
 
-// func.datasource.run_rows_form = async function (
-//   SESSION_ID,
-//   dataSourceSession,
-//   rowIdxP,
-//   raw_data_row
-// ) {
-//   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-//   if (!_ds) return;
-//   let _ROWID = raw_data_row.id;
-//   // var val = _ds.data_feed.rows[rowIdxP];
-
-//   var idx = rowIdxP;
-
-//   const find_ROWID_idx_from_raw_data_arr = function (rowId) {
-//     if (!_ds?.v?.raw_data?.rows) {
-//       throw new Error("ds.v.raw_data.rows not found");
-//     }
-
-//     const index = _ds.v.raw_data.rows.findIndex((item) => item.id === rowId);
-//     if (index === -1) {
-//       throw new Error(`item.id "${rowId}" not found`);
-//     }
-//     return index;
-//   };
-
-//   try {
-//     idx = find_ROWID_idx_from_raw_data_arr(raw_data_row.id);
-//   } catch (e) {
-//     _ROWID = "newRecord";
-//     _ds.data_feed.rows.push({ _ROWID });
-//     idx = func.common.find_ROWID_idx(_ds, _ROWID);
-//   }
-
-//   _ds.currentRecordId = _ROWID; // set temporary to allow expression decoder work
-
-//   await func.datasource.render_fields_form(
-//     SESSION_ID,
-//     dataSourceSession,
-//     raw_data_row
-//   );
-//   const init_count = await func.datasource.get_field_init_count(
-//     SESSION_ID,
-//     dataSourceSession,
-//     _ROWID,
-//     false,
-//     _ds.oninit_triggers_to_run
-//   );
-//   if (init_count > 0) {
-//     await func.datasource.execute_field_init_events(
-//       SESSION_ID,
-//       dataSourceSession,
-//       "form",
-//       _ds.data_feed.rows[idx]._ROWID
-//     );
-//   }
-//   // await form_continue();
-// };
-
 func.datasource.execute_field_init_events = async function (SESSION_ID, dataSourceSession, sourceP, rowIdP) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var args = _ds.args;
@@ -3622,11 +3565,6 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
             _ds.currentRecordId = record_id;
           }
         }
-        // if (!_ds.data_feed.rows_changed) {
-        //   _ds.data_feed.rows_changed = [];
-        // }
-        // if (!_ds.data_feed.rows_changed.includes(record_id))
-        //   _ds.data_feed.rows_changed.push(record_id);
       }
     }
 
@@ -3660,234 +3598,6 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
   });
 };
 
-// func.datasource.update = async function (
-//   SESSION_ID,
-//   datasource_changes,
-//   update_local_scope_only
-// ) {
-//   return new Promise(async (resolve, reject) => {
-//     var _session = SESSION_OBJ[SESSION_ID];
-
-//     if (typeof glb.GLOBAL_VARS === "undefined") {
-//       glb.GLOBAL_VARS = (
-//         await func.common.get_module(
-//           SESSION_ID,
-//           "xuda-system-globals-module.mjs"
-//         )
-//       ).system_globals;
-//     }
-
-//     let fieldComputed_datasource_changes = {};
-
-//     const set_fieldComputed_dependencies = async function (dsNo, field_id, parent_ds) {
-
-//       // iterate child ds
-//       for (const [dsSession, _ds] of Object.entries(_session.DS_GLB)) {
-//         if (parent_ds !== null) {
-//           if (_ds.parentDataSourceNo != parent_ds) continue
-//         } else {
-//           if (dsSession != dsNo) continue
-//         }
-//         let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-//         if (tree_ret.menuType === "component" || tree_ret.menuType === "globals") {
-//           // check if field has fieldComputed property
-//           const _progFields = await func.datasource.get_progFields(
-//             SESSION_ID,
-//             dsSession
-//           );
-//           // find if field is computed
-//           let propExpressions
-//           for await (const val of _progFields) {
-
-//             const fieldId = val.data.field_id;
-
-//             if (fieldId !== field_id) continue
-//             if (val.data.type !== "virtual" || !val.props.fieldComputed) break
-
-//             const _propExpressions = val.props?.propExpressions?.fieldValue
-//             if (_propExpressions && JSON.stringify(_propExpressions).includes(field_id)) {
-//               propExpressions = _propExpressions
-//             }
-//           }
-
-//           if (!propExpressions) return
-
-//           if (!fieldComputed_datasource_changes[dsSession]) {
-//             fieldComputed_datasource_changes[dsSession] = {}
-//           }
-//           // iterate ds rows
-//           for (const row of _ds.data_feed?.rows || []) {
-//             // iterate row fields
-//             for (const [key, val] of Object.entries(row)) {
-//               if (key !== field_id) return
-//               try {
-//                 if (!fieldComputed_datasource_changes[dsSession][row._ROWID]) {
-//                   fieldComputed_datasource_changes[dsSession][row._ROWID] = {}
-//                 }
-//                 let ret = await func.expression.get(
-//                   SESSION_ID,
-//                   propExpressions,
-//                   dsNo,
-//                   "update",
-//                   row._ROWID
-//                 );
-//                 fieldComputed_datasource_changes[dsSession][row._ROWID][field_id] = ret.result
-//                 // const row_idx = func.common.find_ROWID_idx(_ds, record_id);
-
-//                 // _ds.data_feed.rows[row_idx][field_id] = ret.result;
-//               } catch (err) {
-//                 console.error(err);
-//               }
-//             }
-//           }
-//         }
-//         await set_fieldComputed_dependencies(dsNo, field_id, dsSession)
-//       }
-//       debugger
-
-//     }
-
-//     var fields_changed = [];
-//     var datasource_changed = [];
-//     let client_datasource_changes={}
-//     // iterate changes datasource
-//     for await (const [dataSource, row_data] of Object.entries(
-//       datasource_changes
-//     )) {
-//       var _ds = _session.DS_GLB[dataSource];
-//       if (!_ds) {
-//         continue;
-//       }
-//       // iterate changes records
-//       for (const [record_id, fields_data] of Object.entries(row_data)) {
-//         // iterate changes fields
-//         for (const [field_id, value] of Object.entries(fields_data)) {
-//           // mechanism to make update directly on the datasource object
-//           if (record_id === "datasource_main") {
-//             _.set(_ds, field_id, value);
-//             continue;
-//           }
-
-//           if (typeof fields_data === "object") {
-//             if (glb.GLOBAL_VARS[field_id]) {
-//               _ds.data_system[field_id] = value;
-
-//               continue;
-//             }
-
-//             try {
-//               const row_idx = func.common.find_ROWID_idx(_ds, record_id);
-//               _ds.data_feed.rows[row_idx][field_id] = value;
-//               await set_fieldComputed_dependencies(dataSource, field_id, null)
-//             } catch (err) {
-//               console.error(err);
-//             }
-
-//             if (!fields_changed.includes(field_id)) {
-//               fields_changed.push(field_id);
-//             }
-//             if (!datasource_changed.includes(dataSource)) {
-//               datasource_changed.push(dataSource);
-//             }
-//           } else if (fields_data === "set") {
-//             _ds.currentRecordId = record_id;
-//           }
-
-//           if (!update_local_scope_only) {
-//             if (glb.IS_WORKER) {
-//               let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-
-//               if (tree_ret.menuType === "globals") {
-
-//                 const _progFields = await func.datasource.get_progFields(
-//                   SESSION_ID,
-//                   dataSource
-//                 );
-//                 let view_field_obj = func.common.find_item_by_key(
-//                   _progFields,
-//                   "field_id",
-//                   field_id
-//                 );
-//                 if (view_field_obj?.data?.serverField) {
-//                   delete datasource_changes[dataSource][record_id][field_id]
-//                 }
-
-//                 if (record_id === "data_system") {
-//                   delete datasource_changes[dataSource][record_id]
-//                 }
-//               }
-//             }
-//           }
-//         }
-//         if (!_ds.data_feed.rows_changed) {
-//           _ds.data_feed.rows_changed = [];
-//         }
-//         if (!_ds.data_feed.rows_changed.includes(record_id))
-//           _ds.data_feed.rows_changed.push(record_id);
-//       }
-
-//       let new_datasource_changes = { ...datasource_changes, ...fieldComputed_datasource_changes }
-
-//       if (!update_local_scope_only) {
-//         if (glb.IS_WORKER) {
-//           let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-
-//           if (_session.IS_API || typeof IS_MASTER_WEBSOCKET !== "undefined" || typeof IS_PROCESS_SERVER !== "undefined") {
-//             continue;
-//           }
-
-//           if (tree_ret.menuType !== "component" && tree_ret.menuType !== "globals") {
-
-//             continue;
-
-//           }
-
-//           // update client
-
-//           func.utils.post_back_to_client(
-//             SESSION_ID,
-//             "update_client_eventChangesResults_from_worker",
-//             _session.worker_id,
-//             new_datasource_changes
-//           );
-//           return resolve();
-//         }
-
-//         if (!glb.IS_WORKER) {
-//           if (_ds._run_at !== "client" || _ds.tree_obj.menuType === "globals") {
-//             // no need to update worker
-//             // return resolve();
-//             // continue;
-//             // }
-
-//             const ret = await func.index.call_worker(SESSION_ID, {
-//               service: "update_datasource_changes_from_client",
-//               data: {
-//                 session_id: SESSION_ID,
-//                 new_datasource_changes,
-//               },
-//               id: _ds.worker_id,
-//             });
-//           }
-//         }
-//       }
-//     }
-//     if (!glb.IS_WORKER) {
-//       ///// REFRESH SCREEN
-//       if (fields_changed.length) {
-//         await func.UI.screen.refresh_xu_attributes(SESSION_ID, fields_changed);
-//         await func.UI.screen.refresh_screen(
-//           SESSION_ID,
-//           fields_changed,
-//           null,
-//           datasource_changed[0] // refresh the current datasource only
-//         );
-//       }
-//     }
-//     return resolve();
-//   });
-// };
-
 func.datasource.callback = async function (SESSION_ID, dsSessionP, na, rowIdP, jobNoP, NA_callingDataSourceP, NA_isInitP, nodeIdP) {
   var _session = SESSION_OBJ[SESSION_ID];
   var _ds = _session.DS_GLB[dsSessionP];