@genesislcap/pbc-notify-ui 14.484.2-alpha-92fa356.0 → 14.484.2

package/dist/custom-elements.json

@@ -2078,114 +2078,6 @@
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "src/components/foundation-notification-dashboard/rule-expression-builder.utils.ts",
-      "declarations": [
-        {
-          "kind": "function",
-          "name": "mapFieldsToExpressionBuilderFields",
-          "return": {
-            "type": {
-              "text": "ExpressionBuilderTypes.Field[]"
-            }
-          },
-          "parameters": [
-            {
-              "name": "fields",
-              "type": {
-                "text": "Field[]"
-              }
-            }
-          ]
-        },
-        {
-          "kind": "function",
-          "name": "ruleExpressionToRawText",
-          "return": {
-            "type": {
-              "text": "string"
-            }
-          },
-          "parameters": [
-            {
-              "name": "expr",
-              "type": {
-                "text": "AnyExpression | null | undefined"
-              }
-            }
-          ]
-        },
-        {
-          "kind": "function",
-          "name": "rawTextToRuleExpression",
-          "return": {
-            "type": {
-              "text": "PredicateExpression | null"
-            }
-          },
-          "parameters": [
-            {
-              "name": "raw",
-              "type": {
-                "text": "string"
-              }
-            }
-          ]
-        },
-        {
-          "kind": "function",
-          "name": "conditionsToRuleExpression",
-          "return": {
-            "type": {
-              "text": "PredicateExpression"
-            }
-          },
-          "parameters": [
-            {
-              "name": "conditions",
-              "type": {
-                "text": "RuleExpression.Condition[]"
-              }
-            }
-          ]
-        }
-      ],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "mapFieldsToExpressionBuilderFields",
-          "declaration": {
-            "name": "mapFieldsToExpressionBuilderFields",
-            "module": "src/components/foundation-notification-dashboard/rule-expression-builder.utils.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "ruleExpressionToRawText",
-          "declaration": {
-            "name": "ruleExpressionToRawText",
-            "module": "src/components/foundation-notification-dashboard/rule-expression-builder.utils.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "rawTextToRuleExpression",
-          "declaration": {
-            "name": "rawTextToRuleExpression",
-            "module": "src/components/foundation-notification-dashboard/rule-expression-builder.utils.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "conditionsToRuleExpression",
-          "declaration": {
-            "name": "conditionsToRuleExpression",
-            "module": "src/components/foundation-notification-dashboard/rule-expression-builder.utils.ts"
-          }
-        }
-      ]
-    },
     {
       "kind": "javascript-module",
       "path": "src/components/foundation-inbox/inbox-base/inbox-base.ts",
@@ -5000,7 +4892,7 @@
         {
           "kind": "variable",
           "name": "RuleDialogTemplate",
-          "default": "html<RuleDialog>`\n  <rapid-modal ${ref('dialog')} class=\"dialog\" :onCloseCallback=${(x) => () => x.close()}>\n    <div slot=\"top\" class=\"dialog-top\">${(x) => x.ruleDialogTitle}</div>\n\n    <div class=\"dialog-content\">\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <rapid-text-field\n            :value=${sync((x) => x.name)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autofocus\n            autocomplete=\"off\"\n            required\n          >\n            Name\n          </rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field\n            :value=${sync((x) => x.description)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autocomplete=\"off\"\n            required\n          >\n            Description\n          </rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <label>Resource</label>\n          <rapid-select\n            :value=${sync((x) => x.resource)}\n            title=${(x) => x.resource}\n            position=\"below\"\n          >\n            ${repeat(\n              (x) => x.resources,\n              html`\n                <rapid-option value=${(x) => x} title=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-select>\n        </div>\n\n        <div class=\"control\">\n          <label>Topic</label>\n          <rapid-combobox\n            autocomplete=\"both\"\n            :value=${sync((x) => x.topic)}\n            title=${(x) => x.topic}\n          >\n            ${repeat(\n              (x) => x.topics,\n              html`\n                <rapid-option value=${(x) => x} title=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-combobox>\n        </div>\n\n        <div class=\"control\">\n          <label>Severity</label>\n          <rapid-select :value=${sync((x) => x.severity)}>\n            <options-datasource\n              value-field=\"value\"\n              label-field=\"value\"\n              option-element=\"rapid-option\"\n              :data=${(_) => Object.values(Severity).map((value) => ({ value }))}\n            ></options-datasource>\n          </rapid-select>\n        </div>\n\n        <div class=\"control\">\n          <label>Update Type</label>\n          <rapid-multiselect\n            :selectedOptions=${(x) => x.updateType}\n            @selectionChange=${(x, c) => {\n              x.updateType = (c.event as CustomEvent).detail;\n            }}\n            search=\"false\"\n            all=\"false\"\n          >\n            <multiselect-datasource\n              value-field=\"value\"\n              label-field=\"value\"\n              :data=${() => Object.values(UpdateType).map((value) => ({ value, label: value }))}\n            ></multiselect-datasource>\n          </rapid-multiselect>\n        </div>\n      </div>\n\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <rapid-text-field\n            required\n            :value=${sync((x) => x.header)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autocomplete=\"off\"\n          >\n            Header\n          </rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field\n            required\n            :value=${sync((x) => x.message)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autocomplete=\"off\"\n          >\n            Message\n          </rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"control\">\n        <label>Condition(s)</label>\n        <rapid-rule-expression-builder\n          :ruleConfig=${(x) => x.ruleExpressionConfig}\n          @change=${(x, c) => x.handleRuleExpressionChange((c.event as CustomEvent).detail)}\n        ></rapid-rule-expression-builder>\n        <rapid-text-area\n          class=\"expression-preview\"\n          readonly\n          :value=${(x) => x.rawExpressionPreview}\n        >\n          Compiled expression\n        </rapid-text-area>\n      </div>\n    </div>\n\n    <div slot=\"bottom\" class=\"dialog-bottom\">\n      <rapid-button\n        appearance=\"primary\"\n        @click=${(x) => x.submit()}\n        ?disabled=${(x) => x.submitDisabled}\n      >\n        Submit\n      </rapid-button>\n    </div>\n  </rapid-modal>\n`"
+          "default": "html<RuleDialog>`\n  <rapid-modal ${ref('dialog')} class=\"dialog\" :onCloseCallback=${(x) => () => x.close()}>\n    <div slot=\"top\" class=\"dialog-top\">${(x) => x.ruleDialogTitle}</div>\n\n    <div class=\"dialog-content\">\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <rapid-text-field\n            :value=${sync((x) => x.name)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autofocus\n            autocomplete=\"off\"\n            required\n          >\n            Name\n          </rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field\n            :value=${sync((x) => x.description)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autocomplete=\"off\"\n            required\n          >\n            Description\n          </rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <label>Resource</label>\n          <rapid-select\n            :value=${sync((x) => x.resource)}\n            title=${(x) => x.resource}\n            position=\"below\"\n          >\n            ${repeat(\n              (x) => x.resources,\n              html`\n                <rapid-option value=${(x) => x} title=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-select>\n        </div>\n\n        <div class=\"control\">\n          <label>Topic</label>\n          <rapid-combobox\n            autocomplete=\"both\"\n            :value=${sync((x) => x.topic)}\n            title=${(x) => x.topic}\n          >\n            ${repeat(\n              (x) => x.topics,\n              html`\n                <rapid-option value=${(x) => x} title=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-combobox>\n        </div>\n\n        <div class=\"control\">\n          <label>Severity</label>\n          <rapid-select :value=${sync((x) => x.severity)}>\n            <options-datasource\n              value-field=\"value\"\n              label-field=\"value\"\n              option-element=\"rapid-option\"\n              :data=${(_) => Object.values(Severity).map((value) => ({ value }))}\n            ></options-datasource>\n          </rapid-select>\n        </div>\n\n        <div class=\"control\">\n          <label>Update Type</label>\n          <rapid-multiselect\n            :selectedOptions=${(x) => x.updateType}\n            @selectionChange=${(x, c) => {\n              x.updateType = (c.event as CustomEvent).detail;\n            }}\n            search=\"false\"\n            all=\"false\"\n          >\n            <multiselect-datasource\n              value-field=\"value\"\n              label-field=\"value\"\n              :data=${() => Object.values(UpdateType).map((value) => ({ value, label: value }))}\n            ></multiselect-datasource>\n          </rapid-multiselect>\n        </div>\n      </div>\n\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <rapid-text-field\n            required\n            :value=${sync((x) => x.header)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autocomplete=\"off\"\n          >\n            Header\n          </rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field\n            required\n            :value=${sync((x) => x.message)}\n            @change=\"${(x) => x.validateRequiredFields()}\"\n            autocomplete=\"off\"\n          >\n            Message\n          </rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"control\">\n        <label>Condition(s)</label>\n        <div class=\"items\">\n          <div class=\"content-row item\">\n            ${repeat(\n              (x) => x.conditions,\n              html<ConditionNode, RuleDialog>`\n                ${when(\n                  (x) => isGroup(x),\n                  html<ConditionNode>`\n                    <rule-condition-group\n                      :fields=${(x, c) => c.parent.fields}\n                      :node=${(x) => x}\n                      :isFirst=${(x, c) => c.index === 0}\n                      @edit=${(x, c) => c.parent.editCondition(eventDetail(c))}\n                      @delete=${(x, c) => c.parent.deleteCondition(eventDetail(c))}\n                    ></rule-condition-group>\n                  `,\n                )}\n                ${when(\n                  (x) => !isGroup(x),\n                  html<ConditionNode>`\n                    <rule-condition-builder\n                      :fields=${(x, c) => c.parent.fields}\n                      :condition=${(x) => x}\n                      :isFirst=${(x, c) => c.index === 0}\n                      @edit=${(x, c) => c.parent.editCondition(eventDetail(c))}\n                      @delete=${(x, c) => c.parent.deleteCondition(eventDetail(c))}\n                    ></rule-condition-builder>\n                  `,\n                )}\n              `,\n              { positioning: true },\n            )}\n          </div>\n\n          <div class=\"content-row\">\n            <rapid-button appearance=\"lightweight\" @click=${(x) => x.newCondition()}>\n              + Condition\n            </rapid-button>\n            <rapid-button appearance=\"lightweight\" @click=${(x) => x.newGroup()}>\n              + Group\n            </rapid-button>\n          </div>\n        </div>\n        <rapid-text-area\n          class=\"expression-preview\"\n          readonly\n          :value=${(x) => x.rawExpressionPreview}\n        >\n          Compiled expression\n        </rapid-text-area>\n      </div>\n    </div>\n\n    <div slot=\"bottom\" class=\"dialog-bottom\">\n      <rapid-button\n        appearance=\"primary\"\n        @click=${(x) => x.submit()}\n        ?disabled=${(x) => x.submitDisabled}\n      >\n        Submit\n      </rapid-button>\n    </div>\n  </rapid-modal>\n`"
         }
       ],
       "exports": [
@@ -5131,6 +5023,14 @@
               },
               "default": "''"
             },
+            {
+              "kind": "field",
+              "name": "conditions",
+              "type": {
+                "text": "Array<ConditionNode>"
+              },
+              "default": "[]"
+            },
             {
               "kind": "field",
               "name": "submitDisabled",
@@ -5138,6 +5038,14 @@
                 "text": "boolean"
               }
             },
+            {
+              "kind": "field",
+              "name": "rawExpressionPreview",
+              "type": {
+                "text": "string"
+              },
+              "default": "''"
+            },
             {
               "kind": "field",
               "name": "resources",
@@ -5162,31 +5070,6 @@
               },
               "default": "[]"
             },
-            {
-              "kind": "field",
-              "name": "ruleExpressionConfig",
-              "type": {
-                "text": "ExpressionBuilderTypes.RuleConfig"
-              },
-              "default": "{\n    fields: [],\n    partialRuleValidationWarning: true,\n  }"
-            },
-            {
-              "kind": "field",
-              "name": "currentRuleExpression",
-              "type": {
-                "text": "RuleExpression.Expression['PredicateExpression'] | null"
-              },
-              "privacy": "private",
-              "default": "null"
-            },
-            {
-              "kind": "field",
-              "name": "rawExpressionPreview",
-              "type": {
-                "text": "string"
-              },
-              "default": "''"
-            },
             {
               "kind": "method",
               "name": "openDialog",
@@ -5221,21 +5104,9 @@
             },
             {
               "kind": "method",
-              "name": "refreshRuleExpressionConfig",
+              "name": "refreshExpressionPreview",
               "privacy": "private"
             },
-            {
-              "kind": "method",
-              "name": "handleRuleExpressionChange",
-              "parameters": [
-                {
-                  "name": "expression",
-                  "type": {
-                    "text": "RuleExpression.Expression['PredicateExpression']"
-                  }
-                }
-              ]
-            },
             {
               "kind": "method",
               "name": "attributeAssignments",
@@ -5281,6 +5152,38 @@
               "kind": "method",
               "name": "resourceChanged"
             },
+            {
+              "kind": "method",
+              "name": "newCondition"
+            },
+            {
+              "kind": "method",
+              "name": "newGroup"
+            },
+            {
+              "kind": "method",
+              "name": "editCondition",
+              "parameters": [
+                {
+                  "name": "editedCondition",
+                  "type": {
+                    "text": "ConditionNode"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "deleteCondition",
+              "parameters": [
+                {
+                  "name": "deletedCondition",
+                  "type": {
+                    "text": "ConditionNode"
+                  }
+                }
+              ]
+            },
             {
               "kind": "method",
               "name": "validateRequiredFields",

package/dist/dts/components/components.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../../src/components/components.ts"],"names":[],"mappings":"AAuDA,wBAAsB,WAAW,kBAIhC"}
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../../src/components/components.ts"],"names":[],"mappings":"AAqDA,wBAAsB,WAAW,kBAIhC"}

package/dist/dts/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.d.ts

@@ -1,7 +1,6 @@
-import { ExpressionBuilderTypes, RuleExpression } from '@genesislcap/foundation-ui';
 import type { Modal } from '@genesislcap/rapid-design-system';
 import { GenesisElement } from '@genesislcap/web-core';
-import { UpdateType } from '../../../../../notify.types';
+import { ConditionNode, UpdateType } from '../../../../../notify.types';
 import { NotifyService } from '../../../../../services/notify.service';
 import { RuleService } from '../../../../../services/rule.service';
 import { Field, SystemService } from '../../../../../services/system.service';
@@ -27,25 +26,27 @@ export declare class RuleDialog extends GenesisElement {
     updateType: UpdateType[];
     header: string;
     message: string;
+    conditions: Array<ConditionNode>;
     submitDisabled: boolean;
+    rawExpressionPreview: string;
     resources: Array<string>;
     fields: Array<Field>;
     topics: string[];
-    ruleExpressionConfig: ExpressionBuilderTypes.RuleConfig;
-    private currentRuleExpression;
-    rawExpressionPreview: string;
     openDialog(params: RuleDialogParams): Promise<void>;
     close(): void;
     private createRule;
     private editRule;
-    private refreshRuleExpressionConfig;
-    handleRuleExpressionChange(expression: RuleExpression.Expression['PredicateExpression']): void;
+    private refreshExpressionPreview;
     private attributeAssignments;
     get ruleDialogTitle(): string;
     submit(): void;
     private createRuleObject;
     validateResponse(response: any): void;
     resourceChanged(): Promise<void>;
+    newCondition(): void;
+    newGroup(): void;
+    editCondition(editedCondition: ConditionNode): void;
+    deleteCondition(deletedCondition: ConditionNode): void;
     validateRequiredFields(): void;
 }
 //# sourceMappingURL=rule-dialog.d.ts.map

package/dist/dts/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rule-dialog.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAiB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAA2C,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAe9E,OAAO,EAAQ,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE7E;;;;;GAKG;AACH,qBAKa,UAAW,SAAQ,cAAc;IAC/B,WAAW,EAAE,WAAW,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;IAE5C,MAAM,EAAE,KAAK,CAAC;IACF,cAAc,EAAE,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;IAEjF,OAAO,CAAC,MAAM,CAAgB;IAClB,IAAI,EAAE,MAAM,CAAM;IAClB,WAAW,EAAE,MAAM,CAAM;IACzB,QAAQ,EAAE,MAAM,CAAM;IACtB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,UAAU,EAAE,UAAU,EAAE,CAAqB;IAC7C,MAAM,EAAE,MAAM,CAAM;IACpB,OAAO,EAAE,MAAM,CAAM;IACrB,cAAc,EAAE,OAAO,CAAC;IAExB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAC9B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAM;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAM;IAStB,oBAAoB,EAAE,sBAAsB,CAAC,UAAU,CAGjE;IACF,OAAO,CAAC,qBAAqB,CAAiE;IAIlF,oBAAoB,EAAE,MAAM,CAAM;IAEjC,UAAU,CAAC,MAAM,EAAE,gBAAgB;IAmBhD,KAAK;YAsBS,UAAU;YAUV,QAAQ;IAoBtB,OAAO,CAAC,2BAA2B;IASnC,0BAA0B,CAAC,UAAU,EAAE,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC;IAKvF,OAAO,CAAC,oBAAoB;IAc5B,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,MAAM;IAaN,OAAO,CAAC,gBAAgB;IAwBxB,gBAAgB,CAAC,QAAQ,KAAA;IASnB,eAAe;IAMd,sBAAsB;CAK9B"}
+{"version":3,"file":"rule-dialog.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAiB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAEL,aAAa,EAGb,UAAU,EACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAU9E,OAAO,EAAQ,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE7E;;;;;GAKG;AACH,qBAKa,UAAW,SAAQ,cAAc;IAC/B,WAAW,EAAE,WAAW,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;IAE5C,MAAM,EAAE,KAAK,CAAC;IACF,cAAc,EAAE,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;IAEjF,OAAO,CAAC,MAAM,CAAgB;IAClB,IAAI,EAAE,MAAM,CAAM;IAClB,WAAW,EAAE,MAAM,CAAM;IACzB,QAAQ,EAAE,MAAM,CAAM;IACtB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,UAAU,EAAE,UAAU,EAAE,CAAqB;IAC7C,MAAM,EAAE,MAAM,CAAM;IACpB,OAAO,EAAE,MAAM,CAAM;IACrB,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,CAAM;IACtC,cAAc,EAAE,OAAO,CAAC;IAIxB,oBAAoB,EAAE,MAAM,CAAM;IAElC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAC9B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAM;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAM;IAErB,UAAU,CAAC,MAAM,EAAE,gBAAgB;IAmBhD,KAAK;YAsBS,UAAU;YAUV,QAAQ;IAuBtB,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,oBAAoB;IAc5B,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,MAAM;IAaN,OAAO,CAAC,gBAAgB;IAiCxB,gBAAgB,CAAC,QAAQ,KAAA;IASnB,eAAe;IAOrB,YAAY;IAKZ,QAAQ;IAKR,aAAa,CAAC,eAAe,EAAE,aAAa;IAI5C,eAAe,CAAC,gBAAgB,EAAE,aAAa;IAUxC,sBAAsB;CAK9B"}

package/dist/dts/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rule-dialog.template.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.template.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,eAAO,MAAM,kBAAkB,iEAgJ9B,CAAC"}
+{"version":3,"file":"rule-dialog.template.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.template.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIhD,eAAO,MAAM,kBAAkB,iEAuL9B,CAAC"}

package/dist/esm/components/components.js

@@ -1,7 +1,6 @@
 import { __awaiter } from "tslib";
 import { foundationLayoutComponents } from '@genesislcap/foundation-layout';
 import * as rapidDesignSystem from '@genesislcap/rapid-design-system';
-import { RapidRuleExpressionBuilder } from '@genesislcap/rapid-design-system';
 import { rapidGridComponents } from '@genesislcap/rapid-grid-pro';
 import { FoundationInboxCounter } from './foundation-inbox/components/foundation-inbox-counter/foundation-inbox-counter';
 import { InboxSubscription } from './foundation-inbox/components/inbox-subscription/inbox-subscription';
@@ -33,7 +32,6 @@ RuleManagement;
 RuleDialog;
 RuleConditionBuilder;
 RuleConditionGroup;
-RapidRuleExpressionBuilder;
 TemplateManagement;
 TemplateDialog;
 ParameterBuilder;

package/dist/esm/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.js

@@ -1,12 +1,11 @@
 import { __awaiter, __decorate } from "tslib";
 import { customElement, GenesisElement, observable } from '@genesislcap/web-core';
-import { Assignment, defaultUpdateType, Severity } from '../../../../../notify.types';
+import { Assignment, defaultUpdateType, Severity, } from '../../../../../notify.types';
 import { NotifyService } from '../../../../../services/notify.service';
 import { RuleService } from '../../../../../services/rule.service';
 import { SystemService } from '../../../../../services/system.service';
 import { humanize } from '../../../../../utils';
-import { DynamicRuleUtils, showNotificationError, isEmpty, } from '../../../notification-dashboard.utils';
-import { conditionsToRuleExpression, mapFieldsToExpressionBuilderFields, rawTextToRuleExpression, ruleExpressionToRawText, } from '../../../rule-expression-builder.utils';
+import { DynamicRuleUtils, RuleUtils, showNotificationError, isEmpty, } from '../../../notification-dashboard.utils';
 import { DynamicRuleDialogStyles } from '../../../styles/dynamic-rule.styles';
 import { RuleDialogTemplate } from './rule-dialog.template';
 import { RuleDialogMode } from './rule-dialog.types';
@@ -28,25 +27,14 @@ let RuleDialog = class RuleDialog extends GenesisElement {
         this.updateType = defaultUpdateType;
         this.header = '';
         this.message = '';
+        this.conditions = [];
+        // Live read-only preview of the compiled expression, so it's obvious
+        // exactly how a group of rows is being parenthesized as you build it,
+        // rather than only finding out after Submit.
+        this.rawExpressionPreview = '';
         this.resources = [];
         this.fields = [];
         this.topics = [];
-        // Condition(s) are edited via the platform's rapid-rule-expression-builder
-        // (@genesislcap/rapid-design-system) instead of a hand-rolled builder - it
-        // natively supports nested AND/OR groups. ruleExpressionConfig.model holds
-        // the tree being edited; currentRuleExpression tracks the latest emitted
-        // value from the widget's own change event so submit() has something to
-        // serialize even if the user never touched the fields (e.g. editing only
-        // the header).
-        this.ruleExpressionConfig = {
-            fields: [],
-            partialRuleValidationWarning: true,
-        };
-        this.currentRuleExpression = null;
-        // Live read-only preview of the compiled RAW_RULE_EXPRESSION, so it's
-        // obvious exactly how a group of rows is being parenthesized as you build
-        // it, rather than only finding out after Submit.
-        this.rawExpressionPreview = '';
     }
     openDialog(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -77,28 +65,28 @@ let RuleDialog = class RuleDialog extends GenesisElement {
         this.topic = null;
         this.severity = null;
         this.ruleDialogMode = null;
-        this.currentRuleExpression = null;
         // Arrays
         this.resources = [];
         this.topics = [];
+        this.conditions = [];
         this.updateType = [];
         this.dialog.close();
         this.$emit('close');
     }
     createRule() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.conditions.push(DynamicRuleUtils.createEmptyCondition());
             this.resource = this.resources[0];
             this.fields = yield this.systemService.getFields(this.resource);
             this.topic = this.topics[0];
             this.severity = Severity.INFORMATION;
             this.updateType = defaultUpdateType;
-            this.currentRuleExpression = null;
-            this.refreshRuleExpressionConfig();
+            this.refreshExpressionPreview();
         });
     }
     editRule(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
             const rule = data;
             this.ruleId = rule.DYNAMIC_RULE_ID;
             this.name = rule.RULE_NAME;
@@ -106,26 +94,28 @@ let RuleDialog = class RuleDialog extends GenesisElement {
             this.resource = rule.RULE_TABLE;
             this.updateType = rule.TABLE_OPERATIONS;
             this.fields = yield this.systemService.getFields(this.resource);
-            // Structured (flat AND-only) CONDITIONS and raw (arbitrary AND/OR) rules
-            // both normalise to a PredicateExpression to hydrate the widget with.
+            // OR-based rules are stored as a raw expression (RULE_EXPRESSION is null);
+            // reverse-parse it back into structured conditions so editing doesn't crash.
             const conditions = (_a = rule.RULE_EXPRESSION) === null || _a === void 0 ? void 0 : _a.CONDITIONS;
-            this.currentRuleExpression = conditions
-                ? conditionsToRuleExpression(conditions)
+            const loadedConditions = conditions
+                ? RuleUtils.getConditions(conditions)
                 : rule.RAW_RULE_EXPRESSION
-                    ? rawTextToRuleExpression(rule.RAW_RULE_EXPRESSION)
-                    : null;
-            this.refreshRuleExpressionConfig();
-            this.attributeAssignments((_b = rule.RESULT_EXPRESSION) === null || _b === void 0 ? void 0 : _b.ASSIGNMENTS);
+                    ? ((_b = DynamicRuleUtils.parseRawExpression(rule.RAW_RULE_EXPRESSION)) !== null && _b !== void 0 ? _b : [
+                        DynamicRuleUtils.createEmptyCondition(),
+                    ])
+                    : [DynamicRuleUtils.createEmptyCondition()];
+            this.conditions = DynamicRuleUtils.resolveLeftValues(loadedConditions, this.fields);
+            this.refreshExpressionPreview();
+            this.attributeAssignments((_c = rule.RESULT_EXPRESSION) === null || _c === void 0 ? void 0 : _c.ASSIGNMENTS);
         });
     }
-    refreshRuleExpressionConfig() {
-        var _a;
-        this.ruleExpressionConfig = Object.assign(Object.assign({}, this.ruleExpressionConfig), { fields: mapFieldsToExpressionBuilderFields(this.fields), model: (_a = this.currentRuleExpression) !== null && _a !== void 0 ? _a : undefined });
-        this.rawExpressionPreview = ruleExpressionToRawText(this.currentRuleExpression);
-    }
-    handleRuleExpressionChange(expression) {
-        this.currentRuleExpression = expression;
-        this.rawExpressionPreview = ruleExpressionToRawText(expression);
+    refreshExpressionPreview() {
+        try {
+            this.rawExpressionPreview = DynamicRuleUtils.buildRawExpression(this.conditions);
+        }
+        catch (_a) {
+            this.rawExpressionPreview = '';
+        }
     }
     attributeAssignments(assignments) {
         var _a;
@@ -152,11 +142,19 @@ let RuleDialog = class RuleDialog extends GenesisElement {
         }
     }
     createRuleObject() {
-        // The widget can express arbitrary AND/OR nesting that the structured
-        // CONDITIONS format has no representation for, so rules built through it
-        // always submit via RAW_RULE_EXPRESSION (RULE_EXPRESSION null) - the
-        // server branches on which one is non-null.
-        return Object.assign(Object.assign({}, (this.ruleDialogMode === RuleDialogMode.EDIT && { DYNAMIC_RULE_ID: this.ruleId })), { RULE_NAME: this.name, RULE_DESCRIPTION: this.description, RULE_TABLE: this.resource, TABLE_OPERATIONS: this.updateType, RULE_EXPRESSION: null, RAW_RULE_EXPRESSION: ruleExpressionToRawText(this.currentRuleExpression), RESULT_EXPRESSION: {
+        // When any condition carries multiple values, a row is explicitly
+        // OR-joined to the previous one, or a group is present (groups have no
+        // structured-CONDITIONS representation), submit an OR-expression via
+        // RAW_RULE_EXPRESSION (with RULE_EXPRESSION null); otherwise use the
+        // structured CONDITIONS. The server branches on which one is non-null.
+        const useRaw = DynamicRuleUtils.hasMultiValueCondition(this.conditions) ||
+            DynamicRuleUtils.hasOrJoin(this.conditions) ||
+            DynamicRuleUtils.hasGroup(this.conditions);
+        return Object.assign(Object.assign({}, (this.ruleDialogMode === RuleDialogMode.EDIT && { DYNAMIC_RULE_ID: this.ruleId })), { RULE_NAME: this.name, RULE_DESCRIPTION: this.description, RULE_TABLE: this.resource, TABLE_OPERATIONS: this.updateType, RULE_EXPRESSION: useRaw
+                ? null
+                : {
+                    CONDITIONS: DynamicRuleUtils.createConditions(this.conditions),
+                }, RAW_RULE_EXPRESSION: useRaw ? DynamicRuleUtils.buildRawExpression(this.conditions) : null, RESULT_EXPRESSION: {
                 ASSIGNMENTS: [
                     DynamicRuleUtils.createAssignment(Assignment.TOPIC, this.topic),
                     DynamicRuleUtils.createTextAssignment(Assignment.HEADER, this.header, this.fields),
@@ -174,11 +172,31 @@ let RuleDialog = class RuleDialog extends GenesisElement {
     }
     resourceChanged() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.currentRuleExpression = null;
+            this.conditions = [DynamicRuleUtils.createEmptyCondition()];
             this.fields = yield this.systemService.getFields(this.resource);
-            this.refreshRuleExpressionConfig();
+            this.refreshExpressionPreview();
         });
     }
+    // #region Condition
+    newCondition() {
+        this.conditions.push(DynamicRuleUtils.createEmptyCondition());
+        this.refreshExpressionPreview();
+    }
+    newGroup() {
+        this.conditions.push(DynamicRuleUtils.createEmptyGroup());
+        this.refreshExpressionPreview();
+    }
+    editCondition(editedCondition) {
+        this.refreshExpressionPreview();
+    }
+    deleteCondition(deletedCondition) {
+        if (this.conditions.length <= 1) {
+            return;
+        }
+        this.conditions = this.conditions.filter((condition) => condition !== deletedCondition);
+        this.refreshExpressionPreview();
+    }
+    // #endregion
     validateRequiredFields() {
         this.submitDisabled = [this.name, this.description, this.header, this.message].some((value) => isEmpty(value));
     }
@@ -221,22 +239,22 @@ __decorate([
 ], RuleDialog.prototype, "message", void 0);
 __decorate([
     observable
-], RuleDialog.prototype, "submitDisabled", void 0);
+], RuleDialog.prototype, "conditions", void 0);
 __decorate([
     observable
-], RuleDialog.prototype, "resources", void 0);
+], RuleDialog.prototype, "submitDisabled", void 0);
 __decorate([
     observable
-], RuleDialog.prototype, "fields", void 0);
+], RuleDialog.prototype, "rawExpressionPreview", void 0);
 __decorate([
     observable
-], RuleDialog.prototype, "topics", void 0);
+], RuleDialog.prototype, "resources", void 0);
 __decorate([
     observable
-], RuleDialog.prototype, "ruleExpressionConfig", void 0);
+], RuleDialog.prototype, "fields", void 0);
 __decorate([
     observable
-], RuleDialog.prototype, "rawExpressionPreview", void 0);
+], RuleDialog.prototype, "topics", void 0);
 RuleDialog = __decorate([
     customElement({
         name: 'rule-dialog',

package/dist/esm/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-dialog.template.js

@@ -1,6 +1,8 @@
 import { sync } from '@genesislcap/foundation-utils';
-import { html, ref, repeat } from '@genesislcap/web-core';
+import { html, ref, repeat, when } from '@genesislcap/web-core';
 import { Severity, UpdateType } from '../../../../../notify.types';
+import { eventDetail } from '../../../../../utils/eventDetail';
+const isGroup = (node) => Array.isArray(node.CHILDREN);
 export const RuleDialogTemplate = html `
   <rapid-modal ${ref('dialog')} class="dialog" :onCloseCallback=${(x) => () => x.close()}>
     <div slot="top" class="dialog-top">${(x) => x.ruleDialogTitle}</div>
@@ -115,10 +117,39 @@ export const RuleDialogTemplate = html `
 
       <div class="control">
         <label>Condition(s)</label>
-        <rapid-rule-expression-builder
-          :ruleConfig=${(x) => x.ruleExpressionConfig}
-          @change=${(x, c) => x.handleRuleExpressionChange(c.event.detail)}
-        ></rapid-rule-expression-builder>
+        <div class="items">
+          <div class="content-row item">
+            ${repeat((x) => x.conditions, html `
+                ${when((x) => isGroup(x), html `
+                    <rule-condition-group
+                      :fields=${(x, c) => c.parent.fields}
+                      :node=${(x) => x}
+                      :isFirst=${(x, c) => c.index === 0}
+                      @edit=${(x, c) => c.parent.editCondition(eventDetail(c))}
+                      @delete=${(x, c) => c.parent.deleteCondition(eventDetail(c))}
+                    ></rule-condition-group>
+                  `)}
+                ${when((x) => !isGroup(x), html `
+                    <rule-condition-builder
+                      :fields=${(x, c) => c.parent.fields}
+                      :condition=${(x) => x}
+                      :isFirst=${(x, c) => c.index === 0}
+                      @edit=${(x, c) => c.parent.editCondition(eventDetail(c))}
+                      @delete=${(x, c) => c.parent.deleteCondition(eventDetail(c))}
+                    ></rule-condition-builder>
+                  `)}
+              `, { positioning: true })}
+          </div>
+
+          <div class="content-row">
+            <rapid-button appearance="lightweight" @click=${(x) => x.newCondition()}>
+              + Condition
+            </rapid-button>
+            <rapid-button appearance="lightweight" @click=${(x) => x.newGroup()}>
+              + Group
+            </rapid-button>
+          </div>
+        </div>
         <rapid-text-area
           class="expression-preview"
           readonly