@xuda.io/xuda-worker-bundle-min 1.3.1077 → 1.3.1079

package/index.js

@@ -1036,7 +1036,7 @@ func.api.set_field_value = async function (field_id, value) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
     }
   );
 
@@ -1053,7 +1053,7 @@ func.api.get_field_value = async function (field_id) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
     }
   );
 
@@ -1070,7 +1070,7 @@ func.api.invoke_event = async function (event_id) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
     }
   );
 
@@ -1087,7 +1087,7 @@ func.api.call_project_api = async function (prog_id, params) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
     }
   );
 
@@ -1104,7 +1104,7 @@ func.api.call_system_api = async function (api_method, payload) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
     }
   );
 
@@ -1121,7 +1121,7 @@ func.api.call_external_api = async function (method, url, payload) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
     }
   );
 
@@ -1487,7 +1487,7 @@ glb.lifecycle = {
         SESSION_OBJ,
         SESSION_ID,
         APP_OBJ,
-        dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
+        dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
       }
     );
 
@@ -2368,10 +2368,32 @@ func.datasource.execute = async function (
         _ds.v,
         _ds
       );
+
+      let filterModelMongo = _ds.progDataSource.filterModelMongo;
+      if (_ds.progDataSource.filterModelMongoFx) {
+        let ret = await func.expression.get(
+          SESSION_ID,
+          _ds.progDataSource.filterModelMongoFx,
+          dataSourceSession,
+          "query"
+        );
+        filterModelMongo = ret.result;
+      }
+      let filterModelSql = _ds.progDataSource.filterModelSql;
+      if (_ds.progDataSource.filterModelSqlFx) {
+        let ret = await func.expression.get(
+          SESSION_ID,
+          _ds.progDataSource.filterModelSqlFx,
+          dataSourceSession,
+          "query"
+        );
+        filterModelSql = ret.result;
+      }
+
       const filterModel = {
         filterModelNative: _ds.progDataSource.filterModelNative,
-        filterModelMongo: _ds.progDataSource.filterModelMongo,
-        filterModelSql: _ds.progDataSource.filterModelSql,
+        filterModelMongo,
+        filterModelSql,
         filterModelUserMongo: _ds.progDataSource.filterModelUserMongo,
         filterModelUserSql: _ds.progDataSource.filterModelUserSql,
       };
@@ -8194,7 +8216,12 @@ func.events.execute = async function (
           );
         };
         const get_property_value = async function (fieldIdP, val) {
-          var value = props[fieldIdP];
+          // var value = props[fieldIdP];
+
+          var value =
+            props[fieldIdP] || typeof val.defaultValue === "function"
+              ? val?.defaultValue?.()
+              : val?.defaultValue;
 
           if (props[`xu-exp:${fieldIdP}`]) {
             value = (
@@ -9496,11 +9523,20 @@ func.expression.get = async function (
             !["DbQuery", "alert", "exp", "api_rendered_output"].includes(
               sourceP
             ) &&
-            ["string", "date", "time"].includes(val.type) &&
+            ["string", "date"].includes(val.type) &&
+            var_Arr.length > 1
+          ) {
+            res[key] = "`" + val.value + "`";
+          }
+          // new Dec 18 2024 for Ishai
+          if (
+            ["api_rendered_output"].includes(sourceP) &&
+            ["string", "date"].includes(val.type) &&
             var_Arr.length > 1
           ) {
-            res[key] = "`" + val.value + "`"; //res[key] = "'" + val.value + "'"; //
+            res[key] = `"` + val.value + `"`;
           }
+
           if (val.fieldId && val.value && typeof val.value === "string") {
             if (
               ["query", "condition", "range", "sort", "locate"].includes(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle-min",
-  "version": "1.3.1077",
+  "version": "1.3.1079",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {