Fixed import from JsonLogic when like op is used inside group with some group op (#1225)

Author: ukrbublik

packages/core/modules/import/jsonLogic.js

@@ -874,6 +874,10 @@ const convertOp = (op, vals, conv, config, not, meta, parentField = null, _isOne
       match.jlArgs.forEach(arg => havingVals.push(arg));
       // We reset op to new op that represents multiple jsonlogic operators
       conj = match.newOp;
+      if (jlDualMeaningOps.includes(match.newOp)) {
+        // use original order of args
+        havingVals = match.vals;
+      }
     }
   }
 

packages/examples/src/demo/config/index.tsx

@@ -439,7 +439,11 @@ export default (skin: string) => {
             max: 2021,
           },
           valueSources: ["value"],
-        }
+        },
+        model: {
+          type: "text",
+          valueSources: ["value"],
+        },
       }
     },
     prox1: {

packages/examples/src/demo/init_data/index.tsx

@@ -5,6 +5,8 @@ import initLogicWithNot from "./logic/with_not";
 import initLogicAutocomplete from "./logic/autocomplete";
 import initLogicWithNotInSome from "./logic/with_not_in_some";
 import initLogicWithFuncInLhs from "./logic/with_func_in_lhs";
+import initLogicGroupSomeInAny from "./logic/with_group_some_in_any";
+import initLogicGroupSomeInLike from "./logic/with_group_some_in_like";
 
 import {
   Utils, JsonTree,
@@ -26,6 +28,8 @@ export const initFiles: Record<string, any> = {
   "logic/with_not_in_some": initLogicWithNotInSome,
   "logic/with_func_in_lhs": initLogicWithFuncInLhs,
   "logic/autocomplete": initLogicAutocomplete,
+  "logic/with_group_some_in_any": initLogicGroupSomeInAny,
+  "logic/with_group_some_in_like": initLogicGroupSomeInLike,
 
   "tree/complex": initTreeComplex,
   "tree/empty": emptyTree,

packages/examples/src/demo/init_data/logic/with_group_some_in_any.js

@@ -0,0 +1,22 @@
+export default
+{
+  "and": [
+    {
+      "some": [
+        {
+          "var": "cars"
+        },
+        {
+          "in": [
+            {
+              "var": "vendor"
+            },
+            [
+              "Ford"
+            ]
+          ]
+        }
+      ]
+    }
+  ]
+};

packages/examples/src/demo/init_data/logic/with_group_some_in_like.js

@@ -0,0 +1,20 @@
+export default
+{
+  "and": [
+    {
+      "some": [
+        {
+          "var": "cars"
+        },
+        {
+          "in": [
+            "toyo",
+            {
+              "var": "model"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+};

packages/examples/src/demo/utils.tsx

@@ -69,6 +69,7 @@ export const initTreeWithValidation = (initFileKey: string, config: Config, vali
   let errors: string[];
   // eslint-disable-next-line prefer-const
   ({tree, errors} = importFromInitFile(initFileKey, config));
+  console.log("Loaded tree: ", tree?.toJS?.());
   const {fixedTree, fixedErrors, nonFixedErrors} = Utils.sanitizeTree(tree, config, {
     ...(validationOptions ?? {}),
     removeEmptyGroups: false,

packages/tests/specs/QueryWithGroupsAndStructs.test.js

@@ -116,13 +116,20 @@ describe("query with !struct and !group", () => {
     });
   });
 
-  describe("should handle some-in when it's not related to multiselect_contains op", () => {
+  describe("should handle some-in when it's not related to multiselect_contains op and means select_any_in", () => {
     export_checks(configs.with_group_inside_struct, inits.with_nested_and_select_any_in_in_some, "JsonLogic", {
       "query": "vehicles.cars.vendor IN (\"Ford\", \"Toyota\")",
       logic: inits.with_nested_and_select_any_in_in_some,
     });
   });
 
+  describe("should handle some-in when it's not related to multiselect_contains op and means like", () => {
+    export_checks(configs.with_group_inside_struct, inits.with_nested_and_like_in_some, "JsonLogic", {
+      "query": "vehicles.cars.model Contains \"coro\"",
+      logic: inits.with_nested_and_like_in_some,
+    });
+  });
+
 });
 
 //////////////////////////////////////////////////////////////////////////////////////////

packages/tests/support/configs.js

@@ -537,7 +537,11 @@ export const with_group_inside_struct = (BasicConfig) => ({
                 max: 2021,
               },
               valueSources: ["value"],
-            }
+            },
+            model: {
+              type: "text",
+              valueSources: ["value"],
+            },
           }
         },
         bikes: {

packages/tests/support/inits.js

@@ -370,6 +370,15 @@ export const with_nested_and_select_any_in_in_some = {
   ]
 };
 
+export const with_nested_and_like_in_some = {
+  "and": [
+    { "some": [
+      { "var": "vehicles.cars" },
+      { "in": [ "coro", { "var": "model" } ] }
+    ] }
+  ]
+};
+
 export const with_select_not_any_in_in_some = {
   "and": [
     { "some": [