@grexx/grexxlinter 0.2.2667 → 0.2.2716

package/cli.js

@@ -15769,7 +15769,7 @@ function lintFiles(files, ctx, settings) {
 // src/cli.ts
 var PARALLEL_THRESHOLD = 200;
 var MAX_WORKERS = 8;
-var VERSION = "0.2.2667";
+var VERSION = "0.2.2716";
 function isNewer(latest, current) {
   const a = latest.split(".").map(Number);
   const b = current.split(".").map(Number);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grexx/grexxlinter",
-  "version": "0.2.2667",
+  "version": "0.2.2716",
   "description": "Lint Grexx Studio casetype YAML against the studio JSON Schemas.",
   "type": "module",
   "bin": {

package/schemas/.coverage.json

@@ -8997,37 +8997,6 @@
             }
           ]
         },
-        "currency": {
-          "baseline": "MAY",
-          "clauses": [
-            {
-              "modality": "MUST",
-              "when": {
-                "op": "cmp",
-                "field": "type",
-                "fieldName": "Typed - Type",
-                "operator": "==",
-                "value": "singlecurrencymoney",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MAY",
-              "when": {
-                "op": "cmp",
-                "field": "type",
-                "fieldName": "Typed - Type",
-                "operator": "==",
-                "value": "singlecurrencymoney",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            }
-          ]
-        },
         "column": {
           "baseline": "MUST_NOT",
           "clauses": [
@@ -12861,128 +12830,6 @@
     "mapping": {
       "schema": "mapping.schema.json",
       "fields": {
-        "fromAttribute": {
-          "baseline": "MUST_NOT",
-          "clauses": [
-            {
-              "modality": "MUST",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "casedata",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MUST",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "taskout",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MUST_NOT",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "casemetadata",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MUST_NOT",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "dataset",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MUST_NOT",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "inlineTemplate",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MUST_NOT",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "newcasemetadata",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MUST_NOT",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "value",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MAY",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "casedata",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            },
-            {
-              "modality": "MAY",
-              "when": {
-                "op": "cmp",
-                "field": "fromAttributeType",
-                "fieldName": "From attribute type",
-                "operator": "==",
-                "value": "taskout",
-                "valueIsField": false,
-                "isEmpty": false
-              },
-              "covered": true
-            }
-          ]
-        },
         "fromInlineTemplate": {
           "baseline": "MUST_NOT",
           "clauses": [

package/schemas/common.schema.json

@@ -8,6 +8,8 @@
         "$ref" : "#/$defs/inlineReference"
       }, {
         "$ref" : "#/$defs/localReference"
+      }, {
+        "$ref" : "#/$defs/dependencyReference"
       }, {
         "description" : "Raw case-ID (e.g. 1:5085:123 or 1:5085:123:1).",
         "pattern" : "^\\d+:\\d+:\\d+(:\\d+)?$",
@@ -24,6 +26,11 @@
         "type" : "string"
       } ]
     },
+    "dependencyReference" : {
+      "description" : "Reference to an object in an imported dependency: <dep-name>:<uuid>, dep-name as declared in studio.deps.yaml.",
+      "pattern" : "^[a-z0-9][a-z0-9._-]*:[0-9a-f-]+$",
+      "type" : "string"
+    },
     "fileDataObject" : {
       "additionalProperties" : true,
       "description" : "Serialized file/binary data attached to a definition.",

package/schemas/customThrow.behavior.json

@@ -48,8 +48,5 @@
         "isEmpty": false
       }
     ]
-  },
-  "messageType": {
-    "baseline": "MUST"
   }
 }

package/schemas/customThrow.schema.json

@@ -73,8 +73,7 @@
   },
   "required": [
     "_type",
-    "_uid",
-    "messageType"
+    "_uid"
   ],
   "title": "customThrow",
   "type": "object",

package/schemas/formfield.schema.json

@@ -299,23 +299,6 @@
   "title": "formfield",
   "type": "object",
   "allOf": [
-    {
-      "if": {
-        "properties": {
-          "type": {
-            "const": "singlecurrencymoney"
-          }
-        },
-        "required": [
-          "type"
-        ]
-      },
-      "then": {
-        "required": [
-          "currency"
-        ]
-      }
-    },
     {
       "if": {
         "properties": {

package/schemas/gridActivity.behavior.json

@@ -0,0 +1,150 @@
+{
+  "activity": {
+    "requiredWhen": [
+      {
+        "op": "cmp",
+        "field": "enabled",
+        "operator": "==",
+        "value": "true"
+      }
+    ]
+  },
+  "type": {
+    "requiredWhen": [
+      {
+        "op": "cmp",
+        "field": "enabled",
+        "operator": "==",
+        "value": "true"
+      }
+    ]
+  },
+  "icon": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "type",
+        "operator": "in",
+        "value": "[\"inlineAdd\",\"inlineEdit\"]"
+      }
+    ]
+  },
+  "useActivityTitle": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "type",
+        "operator": "in",
+        "value": "[\"inlineAdd\",\"inlineEdit\"]"
+      }
+    ],
+    "labelWhen": [
+      {
+        "when": {
+          "op": "and",
+          "items": [
+            {
+              "op": "cmp",
+              "field": "type",
+              "operator": "in",
+              "value": "[\"singleInline\",\"quickInline\"]"
+            },
+            {
+              "op": "cmp",
+              "field": "icon",
+              "operator": "!==",
+              "value": "",
+              "isEmpty": true
+            }
+          ]
+        },
+        "label": "Use activity label as tooltip"
+      }
+    ]
+  },
+  "title": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "type",
+        "operator": "in",
+        "value": "[\"inlineAdd\",\"inlineEdit\"]"
+      }
+    ],
+    "labelWhen": [
+      {
+        "when": {
+          "op": "and",
+          "items": [
+            {
+              "op": "cmp",
+              "field": "type",
+              "operator": "in",
+              "value": "[\"singleInline\",\"quickInline\"]"
+            },
+            {
+              "op": "cmp",
+              "field": "icon",
+              "operator": "!==",
+              "value": "",
+              "isEmpty": true
+            }
+          ]
+        },
+        "label": "Tooltip"
+      }
+    ],
+    "messageWhen": [
+      {
+        "when": {
+          "op": "cmp",
+          "field": "useActivityTitle",
+          "operator": "==",
+          "value": "true"
+        },
+        "message": "The activity's own name is used while the box above is ticked; this takes over as soon as it is not"
+      },
+      {
+        "when": {
+          "op": "and",
+          "items": [
+            {
+              "op": "cmp",
+              "field": "type",
+              "operator": "in",
+              "value": "[\"singleInline\",\"quickInline\"]"
+            },
+            {
+              "op": "cmp",
+              "field": "icon",
+              "operator": "!==",
+              "value": "",
+              "isEmpty": true
+            }
+          ]
+        },
+        "message": "The icon is drawn on its own, with this as its hover text"
+      }
+    ]
+  },
+  "whenDoneRefreshType": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "type",
+        "operator": "in",
+        "value": "[\"inlineAdd\",\"inlineEdit\"]"
+      }
+    ]
+  },
+  "breaker": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "type",
+        "operator": "in",
+        "value": "[\"singleInline\",\"quickInline\",\"inlineAdd\",\"inlineEdit\"]"
+      }
+    ]
+  }
+}

package/schemas/gridColumn.behavior.json

@@ -0,0 +1,46 @@
+{
+  "clickHandlerColumnCase": {
+    "baseline": "MUST_NOT",
+    "enabledWhen": [
+      {
+        "op": "cmp",
+        "field": "clickHandler",
+        "operator": "notin",
+        "value": "[\"\",\"none\"]"
+      }
+    ]
+  },
+  "aggregationOperation": {
+    "baseline": "MUST_NOT",
+    "enabledWhen": [
+      {
+        "op": "cmp",
+        "field": "usesCases",
+        "operator": "==",
+        "value": "true"
+      }
+    ]
+  },
+  "aggregationStatic": {
+    "baseline": "MUST_NOT",
+    "enabledWhen": [
+      {
+        "op": "and",
+        "items": [
+          {
+            "op": "cmp",
+            "field": "usesCases",
+            "operator": "==",
+            "value": "true"
+          },
+          {
+            "op": "cmp",
+            "field": "aggregationOperation",
+            "operator": "notin",
+            "value": "[\"\",\"none\"]"
+          }
+        ]
+      }
+    ]
+  }
+}

package/schemas/mapping.behavior.json

@@ -3,7 +3,7 @@
     "baseline": "MUST_NOT"
   },
   "fromAttribute": {
-    "baseline": "MUST_NOT",
+    "baseline": "MAY",
     "requiredWhen": [
       {
         "op": "cmp",

package/schemas/mapping.schema.json

@@ -134,8 +134,10 @@
   ],
   "title": "mapping",
   "type": "object",
+  "$comment": "Hand-maintained overlay (deep-merged by scripts/extend.mjs into extended/mapping.schema.json). `fromAttribute` is forced to MAY in overrides.json so the rule pipeline emits no branch for it, and the whole conditional is stated here instead. Why it cannot be additive: rules/mapping.json gives the field a MUST_NOT baseline whose allow-set is requiredWhen (casedata, taskout) only, so every other fromAttributeType lands in the generated `else` as `fromAttribute: false`. Adding a `required` on top of that `false` is unsatisfiable, and `schema-overrides/` concatenates allOf — it cannot delete the generated branch. taskOutFormField is a real, widely-used source the manager export does not model: the form logic it derives from (form Edit mapping v2) never names it, so the field fell to the baseline and every mapping that reads a task-out formfield linted as a forbidden-field. Keep the two lists below in step with rules/mapping.json's requiredWhen/forbiddenWhen after an export:rules run. Conditionals generated by packages/schemas/scripts/extend.mjs from rules/mapping.json.",
   "allOf": [
     {
+      "$comment": "fromAttribute is required for the source types that name an attribute to read. casedata/taskout come from the export; taskOutFormField is the hand-added one.",
       "if": {
         "anyOf": [
           {
@@ -157,11 +159,82 @@
             "required": [
               "fromAttributeType"
             ]
+          },
+          {
+            "properties": {
+              "fromAttributeType": {
+                "const": "taskOutFormField"
+              }
+            },
+            "required": [
+              "fromAttributeType"
+            ]
           }
         ]
       },
-      "then": {},
-      "else": {
+      "then": {
+        "required": [
+          "fromAttribute"
+        ]
+      }
+    },
+    {
+      "$comment": "The source types that carry their value elsewhere (fromValue, a template, a dataset) must not also name an attribute. Mirrors rules/mapping.json forbiddenWhen.",
+      "if": {
+        "anyOf": [
+          {
+            "properties": {
+              "fromAttributeType": {
+                "const": "casemetadata"
+              }
+            },
+            "required": [
+              "fromAttributeType"
+            ]
+          },
+          {
+            "properties": {
+              "fromAttributeType": {
+                "const": "dataset"
+              }
+            },
+            "required": [
+              "fromAttributeType"
+            ]
+          },
+          {
+            "properties": {
+              "fromAttributeType": {
+                "const": "inlineTemplate"
+              }
+            },
+            "required": [
+              "fromAttributeType"
+            ]
+          },
+          {
+            "properties": {
+              "fromAttributeType": {
+                "const": "newcasemetadata"
+              }
+            },
+            "required": [
+              "fromAttributeType"
+            ]
+          },
+          {
+            "properties": {
+              "fromAttributeType": {
+                "const": "value"
+              }
+            },
+            "required": [
+              "fromAttributeType"
+            ]
+          }
+        ]
+      },
+      "then": {
         "properties": {
           "fromAttribute": false
         }
@@ -287,7 +360,7 @@
       "if": {
         "properties": {
           "fromAttributeType": {
-            "const": "casedata"
+            "const": "inlineTemplate"
           }
         },
         "required": [
@@ -296,18 +369,15 @@
       },
       "then": {
         "required": [
-          "fromAttribute"
-        ],
-        "properties": {
-          "fromInlineTemplate": false
-        }
+          "fromInlineTemplate"
+        ]
       }
     },
     {
       "if": {
         "properties": {
           "fromAttributeType": {
-            "const": "taskout"
+            "const": "casedata"
           }
         },
         "required": [
@@ -315,9 +385,6 @@
         ]
       },
       "then": {
-        "required": [
-          "fromAttribute"
-        ],
         "properties": {
           "fromInlineTemplate": false
         }
@@ -336,7 +403,6 @@
       },
       "then": {
         "properties": {
-          "fromAttribute": false,
           "fromInlineTemplate": false
         }
       }
@@ -354,7 +420,6 @@
       },
       "then": {
         "properties": {
-          "fromAttribute": false,
           "fromInlineTemplate": false
         }
       }
@@ -363,7 +428,7 @@
       "if": {
         "properties": {
           "fromAttributeType": {
-            "const": "inlineTemplate"
+            "const": "newcasemetadata"
           }
         },
         "required": [
@@ -371,11 +436,8 @@
         ]
       },
       "then": {
-        "required": [
-          "fromInlineTemplate"
-        ],
         "properties": {
-          "fromAttribute": false
+          "fromInlineTemplate": false
         }
       }
     },
@@ -383,7 +445,7 @@
       "if": {
         "properties": {
           "fromAttributeType": {
-            "const": "newcasemetadata"
+            "const": "taskout"
           }
         },
         "required": [
@@ -392,7 +454,6 @@
       },
       "then": {
         "properties": {
-          "fromAttribute": false,
           "fromInlineTemplate": false
         }
       }
@@ -410,7 +471,6 @@
       },
       "then": {
         "properties": {
-          "fromAttribute": false,
           "fromInlineTemplate": false
         }
       }
@@ -466,6 +526,5 @@
         ]
       }
     }
-  ],
-  "$comment": "Conditionals generated by packages/schemas/scripts/extend.mjs from rules/mapping.json."
+  ]
 }

package/schemas/navigation.schema.json

@@ -60,7 +60,7 @@
       "$ref": "common.schema.json#/$defs/caseIdOrFileReference"
     },
     "rootMenuItem": {
-      "$ref": "menuItem.schema.json"
+      "$ref": "rootMenuItem.schema.json"
     },
     "type": {
       "type": "string"
@@ -85,6 +85,7 @@
   ],
   "title": "navigation",
   "type": "object",
+  "$comment": "Hand-maintained overlay (deep-merged by scripts/extend.mjs into extended/navigation.schema.json). Repoints rootMenuItem at custom/rootMenuItem.schema.json — menuItem with only _type/_uid required — because a root menu item is a container with no entry of its own. L2 refs menuItem here, whose `required: [type]` and type=menu ⇒ text|icon branch do not apply to the root. The overlay merge replaces the $ref string; it cannot delete keys, which is why the relaxed variant is a separate schema rather than an inline restatement. Conditionals generated by packages/schemas/scripts/extend.mjs from rules/navigation.json.",
   "allOf": [
     {
       "if": {
@@ -118,6 +119,5 @@
         }
       }
     }
-  ],
-  "$comment": "Conditionals generated by packages/schemas/scripts/extend.mjs from rules/navigation.json."
+  ]
 }

package/schemas/rootMenuItem.schema.json

@@ -0,0 +1,89 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://grexx.net/studio-next/schemas/rootMenuItem.schema.json",
+  "title": "rootMenuItem",
+  "$comment": "Hand-maintained (packages/schemas/custom/, overlaid into extended/ by scripts/extend.mjs). A navigation's rootMenuItem is a menuItem structurally, but it is a container, not an entry: it carries no type/text/icon/href of its own, only the menuItems beneath it. menuItem.schema.json requires `type` and, for type=menu/link, text-or-icon — so referencing it directly made every real navigation lint as required-field. Here only _type and _uid are required and no conditional applies; the nested menuItems are still validated against menuItem in full. Each property REFERENCES menuItem's own definition, so shapes never fork — only this name list has to track a new menuItem property.",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "_type",
+    "_uid"
+  ],
+  "properties": {
+    "_id": {
+      "$ref": "menuItem.schema.json#/properties/_id"
+    },
+    "_interfaceID": {
+      "$ref": "menuItem.schema.json#/properties/_interfaceID"
+    },
+    "_isInterface": {
+      "$ref": "menuItem.schema.json#/properties/_isInterface"
+    },
+    "_knownIDs": {
+      "$ref": "menuItem.schema.json#/properties/_knownIDs"
+    },
+    "_origin": {
+      "$ref": "menuItem.schema.json#/properties/_origin"
+    },
+    "_src": {
+      "$ref": "menuItem.schema.json#/properties/_src"
+    },
+    "_type": {
+      "$ref": "menuItem.schema.json#/properties/_type"
+    },
+    "_uid": {
+      "$ref": "menuItem.schema.json#/properties/_uid"
+    },
+    "condition": {
+      "$ref": "menuItem.schema.json#/properties/condition"
+    },
+    "cssClass": {
+      "$ref": "menuItem.schema.json#/properties/cssClass"
+    },
+    "description": {
+      "$ref": "menuItem.schema.json#/properties/description"
+    },
+    "dummyUnused": {
+      "$ref": "menuItem.schema.json#/properties/dummyUnused"
+    },
+    "href": {
+      "$ref": "menuItem.schema.json#/properties/href"
+    },
+    "icon": {
+      "$ref": "menuItem.schema.json#/properties/icon"
+    },
+    "inactive": {
+      "$ref": "menuItem.schema.json#/properties/inactive"
+    },
+    "interfaceStudioProduct": {
+      "$ref": "menuItem.schema.json#/properties/interfaceStudioProduct"
+    },
+    "menuItems": {
+      "$ref": "menuItem.schema.json#/properties/menuItems"
+    },
+    "metaCaseToOtap": {
+      "$ref": "menuItem.schema.json#/properties/metaCaseToOtap"
+    },
+    "name": {
+      "$ref": "menuItem.schema.json#/properties/name"
+    },
+    "ourProductId": {
+      "$ref": "menuItem.schema.json#/properties/ourProductId"
+    },
+    "rights": {
+      "$ref": "menuItem.schema.json#/properties/rights"
+    },
+    "subtext": {
+      "$ref": "menuItem.schema.json#/properties/subtext"
+    },
+    "template": {
+      "$ref": "menuItem.schema.json#/properties/template"
+    },
+    "text": {
+      "$ref": "menuItem.schema.json#/properties/text"
+    },
+    "type": {
+      "$ref": "menuItem.schema.json#/properties/type"
+    }
+  }
+}

package/schemas/widget.behavior.json

@@ -2762,5 +2762,175 @@
   },
   "viewCalculated": {
     "baseline": "MUST_NOT"
+  },
+  "showHeader": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      }
+    ]
+  },
+  "title": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      },
+      {
+        "op": "cmp",
+        "field": "showHeader",
+        "operator": "==",
+        "value": "false"
+      }
+    ]
+  },
+  "showToolbar": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      }
+    ]
+  },
+  "showSimpleSearch": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      },
+      {
+        "op": "cmp",
+        "field": "showToolbar",
+        "operator": "==",
+        "value": "false"
+      }
+    ]
+  },
+  "showAdvancedSearch": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      },
+      {
+        "op": "cmp",
+        "field": "showToolbar",
+        "operator": "==",
+        "value": "false"
+      },
+      {
+        "op": "cmp",
+        "field": "showSimpleSearch",
+        "operator": "==",
+        "value": "false"
+      }
+    ]
+  },
+  "showLinenumbers": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      }
+    ]
+  },
+  "showFooter": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      }
+    ]
+  },
+  "orderColumn": {
+    "forbiddenWhen": [
+      {
+        "op": "cmp",
+        "field": "widgetType",
+        "operator": "==",
+        "value": "grid-v2"
+      }
+    ]
+  },
+  "viewToOpen": {
+    "baseline": "MUST_NOT",
+    "requiredWhen": [
+      {
+        "op": "cmp",
+        "field": "clickHandler",
+        "operator": "==",
+        "value": "viewHandler"
+      }
+    ]
+  },
+  "customViewModalClasses": {
+    "baseline": "MUST_NOT",
+    "enabledWhen": [
+      {
+        "op": "cmp",
+        "field": "clickHandler",
+        "operator": "==",
+        "value": "viewHandler"
+      }
+    ]
+  },
+  "clickHandlerColumnCase": {
+    "baseline": "MUST_NOT",
+    "enabledWhen": [
+      {
+        "op": "cmp",
+        "field": "clickHandler",
+        "operator": "notin",
+        "value": "[\"\",\"none\"]"
+      }
+    ]
+  },
+  "gridAggregationRowType": {
+    "baseline": "MUST_NOT",
+    "enabledWhen": [
+      {
+        "op": "cmp",
+        "field": "usesCases",
+        "operator": "==",
+        "value": "true"
+      }
+    ]
+  },
+  "gridAggregationRowPosition": {
+    "baseline": "MUST_NOT",
+    "enabledWhen": [
+      {
+        "op": "and",
+        "items": [
+          {
+            "op": "cmp",
+            "field": "usesCases",
+            "operator": "==",
+            "value": "true"
+          },
+          {
+            "op": "cmp",
+            "field": "gridAggregationRowType",
+            "operator": "notin",
+            "value": "[\"\",\"none\"]"
+          }
+        ]
+      }
+    ]
   }
 }