removed unused type property from the local evaluated expressions

shesha-io · May 3, 2023 · 71eb442 · 71eb442
1 parent c101fb3
commit 71eb442
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/shesha-reactjs/package.json b/shesha-reactjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shesha/reactjs",
-  "version": "4.0.149-canary",
+  "version": "4.0.150-canary",
   "description": "The reactjs frontend application and ui for the shesha framework",
   "license": "GPL-3.0",
   "homepage": "https://shesha-io.github.io/shesha-framework",

diff --git a/shesha-reactjs/src/components/queryBuilder/funcs/evaluate.ts b/shesha-reactjs/src/components/queryBuilder/funcs/evaluate.ts
@@ -4,7 +4,7 @@ import { IEvaluateNode, IEvaluateNodeArgs } from 'utils/jsonLogic';
 const args2JsonLogic: JsonLogicFormatFunc = (funcArgs: TypedMap<JsonLogicValue>): JsonLogicTree => {
     const node: IEvaluateNode = {
         evaluate: [
-            { expression: funcArgs.expression, type: 'string' }
+            { expression: funcArgs.expression }
         ]
     };
 
@@ -18,7 +18,7 @@ const jsonLogic2Args: JsonLogicImportFunc = (val): RuleValue[] => {
 
     const args: IEvaluateNodeArgs = Array.isArray(typedNode.evaluate) && typedNode.evaluate.length === 1
         ? typedNode.evaluate[0] as IEvaluateNodeArgs
-        : { expression: null, type: null };
+        : { expression: null };
 
     return [args.expression];
 };

diff --git a/shesha-reactjs/src/designer-components/_common-migrations/migrateUseExpression.ts b/shesha-reactjs/src/designer-components/_common-migrations/migrateUseExpression.ts
@@ -54,7 +54,7 @@ export const migrateDynamicExpression = (expression: any): object => {
             if (argValue && typeof(argValue) === 'string' && (argValue as string).includes('{{')){
                 return {
                     handled: true,
-                    value: { evaluate: [ { expression: argValue, type: 'text' } ] },
+                    value: { evaluate: [ { expression: argValue } ] },
                 };
             }
             return {

diff --git a/shesha-reactjs/src/utils/jsonLogic.ts b/shesha-reactjs/src/utils/jsonLogic.ts
@@ -114,7 +114,6 @@ export const convertJsonLogicNode = (jsonLogic: object, options: IJsonLogicConve
 
 export interface IEvaluateNodeArgs {
     expression: string;
-    type: string;
 };
 
 export interface IEvaluateNode {