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

package/dist/custom-elements.json

@@ -379,27 +379,6 @@
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "src/styles/scrollbar.styles.ts",
-      "declarations": [
-        {
-          "kind": "variable",
-          "name": "scrollbarStyles",
-          "default": "css`\n  ::-webkit-scrollbar {\n    width: calc((var(--base-height-multiplier) + var(--design-unit)) * 1px);\n  }\n\n  ::-webkit-scrollbar-track {\n    background: var(--neutral-layer-1);\n  }\n\n  ::-webkit-scrollbar-thumb {\n    background: var(--neutral-fill-rest);\n  }\n`"
-        }
-      ],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "scrollbarStyles",
-          "declaration": {
-            "name": "scrollbarStyles",
-            "module": "src/styles/scrollbar.styles.ts"
-          }
-        }
-      ]
-    },
     {
       "kind": "javascript-module",
       "path": "src/utils/eventDetail.ts",
@@ -721,6 +700,27 @@
         }
       ]
     },
+    {
+      "kind": "javascript-module",
+      "path": "src/styles/scrollbar.styles.ts",
+      "declarations": [
+        {
+          "kind": "variable",
+          "name": "scrollbarStyles",
+          "default": "css`\n  ::-webkit-scrollbar {\n    width: calc((var(--base-height-multiplier) + var(--design-unit)) * 1px);\n  }\n\n  ::-webkit-scrollbar-track {\n    background: var(--neutral-layer-1);\n  }\n\n  ::-webkit-scrollbar-thumb {\n    background: var(--neutral-fill-rest);\n  }\n`"
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "scrollbarStyles",
+          "declaration": {
+            "name": "scrollbarStyles",
+            "module": "src/styles/scrollbar.styles.ts"
+          }
+        }
+      ]
+    },
     {
       "kind": "javascript-module",
       "path": "src/components/foundation-inbox/inbox.styles.ts",
@@ -748,7 +748,7 @@
         {
           "kind": "variable",
           "name": "ruleAndTemplate",
-          "default": "css`\n  .template {\n    cursor: pointer;\n\n    .template-name {\n      font-weight: 700;\n    }\n\n    .template-description {\n      font-size: var(--type-ramp-minus-2-font-size);\n    }\n\n    .template-datetime {\n      font-size: var(--type-ramp-minus-1-font-size);\n      color: var(--neutral-foreground-hint);\n    }\n  }\n\n  .rule {\n    cursor: pointer;\n\n    .rule-name {\n      font-weight: 700;\n    }\n\n    .rule-expression {\n      font-size: var(--type-ramp-minus-2-font-size);\n    }\n\n    .rule-datetime {\n      font-size: var(--type-ramp-minus-1-font-size);\n      color: var(--neutral-foreground-hint);\n    }\n  }\n\n  .rule,\n  .template {\n    border-bottom: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    padding: calc(var(--design-unit) * 2px) calc(var(--design-unit) * 3px);\n  }\n\n  .rule-status-actions {\n    display: flex;\n    flex-direction: row;\n    gap: calc(var(--design-unit) * 2px);\n  }\n\n  .rule:hover,\n  .template:hover {\n    background-color: var(--neutral-layer-3);\n  }\n\n  .rule-actions {\n    margin-left: auto;\n    display: flex;\n    gap: calc(var(--design-unit) * 3px);\n    justify-content: space-between;\n    visibility: hidden;\n  }\n\n  .rule:hover > .rule-status-actions > .rule-actions {\n    visibility: visible;\n  }\n\n  .active {\n    color: #7acc79;\n  }\n\n  .paused {\n    color: #ffb660;\n  }\n\n  .rule-action-edit,\n  .rule-action-enable-disable,\n  .rule-action-delete {\n    cursor: pointer;\n  }\n\n  .close-icon {\n    position: absolute;\n    right: calc(var(--design-unit) * 2px);\n    cursor: pointer;\n  }\n`"
+          "default": "css`\n  .template {\n    .template-row {\n      display: flex;\n      align-items: flex-start;\n      justify-content: space-between;\n      gap: calc(var(--design-unit) * 3px);\n    }\n\n    .template-details {\n      flex: 1;\n      min-width: 0;\n    }\n\n    .template-subscribe-toggle {\n      flex-shrink: 0;\n      margin-top: calc(var(--design-unit) * 1px);\n    }\n\n    .template-name {\n      font-weight: 700;\n    }\n\n    .template-description {\n      font-size: var(--type-ramp-minus-2-font-size);\n    }\n\n    .template-datetime {\n      font-size: var(--type-ramp-minus-1-font-size);\n      color: var(--neutral-foreground-hint);\n    }\n  }\n\n  .rule {\n    cursor: pointer;\n\n    .rule-name {\n      font-weight: 700;\n    }\n\n    .rule-expression {\n      font-size: var(--type-ramp-minus-2-font-size);\n    }\n\n    .rule-datetime {\n      font-size: var(--type-ramp-minus-1-font-size);\n      color: var(--neutral-foreground-hint);\n    }\n  }\n\n  .rule,\n  .template {\n    border-bottom: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    padding: calc(var(--design-unit) * 2px) calc(var(--design-unit) * 3px);\n  }\n\n  .template-subscribing {\n    position: relative;\n    z-index: 5;\n    overflow: visible;\n    padding-bottom: calc(var(--design-unit) * 24px);\n  }\n\n  .rule-status-actions {\n    display: flex;\n    flex-direction: row;\n    gap: calc(var(--design-unit) * 2px);\n  }\n\n  .rule:hover {\n    background-color: var(--neutral-layer-3);\n  }\n\n  .rule-actions {\n    margin-left: auto;\n    display: flex;\n    gap: calc(var(--design-unit) * 3px);\n    justify-content: space-between;\n    visibility: hidden;\n  }\n\n  .rule:hover > .rule-status-actions > .rule-actions {\n    visibility: visible;\n  }\n\n  .active {\n    color: #7acc79;\n  }\n\n  .paused {\n    color: #ffb660;\n  }\n\n  .rule-action-edit,\n  .rule-action-enable-disable,\n  .rule-action-delete {\n    cursor: pointer;\n  }\n\n  .close-icon {\n    position: absolute;\n    right: calc(var(--design-unit) * 2px);\n    cursor: pointer;\n  }\n`"
         },
         {
           "kind": "variable",
@@ -815,7 +815,7 @@
         {
           "kind": "variable",
           "name": "FoundationInboxTemplate",
-          "default": "html<FoundationInbox>`\n  <div class=\"inbox-content\">\n    <rapid-tabs ${ref('tabs')} appearance=\"secondary\" activeid=${(x) => InboxTab.ALERTS_NEW}>\n      <rapid-tab\n        slot=\"alert-log-tab\"\n        id=${InboxTab.ALERTS_NEW}\n        @click=${(x) => x.inboxTabChanged(InboxTab.ALERTS_NEW)}\n        appearance=\"secondary\"\n      >\n        Alerts\n      </rapid-tab>\n      <rapid-tab\n        slot=\"alert-log-tab\"\n        id=${InboxTab.ALERT_HISTORY}\n        @click=${(x) => x.inboxTabChanged(InboxTab.ALERT_HISTORY)}\n        appearance=\"secondary\"\n      >\n        Alert History\n      </rapid-tab>\n      ${when(\n        (x) => x.auth.currentUser?.hasPermission(NotifyPermission.NotificationRuleView),\n        html`\n          <rapid-tab\n            slot=\"my-alerts-tab\"\n            id=${InboxTab.MY_ALERTS}\n            @click=${(x) => x.inboxTabChanged(InboxTab.MY_ALERTS)}\n            appearance=\"secondary\"\n          >\n            Subscriptions\n          </rapid-tab>\n        `,\n      )}\n      ${when(\n        (x) => x.auth.currentUser?.hasPermission(NotifyPermission.NotificationRuleTemplateView),\n        html`\n          <rapid-tab\n            slot=\"subscribe-tab\"\n            id=${InboxTab.SUBSCRIBE}\n            @click=${(x) => x.inboxTabChanged(InboxTab.SUBSCRIBE)}\n            appearance=\"secondary\"\n          >\n            Subscribe\n          </rapid-tab>\n        `,\n      )}\n\n      <!-- Alerts -->\n      ${(_) => alertsTab(InboxTab.ALERTS_NEW)} ${(_) => alertsTab(InboxTab.ALERT_HISTORY)}\n      ${when(\n        (x) => x.auth.currentUser?.hasPermission(NotifyPermission.NotificationRuleView),\n        html`\n          <!-- Rules -->\n          <rapid-tab-panel\n            slot=\"my-alerts-tab\"\n            class=\"my-alerts-tab-panel\"\n            id=${InboxTab.MY_ALERTS}\n            style=${(x) => (x.selectedTab === InboxTab.MY_ALERTS ? '' : 'display: none;')}\n          >\n            <div class=\"my-alerts-tab-content\">\n              ${repeat(\n                (x) => x.rulesFilter,\n                html<any>`\n                  <div class=\"rule\">\n                    <div class=\"rule-name\">${(x) => x.NAME}</div>\n                    <div class=\"rule-expression\">${(x) => x.RULE_EXPRESSION}</div>\n                    <div class=\"rule-datetime\">${(x, c) => getFormattedDate(x.DATETIME)}</div>\n                    <div class=\"rule-status-actions\">\n                      <div class=\"rule-status ${(x) => getStatus(x.RULE_STATUS).toLowerCase()}\">\n                        ${(x, c) => getStatus(x.RULE_STATUS)}\n                      </div>\n                      <div class=\"rule-actions\">\n                        <!--\n                        <span class=\"rule-action-edit\" @click=${(x, c) => c.parent.editAlert(x)}}>\n                          <rapid-icon name=\"gear\"></rapid-icon>\n                        </span>\n                        -->\n                        <span\n                          class=\"rule-action-enable-disable\"\n                          @click=${(x, c) => c.parent.playPauseAlert(x)}\n                        >\n                          <rapid-icon name=${(x) => getIcon(x.RULE_STATUS)}></rapid-icon>\n                        </span>\n                        <span\n                          class=\"rule-action-delete\"\n                          @click=${(x, c) => c.parent.deleteAlert(x)}\n                        >\n                          <rapid-icon name=\"trash\"></rapid-icon>\n                        </span>\n                      </div>\n                    </div>\n                  </div>\n                `,\n              )}\n            </div>\n          </rapid-tab-panel>\n        `,\n      )}\n      ${when(\n        (x) => x.auth.currentUser?.hasPermission(NotifyPermission.NotificationRuleTemplateView),\n        html`\n          <!-- Templates -->\n          <rapid-tab-panel\n            slot=\"subscribe-tab\"\n            class=\"subscribe-tab-panel\"\n            id=${InboxTab.SUBSCRIBE}\n            style=${(x) => (x.selectedTab === InboxTab.SUBSCRIBE ? '' : 'display: none;')}\n          >\n            <div class=\"search\">\n              <rapid-text-field\n                class=\"search-input\"\n                @input=${(x, c) => {\n                  x.searchSubscribe = (c.event.target as HTMLInputElement).value;\n                  x.filterSearchSubscribe();\n                }}\n                placeholder=\"Search Templates...\"\n                autocomplete=\"off\"\n              ></rapid-text-field>\n            </div>\n            <div class=\"subscribe-tab-content\">\n              ${repeat(\n                (x) => x.templatesFilter,\n                html`\n                  <div\n                    class=\"template\"\n                    @click=${(x, c) => c.parent.openTemplateSubscription(x)}\n                    id=${(x) => x.ID}\n                  >\n                    <div class=\"template-name\">${(x) => x.NAME}</div>\n                    <div class=\"template-description\">${(x) => x.DESCRIPTION}</div>\n                    <div class=\"template-datetime\">${(x, c) => getFormattedDate(x.DATETIME)}</div>\n                  </div>\n                `,\n              )}\n            </div>\n            ${when(\n              (x) => x.ruleTemplateDetails,\n              html`\n                <inbox-subscription\n                  :template=${(x) => x.ruleTemplateDetails}\n                  @templateSubscribed=${(x) => (x.ruleTemplateDetails = null)}\n                ></inbox-subscription>\n              `,\n            )}\n          </rapid-tab-panel>\n        `,\n      )}\n    </rapid-tabs>\n  </div>\n`",
+          "default": "html<FoundationInbox>`\n  <div class=\"inbox-content\">\n    <rapid-tabs ${ref('tabs')} appearance=\"secondary\" activeid=${(x) => InboxTab.ALERTS_NEW}>\n      <rapid-tab\n        slot=\"alert-log-tab\"\n        id=${InboxTab.ALERTS_NEW}\n        @click=${(x) => x.inboxTabChanged(InboxTab.ALERTS_NEW)}\n        appearance=\"secondary\"\n      >\n        Alerts\n      </rapid-tab>\n      <rapid-tab\n        slot=\"alert-log-tab\"\n        id=${InboxTab.ALERT_HISTORY}\n        @click=${(x) => x.inboxTabChanged(InboxTab.ALERT_HISTORY)}\n        appearance=\"secondary\"\n      >\n        Alert History\n      </rapid-tab>\n      ${when(\n        (x) => x.auth.currentUser?.hasPermission(NotifyPermission.NotificationRuleTemplateView),\n        html`\n          <rapid-tab\n            slot=\"subscribe-tab\"\n            id=${InboxTab.SUBSCRIBE}\n            @click=${(x) => x.inboxTabChanged(InboxTab.SUBSCRIBE)}\n            appearance=\"secondary\"\n          >\n            Subscribe\n          </rapid-tab>\n        `,\n      )}\n\n      <!-- Alerts -->\n      ${(_) => alertsTab(InboxTab.ALERTS_NEW)} ${(_) => alertsTab(InboxTab.ALERT_HISTORY)}\n      ${when(\n        (x) => x.auth.currentUser?.hasPermission(NotifyPermission.NotificationRuleTemplateView),\n        html`\n          <rapid-tab-panel\n            slot=\"subscribe-tab\"\n            class=\"subscribe-tab-panel\"\n            id=${InboxTab.SUBSCRIBE}\n            style=${(x) => (x.selectedTab === InboxTab.SUBSCRIBE ? '' : 'display: none;')}\n          >\n            <div class=\"search\">\n              <rapid-text-field\n                class=\"search-input\"\n                @input=${(x, c) => {\n                  x.searchSubscribe = (c.event.target as HTMLInputElement).value;\n                  x.filterSearchSubscribe();\n                }}\n                placeholder=\"Search Templates...\"\n                autocomplete=\"off\"\n              ></rapid-text-field>\n            </div>\n            <div class=\"subscribe-tab-content\">\n              ${repeat(\n                (x) => x.templatesFilter,\n                html<RuleTemplate, FoundationInbox>`\n                  <div\n                    class=\"template ${(x, c) =>\n                      c.parent.pendingSubscribeTemplateId === x.ID ? 'template-subscribing' : ''}\"\n                    id=${(x) => x.ID}\n                  >\n                    <div class=\"template-row\">\n                      <div class=\"template-details\">\n                        <div class=\"template-name\">${(x) => x.NAME}</div>\n                        <div class=\"template-description\">${(x) => x.DESCRIPTION}</div>\n                        <div class=\"template-datetime\">\n                          ${(x, c) => getFormattedDate(x.DATETIME)}\n                        </div>\n                      </div>\n                      <rapid-switch\n                        class=\"template-subscribe-toggle\"\n                        :checked=${(x, c) => c.parent.isTemplateSubscribed(x)}\n                        @change=${(x, c) => c.parent.handleTemplateToggle(x, c.event as Event)}\n                        @click=${(_, c) => c.event.stopPropagation()}\n                      ></rapid-switch>\n                    </div>\n                    ${when(\n                      (x, c) => c.parent.pendingSubscribeTemplateId === x.ID,\n                      html`\n                        <inbox-subscription\n                          inline\n                          :template=${(x, c) => c.parent.ruleTemplateDetails}\n                          @templateSubscribed=${(x, c) =>\n                            c.parent.onTemplateSubscribed(eventDetail(c))}\n                          @subscribeCancelled=${(x, c) => c.parent.cancelPendingSubscribe()}\n                        ></inbox-subscription>\n                      `,\n                    )}\n                  </div>\n                `,\n              )}\n            </div>\n          </rapid-tab-panel>\n        `,\n      )}\n    </rapid-tabs>\n  </div>\n`",
           "privacy": "public"
         }
       ],
@@ -961,18 +961,6 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
-            {
-              "kind": "field",
-              "name": "rulesFilter",
-              "type": {
-                "text": "Rule[]"
-              },
-              "default": "[]",
-              "inheritedFrom": {
-                "name": "FoundationInboxBase",
-                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "templateService",
@@ -1068,6 +1056,30 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
+            {
+              "kind": "field",
+              "name": "pendingSubscribeTemplateId",
+              "type": {
+                "text": "string"
+              },
+              "default": "null",
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "subscribedTemplateIds",
+              "type": {
+                "text": "Record<string, boolean>"
+              },
+              "default": "{}",
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
             {
               "kind": "field",
               "name": "selectedTab",
@@ -1222,14 +1234,6 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
-            {
-              "kind": "field",
-              "name": "rulesChanged",
-              "inheritedFrom": {
-                "name": "FoundationInboxBase",
-                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "templatesChanged",
@@ -1317,7 +1321,7 @@
             },
             {
               "kind": "method",
-              "name": "editAlert",
+              "name": "refreshSubscribeData",
               "inheritedFrom": {
                 "name": "FoundationInboxBase",
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
@@ -1325,12 +1329,17 @@
             },
             {
               "kind": "method",
-              "name": "playPauseAlert",
+              "name": "findSubscribedRule",
+              "return": {
+                "type": {
+                  "text": "Rule | undefined"
+                }
+              },
               "parameters": [
                 {
-                  "name": "ruleClicked",
+                  "name": "template",
                   "type": {
-                    "text": "Rule"
+                    "text": "RuleTemplate"
                   }
                 }
               ],
@@ -1341,12 +1350,17 @@
             },
             {
               "kind": "method",
-              "name": "deleteAlert",
+              "name": "isTemplateSubscribed",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              },
               "parameters": [
                 {
-                  "name": "ruleClicked",
+                  "name": "template",
                   "type": {
-                    "text": "Rule"
+                    "text": "RuleTemplate"
                   }
                 }
               ],
@@ -1357,12 +1371,35 @@
             },
             {
               "kind": "method",
-              "name": "openTemplateSubscription",
+              "name": "handleTemplateToggle",
               "parameters": [
                 {
-                  "name": "ruleTemplate",
+                  "name": "template",
                   "type": {
-                    "text": "any"
+                    "text": "RuleTemplate"
+                  }
+                },
+                {
+                  "name": "event",
+                  "type": {
+                    "text": "Event"
+                  }
+                }
+              ],
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "onTemplateSubscribed",
+              "parameters": [
+                {
+                  "name": "templateId",
+                  "optional": true,
+                  "type": {
+                    "text": "string"
                   }
                 }
               ],
@@ -1371,6 +1408,14 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
+            {
+              "kind": "method",
+              "name": "cancelPendingSubscribe",
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
             {
               "kind": "method",
               "name": "formatDateStrForMatchCriteria",
@@ -1420,24 +1465,6 @@
       "kind": "javascript-module",
       "path": "src/components/foundation-inbox/inbox.utils.ts",
       "declarations": [
-        {
-          "kind": "function",
-          "name": "getStatus",
-          "parameters": [
-            {
-              "name": "ruleStatus"
-            }
-          ]
-        },
-        {
-          "kind": "function",
-          "name": "getIcon",
-          "parameters": [
-            {
-              "name": "ruleStatus"
-            }
-          ]
-        },
         {
           "kind": "function",
           "name": "getFormattedDate",
@@ -1461,22 +1488,6 @@
         }
       ],
       "exports": [
-        {
-          "kind": "js",
-          "name": "getStatus",
-          "declaration": {
-            "name": "getStatus",
-            "module": "src/components/foundation-inbox/inbox.utils.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "getIcon",
-          "declaration": {
-            "name": "getIcon",
-            "module": "src/components/foundation-inbox/inbox.utils.ts"
-          }
-        },
         {
           "kind": "js",
           "name": "getFormattedDate",
@@ -1729,11 +1740,21 @@
               "name": "createAssignment",
               "static": true
             },
+            {
+              "kind": "field",
+              "name": "createTextAssignment",
+              "static": true
+            },
             {
               "kind": "field",
               "name": "getAssignmentValue",
               "static": true
             },
+            {
+              "kind": "field",
+              "name": "getAssignmentText",
+              "static": true
+            },
             {
               "kind": "method",
               "name": "createConditions",
@@ -1747,7 +1768,7 @@
                 {
                   "name": "conditions",
                   "type": {
-                    "text": "ConditionBuilderEntity[]"
+                    "text": "ConditionNode[]"
                   }
                 },
                 {
@@ -1755,121 +1776,258 @@
                   "optional": true
                 }
               ]
-            }
-          ]
-        },
-        {
-          "kind": "class",
-          "description": "",
-          "name": "TemplateUtils",
-          "members": [
-            {
-              "kind": "field",
-              "name": "createEmptyParameter",
-              "static": true
             },
             {
               "kind": "method",
-              "name": "getParameters",
+              "name": "hasMultiValueCondition",
               "static": true,
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              },
               "parameters": [
                 {
-                  "name": "parameters"
+                  "name": "conditions",
+                  "type": {
+                    "text": "ConditionNode[]"
+                  }
                 }
               ]
             },
             {
               "kind": "method",
-              "name": "buildRightValue",
-              "privacy": "private",
+              "name": "hasOrJoin",
               "static": true,
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              },
               "parameters": [
                 {
-                  "name": "logicalOperator",
+                  "name": "conditions",
                   "type": {
-                    "text": "LogicalOperator"
+                    "text": "ConditionNode[]"
                   }
-                },
-                {
-                  "name": "condition"
-                },
-                {
-                  "name": "parameters",
-                  "optional": true
                 }
               ]
             },
             {
               "kind": "method",
-              "name": "getConditions",
+              "name": "hasGroup",
               "static": true,
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              },
               "parameters": [
                 {
-                  "name": "conditions"
-                },
-                {
-                  "name": "parameters",
-                  "optional": true
+                  "name": "conditions",
+                  "type": {
+                    "text": "ConditionNode[]"
+                  }
                 }
               ]
             },
             {
               "kind": "method",
-              "name": "createParameterDetails",
+              "name": "flattenConditions",
               "static": true,
+              "return": {
+                "type": {
+                  "text": "ConditionBuilderEntity[]"
+                }
+              },
               "parameters": [
                 {
-                  "name": "parameters"
+                  "name": "conditions",
+                  "type": {
+                    "text": "ConditionNode[]"
+                  }
                 }
               ]
-            }
-          ]
-        },
-        {
-          "kind": "class",
-          "description": "",
-          "name": "RuleUtils",
-          "members": [
+            },
             {
               "kind": "method",
-              "name": "buildRightValue",
-              "privacy": "private",
+              "name": "resolveLeftValues",
               "static": true,
+              "return": {
+                "type": {
+                  "text": "ConditionNode[]"
+                }
+              },
               "parameters": [
                 {
-                  "name": "logicalOperator",
+                  "name": "conditions",
                   "type": {
-                    "text": "LogicalOperator"
+                    "text": "ConditionNode[]"
                   }
                 },
                 {
-                  "name": "condition"
+                  "name": "fields",
+                  "type": {
+                    "text": "any[]"
+                  }
                 }
               ]
             },
+            {
+              "kind": "field",
+              "name": "createEmptyGroup",
+              "static": true
+            },
             {
               "kind": "method",
-              "name": "getConditions",
+              "name": "buildRawExpression",
               "static": true,
+              "return": {
+                "type": {
+                  "text": "string"
+                }
+              },
               "parameters": [
                 {
-                  "name": "conditions"
+                  "name": "conditions",
+                  "type": {
+                    "text": "ConditionNode[]"
+                  }
                 }
               ]
-            }
-          ]
-        },
-        {
-          "kind": "function",
-          "name": "showNotificationError",
-          "parameters": [
+            },
             {
-              "name": "error"
-            }
-          ]
-        }
-      ],
-      "exports": [
+              "kind": "method",
+              "name": "parseRawExpression",
+              "static": true,
+              "return": {
+                "type": {
+                  "text": "ConditionNode[] | null"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "rawExpression",
+                  "type": {
+                    "text": "string"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "kind": "class",
+          "description": "",
+          "name": "TemplateUtils",
+          "members": [
+            {
+              "kind": "field",
+              "name": "createEmptyParameter",
+              "static": true
+            },
+            {
+              "kind": "method",
+              "name": "getParameters",
+              "static": true,
+              "parameters": [
+                {
+                  "name": "parameters"
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "buildRightValue",
+              "privacy": "private",
+              "static": true,
+              "parameters": [
+                {
+                  "name": "logicalOperator",
+                  "type": {
+                    "text": "LogicalOperator"
+                  }
+                },
+                {
+                  "name": "condition"
+                },
+                {
+                  "name": "parameters",
+                  "optional": true
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "getConditions",
+              "static": true,
+              "parameters": [
+                {
+                  "name": "conditions"
+                },
+                {
+                  "name": "parameters",
+                  "optional": true
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "createParameterDetails",
+              "static": true,
+              "parameters": [
+                {
+                  "name": "parameters"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "kind": "class",
+          "description": "",
+          "name": "RuleUtils",
+          "members": [
+            {
+              "kind": "method",
+              "name": "buildRightValue",
+              "privacy": "private",
+              "static": true,
+              "parameters": [
+                {
+                  "name": "logicalOperator",
+                  "type": {
+                    "text": "LogicalOperator"
+                  }
+                },
+                {
+                  "name": "condition"
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "getConditions",
+              "static": true,
+              "parameters": [
+                {
+                  "name": "conditions"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "kind": "function",
+          "name": "showNotificationError",
+          "parameters": [
+            {
+              "name": "error"
+            }
+          ]
+        }
+      ],
+      "exports": [
         {
           "kind": "js",
           "name": "UUIDGenerator",
@@ -1920,6 +2078,114 @@
         }
       ]
     },
+    {
+      "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",
@@ -2005,14 +2271,6 @@
               },
               "default": "[]"
             },
-            {
-              "kind": "field",
-              "name": "rulesFilter",
-              "type": {
-                "text": "Rule[]"
-              },
-              "default": "[]"
-            },
             {
               "kind": "field",
               "name": "templateService",
@@ -2076,6 +2334,22 @@
               },
               "default": "null"
             },
+            {
+              "kind": "field",
+              "name": "pendingSubscribeTemplateId",
+              "type": {
+                "text": "string"
+              },
+              "default": "null"
+            },
+            {
+              "kind": "field",
+              "name": "subscribedTemplateIds",
+              "type": {
+                "text": "Record<string, boolean>"
+              },
+              "default": "{}"
+            },
             {
               "kind": "field",
               "name": "selectedTab",
@@ -2174,10 +2448,6 @@
               "kind": "method",
               "name": "loadMoreAlerts"
             },
-            {
-              "kind": "field",
-              "name": "rulesChanged"
-            },
             {
               "kind": "field",
               "name": "templatesChanged"
@@ -2229,44 +2499,77 @@
             },
             {
               "kind": "method",
-              "name": "editAlert"
+              "name": "refreshSubscribeData"
             },
             {
               "kind": "method",
-              "name": "playPauseAlert",
+              "name": "findSubscribedRule",
+              "return": {
+                "type": {
+                  "text": "Rule | undefined"
+                }
+              },
               "parameters": [
                 {
-                  "name": "ruleClicked",
+                  "name": "template",
                   "type": {
-                    "text": "Rule"
+                    "text": "RuleTemplate"
                   }
                 }
               ]
             },
             {
               "kind": "method",
-              "name": "deleteAlert",
+              "name": "isTemplateSubscribed",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              },
               "parameters": [
                 {
-                  "name": "ruleClicked",
+                  "name": "template",
                   "type": {
-                    "text": "Rule"
+                    "text": "RuleTemplate"
                   }
                 }
               ]
             },
             {
               "kind": "method",
-              "name": "openTemplateSubscription",
+              "name": "handleTemplateToggle",
               "parameters": [
                 {
-                  "name": "ruleTemplate",
+                  "name": "template",
                   "type": {
-                    "text": "any"
+                    "text": "RuleTemplate"
+                  }
+                },
+                {
+                  "name": "event",
+                  "type": {
+                    "text": "Event"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "onTemplateSubscribed",
+              "parameters": [
+                {
+                  "name": "templateId",
+                  "optional": true,
+                  "type": {
+                    "text": "string"
                   }
                 }
               ]
             },
+            {
+              "kind": "method",
+              "name": "cancelPendingSubscribe"
+            },
             {
               "kind": "method",
               "name": "formatDateStrForMatchCriteria",
@@ -2305,7 +2608,12 @@
         {
           "kind": "variable",
           "name": "ConditionBuilderStyles",
-          "default": "css`\n  .condition-builder {\n    display: flex;\n    gap: calc(var(--design-unit) * 2px);\n    margin-bottom: calc(var(--design-unit) * 2px);\n  }\n\n  rapid-button {\n    margin: 0;\n  }\n\n  .delete {\n    margin: 0;\n    display: flex;\n    justify-content: center;\n    height: calc(var(--design-unit) * 9px);\n  }\n\n  .delete:hover {\n    background-color: color-mix(in srgb, var(--neutral-foreground-rest), transparent 89%);\n  }\n\n  rapid-text-field {\n    width: 100%;\n    margin-bottom: 0;\n  }\n\n  rapid-text-field::part(root) {\n    height: calc(var(--design-unit) * 9px);\n  }\n\n  rapid-select {\n    min-width: auto;\n  }\n\n  rapid-select.left-value::part(control) {\n    width: 250px;\n  }\n\n  rapid-select.logical-operator::part(control) {\n    width: 160px;\n  }\n\n  .logical-operator-null-and-blank {\n    width: 100%;\n  }\n\n  rapid-select.right-criteria::part(control) {\n    width: 135px;\n  }\n\n  rapid-select.right-criteria-user-entry {\n    width: 100%;\n  }\n\n  rapid-select.right-criteria-select {\n    width: 100%;\n    min-width: 0;\n  }\n\n  rapid-select::part(listbox) {\n    max-height: 160px;\n  }\n`"
+          "default": "css`\n  .condition-builder {\n    display: flex;\n    gap: calc(var(--design-unit) * 2px);\n    align-items: center;\n    margin-bottom: calc(var(--design-unit) * 2px);\n  }\n\n  rapid-button {\n    margin: 0;\n  }\n\n  /* The AND/OR toggle sits on its own row ABOVE the condition it joins,\n     rendered as a pair of small text links rather than buttons - reads like\n     a sentence connector (\"... and ...\") instead of a UI control competing\n     with the row's fields for attention. */\n  .join-toggle-row {\n    display: flex;\n    margin-bottom: calc(var(--design-unit) * 1px);\n  }\n\n  .join-toggle {\n    display: flex;\n    gap: calc(var(--design-unit) * 1.5px);\n  }\n\n  .join-text {\n    font-size: 11px;\n    font-weight: 700;\n    letter-spacing: 0.02em;\n    color: var(--accent-fill-rest);\n    cursor: pointer;\n    text-decoration: underline dotted;\n    text-underline-offset: 3px;\n    opacity: 40%;\n  }\n\n  .join-text:hover {\n    opacity: 70%;\n  }\n\n  .join-text.active {\n    opacity: 100%;\n    text-decoration: underline solid;\n  }\n\n  .join-text.active:hover {\n    opacity: 100%;\n  }\n\n  .delete {\n    margin: 0;\n    display: flex;\n    justify-content: center;\n    height: calc(var(--design-unit) * 9px);\n  }\n\n  .delete:hover {\n    background-color: color-mix(in srgb, var(--neutral-foreground-rest), transparent 89%);\n  }\n\n  rapid-text-field {\n    width: 100%;\n    margin-bottom: 0;\n  }\n\n  rapid-text-field::part(root) {\n    height: calc(var(--design-unit) * 9px);\n  }\n\n  rapid-select {\n    min-width: auto;\n  }\n\n  rapid-select.left-value::part(control) {\n    width: 250px;\n  }\n\n  rapid-select.logical-operator::part(control) {\n    width: 160px;\n  }\n\n  .logical-operator-null-and-blank {\n    width: 100%;\n  }\n\n  rapid-select.right-criteria::part(control) {\n    width: 135px;\n  }\n\n  rapid-select.right-criteria-user-entry {\n    width: 100%;\n  }\n\n  rapid-select.right-criteria-select {\n    width: 100%;\n    min-width: 0;\n  }\n\n  rapid-select::part(listbox) {\n    max-height: 160px;\n  }\n`"
+        },
+        {
+          "kind": "variable",
+          "name": "ConditionGroupStyles",
+          "default": "css`\n  .condition-group-row {\n    margin-bottom: calc(var(--design-unit) * 2px);\n  }\n\n  /* The AND/OR toggle sits on its own row ABOVE the group it joins - see\n     ConditionBuilderStyles' .join-toggle-row/.join-text for why it's a pair\n     of text links rather than buttons. */\n  .join-toggle-row {\n    display: flex;\n    margin-bottom: calc(var(--design-unit) * 1px);\n  }\n\n  .join-toggle {\n    display: flex;\n    gap: calc(var(--design-unit) * 1.5px);\n  }\n\n  .join-text {\n    font-size: 11px;\n    font-weight: 700;\n    letter-spacing: 0.02em;\n    color: var(--accent-fill-rest);\n    cursor: pointer;\n    text-decoration: underline dotted;\n    text-underline-offset: 3px;\n    opacity: 40%;\n  }\n\n  .join-text:hover {\n    opacity: 70%;\n  }\n\n  .join-text.active {\n    opacity: 100%;\n    text-decoration: underline solid;\n  }\n\n  .join-text.active:hover {\n    opacity: 100%;\n  }\n\n  /* A full bordered box reads as \"this is one parenthesized unit\" more\n     literally than a left rail - it nests naturally too, a group inside a\n     group just gets a second box drawn inside the first, like actual nested\n     parens would look. */\n  .condition-group-box {\n    flex: 1;\n    min-width: 0;\n    border: calc(var(--design-unit) * 0.5px) solid\n      color-mix(in srgb, var(--accent-fill-rest), transparent 25%);\n    border-radius: calc(var(--design-unit) * 1px);\n    padding: calc(var(--design-unit) * 2px);\n    background-color: color-mix(in srgb, var(--accent-fill-rest), transparent 96%);\n  }\n\n  .condition-group-box > .content-row {\n    display: flex;\n    gap: calc(var(--design-unit) * 2px);\n    align-items: center;\n    margin-top: calc(var(--design-unit) * 1px);\n  }\n\n  .condition-group-box > .content-row rapid-button {\n    font-size: 12px;\n  }\n\n  rule-condition-builder,\n  rule-condition-group,\n  template-condition-builder,\n  template-condition-group {\n    display: block;\n    margin-bottom: calc(var(--design-unit) * 1px);\n  }\n\n  .delete-group {\n    margin: 0;\n    opacity: 60%;\n  }\n\n  .delete-group:hover {\n    opacity: 100%;\n  }\n`"
         }
       ],
       "exports": [
@@ -2316,6 +2624,14 @@
             "name": "ConditionBuilderStyles",
             "module": "src/components/foundation-notification-dashboard/styles/condition-builder.styles.ts"
           }
+        },
+        {
+          "kind": "js",
+          "name": "ConditionGroupStyles",
+          "declaration": {
+            "name": "ConditionGroupStyles",
+            "module": "src/components/foundation-notification-dashboard/styles/condition-builder.styles.ts"
+          }
         }
       ]
     },
@@ -2331,7 +2647,7 @@
         {
           "kind": "variable",
           "name": "DynamicRuleDialogStyles",
-          "default": "css`\n  ${scrollbarStyles}\n  ${top}\n  ${bottom}\n\n  rapid-modal::part(dialog) {\n    padding: 0;\n    background: var(--neutral-layer-4);\n    border: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n  }\n\n  .dialog-content {\n    display: flex;\n    flex-direction: column;\n    width: ${String(modalWidthPx)}px;\n    max-height: 500px;\n    overflow-y: scroll;\n    gap: calc(var(--design-unit) * 3px);\n    padding: calc(var(--design-unit) * 4px);\n  }\n\n  .content-row {\n    display: flex;\n    gap: calc(var(--design-unit) * 3px);\n  }\n\n  .control {\n    display: flex;\n    flex-direction: column;\n    width: 100%;\n    gap: calc(var(--design-unit) * 2px);\n  }\n\n  .items {\n    border: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    border-radius: calc(var(--control-corner-radius) * 1px);\n    display: flex;\n    padding: calc(var(--design-unit) * 2px);\n    flex-direction: column;\n  }\n\n  .item {\n    gap: 0;\n    flex-direction: column;\n    margin-bottom: 0;\n  }\n\n  ${textField}\n  ${select}\n\n  rapid-button {\n    margin: 0;\n  }\n\n  rapid-select {\n    min-width: 0;\n  }\n\n  rapid-select::part(listbox) {\n    max-height: 160px;\n  }\n\n  .horizontal {\n    flex-direction: row;\n  }\n\n  .destination {\n    align-self: center;\n  }\n\n  .topic {\n    min-width: revert-layer;\n  }\n`"
+          "default": "css`\n  ${scrollbarStyles}\n  ${top}\n  ${bottom}\n\n  rapid-modal::part(dialog) {\n    padding: 0;\n    background: var(--neutral-layer-4);\n    border: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n  }\n\n  .dialog-content {\n    display: flex;\n    flex-direction: column;\n    width: ${String(modalWidthPx)}px;\n    max-height: 500px;\n    overflow-y: scroll;\n    gap: calc(var(--design-unit) * 3px);\n    padding: calc(var(--design-unit) * 4px);\n  }\n\n  .content-row {\n    display: flex;\n    gap: calc(var(--design-unit) * 3px);\n  }\n\n  .control {\n    display: flex;\n    flex-direction: column;\n    width: 100%;\n    gap: calc(var(--design-unit) * 2px);\n  }\n\n  .items {\n    border: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    border-radius: calc(var(--control-corner-radius) * 1px);\n    display: flex;\n    padding: calc(var(--design-unit) * 2px);\n    flex-direction: column;\n  }\n\n  .item {\n    gap: 0;\n    flex-direction: column;\n    margin-bottom: 0;\n  }\n\n  ${textField}\n  ${select}\n\n  rapid-button {\n    margin: 0;\n  }\n\n  rapid-select {\n    min-width: 0;\n  }\n\n  rapid-select::part(listbox) {\n    max-height: 160px;\n  }\n\n  .horizontal {\n    flex-direction: row;\n  }\n\n  .destination {\n    align-self: center;\n  }\n\n  .topic {\n    min-width: revert-layer;\n  }\n\n  .expression-preview {\n    width: 100%;\n    margin-top: calc(var(--design-unit) * 2px);\n  }\n\n  .expression-preview::part(control) {\n    font-family: var(--body-font, monospace);\n    font-size: 12px;\n    color: var(--neutral-foreground-hint);\n    min-height: calc(var(--design-unit) * 12px);\n    resize: vertical;\n  }\n`"
         }
       ],
       "exports": [
@@ -2726,9 +3042,9 @@
           "kind": "variable",
           "name": "ALL_PARAM_TYPES",
           "type": {
-            "text": "[\n  // PARAM_TYPE_FIELD,\n  PARAM_TYPE_STRING,\n  // PARAM_TYPE_BOOLEAN,\n  PARAM_TYPE_NUMBER,\n]"
+            "text": "[\n  // PARAM_TYPE_FIELD,\n  PARAM_TYPE_STRING,\n  PARAM_TYPE_BOOLEAN,\n  PARAM_TYPE_NUMBER,\n]"
           },
-          "default": "[\n  // PARAM_TYPE_FIELD,\n  PARAM_TYPE_STRING,\n  // PARAM_TYPE_BOOLEAN,\n  PARAM_TYPE_NUMBER,\n]"
+          "default": "[\n  // PARAM_TYPE_FIELD,\n  PARAM_TYPE_STRING,\n  PARAM_TYPE_BOOLEAN,\n  PARAM_TYPE_NUMBER,\n]"
         }
       ],
       "exports": [
@@ -3321,18 +3637,6 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
-            {
-              "kind": "field",
-              "name": "rulesFilter",
-              "type": {
-                "text": "Rule[]"
-              },
-              "default": "[]",
-              "inheritedFrom": {
-                "name": "FoundationInboxBase",
-                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "templateService",
@@ -3428,6 +3732,30 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
+            {
+              "kind": "field",
+              "name": "pendingSubscribeTemplateId",
+              "type": {
+                "text": "string"
+              },
+              "default": "null",
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "subscribedTemplateIds",
+              "type": {
+                "text": "Record<string, boolean>"
+              },
+              "default": "{}",
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
             {
               "kind": "field",
               "name": "selectedTab",
@@ -3582,14 +3910,6 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
-            {
-              "kind": "field",
-              "name": "rulesChanged",
-              "inheritedFrom": {
-                "name": "FoundationInboxBase",
-                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "templatesChanged",
@@ -3677,7 +3997,28 @@
             },
             {
               "kind": "method",
-              "name": "editAlert",
+              "name": "refreshSubscribeData",
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "findSubscribedRule",
+              "return": {
+                "type": {
+                  "text": "Rule | undefined"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "template",
+                  "type": {
+                    "text": "RuleTemplate"
+                  }
+                }
+              ],
               "inheritedFrom": {
                 "name": "FoundationInboxBase",
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
@@ -3685,12 +4026,17 @@
             },
             {
               "kind": "method",
-              "name": "playPauseAlert",
+              "name": "isTemplateSubscribed",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              },
               "parameters": [
                 {
-                  "name": "ruleClicked",
+                  "name": "template",
                   "type": {
-                    "text": "Rule"
+                    "text": "RuleTemplate"
                   }
                 }
               ],
@@ -3701,12 +4047,18 @@
             },
             {
               "kind": "method",
-              "name": "deleteAlert",
+              "name": "handleTemplateToggle",
               "parameters": [
                 {
-                  "name": "ruleClicked",
+                  "name": "template",
                   "type": {
-                    "text": "Rule"
+                    "text": "RuleTemplate"
+                  }
+                },
+                {
+                  "name": "event",
+                  "type": {
+                    "text": "Event"
                   }
                 }
               ],
@@ -3717,12 +4069,13 @@
             },
             {
               "kind": "method",
-              "name": "openTemplateSubscription",
+              "name": "onTemplateSubscribed",
               "parameters": [
                 {
-                  "name": "ruleTemplate",
+                  "name": "templateId",
+                  "optional": true,
                   "type": {
-                    "text": "any"
+                    "text": "string"
                   }
                 }
               ],
@@ -3731,6 +4084,14 @@
                 "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
               }
             },
+            {
+              "kind": "method",
+              "name": "cancelPendingSubscribe",
+              "inheritedFrom": {
+                "name": "FoundationInboxBase",
+                "module": "src/components/foundation-inbox/inbox-base/inbox-base.ts"
+              }
+            },
             {
               "kind": "method",
               "name": "formatDateStrForMatchCriteria",
@@ -3783,7 +4144,7 @@
         {
           "kind": "variable",
           "name": "InboxSubscriptionStyles",
-          "default": "css`\n  .inbox-subscription {\n    display: flex;\n    flex-direction: column;\n  }\n\n  .inbox-subscription-header {\n    border-top: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    border-bottom: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    padding: calc(var(--design-unit) * 2px);\n  }\n\n  .inbox-subscription-content {\n    display: flex;\n    flex-direction: column;\n    gap: calc(var(--design-unit) * 2px);\n    overflow: auto;\n    max-height: calc(var(--design-unit) * 80px);\n    border: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    margin: calc(var(--design-unit) * 2px);\n    padding: calc(var(--design-unit) * 2px);\n    border-radius: calc(var(--control-corner-radius) * 1px);\n  }\n\n  .inbox-subscription-footer {\n    padding: calc(var(--design-unit) * 2px);\n    border-top: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n  }\n\n  rapid-button.subscribe {\n    display: flex;\n    margin: 0;\n    width: 100%;\n  }\n`"
+          "default": "css`\n  .inbox-subscription {\n    display: flex;\n    flex-direction: column;\n  }\n\n  .inbox-subscription.inline {\n    margin-top: calc(var(--design-unit) * 2px);\n    padding-top: calc(var(--design-unit) * 2px);\n    border-top: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n  }\n\n  .inbox-subscription-header {\n    border-top: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    border-bottom: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    padding: calc(var(--design-unit) * 2px);\n  }\n\n  .inbox-subscription-empty {\n    padding: 0 calc(var(--design-unit) * 2px);\n    margin: calc(var(--design-unit) * 2px) 0 0;\n  }\n\n  .inbox-subscription-content {\n    display: flex;\n    flex-direction: column;\n    gap: calc(var(--design-unit) * 3px);\n    border: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    margin: calc(var(--design-unit) * 2px);\n    padding: calc(var(--design-unit) * 2px);\n    border-radius: calc(var(--control-corner-radius) * 1px);\n  }\n\n  .inbox-subscription:not(.inline) .inbox-subscription-content {\n    overflow: auto;\n    max-height: calc(var(--design-unit) * 80px);\n  }\n\n  .inbox-subscription.inline .inbox-subscription-content {\n    margin: calc(var(--design-unit) * 2px) 0 0;\n    overflow: visible;\n    max-height: none;\n    padding-bottom: calc(var(--design-unit) * 4px);\n  }\n\n  .inbox-subscription.inline .control:focus-within {\n    position: relative;\n    z-index: 2;\n  }\n\n  .inbox-subscription-footer {\n    display: flex;\n    gap: calc(var(--design-unit) * 2px);\n    padding: calc(var(--design-unit) * 2px) 0 0;\n    border-top: calc(var(--stroke-width) * 1px) solid var(--neutral-stroke-divider-rest);\n    margin-top: calc(var(--design-unit) * 2px);\n  }\n\n  .inbox-subscription:not(.inline) .inbox-subscription-footer {\n    padding: calc(var(--design-unit) * 2px);\n    margin-top: 0;\n  }\n\n  .inbox-subscription-footer.auto-submit {\n    justify-content: flex-end;\n    border-top: none;\n    margin-top: 0;\n    padding-top: 0;\n  }\n\n  rapid-button.subscribe,\n  rapid-button.cancel {\n    display: flex;\n    margin: 0;\n    flex: 1;\n  }\n`"
         }
       ],
       "exports": [
@@ -3804,7 +4165,7 @@
         {
           "kind": "variable",
           "name": "InboxSubscriptionTemplate",
-          "default": "html<InboxSubscription>`\n  <div class=\"inbox-subscription\">\n    <div class=\"inbox-subscription-header\">\n      Subscribe to\n      <span style=\"font-weight: bold;\">${(x) => x.template.RULE_NAME}</span>\n    </div>\n\n    ${when(\n      (x) => Object.values(x.template.PARAMETERS).length === 0,\n      html`\n        <p style=\"padding-left: 10px;\">The selected template doesn't have parameters.</p>\n      `,\n    )}\n    ${when(\n      (x) => Object.values(x.template.PARAMETERS).length > 0,\n      html`\n        <div class=\"inbox-subscription-content\">\n          ${repeat(\n            // @ts-ignore\n            (x) => Object.values(x.template.PARAMETERS),\n            html<RuleParameterEntity>`\n              <rule-parameter\n                :parameter=${(x) => x}\n                :isFirstElement=${(x, c) => c.parent.isFirstElement(x)}\n                :operator=${(x, c) => c.parent.parametersOperators[x.PARAM_NAME]}\n                @parameterEdited=${(x, c) => c.parent.parameterEdit(eventDetail(c))}\n              ></rule-parameter>\n            `,\n          )}\n        </div>\n      `,\n    )}\n\n    <div class=\"inbox-subscription-footer\">\n      <rapid-button\n        class=\"subscribe\"\n        appearance=\"primary\"\n        @click=${(x) => x.subscribeTemplate()}\n        ?disabled=${(x) => x.subscribeDisabled}\n      >\n        Subscribe\n      </rapid-button>\n    </div>\n  </div>\n`"
+          "default": "html<InboxSubscription>`\n  <div class=\"inbox-subscription ${(x) => (x.inline ? 'inline' : '')}\">\n    ${when(\n      (x) => !x.inline,\n      html`\n        <div class=\"inbox-subscription-header\">\n          Subscribe to\n          <span style=\"font-weight: bold;\">${(x) => x.template.RULE_NAME}</span>\n        </div>\n      `,\n    )}\n    ${when(\n      (x) => Object.values(x.template?.PARAMETERS ?? {}).length === 0,\n      html`\n        <p class=\"inbox-subscription-empty\">The selected template doesn't have parameters.</p>\n      `,\n    )}\n    ${when(\n      (x) => Object.values(x.template?.PARAMETERS ?? {}).length > 0,\n      html`\n        <div class=\"inbox-subscription-content\">\n          ${repeat(\n            // @ts-ignore\n            (x) => Object.values(x.template?.PARAMETERS ?? {}),\n            html<RuleParameterEntity>`\n              <rule-parameter\n                :parameter=${(x) => x}\n                :isFirstElement=${(x, c) => c.parent.isFirstElement(x)}\n                :operator=${(x, c) => c.parent.parametersOperators[x.PARAM_NAME]}\n                :requireSelection=${(x, c) => c.parent.usesAutoSubmit()}\n                @parameterEdited=${(x, c) => c.parent.parameterEdit(eventDetail(c))}\n              ></rule-parameter>\n            `,\n          )}\n        </div>\n      `,\n    )}\n    ${when(\n      (x) => !x.inline || x.requiresManualSubscribe(),\n      html`\n        <div class=\"inbox-subscription-footer\">\n          ${when(\n            (x) => x.inline,\n            html`\n              <rapid-button\n                class=\"cancel\"\n                appearance=\"neutral\"\n                @click=${(x) => x.cancelSubscribe()}\n              >\n                Cancel\n              </rapid-button>\n            `,\n          )}\n          <rapid-button\n            class=\"subscribe\"\n            appearance=\"primary\"\n            @click=${(x) => x.subscribeTemplate()}\n            ?disabled=${(x) => x.subscribeDisabled}\n          >\n            Subscribe\n          </rapid-button>\n        </div>\n      `,\n    )}\n    ${when(\n      (x) => x.inline && x.usesAutoSubmit(),\n      html`\n        <div class=\"inbox-subscription-footer auto-submit\">\n          <rapid-button class=\"cancel\" appearance=\"neutral\" @click=${(x) => x.cancelSubscribe()}>\n            Cancel\n          </rapid-button>\n        </div>\n      `,\n    )}\n  </div>\n`"
         }
       ],
       "exports": [
@@ -3831,6 +4192,14 @@
               "kind": "field",
               "name": "template"
             },
+            {
+              "kind": "field",
+              "name": "inline",
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false"
+            },
             {
               "kind": "field",
               "name": "parametersDetails",
@@ -3840,6 +4209,15 @@
               "privacy": "private",
               "default": "{}"
             },
+            {
+              "kind": "field",
+              "name": "isSubmitting",
+              "type": {
+                "text": "boolean"
+              },
+              "privacy": "private",
+              "default": "false"
+            },
             {
               "kind": "field",
               "name": "parametersOperators",
@@ -3867,6 +4245,24 @@
               "kind": "method",
               "name": "templateChanged"
             },
+            {
+              "kind": "method",
+              "name": "usesAutoSubmit",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "requiresManualSubscribe",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              }
+            },
             {
               "kind": "method",
               "name": "parameterEdit",
@@ -3879,6 +4275,11 @@
                 }
               ]
             },
+            {
+              "kind": "method",
+              "name": "autoSubscribe",
+              "privacy": "private"
+            },
             {
               "kind": "method",
               "name": "verifySubscribe"
@@ -3891,6 +4292,10 @@
               "kind": "method",
               "name": "subscribeTemplate"
             },
+            {
+              "kind": "method",
+              "name": "cancelSubscribe"
+            },
             {
               "kind": "field",
               "name": "createParametersOperatorMap"
@@ -3900,12 +4305,23 @@
             {
               "description": "Fired when a template subscription is created",
               "name": "templateSubscribed"
+            },
+            {
+              "description": "Fired when inline parameter entry is cancelled",
+              "name": "subscribeCancelled"
             }
           ],
           "attributes": [
             {
               "name": "template",
               "fieldName": "template"
+            },
+            {
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false",
+              "fieldName": "inline"
             }
           ],
           "superclass": {
@@ -4214,7 +4630,7 @@
         {
           "kind": "variable",
           "name": "RuleParameterStyles",
-          "default": "css`\n  .control {\n    display: flex;\n    flex-direction: column;\n    width: 100%;\n  }\n\n  label {\n    margin-bottom: calc(var(--design-unit) * 2px);\n  }\n\n  .input-field {\n    display: flex;\n  }\n\n  .input-field::part(root) {\n    width: 100%;\n  }\n\n  rapid-select::part(listbox) {\n    max-height: 160px;\n  }\n`"
+          "default": "css`\n  .control {\n    display: flex;\n    flex-direction: column;\n    width: 100%;\n  }\n\n  label {\n    margin-bottom: calc(var(--design-unit) * 2px);\n  }\n\n  .input-field {\n    display: flex;\n    width: 100%;\n    min-width: 0;\n  }\n\n  .input-field::part(root) {\n    width: 100%;\n  }\n\n  rapid-select.input-field {\n    width: 100%;\n    min-width: 0;\n  }\n\n  rapid-select.input-field::part(control) {\n    width: 100%;\n  }\n\n  rapid-select.input-field::part(listbox) {\n    z-index: 1000;\n    max-height: min(240px, 50vh);\n    overflow-y: auto;\n    box-shadow: 0 4px 16px rgb(0 0 0 / 24%);\n  }\n`"
         }
       ],
       "exports": [
@@ -4235,7 +4651,7 @@
         {
           "kind": "variable",
           "name": "RuleParameterTemplate",
-          "default": "html<RuleParameter>`\n  <div class=\"control\">\n    <label>\n      <span style=\"font-weight: bold;\">${(x) => x.parameter.PARAM_LABEL}</span>\n      ${(x, c) => humanize(x.operator).toLowerCase()}\n    </label>\n\n    <!-- USER_TEXT -->\n    ${when(\n      (x) => x.parameter.PARAM_SOURCE_TYPE === PARAM_SOURCE_TYPE_USER_TEXT,\n      html`\n        ${when(\n          (x) => x.parameter.PARAM_TYPE === PARAM_TYPE_STRING,\n          html`\n            <rapid-text-field\n              autofocus=${(x) => x.isFirstElement}\n              class=\"input-field\"\n              :value=${sync((x) => x.inputValue)}\n              @input=${(x, c) => x.parameterEdit((c.event.target as HTMLInputElement).value)}\n            ></rapid-text-field>\n          `,\n        )}\n        ${when(\n          (x) => x.parameter.PARAM_TYPE === PARAM_TYPE_NUMBER,\n          html`\n            <rapid-number-field\n              hide-step\n              autofocus=${(x) => x.isFirstElement}\n              class=\"input-field\"\n              :value=${sync((x) => x.inputValue)}\n              @input=${(x, c) => x.parameterEdit((c.event.target as HTMLInputElement).value)}\n            ></rapid-number-field>\n          `,\n        )}\n\n        <!-- TODO: Implement\n        ${when(\n          (x) => x.parameter.PARAM_TYPE === PARAM_TYPE_BOOLEAN,\n          html`\n            <rapid-select\n              autofocus=${(x) => x.isFirstElement}\n              class=\"input-field\"\n              :value=${sync((x) => x.inputValue)}\n            >\n              <rapid-option value=\"true\">true</rapid-option>\n              <rapid-option value=\"false\">false</rapid-option>\n            </rapid-select>\n          `,\n        )}\n        -->\n      `,\n    )}\n\n    <!-- DEFINED_GROUP -->\n    ${when(\n      (x) => x.parameter.PARAM_SOURCE_TYPE === PARAM_SOURCE_TYPE_DEFINED_GROUP,\n      html`\n        <rapid-select\n          autofocus=${(x) => x.isFirstElement}\n          class=\"input-field\"\n          :value=${sync((x) => x.inputValue)}\n        >\n          ${repeat(\n            (x) => x.parameter.PARAM_SOURCE.split(','),\n            html`\n              <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n            `,\n          )}\n        </rapid-select>\n      `,\n    )}\n\n    <!-- TODO: REQ_REP -->\n    ${when(\n      (x) => x.parameter.PARAM_SOURCE_TYPE === PARAM_SOURCE_TYPE_REQ_REP,\n      html`\n        <rapid-select :value=${sync((x) => x.inputValue)}></rapid-select>\n      `,\n    )}\n  </div>\n`"
+          "default": "html<RuleParameter>`\n  <div class=\"control\">\n    <label>\n      <span style=\"font-weight: bold;\">${(x) => x.parameter.PARAM_LABEL}</span>\n      ${(x, c) => humanize(x.operator).toLowerCase()}\n    </label>\n\n    <!-- USER_TEXT -->\n    ${when(\n      (x) => x.parameter.PARAM_SOURCE_TYPE === PARAM_SOURCE_TYPE_USER_TEXT,\n      html`\n        ${when(\n          (x) => x.parameter.PARAM_TYPE === PARAM_TYPE_STRING,\n          html`\n            <rapid-text-field\n              autofocus=${(x) => x.isFirstElement}\n              class=\"input-field\"\n              :value=${sync((x) => x.inputValue)}\n              @input=${(x, c) => x.parameterEdit((c.event.target as HTMLInputElement).value)}\n            ></rapid-text-field>\n          `,\n        )}\n        ${when(\n          (x) => x.parameter.PARAM_TYPE === PARAM_TYPE_NUMBER,\n          html`\n            <rapid-number-field\n              hide-step\n              autofocus=${(x) => x.isFirstElement}\n              class=\"input-field\"\n              :value=${sync((x) => x.inputValue)}\n              @input=${(x, c) => x.parameterEdit((c.event.target as HTMLInputElement).value)}\n            ></rapid-number-field>\n          `,\n        )}\n        ${when(\n          (x) => x.parameter.PARAM_TYPE === PARAM_TYPE_BOOLEAN,\n          html`\n            <rapid-switch\n              class=\"input-field\"\n              ?checked=${(x) => x.inputValue === 'true'}\n              @change=${(x, c) =>\n                x.parameterEdit(String((c.event.target as HTMLInputElement).checked))}\n            ></rapid-switch>\n          `,\n        )}\n      `,\n    )}\n\n    <!-- DEFINED_GROUP -->\n    ${when(\n      (x) => x.parameter.PARAM_SOURCE_TYPE === PARAM_SOURCE_TYPE_DEFINED_GROUP,\n      html`\n        <rapid-select\n          autofocus=${(x) => x.isFirstElement}\n          class=\"input-field\"\n          :value=${sync((x) => x.inputValue)}\n          @change=${(x, c) => x.parameterEdit((c.event.currentTarget as HTMLSelectElement).value)}\n        >\n          ${repeat(\n            (x) =>\n              (x.parameter.PARAM_SOURCE ?? '')\n                .split(',')\n                .map((value) => value.trim())\n                .filter((value) => value.length),\n            html`\n              <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n            `,\n          )}\n        </rapid-select>\n      `,\n    )}\n\n    <!-- TODO: REQ_REP -->\n    ${when(\n      (x) => x.parameter.PARAM_SOURCE_TYPE === PARAM_SOURCE_TYPE_REQ_REP,\n      html`\n        <rapid-select :value=${sync((x) => x.inputValue)}></rapid-select>\n      `,\n    )}\n  </div>\n`"
         }
       ],
       "exports": [
@@ -4265,6 +4681,14 @@
                 "text": "RuleParameterEntity"
               }
             },
+            {
+              "kind": "field",
+              "name": "requireSelection",
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false"
+            },
             {
               "kind": "field",
               "name": "isFirstElement",
@@ -4289,6 +4713,33 @@
               },
               "default": "''"
             },
+            {
+              "kind": "method",
+              "name": "parameterChanged"
+            },
+            {
+              "kind": "method",
+              "name": "requireSelectionChanged"
+            },
+            {
+              "kind": "method",
+              "name": "inputValueChanged"
+            },
+            {
+              "kind": "method",
+              "name": "initParameter",
+              "privacy": "private"
+            },
+            {
+              "kind": "method",
+              "name": "checkAndClearForcedSelection",
+              "privacy": "private"
+            },
+            {
+              "kind": "method",
+              "name": "clearForcedSelection",
+              "privacy": "private"
+            },
             {
               "kind": "method",
               "name": "parameterEdit",
@@ -4314,7 +4765,14 @@
               "type": {
                 "text": "RuleParameterEntity"
               },
-              "fieldName": "parameter"
+              "fieldName": "parameter"
+            },
+            {
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false",
+              "fieldName": "requireSelection"
             },
             {
               "name": "isFirstElement",
@@ -4542,7 +5000,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        <div class=\"items\">\n          <div class=\"content-row item\">\n            ${repeat(\n              (x) => x.conditions,\n              html<ConditionBuilderEntity>`\n                <rule-condition-builder\n                  :fields=${(x, c) => c.parent.fields}\n                  :condition=${(x) => x}\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          </div>\n\n          <div class=\"content-row\">\n            <rapid-button @click=${(x) => x.newCondition()}>+ Condition</rapid-button>\n          </div>\n        </div>\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        <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`"
         }
       ],
       "exports": [
@@ -4673,14 +5131,6 @@
               },
               "default": "''"
             },
-            {
-              "kind": "field",
-              "name": "conditions",
-              "type": {
-                "text": "Array<ConditionBuilderEntity>"
-              },
-              "default": "[]"
-            },
             {
               "kind": "field",
               "name": "submitDisabled",
@@ -4712,6 +5162,31 @@
               },
               "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",
@@ -4744,6 +5219,23 @@
                 }
               ]
             },
+            {
+              "kind": "method",
+              "name": "refreshRuleExpressionConfig",
+              "privacy": "private"
+            },
+            {
+              "kind": "method",
+              "name": "handleRuleExpressionChange",
+              "parameters": [
+                {
+                  "name": "expression",
+                  "type": {
+                    "text": "RuleExpression.Expression['PredicateExpression']"
+                  }
+                }
+              ]
+            },
             {
               "kind": "method",
               "name": "attributeAssignments",
@@ -4789,34 +5281,6 @@
               "kind": "method",
               "name": "resourceChanged"
             },
-            {
-              "kind": "method",
-              "name": "newCondition"
-            },
-            {
-              "kind": "method",
-              "name": "editCondition",
-              "parameters": [
-                {
-                  "name": "editedCondition",
-                  "type": {
-                    "text": "ConditionBuilderEntity"
-                  }
-                }
-              ]
-            },
-            {
-              "kind": "method",
-              "name": "deleteCondition",
-              "parameters": [
-                {
-                  "name": "deletedCondition",
-                  "type": {
-                    "text": "ConditionBuilderEntity"
-                  }
-                }
-              ]
-            },
             {
               "kind": "method",
               "name": "validateRequiredFields",
@@ -4887,7 +5351,7 @@
         {
           "kind": "variable",
           "name": "TemplateDialogTemplate",
-          "default": "html<TemplateDialog>`\n  <rapid-modal ${ref('dialog')} class=\"dialog\" :onCloseCallback=${(x) => () => x.close()}>\n    <div slot=\"top\" class=\"dialog-top\">${(x) => x.templateDialogTitle}</div>\n\n    <div class=\"dialog-content\">\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <rapid-text-field :value=${sync((x) => x.name)} autofocus>Name</rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field :value=${sync((x) => x.description)}>Description</rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <label>Resource</label>\n          <rapid-select :value=${sync((x) => x.resource)} position=\"below\">\n            ${repeat(\n              (x) => x.resources,\n              html`\n                <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-select>\n        </div>\n\n        <div class=\"control\">\n          <label>Topic</label>\n          <rapid-select :value=${sync((x) => x.topic)}>\n            ${repeat(\n              (x) => x.topics,\n              html`\n                <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-select>\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 :value=${sync((x) => x.header)}>Header</rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field :value=${sync((x) => x.message)}>Message</rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"control\">\n        <label>Parameter(s)</label>\n        <div class=\"items\">\n          <div class=\"content-row item\">\n            ${repeat(\n              (x) => x.parameters,\n              html`\n                <parameter-builder\n                  :parameter=${(x) => x}\n                  @edit=${(x, c) => c.parent.editParameter(eventDetail(c))}\n                  @delete=${(x, c) => c.parent.deleteParameter(eventDetail(c))}\n                ></parameter-builder>\n              `,\n            )}\n          </div>\n\n          <div class=\"content-row\">\n            <rapid-button @click=${(x) => x.newParameter()}>+ Parameter</rapid-button>\n          </div>\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<ConditionBuilderEntity>`\n                <template-condition-builder\n                  :fields=${(x, c) => c.parent.fields}\n                  :parameters=${(x, c) => c.parent.parameters}\n                  :condition=${(x) => x}\n                  @edit=${(x, c) => c.parent.editCondition(eventDetail(c))}\n                  @delete=${(x, c) => c.parent.deleteCondition(eventDetail(c))}\n                ></template-condition-builder>\n              `,\n            )}\n          </div>\n\n          <div class=\"content-row\">\n            <rapid-button @click=${(x) => x.newCondition()}>+ Condition</rapid-button>\n          </div>\n        </div>\n      </div>\n    </div>\n\n    <div slot=\"bottom\" class=\"dialog-bottom\">\n      <rapid-button appearance=\"primary\" @click=${(x) => x.submit()}>Submit</rapid-button>\n    </div>\n  </rapid-modal>\n`"
+          "default": "html<TemplateDialog>`\n  <rapid-modal ${ref('dialog')} class=\"dialog\" :onCloseCallback=${(x) => () => x.close()}>\n    <div slot=\"top\" class=\"dialog-top\">${(x) => x.templateDialogTitle}</div>\n\n    <div class=\"dialog-content\">\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <rapid-text-field :value=${sync((x) => x.name)} autofocus>Name</rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field :value=${sync((x) => x.description)}>Description</rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"content-row\">\n        <div class=\"control\">\n          <label>Resource</label>\n          <rapid-select :value=${sync((x) => x.resource)} position=\"below\">\n            ${repeat(\n              (x) => x.resources,\n              html`\n                <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-select>\n        </div>\n\n        <div class=\"control\">\n          <label>Topic</label>\n          <rapid-select :value=${sync((x) => x.topic)}>\n            ${repeat(\n              (x) => x.topics,\n              html`\n                <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n              `,\n            )}\n          </rapid-select>\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 :value=${sync((x) => x.header)}>Header</rapid-text-field>\n        </div>\n\n        <div class=\"control\">\n          <rapid-text-field :value=${sync((x) => x.message)}>Message</rapid-text-field>\n        </div>\n      </div>\n\n      <div class=\"control\">\n        <label>Parameter(s)</label>\n        <div class=\"items\">\n          <div class=\"content-row item\">\n            ${repeat(\n              (x) => x.parameters,\n              html`\n                <parameter-builder\n                  :parameter=${(x) => x}\n                  @edit=${(x, c) => c.parent.editParameter(eventDetail(c))}\n                  @delete=${(x, c) => c.parent.deleteParameter(eventDetail(c))}\n                ></parameter-builder>\n              `,\n            )}\n          </div>\n\n          <div class=\"content-row\">\n            <rapid-button @click=${(x) => x.newParameter()}>+ Parameter</rapid-button>\n          </div>\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, TemplateDialog>`\n                ${when(\n                  (x) => isGroup(x),\n                  html<ConditionNode>`\n                    <template-condition-group\n                      :fields=${(x, c) => c.parent.fields}\n                      :parameters=${(x, c) => c.parent.parameters}\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                    ></template-condition-group>\n                  `,\n                )}\n                ${when(\n                  (x) => !isGroup(x),\n                  html<ConditionNode>`\n                    <template-condition-builder\n                      :fields=${(x, c) => c.parent.fields}\n                      :parameters=${(x, c) => c.parent.parameters}\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                    ></template-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 appearance=\"primary\" @click=${(x) => x.submit()}>Submit</rapid-button>\n    </div>\n  </rapid-modal>\n`"
         }
       ],
       "exports": [
@@ -5031,10 +5495,18 @@
               "kind": "field",
               "name": "conditions",
               "type": {
-                "text": "Array<ConditionBuilderEntity>"
+                "text": "Array<ConditionNode>"
               },
               "default": "[]"
             },
+            {
+              "kind": "field",
+              "name": "rawExpressionPreview",
+              "type": {
+                "text": "string"
+              },
+              "default": "''"
+            },
             {
               "kind": "field",
               "name": "resources",
@@ -5096,6 +5568,11 @@
                 }
               ]
             },
+            {
+              "kind": "method",
+              "name": "refreshExpressionPreview",
+              "privacy": "private"
+            },
             {
               "kind": "method",
               "name": "attributeAssignments",
@@ -5145,6 +5622,10 @@
               "kind": "method",
               "name": "newCondition"
             },
+            {
+              "kind": "method",
+              "name": "newGroup"
+            },
             {
               "kind": "method",
               "name": "editCondition",
@@ -5152,7 +5633,7 @@
                 {
                   "name": "editedCondition",
                   "type": {
-                    "text": "ConditionBuilderEntity"
+                    "text": "ConditionNode"
                   }
                 }
               ]
@@ -5164,7 +5645,7 @@
                 {
                   "name": "deletedCondition",
                   "type": {
-                    "text": "ConditionBuilderEntity"
+                    "text": "ConditionNode"
                   }
                 }
               ]
@@ -5271,7 +5752,7 @@
         {
           "kind": "variable",
           "name": "RuleConditionBuilderTemplate",
-          "default": "html<RuleConditionBuilder>`\n  <div class=\"condition-builder\">\n    <rapid-select\n      :value=${sync((x) => x.leftValue)}\n      :initialValue=${sync((x) => x.leftValue)}\n      title=${(x) => (x.leftValue ? JSON.parse(x.leftValue).FIELD_NAME : '')}\n      class=\"left-value\"\n    >\n      ${repeat(\n        (x) => x.getAllFields(),\n        html`\n          <rapid-option value=${(x) => JSON.stringify(x)} title=${(x) => x.FIELD_NAME}>\n            ${(x) => x.FIELD_NAME}\n          </rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    <rapid-select\n      class=\"logical-operator${(x) =>\n        classNames([\n          '-null-and-blank',\n          nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n        ])}\"\n      :value=${sync((x) => x.logicalOperator)}\n      title=${(x) => x.logicalOperator}\n    >\n      ${repeat(\n        (x) => x.getLogicalOperators(),\n        html`\n          <rapid-option value=${(x) => x.operator} title=${(x) => x}>\n            ${(x) => x.label}\n          </rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    ${when(\n      (x) => !nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n      html`\n        <rapid-select\n          class=\"right-criteria\"\n          :value=${sync((x) => x.rightCriteria)}\n          title=${(x) => x.rightCriteria}\n        >\n          ${repeat(\n            (x) => x.getRightCriteria(),\n            html`\n              <rapid-option value=${(x) => x} title=${(x) => x}>${(x) => x}</rapid-option>\n            `,\n          )}\n        </rapid-select>\n\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.VALUE,\n          html`\n            ${whenElse(\n              (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.BOOLEAN,\n              html`\n                <rapid-select class=\"right-criteria-select\" :value=${sync((x) => x.rightValueText)}>\n                  <rapid-option value=\"true\">true</rapid-option>\n                  <rapid-option value=\"false\">false</rapid-option>\n                </rapid-select>\n              `,\n              html`\n                ${whenElse(\n                  (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.DATE,\n                  html`\n                    <rapid-text-field\n                      class=\"right-criteria-text\"\n                      :value=${sync((x) => x.rightValueText)}\n                      type=\"date\"\n                    ></rapid-text-field>\n                  `,\n                  html`\n                    ${whenElse(\n                      (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.DATETIME,\n                      html`\n                        <rapid-text-field\n                          class=\"right-criteria-text\"\n                          :value=${sync((x) => x.rightValueText)}\n                          type=\"datetime-local\"\n                        ></rapid-text-field>\n                      `,\n                      html`\n                        <rapid-text-field\n                          class=\"right-criteria-text\"\n                          :value=${sync((x) => x.rightValueText)}\n                          placeholder=\"Value\"\n                          autocomplete=\"off\"\n                        ></rapid-text-field>\n                      `,\n                    )}\n                  `,\n                )}\n              `,\n            )}\n          `,\n        )}\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.FIELD,\n          html`\n            <rapid-select\n              class=\"right-criteria-select\"\n              :value=${sync((x) => x.rightValueSelect)}\n              title=${(x) => x.rightValueSelect}\n            >\n              ${repeat(\n                (x) => x.getApplicableFields(),\n                html`\n                  <rapid-option value=${(x) => x.FIELD_NAME} title=${(x) => x.FIELD_NAME}>\n                    ${(x) => x.FIELD_NAME}\n                  </rapid-option>\n                `,\n              )}\n            </rapid-select>\n          `,\n        )}\n      `,\n    )}\n\n    <rapid-button appearance=\"icon\" class=\"delete\" @click=${(x) => x.deleteCondition()}>\n      <rapid-icon\n        style=\"opacity: 0.5\"\n        variant=\"regular\"\n        name=\"trash-alt\"\n        size=\"lg\"\n        part=\"icon\"\n      ></rapid-icon>\n    </rapid-button>\n  </div>\n`"
+          "default": "html<RuleConditionBuilder>`\n  ${when(\n    (x) => !x.isFirst,\n    html`\n      <div class=\"join-toggle-row\">\n        <div class=\"join-toggle\">\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'AND'])}\"\n            @click=${(x) => (x.joinOperator = 'AND')}\n          >\n            AND\n          </span>\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'OR'])}\"\n            @click=${(x) => (x.joinOperator = 'OR')}\n          >\n            OR\n          </span>\n        </div>\n      </div>\n    `,\n  )}\n  <div class=\"condition-builder\">\n    <rapid-select\n      :value=${sync((x) => x.leftValue)}\n      :initialValue=${sync((x) => x.leftValue)}\n      title=${(x) => (x.leftValue ? JSON.parse(x.leftValue).FIELD_NAME : '')}\n      class=\"left-value\"\n    >\n      ${repeat(\n        (x) => x.getAllFields(),\n        html`\n          <rapid-option value=${(x) => JSON.stringify(x)} title=${(x) => x.FIELD_NAME}>\n            ${(x) => x.FIELD_NAME}\n          </rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    <rapid-select\n      class=\"logical-operator${(x) =>\n        classNames([\n          '-null-and-blank',\n          nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n        ])}\"\n      :value=${sync((x) => x.logicalOperator)}\n      title=${(x) => x.logicalOperator}\n    >\n      ${repeat(\n        (x) => x.getLogicalOperators(),\n        html`\n          <rapid-option value=${(x) => x.operator} title=${(x) => x}>\n            ${(x) => x.label}\n          </rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    ${when(\n      (x) => !nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n      html`\n        <rapid-select\n          class=\"right-criteria\"\n          :value=${sync((x) => x.rightCriteria)}\n          title=${(x) => x.rightCriteria}\n        >\n          ${repeat(\n            (x) => x.getRightCriteria(),\n            html`\n              <rapid-option value=${(x) => x} title=${(x) => x}>${(x) => x}</rapid-option>\n            `,\n          )}\n        </rapid-select>\n\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.VALUE,\n          html`\n            ${whenElse(\n              (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.BOOLEAN,\n              html`\n                <rapid-select class=\"right-criteria-select\" :value=${sync((x) => x.rightValueText)}>\n                  <rapid-option value=\"true\">true</rapid-option>\n                  <rapid-option value=\"false\">false</rapid-option>\n                </rapid-select>\n              `,\n              html`\n                ${whenElse(\n                  (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === 'ENUM',\n                  html`\n                    <rapid-multiselect\n                      class=\"right-criteria-select\"\n                      :selectedOptions=${(x) => x.rightValueMultiSelect}\n                      @selectionChange=${(x, c) => {\n                        x.rightValueMultiSelect = (c.event as CustomEvent).detail;\n                      }}\n                      search=\"true\"\n                      all=\"false\"\n                    >\n                      <multiselect-datasource\n                        value-field=\"value\"\n                        label-field=\"value\"\n                        :data=${(x) => x.getEnumValues().map((value) => ({ value }))}\n                      ></multiselect-datasource>\n                    </rapid-multiselect>\n                  `,\n                  html`\n                    ${whenElse(\n                      (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.DATE,\n                      html`\n                        <rapid-text-field\n                          class=\"right-criteria-text\"\n                          :value=${sync((x) => x.rightValueText)}\n                          type=\"date\"\n                        ></rapid-text-field>\n                      `,\n                      html`\n                        ${whenElse(\n                          (x) =>\n                            JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.DATETIME,\n                          html`\n                            <rapid-text-field\n                              class=\"right-criteria-text\"\n                              :value=${sync((x) => x.rightValueText)}\n                              type=\"datetime-local\"\n                            ></rapid-text-field>\n                          `,\n                          html`\n                            <rapid-text-field\n                              class=\"right-criteria-text\"\n                              :value=${sync((x) => x.rightValueText)}\n                              placeholder=\"Value (comma-separate for multiple)\"\n                              autocomplete=\"off\"\n                            ></rapid-text-field>\n                          `,\n                        )}\n                      `,\n                    )}\n                  `,\n                )}\n              `,\n            )}\n          `,\n        )}\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.FIELD,\n          html`\n            <rapid-select\n              class=\"right-criteria-select\"\n              :value=${sync((x) => x.rightValueSelect)}\n              title=${(x) => x.rightValueSelect}\n            >\n              ${repeat(\n                (x) => x.getApplicableFields(),\n                html`\n                  <rapid-option value=${(x) => x.FIELD_NAME} title=${(x) => x.FIELD_NAME}>\n                    ${(x) => x.FIELD_NAME}\n                  </rapid-option>\n                `,\n              )}\n            </rapid-select>\n          `,\n        )}\n      `,\n    )}\n\n    <rapid-button appearance=\"icon\" class=\"delete\" @click=${(x) => x.deleteCondition()}>\n      <rapid-icon\n        style=\"opacity: 0.5\"\n        variant=\"regular\"\n        name=\"trash-alt\"\n        size=\"lg\"\n        part=\"icon\"\n      ></rapid-icon>\n    </rapid-button>\n  </div>\n`"
         }
       ],
       "exports": [
@@ -5309,6 +5790,21 @@
               },
               "default": "[]"
             },
+            {
+              "kind": "field",
+              "name": "isFirst",
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false"
+            },
+            {
+              "kind": "field",
+              "name": "joinOperator",
+              "type": {
+                "text": "string"
+              }
+            },
             {
               "kind": "field",
               "name": "leftValue",
@@ -5356,6 +5852,14 @@
               },
               "default": "null"
             },
+            {
+              "kind": "field",
+              "name": "rightValueMultiSelect",
+              "type": {
+                "text": "string[]"
+              },
+              "default": "[]"
+            },
             {
               "kind": "method",
               "name": "deleteCondition"
@@ -5364,6 +5868,10 @@
               "kind": "method",
               "name": "conditionChanged"
             },
+            {
+              "kind": "method",
+              "name": "joinOperatorChanged"
+            },
             {
               "kind": "method",
               "name": "fieldsChanged"
@@ -5387,91 +5895,260 @@
               }
             },
             {
-              "kind": "method",
-              "name": "getLogicalOperators",
-              "return": {
-                "type": {
-                  "text": "Array<any>"
-                }
-              }
+              "kind": "method",
+              "name": "getLogicalOperators",
+              "return": {
+                "type": {
+                  "text": "Array<any>"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "leftValueChanged"
+            },
+            {
+              "kind": "method",
+              "name": "logicalOperatorChanged"
+            },
+            {
+              "kind": "method",
+              "name": "rightCriteriaChanged"
+            },
+            {
+              "kind": "method",
+              "name": "clearRightValueText",
+              "privacy": "private"
+            },
+            {
+              "kind": "method",
+              "name": "clearRightValueSelect",
+              "privacy": "private"
+            },
+            {
+              "kind": "method",
+              "name": "rightValueTextChanged"
+            },
+            {
+              "kind": "method",
+              "name": "rightValueSelectChanged"
+            },
+            {
+              "kind": "method",
+              "name": "rightValueMultiSelectChanged"
+            },
+            {
+              "kind": "method",
+              "name": "getEnumValues",
+              "return": {
+                "type": {
+                  "text": "string[]"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "convertDateTime",
+              "parameters": [
+                {
+                  "name": "dateTimeStr",
+                  "type": {
+                    "text": "string"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "convertLongForDatePicker",
+              "parameters": [
+                {
+                  "name": "value",
+                  "type": {
+                    "text": "number"
+                  }
+                },
+                {
+                  "name": "time",
+                  "default": "false",
+                  "type": {
+                    "text": "boolean"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "getAllFields"
+            },
+            {
+              "kind": "method",
+              "name": "getApplicableFields"
+            }
+          ],
+          "events": [
+            {
+              "description": "Fired when a condition is deleted. detail: `ConditionBuilderEntity`",
+              "name": "delete"
+            },
+            {
+              "description": "Fired when a condition is edited. detail: `ConditionBuilderEntity`",
+              "name": "edit"
+            }
+          ],
+          "superclass": {
+            "name": "GenesisElement",
+            "package": "@genesislcap/web-core"
+          },
+          "tagName": "rule-condition-builder",
+          "customElement": true
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "RuleConditionBuilder",
+          "declaration": {
+            "name": "RuleConditionBuilder",
+            "module": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.ts"
+          }
+        },
+        {
+          "kind": "custom-element-definition",
+          "name": "rule-condition-builder",
+          "declaration": {
+            "name": "RuleConditionBuilder",
+            "module": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.ts"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.types.ts",
+      "declarations": [],
+      "exports": []
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-group/rule-condition-group.template.ts",
+      "declarations": [
+        {
+          "kind": "variable",
+          "name": "RuleConditionGroupTemplate",
+          "default": "html<RuleConditionGroup>`\n  ${when(\n    (x) => !x.isFirst,\n    html`\n      <div class=\"join-toggle-row\">\n        <div class=\"join-toggle\">\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'AND'])}\"\n            @click=${(x) => (x.joinOperator = 'AND')}\n          >\n            AND\n          </span>\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'OR'])}\"\n            @click=${(x) => (x.joinOperator = 'OR')}\n          >\n            OR\n          </span>\n        </div>\n      </div>\n    `,\n  )}\n  <div class=\"condition-group-row\">\n    <div class=\"condition-group-box\">\n      ${repeat(\n        (x) => x.groupChildren,\n        html<ConditionNode, RuleConditionGroup>`\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.editChild(eventDetail(c))}\n                @delete=${(x, c) => c.parent.deleteChild(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.editChild(eventDetail(c))}\n                @delete=${(x, c) => c.parent.deleteChild(eventDetail(c))}\n              ></rule-condition-builder>\n            `,\n          )}\n        `,\n        { positioning: true },\n      )}\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()}>+ Group</rapid-button>\n        <rapid-button appearance=\"icon\" class=\"delete-group\" @click=${(x) => x.deleteSelf()}>\n          <rapid-icon variant=\"regular\" name=\"trash-alt\" size=\"lg\" part=\"icon\"></rapid-icon>\n        </rapid-button>\n      </div>\n    </div>\n  </div>\n`"
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "RuleConditionGroupTemplate",
+          "declaration": {
+            "name": "RuleConditionGroupTemplate",
+            "module": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-group/rule-condition-group.template.ts"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-group/rule-condition-group.ts",
+      "declarations": [
+        {
+          "kind": "class",
+          "description": "Parenthesized group of conditions/nested groups for notification rule\ncriteria, joined to the previous sibling via AND/OR like a single\ncondition row - but bracketing its own children off from the rest of the\nlist, so e.g. \"(A && B) || C\" can be expressed without the AND silently\nspanning more than intended.",
+          "name": "RuleConditionGroup",
+          "members": [
+            {
+              "kind": "field",
+              "name": "node",
+              "type": {
+                "text": "ConditionGroupEntity"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "fields",
+              "type": {
+                "text": "Field[]"
+              },
+              "default": "[]"
             },
             {
-              "kind": "method",
-              "name": "leftValueChanged"
+              "kind": "field",
+              "name": "isFirst",
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false"
             },
             {
-              "kind": "method",
-              "name": "logicalOperatorChanged"
+              "kind": "field",
+              "name": "joinOperator",
+              "type": {
+                "text": "string"
+              }
             },
             {
-              "kind": "method",
-              "name": "rightCriteriaChanged"
+              "kind": "field",
+              "name": "groupChildren",
+              "type": {
+                "text": "ConditionNode[]"
+              },
+              "default": "[]"
             },
             {
               "kind": "method",
-              "name": "clearRightValueText",
-              "privacy": "private"
+              "name": "nodeChanged"
             },
             {
               "kind": "method",
-              "name": "clearRightValueSelect",
-              "privacy": "private"
+              "name": "joinOperatorChanged"
             },
             {
               "kind": "method",
-              "name": "rightValueTextChanged"
+              "name": "newCondition"
             },
             {
               "kind": "method",
-              "name": "rightValueSelectChanged"
+              "name": "newGroup"
             },
             {
               "kind": "method",
-              "name": "convertDateTime",
+              "name": "editChild",
               "parameters": [
                 {
-                  "name": "dateTimeStr",
+                  "name": "_editedChild",
                   "type": {
-                    "text": "string"
+                    "text": "ConditionNode"
                   }
                 }
               ]
             },
             {
               "kind": "method",
-              "name": "convertLongForDatePicker",
+              "name": "deleteChild",
               "parameters": [
                 {
-                  "name": "value",
-                  "type": {
-                    "text": "number"
-                  }
-                },
-                {
-                  "name": "time",
-                  "default": "false",
+                  "name": "deletedChild",
                   "type": {
-                    "text": "boolean"
+                    "text": "ConditionNode"
                   }
                 }
               ]
             },
             {
               "kind": "method",
-              "name": "getAllFields"
-            },
-            {
-              "kind": "method",
-              "name": "getApplicableFields"
+              "name": "deleteSelf"
             }
           ],
           "events": [
             {
-              "description": "Fired when a condition is deleted. detail: `ConditionBuilderEntity`",
+              "description": "Fired when this whole group should be removed",
               "name": "delete"
             },
             {
-              "description": "Fired when a condition is edited. detail: `ConditionBuilderEntity`",
+              "description": "Fired when anything inside this group changes",
               "name": "edit"
             }
           ],
@@ -5479,35 +6156,29 @@
             "name": "GenesisElement",
             "package": "@genesislcap/web-core"
           },
-          "tagName": "rule-condition-builder",
+          "tagName": "rule-condition-group",
           "customElement": true
         }
       ],
       "exports": [
         {
           "kind": "js",
-          "name": "RuleConditionBuilder",
+          "name": "RuleConditionGroup",
           "declaration": {
-            "name": "RuleConditionBuilder",
-            "module": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.ts"
+            "name": "RuleConditionGroup",
+            "module": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-group/rule-condition-group.ts"
           }
         },
         {
           "kind": "custom-element-definition",
-          "name": "rule-condition-builder",
+          "name": "rule-condition-group",
           "declaration": {
-            "name": "RuleConditionBuilder",
-            "module": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.ts"
+            "name": "RuleConditionGroup",
+            "module": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-group/rule-condition-group.ts"
           }
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.types.ts",
-      "declarations": [],
-      "exports": []
-    },
     {
       "kind": "javascript-module",
       "path": "src/components/foundation-notification-dashboard/components/templates/template-dialog/parameter-builder/parameter-builder.styles.ts",
@@ -5729,7 +6400,7 @@
         {
           "kind": "variable",
           "name": "TemplateConditionBuilderTemplate",
-          "default": "html<TemplateConditionBuilder>`\n  <div class=\"condition-builder\">\n    <rapid-select\n      :value=${sync((x) => x.leftValue)}\n      :initialValue=${sync((x) => x.leftValue)}\n      class=\"left-value\"\n    >\n      ${repeat(\n        (x) => x.leftValueItems,\n        html<Field>`\n          <rapid-option value=${(x) => JSON.stringify(x)}>${(x) => x.FIELD_NAME}</rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    <rapid-select\n      class=\"logical-operator${(x) =>\n        classNames([\n          '-null-and-blank',\n          nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n        ])}\"\n      :value=${sync((x) => x.logicalOperator)}\n    >\n      ${repeat(\n        (_) => Object.values(LogicalOperator),\n        html`\n          <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    ${when(\n      (x) => !nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n      html`\n        <rapid-select class=\"right-criteria\" :value=${sync((x) => x.rightCriteria)}>\n          ${repeat(\n            (_) => Object.values(RightCriteria),\n            html`\n              <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n            `,\n          )}\n        </rapid-select>\n\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.VALUE,\n          html<TemplateConditionBuilder>`\n            ${whenElse(\n              (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.BOOLEAN,\n              html`\n                <rapid-select class=\"right-criteria-select\" :value=${sync((x) => x.rightValueText)}>\n                  <rapid-option value=\"true\">true</rapid-option>\n                  <rapid-option value=\"false\">false</rapid-option>\n                </rapid-select>\n              `,\n              html`\n                <rapid-text-field\n                  class=\"right-criteria-text\"\n                  :value=${sync((x) => x.rightValueText)}\n                  placeholder=\"Value\"\n                  autocomplete=\"off\"\n                ></rapid-text-field>\n              `,\n            )}\n          `,\n        )}\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.USER_ENTRY,\n          html<TemplateConditionBuilder>`\n            <rapid-select class=\"right-criteria-select\" :value=${sync((x) => x.rightValueSelect)}>\n              ${(x) => rightValueItemsOptions(x.rightValueItems)}\n            </rapid-select>\n          `,\n        )}\n      `,\n    )}\n\n    <rapid-button appearance=\"icon\" class=\"delete\" @click=${(x) => x.deleteCondition()}>\n      <rapid-icon\n        style=\"opacity: 0.5\"\n        variant=\"regular\"\n        name=\"trash-alt\"\n        size=\"lg\"\n        part=\"icon\"\n      ></rapid-icon>\n    </rapid-button>\n  </div>\n`"
+          "default": "html<TemplateConditionBuilder>`\n  ${when(\n    (x) => !x.isFirst,\n    html`\n      <div class=\"join-toggle-row\">\n        <div class=\"join-toggle\">\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'AND'])}\"\n            @click=${(x) => (x.joinOperator = 'AND')}\n          >\n            AND\n          </span>\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'OR'])}\"\n            @click=${(x) => (x.joinOperator = 'OR')}\n          >\n            OR\n          </span>\n        </div>\n      </div>\n    `,\n  )}\n  <div class=\"condition-builder\">\n    <rapid-select\n      :value=${sync((x) => x.leftValue)}\n      :initialValue=${sync((x) => x.leftValue)}\n      class=\"left-value\"\n    >\n      ${repeat(\n        (x) => x.leftValueItems,\n        html<Field>`\n          <rapid-option value=${(x) => JSON.stringify(x)}>${(x) => x.FIELD_NAME}</rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    <rapid-select\n      class=\"logical-operator${(x) =>\n        classNames([\n          '-null-and-blank',\n          nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n        ])}\"\n      :value=${sync((x) => x.logicalOperator)}\n    >\n      ${repeat(\n        (_) => Object.values(LogicalOperator),\n        html`\n          <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n        `,\n      )}\n    </rapid-select>\n\n    ${when(\n      (x) => !nullAndBlankLogicalOperatorValues.includes(LogicalOperator[x.logicalOperator]),\n      html`\n        <rapid-select class=\"right-criteria\" :value=${sync((x) => x.rightCriteria)}>\n          ${repeat(\n            (_) => Object.values(RightCriteria),\n            html`\n              <rapid-option value=${(x) => x}>${(x) => x}</rapid-option>\n            `,\n          )}\n        </rapid-select>\n\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.VALUE,\n          html<TemplateConditionBuilder>`\n            ${whenElse(\n              (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === FieldTypeEnum.BOOLEAN,\n              html`\n                <rapid-select class=\"right-criteria-select\" :value=${sync((x) => x.rightValueText)}>\n                  <rapid-option value=\"true\">true</rapid-option>\n                  <rapid-option value=\"false\">false</rapid-option>\n                </rapid-select>\n              `,\n              html`\n                ${whenElse(\n                  (x) => JSON.parse(x.leftValue ?? '{}').FIELD_TYPE === 'ENUM',\n                  html`\n                    <rapid-multiselect\n                      class=\"right-criteria-select\"\n                      :selectedOptions=${(x) => x.rightValueMultiSelect}\n                      @selectionChange=${(x, c) => {\n                        x.rightValueMultiSelect = (c.event as CustomEvent).detail;\n                      }}\n                      search=\"true\"\n                      all=\"false\"\n                    >\n                      <multiselect-datasource\n                        value-field=\"value\"\n                        label-field=\"value\"\n                        :data=${(x) => x.getEnumValues().map((value) => ({ value }))}\n                      ></multiselect-datasource>\n                    </rapid-multiselect>\n                  `,\n                  html`\n                    <rapid-text-field\n                      class=\"right-criteria-text\"\n                      :value=${sync((x) => x.rightValueText)}\n                      placeholder=\"Value (comma-separate for multiple)\"\n                      autocomplete=\"off\"\n                    ></rapid-text-field>\n                  `,\n                )}\n              `,\n            )}\n          `,\n        )}\n        ${when(\n          (x) => x.rightCriteria === RightCriteria.USER_ENTRY,\n          html<TemplateConditionBuilder>`\n            <rapid-select class=\"right-criteria-select\" :value=${sync((x) => x.rightValueSelect)}>\n              ${(x) => rightValueItemsOptions(x.rightValueItems)}\n            </rapid-select>\n          `,\n        )}\n      `,\n    )}\n\n    <rapid-button appearance=\"icon\" class=\"delete\" @click=${(x) => x.deleteCondition()}>\n      <rapid-icon\n        style=\"opacity: 0.5\"\n        variant=\"regular\"\n        name=\"trash-alt\"\n        size=\"lg\"\n        part=\"icon\"\n      ></rapid-icon>\n    </rapid-button>\n  </div>\n`"
         }
       ],
       "exports": [
@@ -5775,6 +6446,21 @@
               },
               "default": "[]"
             },
+            {
+              "kind": "field",
+              "name": "isFirst",
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false"
+            },
+            {
+              "kind": "field",
+              "name": "joinOperator",
+              "type": {
+                "text": "string"
+              }
+            },
             {
               "kind": "field",
               "name": "leftValue",
@@ -5830,6 +6516,14 @@
               },
               "default": "[]"
             },
+            {
+              "kind": "field",
+              "name": "rightValueMultiSelect",
+              "type": {
+                "text": "string[]"
+              },
+              "default": "[]"
+            },
             {
               "kind": "method",
               "name": "deleteCondition"
@@ -5838,10 +6532,39 @@
               "kind": "method",
               "name": "conditionChanged"
             },
+            {
+              "kind": "method",
+              "name": "joinOperatorChanged"
+            },
             {
               "kind": "method",
               "name": "parametersChanged"
             },
+            {
+              "kind": "method",
+              "name": "getMatchingParameter",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "ParameterBuilderEntity | undefined"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "syncParameterBinding",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "resetToValueEditor",
+              "privacy": "private"
+            },
             {
               "kind": "method",
               "name": "fieldsChanged"
@@ -5885,6 +6608,19 @@
             {
               "kind": "method",
               "name": "rightValueSelectChanged"
+            },
+            {
+              "kind": "method",
+              "name": "rightValueMultiSelectChanged"
+            },
+            {
+              "kind": "method",
+              "name": "getEnumValues",
+              "return": {
+                "type": {
+                  "text": "string[]"
+                }
+              }
             }
           ],
           "events": [
@@ -5948,6 +6684,164 @@
           }
         }
       ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-group/template-condition-group.template.ts",
+      "declarations": [
+        {
+          "kind": "variable",
+          "name": "TemplateConditionGroupTemplate",
+          "default": "html<TemplateConditionGroup>`\n  ${when(\n    (x) => !x.isFirst,\n    html`\n      <div class=\"join-toggle-row\">\n        <div class=\"join-toggle\">\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'AND'])}\"\n            @click=${(x) => (x.joinOperator = 'AND')}\n          >\n            AND\n          </span>\n          <span\n            class=\"join-text${(x) => classNames(['active', x.joinOperator === 'OR'])}\"\n            @click=${(x) => (x.joinOperator = 'OR')}\n          >\n            OR\n          </span>\n        </div>\n      </div>\n    `,\n  )}\n  <div class=\"condition-group-row\">\n    <div class=\"condition-group-box\">\n      ${repeat(\n        (x) => x.groupChildren,\n        html<ConditionNode, TemplateConditionGroup>`\n          ${when(\n            (x) => isGroup(x),\n            html<ConditionNode>`\n              <template-condition-group\n                :fields=${(x, c) => c.parent.fields}\n                :parameters=${(x, c) => c.parent.parameters}\n                :node=${(x) => x}\n                :isFirst=${(x, c) => c.index === 0}\n                @edit=${(x, c) => c.parent.editChild(eventDetail(c))}\n                @delete=${(x, c) => c.parent.deleteChild(eventDetail(c))}\n              ></template-condition-group>\n            `,\n          )}\n          ${when(\n            (x) => !isGroup(x),\n            html<ConditionNode>`\n              <template-condition-builder\n                :fields=${(x, c) => c.parent.fields}\n                :parameters=${(x, c) => c.parent.parameters}\n                :condition=${(x) => x}\n                :isFirst=${(x, c) => c.index === 0}\n                @edit=${(x, c) => c.parent.editChild(eventDetail(c))}\n                @delete=${(x, c) => c.parent.deleteChild(eventDetail(c))}\n              ></template-condition-builder>\n            `,\n          )}\n        `,\n        { positioning: true },\n      )}\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()}>+ Group</rapid-button>\n        <rapid-button appearance=\"icon\" class=\"delete-group\" @click=${(x) => x.deleteSelf()}>\n          <rapid-icon variant=\"regular\" name=\"trash-alt\" size=\"lg\" part=\"icon\"></rapid-icon>\n        </rapid-button>\n      </div>\n    </div>\n  </div>\n`"
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "TemplateConditionGroupTemplate",
+          "declaration": {
+            "name": "TemplateConditionGroupTemplate",
+            "module": "src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-group/template-condition-group.template.ts"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-group/template-condition-group.ts",
+      "declarations": [
+        {
+          "kind": "class",
+          "description": "Parenthesized group of conditions/nested groups for notification template\ncriteria - see rule-condition-group for the rationale. Also forwards\n:parameters down to nested template-condition-builder rows so parameter\nbinding (USER_ENTRY) keeps working inside a group.",
+          "name": "TemplateConditionGroup",
+          "members": [
+            {
+              "kind": "field",
+              "name": "node",
+              "type": {
+                "text": "ConditionGroupEntity"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "fields",
+              "type": {
+                "text": "Field[]"
+              },
+              "default": "[]"
+            },
+            {
+              "kind": "field",
+              "name": "parameters",
+              "type": {
+                "text": "Array<ParameterBuilderEntity>"
+              },
+              "default": "[]"
+            },
+            {
+              "kind": "field",
+              "name": "isFirst",
+              "type": {
+                "text": "boolean"
+              },
+              "default": "false"
+            },
+            {
+              "kind": "field",
+              "name": "joinOperator",
+              "type": {
+                "text": "string"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "groupChildren",
+              "type": {
+                "text": "ConditionNode[]"
+              },
+              "default": "[]"
+            },
+            {
+              "kind": "method",
+              "name": "nodeChanged"
+            },
+            {
+              "kind": "method",
+              "name": "joinOperatorChanged"
+            },
+            {
+              "kind": "method",
+              "name": "newCondition"
+            },
+            {
+              "kind": "method",
+              "name": "newGroup"
+            },
+            {
+              "kind": "method",
+              "name": "editChild",
+              "parameters": [
+                {
+                  "name": "_editedChild",
+                  "type": {
+                    "text": "ConditionNode"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "deleteChild",
+              "parameters": [
+                {
+                  "name": "deletedChild",
+                  "type": {
+                    "text": "ConditionNode"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "deleteSelf"
+            }
+          ],
+          "events": [
+            {
+              "description": "Fired when this whole group should be removed",
+              "name": "delete"
+            },
+            {
+              "description": "Fired when anything inside this group changes",
+              "name": "edit"
+            }
+          ],
+          "superclass": {
+            "name": "GenesisElement",
+            "package": "@genesislcap/web-core"
+          },
+          "tagName": "template-condition-group",
+          "customElement": true
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "TemplateConditionGroup",
+          "declaration": {
+            "name": "TemplateConditionGroup",
+            "module": "src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-group/template-condition-group.ts"
+          }
+        },
+        {
+          "kind": "custom-element-definition",
+          "name": "template-condition-group",
+          "declaration": {
+            "name": "TemplateConditionGroup",
+            "module": "src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-group/template-condition-group.ts"
+          }
+        }
+      ]
     }
   ]
 }