@xuda.io/runtime-bundle 1.0.961 → 1.0.963

package/js/xuda-runtime-slim.js

@@ -4655,7 +4655,7 @@ func.datasource.del = function (SESSION_ID, dsP) {
   perform_delete();
 };
 
-func.datasource.update = async function (SESSION_ID, datasource_changes, update_local_scope_only, avoid_xu_for_refresh) {
+func.datasource.update = async function (SESSION_ID, datasource_changes, update_local_scope_only, avoid_xu_for_refresh, trigger) {
   return new Promise(async (resolve, reject) => {
     var _session = SESSION_OBJ[SESSION_ID];
 
@@ -4864,7 +4864,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
           return Math.min(...arr.map(Number));
         }
 
-        await func.UI.screen.refresh_xu_attributes(SESSION_ID, _.cloneDeep(fields_changed), null, null, findMin(datasource_changed), avoid_xu_for_refresh);
+        await func.UI.screen.refresh_xu_attributes(SESSION_ID, _.cloneDeep(fields_changed), null, null, findMin(datasource_changed), avoid_xu_for_refresh, trigger);
         // await removed from the below function cause to dead lock Mar 3 25
         await func.UI.screen.refresh_screen(
           SESSION_ID,
@@ -8357,34 +8357,141 @@ func.UI.worker.init = async function (SESSION_ID) {
 
   let last_job_in_queue = 0;
   // let run_stat;
+  // const job_iterator = async function () {
+  //   let from_job_num_to_run = last_job_in_queue;
+  //   last_job_in_queue = UI_WORKER_OBJ.num - from_job_num_to_run;
+
+  //   if (typeof UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === null) {
+  //     // idle
+  //     this.attempt = 0;
+  //     if (UI_WORKER_OBJ.jobs.length) {
+  //       // clearInterval(this._interval);
+  //       for await (const [key, val] of Object.entries(UI_WORKER_OBJ.jobs)) {
+  //         // if (val.job_num < from_job_num_to_run) continue;
+  //         try {
+  //           if (val.stat) {
+  //             break;
+  //           }
+
+  //           await func.UI.worker.execute(val.SESSION_ID, val);
+  //           // break;
+  //         } catch (err) {
+  //           console.error(err);
+  //         }
+  //       }
+  //     }
+  //   } else {
+  //     //busy
+
+  //     this.attempt++;
+  //   }
+  // };
+
   const job_iterator = async function () {
     let from_job_num_to_run = last_job_in_queue;
     last_job_in_queue = UI_WORKER_OBJ.num - from_job_num_to_run;
 
-    if (typeof UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === null) {
-      // idle
-      this.attempt = 0;
-      if (UI_WORKER_OBJ.jobs.length) {
-        // clearInterval(this._interval);
-        for await (const [key, val] of Object.entries(UI_WORKER_OBJ.jobs)) {
-          // if (val.job_num < from_job_num_to_run) continue;
-          try {
-            if (val.stat) {
-              break;
-            }
+    // if (typeof UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === null) {
+    // idle
+    this.attempt = 0;
+    if (UI_WORKER_OBJ.jobs.length) {
+      let running_job_children_elements = [];
+      let active_job_children_elements = [];
+      for (const [key, val] of Object.entries(UI_WORKER_OBJ.jobs)) {
+        try {
+          if (val.stat === 'busy') continue;
+
+          if (!val.elementP) {
+            func.UI.worker.execute(val.SESSION_ID, val);
+            continue;
+          }
+
+          const active_xu_ui_id = val.elementP.attr('xu-ui-id');
+          if (!active_xu_ui_id) continue;
 
-            await func.UI.worker.execute(val.SESSION_ID, val);
-            // break;
-          } catch (err) {
-            console.error(err);
+          const running_job_obj = UI_WORKER_OBJ.jobs[0];
+
+          const running_xu_ui_id = running_job_obj?.elementP?.attr('xu-ui-id');
+          if (!running_xu_ui_id) continue;
+
+          $.each(running_job_obj.elementP.find('*'), function (key, val) {
+            const xu_ui_id = val.elementP.attr('xu-ui-id');
+            if (!xu_ui_id) return true;
+            running_job_children_elements.push(xu_ui_id);
+          });
+
+          $.each(val.elementP.find('*'), function (key, val) {
+            const xu_ui_id = val.elementP.attr('xu-ui-id');
+            if (!xu_ui_id) return true;
+            active_job_children_elements.push(xu_ui_id);
+          });
+
+          // skip - if job element exist in the active job ui as child element
+          if (running_job_children_elements.includes(active_xu_ui_id)) {
+            continue;
           }
+
+          // abort - if active job element exist in the current job ui (parent element changed)
+          if (active_job_children_elements.includes(running_xu_ui_id)) {
+            $.each(active_job_children_elements, function (key, val) {
+              const $elm = $(`[xu-ui-id=${val}]`);
+              if (!$elm.length) return true;
+              if (!$elm.data().xuData) return true;
+              $elm.data().xuData.pending_to_delete = true;
+            });
+
+            func.UI.worker.delete_job(SESSION_ID, running_job_obj.job_num);
+            break;
+          }
+
+          // execute - if active job element not exist the current job ui and not detected as parent element
+          func.UI.worker.execute(val.SESSION_ID, val);
+          continue;
+
+          // active_job_children_elements = [];
+          // if (val.elementP) {
+          //   // get active_job children elements only if job handle ui job (not update)
+          //   $.each(val.elementP.find('*'), function (key, val) {
+          //     const xu_ui_id = val.elementP.attr('xu-ui-id');
+          //     if (!xu_ui_id) return true;
+          //     active_job_children_elements.push(xu_ui_id);
+          //   });
+          //   func.UI.worker.execute(val.SESSION_ID, val);
+          //   continue;
+          // } else {
+          //   // non ui job
+          //   await func.UI.worker.execute(val.SESSION_ID, val);
+          //   break;
+          // }
+
+          // if (UI_WORKER_OBJ.jobs.length > 1 && val.elementP) {
+          //   const xu_ui_id = val.elementP.attr('xu-ui-id');
+          //   if (!xu_ui_id) continue;
+          //   // skip - if job element exist in the active job ui as child element
+          //   if (active_job_children_elements.includes(xu_ui_id)) {
+          //     continue;
+          //   }
+          //   // abort - if active job element exist in the current job ui (parent element changed)
+          //   $.each(val.elementP.find('*'), function (key, val) {
+          //     const xu_ui_id = val.elementP.attr('xu-ui-id');
+          //     if (!xu_ui_id) return true;
+          //     active_job_children_elements.push(xu_ui_id);
+          //   });
+          //   // execute - if active job element not exist the current job ui and not detected as parent element
+          //   const active_job = UI_WORKER_OBJ.jobs[0];
+          // }
+
+          // break;
+        } catch (err) {
+          console.error(err);
         }
       }
-    } else {
-      //busy
-
-      this.attempt++;
     }
+    // } else {
+    //   //busy
+
+    //   this.attempt++;
+    // }
   };
 
   this._interval = setInterval(job_iterator, 1);
@@ -8471,7 +8578,7 @@ func.UI.worker.delete_job = async function (SESSION_ID, jobNoP) {
   var job_index = func.UI.worker.find_job_index(SESSION_ID, jobNoP);
 
   if (!UI_WORKER_OBJ.jobs[job_index]) {
-    UI_WORKER_OBJ.stat = null;
+    // UI_WORKER_OBJ.stat = null;
     return;
   }
 
@@ -8483,20 +8590,20 @@ func.UI.worker.delete_job = async function (SESSION_ID, jobNoP) {
   if (dsSession && ds_obj?.loops_limit && ds_obj?.loops_count < ds_obj?.loops_limit - 1) {
     return;
   }
-  UI_WORKER_OBJ.stat = null;
+  // UI_WORKER_OBJ.stat = null;
 
   UI_WORKER_OBJ.jobs.splice(job_index, 1);
 };
 func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
   var job_index = func.UI.worker.find_job_index(SESSION_ID, queue_obj.job_num);
-  if (UI_WORKER_OBJ.jobs?.[job_index]?.stat === 'busy') {
-    if (queue_obj.jobNoP) UI_WORKER_OBJ.stat = job_index;
-    return;
-  }
-  if (queue_obj.jobNoP && !UI_WORKER_OBJ.jobs[job_index]) {
-    UI_WORKER_OBJ.stat = null;
-    return;
-  }
+  // if (UI_WORKER_OBJ.jobs?.[job_index]?.stat === 'busy') {
+  //   if (queue_obj.jobNoP) UI_WORKER_OBJ.stat = job_index;
+  //   return;
+  // }
+  // if (queue_obj.jobNoP && !UI_WORKER_OBJ.jobs[job_index]) {
+  //   UI_WORKER_OBJ.stat = null;
+  //   return;
+  // }
 
   if (queue_obj.jobNoP) UI_WORKER_OBJ.stat = job_index;
   if (UI_WORKER_OBJ.jobs[job_index]) {
@@ -9759,7 +9866,7 @@ func.events.execute = async function (
         }
       }
 
-      await func.datasource.update(SESSION_ID, datasource_changes);
+      await func.datasource.update(SESSION_ID, datasource_changes, null, null, triggerP);
 
       if (_ds.PARAM_OUT_INFO) {
         for await (const [key, val] of Object.entries(_ds.PARAM_OUT_INFO)) {
@@ -11326,13 +11433,15 @@ func.UI.screen.call_embed = function (SESSION_ID, prog) {
   });
   func.UI.main.embed_prog_execute(SESSION_ID, prog);
 };
-func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed, avoid_xu_for_refresh) {
-  if (!_.isEmpty(SCREEN_BLOCKER_OBJ)) {
-    // let dom  to finish
-    setTimeout(() => {
-      func.UI.screen.refresh_xu_attributes(SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed);
-    }, 100);
-    return;
+func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed, avoid_xu_for_refresh, trigger) {
+  if (trigger !== 'click') {
+    if (!_.isEmpty(SCREEN_BLOCKER_OBJ)) {
+      // let dom  to finish
+      setTimeout(() => {
+        func.UI.screen.refresh_xu_attributes(SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed);
+      }, 100);
+      return;
+    }
   }
 
   UI_WORKER_OBJ.cache = {};

package/js/xuda-runtime-slim.min.es.js

@@ -4656,7 +4656,7 @@ func.datasource.del = function (SESSION_ID, dsP) {
   perform_delete();
 };
 
-func.datasource.update = async function (SESSION_ID, datasource_changes, update_local_scope_only, avoid_xu_for_refresh) {
+func.datasource.update = async function (SESSION_ID, datasource_changes, update_local_scope_only, avoid_xu_for_refresh, trigger) {
   return new Promise(async (resolve, reject) => {
     var _session = SESSION_OBJ[SESSION_ID];
 
@@ -4865,7 +4865,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
           return Math.min(...arr.map(Number));
         }
 
-        await func.UI.screen.refresh_xu_attributes(SESSION_ID, _.cloneDeep(fields_changed), null, null, findMin(datasource_changed), avoid_xu_for_refresh);
+        await func.UI.screen.refresh_xu_attributes(SESSION_ID, _.cloneDeep(fields_changed), null, null, findMin(datasource_changed), avoid_xu_for_refresh, trigger);
         // await removed from the below function cause to dead lock Mar 3 25
         await func.UI.screen.refresh_screen(
           SESSION_ID,
@@ -8358,34 +8358,141 @@ func.UI.worker.init = async function (SESSION_ID) {
 
   let last_job_in_queue = 0;
   // let run_stat;
+  // const job_iterator = async function () {
+  //   let from_job_num_to_run = last_job_in_queue;
+  //   last_job_in_queue = UI_WORKER_OBJ.num - from_job_num_to_run;
+
+  //   if (typeof UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === null) {
+  //     // idle
+  //     this.attempt = 0;
+  //     if (UI_WORKER_OBJ.jobs.length) {
+  //       // clearInterval(this._interval);
+  //       for await (const [key, val] of Object.entries(UI_WORKER_OBJ.jobs)) {
+  //         // if (val.job_num < from_job_num_to_run) continue;
+  //         try {
+  //           if (val.stat) {
+  //             break;
+  //           }
+
+  //           await func.UI.worker.execute(val.SESSION_ID, val);
+  //           // break;
+  //         } catch (err) {
+  //           console.error(err);
+  //         }
+  //       }
+  //     }
+  //   } else {
+  //     //busy
+
+  //     this.attempt++;
+  //   }
+  // };
+
   const job_iterator = async function () {
     let from_job_num_to_run = last_job_in_queue;
     last_job_in_queue = UI_WORKER_OBJ.num - from_job_num_to_run;
 
-    if (typeof UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === null) {
-      // idle
-      this.attempt = 0;
-      if (UI_WORKER_OBJ.jobs.length) {
-        // clearInterval(this._interval);
-        for await (const [key, val] of Object.entries(UI_WORKER_OBJ.jobs)) {
-          // if (val.job_num < from_job_num_to_run) continue;
-          try {
-            if (val.stat) {
-              break;
-            }
+    // if (typeof UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === 'undefined' || UI_WORKER_OBJ.stat === null) {
+    // idle
+    this.attempt = 0;
+    if (UI_WORKER_OBJ.jobs.length) {
+      let running_job_children_elements = [];
+      let active_job_children_elements = [];
+      for (const [key, val] of Object.entries(UI_WORKER_OBJ.jobs)) {
+        try {
+          if (val.stat === 'busy') continue;
+
+          if (!val.elementP) {
+            func.UI.worker.execute(val.SESSION_ID, val);
+            continue;
+          }
+
+          const active_xu_ui_id = val.elementP.attr('xu-ui-id');
+          if (!active_xu_ui_id) continue;
 
-            await func.UI.worker.execute(val.SESSION_ID, val);
-            // break;
-          } catch (err) {
-            console.error(err);
+          const running_job_obj = UI_WORKER_OBJ.jobs[0];
+
+          const running_xu_ui_id = running_job_obj?.elementP?.attr('xu-ui-id');
+          if (!running_xu_ui_id) continue;
+
+          $.each(running_job_obj.elementP.find('*'), function (key, val) {
+            const xu_ui_id = val.elementP.attr('xu-ui-id');
+            if (!xu_ui_id) return true;
+            running_job_children_elements.push(xu_ui_id);
+          });
+
+          $.each(val.elementP.find('*'), function (key, val) {
+            const xu_ui_id = val.elementP.attr('xu-ui-id');
+            if (!xu_ui_id) return true;
+            active_job_children_elements.push(xu_ui_id);
+          });
+
+          // skip - if job element exist in the active job ui as child element
+          if (running_job_children_elements.includes(active_xu_ui_id)) {
+            continue;
           }
+
+          // abort - if active job element exist in the current job ui (parent element changed)
+          if (active_job_children_elements.includes(running_xu_ui_id)) {
+            $.each(active_job_children_elements, function (key, val) {
+              const $elm = $(`[xu-ui-id=${val}]`);
+              if (!$elm.length) return true;
+              if (!$elm.data().xuData) return true;
+              $elm.data().xuData.pending_to_delete = true;
+            });
+
+            func.UI.worker.delete_job(SESSION_ID, running_job_obj.job_num);
+            break;
+          }
+
+          // execute - if active job element not exist the current job ui and not detected as parent element
+          func.UI.worker.execute(val.SESSION_ID, val);
+          continue;
+
+          // active_job_children_elements = [];
+          // if (val.elementP) {
+          //   // get active_job children elements only if job handle ui job (not update)
+          //   $.each(val.elementP.find('*'), function (key, val) {
+          //     const xu_ui_id = val.elementP.attr('xu-ui-id');
+          //     if (!xu_ui_id) return true;
+          //     active_job_children_elements.push(xu_ui_id);
+          //   });
+          //   func.UI.worker.execute(val.SESSION_ID, val);
+          //   continue;
+          // } else {
+          //   // non ui job
+          //   await func.UI.worker.execute(val.SESSION_ID, val);
+          //   break;
+          // }
+
+          // if (UI_WORKER_OBJ.jobs.length > 1 && val.elementP) {
+          //   const xu_ui_id = val.elementP.attr('xu-ui-id');
+          //   if (!xu_ui_id) continue;
+          //   // skip - if job element exist in the active job ui as child element
+          //   if (active_job_children_elements.includes(xu_ui_id)) {
+          //     continue;
+          //   }
+          //   // abort - if active job element exist in the current job ui (parent element changed)
+          //   $.each(val.elementP.find('*'), function (key, val) {
+          //     const xu_ui_id = val.elementP.attr('xu-ui-id');
+          //     if (!xu_ui_id) return true;
+          //     active_job_children_elements.push(xu_ui_id);
+          //   });
+          //   // execute - if active job element not exist the current job ui and not detected as parent element
+          //   const active_job = UI_WORKER_OBJ.jobs[0];
+          // }
+
+          // break;
+        } catch (err) {
+          console.error(err);
         }
       }
-    } else {
-      //busy
-
-      this.attempt++;
     }
+    // } else {
+    //   //busy
+
+    //   this.attempt++;
+    // }
   };
 
   this._interval = setInterval(job_iterator, 1);
@@ -8472,7 +8579,7 @@ func.UI.worker.delete_job = async function (SESSION_ID, jobNoP) {
   var job_index = func.UI.worker.find_job_index(SESSION_ID, jobNoP);
 
   if (!UI_WORKER_OBJ.jobs[job_index]) {
-    UI_WORKER_OBJ.stat = null;
+    // UI_WORKER_OBJ.stat = null;
     return;
   }
 
@@ -8484,20 +8591,20 @@ func.UI.worker.delete_job = async function (SESSION_ID, jobNoP) {
   if (dsSession && ds_obj?.loops_limit && ds_obj?.loops_count < ds_obj?.loops_limit - 1) {
     return;
   }
-  UI_WORKER_OBJ.stat = null;
+  // UI_WORKER_OBJ.stat = null;
 
   UI_WORKER_OBJ.jobs.splice(job_index, 1);
 };
 func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
   var job_index = func.UI.worker.find_job_index(SESSION_ID, queue_obj.job_num);
-  if (UI_WORKER_OBJ.jobs?.[job_index]?.stat === 'busy') {
-    if (queue_obj.jobNoP) UI_WORKER_OBJ.stat = job_index;
-    return;
-  }
-  if (queue_obj.jobNoP && !UI_WORKER_OBJ.jobs[job_index]) {
-    UI_WORKER_OBJ.stat = null;
-    return;
-  }
+  // if (UI_WORKER_OBJ.jobs?.[job_index]?.stat === 'busy') {
+  //   if (queue_obj.jobNoP) UI_WORKER_OBJ.stat = job_index;
+  //   return;
+  // }
+  // if (queue_obj.jobNoP && !UI_WORKER_OBJ.jobs[job_index]) {
+  //   UI_WORKER_OBJ.stat = null;
+  //   return;
+  // }
 
   if (queue_obj.jobNoP) UI_WORKER_OBJ.stat = job_index;
   if (UI_WORKER_OBJ.jobs[job_index]) {
@@ -9053,13 +9160,15 @@ func.UI.screen.call_embed = function (SESSION_ID, prog) {
   });
   func.UI.main.embed_prog_execute(SESSION_ID, prog);
 };
-func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed, avoid_xu_for_refresh) {
-  if (!_.isEmpty(SCREEN_BLOCKER_OBJ)) {
-    // let dom  to finish
-    setTimeout(() => {
-      func.UI.screen.refresh_xu_attributes(SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed);
-    }, 100);
-    return;
+func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed, avoid_xu_for_refresh, trigger) {
+  if (trigger !== 'click') {
+    if (!_.isEmpty(SCREEN_BLOCKER_OBJ)) {
+      // let dom  to finish
+      setTimeout(() => {
+        func.UI.screen.refresh_xu_attributes(SESSION_ID, fields_arr, jobNoP, $elm_to_search, dsSession_changed);
+      }, 100);
+      return;
+    }
   }
 
   UI_WORKER_OBJ.cache = {};
@@ -13857,7 +13966,7 @@ func.events.execute = async function (
         }
       }
 
-      await func.datasource.update(SESSION_ID, datasource_changes);
+      await func.datasource.update(SESSION_ID, datasource_changes, null, null, triggerP);
 
       if (_ds.PARAM_OUT_INFO) {
         for await (const [key, val] of Object.entries(_ds.PARAM_OUT_INFO)) {