@xuda.io/runtime-bundle 1.0.1263 → 1.0.1265

package/js/xuda-runtime-slim.js

@@ -8674,10 +8674,10 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
   }
 
   const fx = {
-    update_datasource: async function () {
+    update_datasource: async function (currentRecordId) {
       if (queue_obj?.paramsP) {
         var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[queue_obj.dsSession];
-        _ds.currentRecordId = queue_obj.paramsP.currentRecordId;
+        _ds.currentRecordId = currentRecordId || queue_obj.paramsP.currentRecordId;
 
         var datasource_changes = {
           [_ds.dsSession]: { [_ds.currentRecordId]: 'set' },
@@ -8815,6 +8815,7 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
     render_viewport: async function () {
       const { nodeP, $div, parent_infoP, $root_container, jobNoP, is_skeleton, paramsP, $container } = queue_obj?.paramsP || {};
       if (nodeP?.children?.length && !$div.children().length) {
+        await fx.update_datasource($div?.data()?.xuData?.currentRecordId);
         $div.removeClass('skeleton');
         for await (const [key, val] of Object.entries(nodeP.children)) {
           const ret = await func.UI.screen.render_ui_tree(SESSION_ID, $div, nodeP.children[key], parent_infoP, paramsP, jobNoP, is_skeleton, Number(key), null, nodeP, null, $root_container);
@@ -14323,28 +14324,28 @@ func.UI.screen.set_attributes_new = async function (SESSION_ID, is_skeleton, $ro
 
   // ALL
 
-  function sortArrayByIncludedStrings(mainArray, searchStrings) {
-    return mainArray.sort((a, b) => {
-      // Check if 'a' includes any of the search strings
-      const aIncludesSearchString = searchStrings.some((str) => a[0].includes(str));
-      // Check if 'b' includes any of the search strings
-      const bIncludesSearchString = searchStrings.some((str) => b[0].includes(str));
-
-      if (aIncludesSearchString && !bIncludesSearchString) {
-        // 'a' has a search string, 'b' doesn't, so 'a' comes first
-        return -1;
-      } else if (!aIncludesSearchString && bIncludesSearchString) {
-        // 'b' has a search string, 'a' doesn't, so 'b' comes first
-        return 1;
-      } else {
-        // Both or neither include a search string, maintain original relative order or use another sorting criteria
-        // For example, you could sort alphabetically here:
-        return -1; //a.localeCompare(b);
-      }
-    });
-  }
+  // function sortArrayByIncludedStrings(mainArray, searchStrings) {
+  //   return mainArray.sort((a, b) => {
+  //     // Check if 'a' includes any of the search strings
+  //     const aIncludesSearchString = searchStrings.some((str) => a[0].includes(str));
+  //     // Check if 'b' includes any of the search strings
+  //     const bIncludesSearchString = searchStrings.some((str) => b[0].includes(str));
+
+  //     if (aIncludesSearchString && !bIncludesSearchString) {
+  //       // 'a' has a search string, 'b' doesn't, so 'a' comes first
+  //       return -1;
+  //     } else if (!aIncludesSearchString && bIncludesSearchString) {
+  //       // 'b' has a search string, 'a' doesn't, so 'b' comes first
+  //       return 1;
+  //     } else {
+  //       // Both or neither include a search string, maintain original relative order or use another sorting criteria
+  //       // For example, you could sort alphabetically here:
+  //       return 0; //a.localeCompare(b);
+  //     }
+  //   });
+  // }
 
-  const sortedAttrs = sortArrayByIncludedStrings(Object.entries(nodeP.attributes), ['xu-exp:xu-render', 'xu-render', 'xu-exp:program', 'program']);
+  // const sortedAttrs = sortArrayByIncludedStrings(Object.entries(nodeP.attributes), ['xu-exp:xu-render', 'xu-render', 'xu-exp:program', 'program']);
 
   for await (const [key, val] of Object.entries(nodeP.attributes)) {
     if (_ret.abort || $container?.data()?.xuData?.pending_to_delete) break;

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

@@ -8675,10 +8675,10 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
   }
 
   const fx = {
-    update_datasource: async function () {
+    update_datasource: async function (currentRecordId) {
       if (queue_obj?.paramsP) {
         var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[queue_obj.dsSession];
-        _ds.currentRecordId = queue_obj.paramsP.currentRecordId;
+        _ds.currentRecordId = currentRecordId || queue_obj.paramsP.currentRecordId;
 
         var datasource_changes = {
           [_ds.dsSession]: { [_ds.currentRecordId]: 'set' },
@@ -8816,6 +8816,7 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
     render_viewport: async function () {
       const { nodeP, $div, parent_infoP, $root_container, jobNoP, is_skeleton, paramsP, $container } = queue_obj?.paramsP || {};
       if (nodeP?.children?.length && !$div.children().length) {
+        await fx.update_datasource($div?.data()?.xuData?.currentRecordId);
         $div.removeClass('skeleton');
         for await (const [key, val] of Object.entries(nodeP.children)) {
           const ret = await func.UI.screen.render_ui_tree(SESSION_ID, $div, nodeP.children[key], parent_infoP, paramsP, jobNoP, is_skeleton, Number(key), null, nodeP, null, $root_container);
@@ -12048,28 +12049,28 @@ func.UI.screen.set_attributes_new = async function (SESSION_ID, is_skeleton, $ro
 
   // ALL
 
-  function sortArrayByIncludedStrings(mainArray, searchStrings) {
-    return mainArray.sort((a, b) => {
-      // Check if 'a' includes any of the search strings
-      const aIncludesSearchString = searchStrings.some((str) => a[0].includes(str));
-      // Check if 'b' includes any of the search strings
-      const bIncludesSearchString = searchStrings.some((str) => b[0].includes(str));
-
-      if (aIncludesSearchString && !bIncludesSearchString) {
-        // 'a' has a search string, 'b' doesn't, so 'a' comes first
-        return -1;
-      } else if (!aIncludesSearchString && bIncludesSearchString) {
-        // 'b' has a search string, 'a' doesn't, so 'b' comes first
-        return 1;
-      } else {
-        // Both or neither include a search string, maintain original relative order or use another sorting criteria
-        // For example, you could sort alphabetically here:
-        return -1; //a.localeCompare(b);
-      }
-    });
-  }
+  // function sortArrayByIncludedStrings(mainArray, searchStrings) {
+  //   return mainArray.sort((a, b) => {
+  //     // Check if 'a' includes any of the search strings
+  //     const aIncludesSearchString = searchStrings.some((str) => a[0].includes(str));
+  //     // Check if 'b' includes any of the search strings
+  //     const bIncludesSearchString = searchStrings.some((str) => b[0].includes(str));
+
+  //     if (aIncludesSearchString && !bIncludesSearchString) {
+  //       // 'a' has a search string, 'b' doesn't, so 'a' comes first
+  //       return -1;
+  //     } else if (!aIncludesSearchString && bIncludesSearchString) {
+  //       // 'b' has a search string, 'a' doesn't, so 'b' comes first
+  //       return 1;
+  //     } else {
+  //       // Both or neither include a search string, maintain original relative order or use another sorting criteria
+  //       // For example, you could sort alphabetically here:
+  //       return 0; //a.localeCompare(b);
+  //     }
+  //   });
+  // }
 
-  const sortedAttrs = sortArrayByIncludedStrings(Object.entries(nodeP.attributes), ['xu-exp:xu-render', 'xu-render', 'xu-exp:program', 'program']);
+  // const sortedAttrs = sortArrayByIncludedStrings(Object.entries(nodeP.attributes), ['xu-exp:xu-render', 'xu-render', 'xu-exp:program', 'program']);
 
   for await (const [key, val] of Object.entries(nodeP.attributes)) {
     if (_ret.abort || $container?.data()?.xuData?.pending_to_delete) break;