@xuda.io/runtime-bundle 1.0.1383 → 1.0.1385

package/js/xuda-runtime-bundle.js

@@ -27601,6 +27601,7 @@ func.UI.utils.get_panels_wrapper_from_dom = async function (SESSION_ID, $xu_embe
 
 func.UI.worker = {};
 func.UI.worker.ID = null;
+func.UI.worker.idle = 0;
 func.UI.worker.init = async function (SESSION_ID) {
   $.fn.isInViewport = function () {
     var elementTop = $(this).offset().top;
@@ -27614,35 +27615,35 @@ func.UI.worker.init = async function (SESSION_ID) {
 
   let last_job_in_queue = 0;
   // let run_stat;
-  const job_iterator2 = 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
+  // const job_iterator2 = 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++;
-    }
-  };
+  //     this.attempt++;
+  //   }
+  // };
 
   const job_iterator = async function () {
     let from_job_num_to_run = last_job_in_queue;
@@ -27651,7 +27652,9 @@ func.UI.worker.init = async function (SESSION_ID) {
     // 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) {
+      func.UI.worker.idle = 0;
       let running_job_children_elements = [];
       let active_job_children_elements = [];
       for await (const [key, val] of Object.entries(UI_WORKER_OBJ.jobs)) {
@@ -27746,6 +27749,17 @@ func.UI.worker.init = async function (SESSION_ID) {
           console.error(err);
         }
       }
+    } else {
+      func.UI.worker.idle++;
+
+      if (func.UI.worker.idle > 1000) {
+        // cleaning pending_to_delete
+        $.each($('body').find('*'), (key, val) => {
+          if ($(val)?.data()?.xuData?.pending_to_delete) {
+            $(val).data().xuData.pending_to_delete = false;
+          }
+        });
+      }
     }
     // } else {
     //   //busy
@@ -29209,6 +29223,36 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         _dataSourceFilterModelType,
       );
 
+      if (_dataSourceFilterModelType === 'index' && _ds?.progDataSource?.sortModel) {
+        function sortByKeys(array, sortConfig) {
+          return array.sort((a, b) => {
+            for (let config of sortConfig) {
+              const key = config.field_id;
+              const direction = config.sort_dir === 'desc' ? -1 : 1;
+
+              const valA = a.value[key];
+              const valB = b.value[key];
+
+              // Handle numeric comparison
+              if (typeof valA === 'number' && typeof valB === 'number') {
+                if (valA !== valB) {
+                  return (valA - valB) * direction;
+                }
+              }
+              // Handle string comparison
+              else if (typeof valA === 'string' && typeof valB === 'string') {
+                if (valA !== valB) {
+                  return valA.localeCompare(valB) * direction;
+                }
+              }
+            }
+            return 0;
+          });
+        }
+        const sorted = sortByKeys(_ds.v.raw_data.rows, _ds.progDataSource.sortModel);
+        _ds.v.raw_data.rows = sorted;
+      }
+
       if (_ds?.progDataSource?.dataSourceLimit) {
         const ret_rows_found = await func.db.get_query(SESSION_ID, _ds._dataSourceTableId, _ds.v.couchView, dataSourceSession, _ds.viewSourceDesc, 'datasource table', prog_obj.progDataSource.dataSourceReduce, null, null, true, null, null, null, filterModel, _dataSourceFilterModelType);
         _ds.rows_found = ret_rows_found?.rows?.[0]?.value || 0;
@@ -29227,17 +29271,8 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         data = [];
       }
 
-      // let _KEY = 0;
-      // for (const _VAL of data) {
-      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-      //   _KEY++;
-      // }
-
       _ds.rows_found = data?.length || 0;
 
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
       let _KEY = 0;
       for (const _VAL of data) {
         _ds.v.raw_data.rows.push({ id: _KEY, value: { _KEY, _VAL } });
@@ -29252,13 +29287,7 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         data = {};
       }
 
-      // for (let [_KEY, _VAL] of Object.keys(data)) {
-      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-      // }
       _ds.rows_found = Object.keys(data)?.length || 0;
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
 
       for (let [_KEY, _VAL] of Object.keys(data)) {
         _ds.v.raw_data.rows.push({ id: _KEY, value: { _KEY, _VAL } });
@@ -29273,21 +29302,6 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
         data = '';
       }
 
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
-
-      // let _KEY = 0;
-      // let arr = data.split(",");
-      // for (const _VAL of arr) {
-      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-      //   _KEY++;
-      // }
-      // _ds.rows_found = arr?.length || 0;
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
-
       let _KEY = 0;
       let arr = data.split(',');
       for (const _VAL of arr) {