@genesislcap/pbc-notify-ui 15.14.0 → 15.14.2

package/dist/dts/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-builder/template-condition-builder.d.ts

@@ -1,5 +1,6 @@
 import { GenesisElement } from '@genesislcap/web-core';
 import { ConditionBuilderEntity } from '../../../../../../notify.types';
+import { Field } from '../../../../../../services/system.service';
 import { ParameterBuilderEntity } from '../template-dialog.types';
 /**
  * Condition builder for template notification rules.
@@ -11,7 +12,7 @@ import { ParameterBuilderEntity } from '../template-dialog.types';
 export declare class TemplateConditionBuilder extends GenesisElement {
     condition: ConditionBuilderEntity;
     parameters: Array<ParameterBuilderEntity>;
-    fields: Array<string>;
+    fields: Field[];
     isFirst: boolean;
     joinOperator: string;
     leftValue: any;

package/dist/dts/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-builder/template-condition-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-condition-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-builder/template-condition-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AACxF,OAAO,EACL,sBAAsB,EAKvB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE;;;;;;GAMG;AACH,qBAKa,wBAAyB,SAAQ,cAAc;IACpD,SAAS,EAAE,sBAAsB,CAAC;IAClC,UAAU,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAM;IAC/C,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAIrB,OAAO,EAAE,OAAO,CAAS;IACzB,YAAY,EAAE,MAAM,CAAoB;IAExC,SAAS,EAAE,GAAG,CAAQ;IACtB,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAEhC,eAAe,EAAE,MAAM,CAAQ;IAC/B,aAAa,EAAE,MAAM,CAAuB;IAC5C,cAAc,EAAE,MAAM,CAAQ;IAC9B,gBAAgB,EAAE,MAAM,CAAQ;IAChC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IACjC,qBAAqB,EAAE,MAAM,EAAE,CAAM;IAEjD,eAAe;IAIT,gBAAgB;IAuBtB,mBAAmB;IASnB,iBAAiB;IAiBjB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,oBAAoB;IAoB5B,OAAO,CAAC,kBAAkB;IAa1B,aAAa;IASb,sBAAsB;IAetB,OAAO,CAAC,eAAe;IAiBvB,gBAAgB;IAmBhB,OAAO,CAAC,gBAAgB;IAuBxB,oBAAoB;IA6BpB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,qBAAqB;IAI7B,qBAAqB;IASrB,uBAAuB;IASvB,4BAA4B;IAgB5B,aAAa,IAAI,MAAM,EAAE;CAI1B"}
+{"version":3,"file":"template-condition-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-builder/template-condition-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAClF,OAAO,EACL,sBAAsB,EAKvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE;;;;;;GAMG;AACH,qBAKa,wBAAyB,SAAQ,cAAc;IAC9C,SAAS,EAAE,sBAAsB,CAAC;IAClC,UAAU,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAM;IAC/C,MAAM,EAAE,KAAK,EAAE,CAAM;IAIrB,OAAO,EAAE,OAAO,CAAS;IACzB,YAAY,EAAE,MAAM,CAAoB;IAExC,SAAS,EAAE,GAAG,CAAQ;IACtB,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAEhC,eAAe,EAAE,MAAM,CAAQ;IAC/B,aAAa,EAAE,MAAM,CAAuB;IAC5C,cAAc,EAAE,MAAM,CAAQ;IAC9B,gBAAgB,EAAE,MAAM,CAAQ;IAChC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IACjC,qBAAqB,EAAE,MAAM,EAAE,CAAM;IAEjD,eAAe;IAIT,gBAAgB;IAuBtB,mBAAmB;IASnB,iBAAiB;IAiBjB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,oBAAoB;IAoB5B,OAAO,CAAC,kBAAkB;IAa1B,aAAa;IASb,sBAAsB;IAetB,OAAO,CAAC,eAAe;IAiBvB,gBAAgB;IAmBhB,OAAO,CAAC,gBAAgB;IAuBxB,oBAAoB;IA6BpB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,qBAAqB;IAI7B,qBAAqB;IASrB,uBAAuB;IASvB,4BAA4B;IAgB5B,aAAa,IAAI,MAAM,EAAE;CAI1B"}

package/dist/dts/components/foundation-notification-dashboard/components/templates/template-dialog/template-dialog.d.ts

@@ -68,6 +68,7 @@ export declare class TemplateDialog extends TemplateDialog_base {
     resources: Array<string>;
     fields: Array<Field>;
     topics: Array<string>;
+    private hydrating;
     private requiredFields;
     get isAlertSoundEditMode(): boolean;
     get alertSoundEntityId(): string | null;

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

@@ -1 +1 @@
-{"version":3,"file":"template-dialog.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/templates/template-dialog/template-dialog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAiB,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAEL,aAAa,EAGb,UAAU,EACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAW3E,OAAO,EAAE,sBAAsB,EAAY,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/F;;;;;GAKG;AACH,qBAKa,cAAe,SAAQ,mBAAyC;IAC1D,eAAe,EAAE,eAAe,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IAEtC,MAAM,EAAE,KAAK,CAAC;IACF,kBAAkB,EAAE,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,OAAO,kBAAkB,CAAC,CACrF;IAEP,OAAO,CAAC,UAAU,CAAgB;IACtB,IAAI,EAAE,MAAM,CAAQ;IACpB,WAAW,EAAE,MAAM,CAAQ;IAC3B,MAAM,MAAQ;IACd,OAAO,MAAQ;IACf,QAAQ,EAAE,MAAM,CAAM;IACtB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,UAAU,EAAE,UAAU,EAAE,CAAqB;IAE7C,UAAU,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAM;IAC/C,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,CAAM;IAItC,oBAAoB,EAAE,MAAM,CAAM;IAElC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAC9B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAM;IAC1B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAEvC,OAAO,CAAC,cAAc,CAAkE;IAExF,IAAI,oBAAoB,IAAI,OAAO,CAElC;IAED,IAAI,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAI,uBAAuB,IAAI,QAAQ,GAAG,KAAK,CAI9C;IAEY,UAAU,CAAC,MAAM,EAAE,GAAG;IAoBnC,KAAK;YAyBS,cAAc;YAUd,YAAY;IAyB1B,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,oBAAoB;IAc5B,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,MAAM;IAwBN,OAAO,CAAC,oBAAoB;IAwC5B,gBAAgB,CAAC,QAAQ,KAAA;IAUnB,eAAe;IAOrB,YAAY;IAKZ,QAAQ;IAKR,aAAa,CAAC,eAAe,EAAE,aAAa;IAI5C,eAAe,CAAC,gBAAgB,EAAE,aAAa;IAW/C,YAAY;IAIZ,aAAa,CAAC,eAAe,EAAE,sBAAsB;IAIrD,eAAe,CAAC,gBAAgB,EAAE,sBAAsB;IAYxD,IACW,sBAAsB,IAAI,OAAO,CAE3C;CACF"}
+{"version":3,"file":"template-dialog.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/templates/template-dialog/template-dialog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAiB,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAEL,aAAa,EAGb,UAAU,EACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAW3E,OAAO,EAAE,sBAAsB,EAAY,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/F;;;;;GAKG;AACH,qBAKa,cAAe,SAAQ,mBAAyC;IAC1D,eAAe,EAAE,eAAe,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IAEtC,MAAM,EAAE,KAAK,CAAC;IACF,kBAAkB,EAAE,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,OAAO,kBAAkB,CAAC,CACrF;IAEP,OAAO,CAAC,UAAU,CAAgB;IACtB,IAAI,EAAE,MAAM,CAAQ;IACpB,WAAW,EAAE,MAAM,CAAQ;IAC3B,MAAM,MAAQ;IACd,OAAO,MAAQ;IACf,QAAQ,EAAE,MAAM,CAAM;IACtB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,UAAU,EAAE,UAAU,EAAE,CAAqB;IAE7C,UAAU,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAM;IAC/C,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,CAAM;IAItC,oBAAoB,EAAE,MAAM,CAAM;IAElC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAC9B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAM;IAC1B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IACvC,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,cAAc,CAAkE;IAExF,IAAI,oBAAoB,IAAI,OAAO,CAElC;IAED,IAAI,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAI,uBAAuB,IAAI,QAAQ,GAAG,KAAK,CAI9C;IAEY,UAAU,CAAC,MAAM,EAAE,GAAG;IA4BnC,KAAK;YAyBS,cAAc;YAUd,YAAY;IAyB1B,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,oBAAoB;IAc5B,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,MAAM;IAwBN,OAAO,CAAC,oBAAoB;IAwC5B,gBAAgB,CAAC,QAAQ,KAAA;IAUnB,eAAe;IAWrB,YAAY;IAKZ,QAAQ;IAKR,aAAa,CAAC,eAAe,EAAE,aAAa;IAI5C,eAAe,CAAC,gBAAgB,EAAE,aAAa;IAW/C,YAAY;IAIZ,aAAa,CAAC,eAAe,EAAE,sBAAsB;IAIrD,eAAe,CAAC,gBAAgB,EAAE,sBAAsB;IAYxD,IACW,sBAAsB,IAAI,OAAO,CAE3C;CACF"}

package/dist/dts/react.d.ts

@@ -79,6 +79,15 @@ export declare const FoundationInbox: React.ForwardRefExoticComponent<
 >;
 export type FoundationInboxRef = FoundationInboxWC;
 
+export declare const FoundationNotificationDashboard: React.ForwardRefExoticComponent<
+  React.PropsWithChildren<
+    Omit<PublicOf<FoundationNotificationDashboardWC>, 'children' | 'style'> &
+    HTMLWCProps & {
+    }
+  > & React.RefAttributes<FoundationNotificationDashboardWC>
+>;
+export type FoundationNotificationDashboardRef = FoundationNotificationDashboardWC;
+
 export declare const FoundationSoundsPanel: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
     Omit<PublicOf<FoundationSoundsPanelWC>, 'children' | 'style'> &
@@ -97,15 +106,6 @@ export declare const FoundationSounds: React.ForwardRefExoticComponent<
 >;
 export type FoundationSoundsRef = FoundationSoundsWC;
 
-export declare const FoundationNotificationDashboard: React.ForwardRefExoticComponent<
-  React.PropsWithChildren<
-    Omit<PublicOf<FoundationNotificationDashboardWC>, 'children' | 'style'> &
-    HTMLWCProps & {
-    }
-  > & React.RefAttributes<FoundationNotificationDashboardWC>
->;
-export type FoundationNotificationDashboardRef = FoundationNotificationDashboardWC;
-
 export declare const FoundationInboxCounter: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
     Omit<PublicOf<FoundationInboxCounterWC>, 'children' | 'style'> &

package/dist/dts/services/system.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system.service.d.ts","sourceRoot":"","sources":["../../../src/services/system.service.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,KAAK,GAAG;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAClC,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;CAC/C;AAgCD,eAAO,MAAM,aAAa,qEAEzB,CAAC"}
+{"version":3,"file":"system.service.d.ts","sourceRoot":"","sources":["../../../src/services/system.service.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,KAAK,GAAG;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAClC,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;CAC/C;AA2DD,eAAO,MAAM,aAAa,qEAEzB,CAAC"}

package/dist/esm/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-builder/template-condition-builder.js

@@ -1,6 +1,6 @@
 import { __awaiter, __decorate } from "tslib";
 import { FieldTypeEnum } from '@genesislcap/foundation-comms';
-import { attr, customElement, GenesisElement, observable } from '@genesislcap/web-core';
+import { customElement, GenesisElement, observable } from '@genesislcap/web-core';
 import { JoinOperator, LogicalOperator, RightCriteria, nullAndBlankLogicalOperatorValues, } from '../../../../../../notify.types';
 import { logger } from '../../../../../../utils';
 import { ConditionBuilderStyles } from '../../../../styles/condition-builder.styles';
@@ -261,13 +261,13 @@ let TemplateConditionBuilder = class TemplateConditionBuilder extends GenesisEle
     }
 };
 __decorate([
-    attr
+    observable
 ], TemplateConditionBuilder.prototype, "condition", void 0);
 __decorate([
-    attr
+    observable
 ], TemplateConditionBuilder.prototype, "parameters", void 0);
 __decorate([
-    attr
+    observable
 ], TemplateConditionBuilder.prototype, "fields", void 0);
 __decorate([
     observable

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

@@ -39,6 +39,7 @@ let TemplateDialog = class TemplateDialog extends AlertSoundAttachmentMixin(Gene
         this.resources = [];
         this.fields = [];
         this.topics = [];
+        this.hydrating = false;
         this.requiredFields = () => [this.name, this.description, this.header, this.message];
     }
     get isAlertSoundEditMode() {
@@ -54,21 +55,31 @@ let TemplateDialog = class TemplateDialog extends AlertSoundAttachmentMixin(Gene
     }
     openDialog(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.topics = yield this.notifyService.getNotifyRouteTopics();
-            this.resources = yield this.systemService.getResources(); // TODO: Tables + Views
             this.templateDialogMode = params.mode;
-            switch (params.mode) {
-                case TemplateDialogMode.CREATE:
-                    yield this.createTemplate();
-                    break;
-                case TemplateDialogMode.EDIT:
-                    yield this.editTemplate(params.data);
-                    break;
-                default:
-                    logger.error('Error on TemplateDialogMode');
-                    break;
-            }
+            this.hydrating = true;
             this.dialog.show();
+            try {
+                this.topics = yield this.notifyService.getNotifyRouteTopics();
+                this.resources = yield this.systemService.getResources(); // TODO: Tables + Views
+                switch (params.mode) {
+                    case TemplateDialogMode.CREATE:
+                        yield this.createTemplate();
+                        break;
+                    case TemplateDialogMode.EDIT:
+                        yield this.editTemplate(params.data);
+                        break;
+                    default:
+                        logger.error('Error on TemplateDialogMode');
+                        break;
+                }
+            }
+            catch (error) {
+                logger.error('Failed to initialize template dialog', error);
+                this.close();
+            }
+            finally {
+                this.hydrating = false;
+            }
         });
     }
     close() {
@@ -210,6 +221,9 @@ let TemplateDialog = class TemplateDialog extends AlertSoundAttachmentMixin(Gene
     }
     resourceChanged() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.hydrating) {
+                return;
+            }
             this.conditions = [DynamicRuleUtils.createEmptyCondition()];
             this.fields = yield this.systemService.getFields(this.resource);
             this.refreshExpressionPreview();

package/dist/esm/services/system.service.js

@@ -1,6 +1,25 @@
 import { __awaiter, __decorate } from "tslib";
 import { Connect } from '@genesislcap/foundation-comms';
 import { DI } from '@genesislcap/web-core';
+function schemaDefinitionToField(name, def) {
+    var _a, _b;
+    const raw = def && typeof def === 'object' ? def : {};
+    const oneOf = Array.isArray(raw.oneOf) ? raw.oneOf : [];
+    const concrete = (_a = oneOf.find((option) => {
+        if (!option || typeof option !== 'object') {
+            return false;
+        }
+        return option.type !== 'null';
+    })) !== null && _a !== void 0 ? _a : raw;
+    const genesisType = typeof concrete.genesisType === 'string' ? concrete.genesisType : undefined;
+    const jsonType = typeof concrete.type === 'string' ? concrete.type : undefined;
+    const enumValues = Array.isArray(concrete.enum) ? concrete.enum.map(String) : null;
+    return {
+        FIELD_NAME: name,
+        FIELD_TYPE: ((_b = genesisType !== null && genesisType !== void 0 ? genesisType : jsonType) !== null && _b !== void 0 ? _b : 'STRING').toUpperCase(),
+        FIELD_VALUES: enumValues,
+    };
+}
 class SystemServiceImpl {
     getResources() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -12,21 +31,27 @@ class SystemServiceImpl {
     }
     getFields(resource) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             if (!resource) {
                 return [];
             }
-            const response = yield this.connect.request('SYSTEM_ENTITY_FIELDS', {
-                REQUEST: {
-                    ENTITY_NAME: resource,
-                },
-            });
-            return response.REPLY.sort((a, b) => a.NAME.localeCompare(b.NAME)).map((entity) => ({
-                FIELD_NAME: entity.NAME,
-                FIELD_TYPE: entity.TYPE,
-                // Enum fields expose their allowed values (space-separated) so the condition
-                // builder can render a multiselect for them.
-                FIELD_VALUES: entity.VALUES ? entity.VALUES.split(' ').filter((v) => v.length) : null,
-            }));
+            try {
+                const schema = yield this.connect.getJSONSchema(resource);
+                const reply = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.OUTBOUND) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.REPLY;
+                if (!reply || typeof reply === 'boolean') {
+                    return [];
+                }
+                const items = Array.isArray(reply.items) ? reply.items[0] : reply.items;
+                if (!items || typeof items === 'boolean' || !items.properties) {
+                    return [];
+                }
+                return Object.entries(items.properties)
+                    .map(([name, def]) => schemaDefinitionToField(name, def))
+                    .sort((a, b) => a.FIELD_NAME.localeCompare(b.FIELD_NAME));
+            }
+            catch (_c) {
+                return [];
+            }
         });
     }
 }

package/dist/react.cjs

@@ -52,6 +52,11 @@ const FoundationInbox = React.forwardRef(function FoundationInbox(props, ref) {
   return React.createElement(customElements.getName(FoundationInboxWC) ?? 'foundation-inbox', { ...rest, ref }, children);
 });
 
+const FoundationNotificationDashboard = React.forwardRef(function FoundationNotificationDashboard(props, ref) {
+  const { children, ...rest } = props;
+  return React.createElement(customElements.getName(FoundationNotificationDashboardWC) ?? 'foundation-notification-dashboard', { ...rest, ref }, children);
+});
+
 const FoundationSoundsPanel = React.forwardRef(function FoundationSoundsPanel(props, ref) {
   const { children, ...rest } = props;
   return React.createElement(customElements.getName(FoundationSoundsPanelWC) ?? 'foundation-sounds-panel', { ...rest, ref }, children);
@@ -62,11 +67,6 @@ const FoundationSounds = React.forwardRef(function FoundationSounds(props, ref)
   return React.createElement(customElements.getName(FoundationSoundsWC) ?? 'foundation-sounds', { ...rest, ref }, children);
 });
 
-const FoundationNotificationDashboard = React.forwardRef(function FoundationNotificationDashboard(props, ref) {
-  const { children, ...rest } = props;
-  return React.createElement(customElements.getName(FoundationNotificationDashboardWC) ?? 'foundation-notification-dashboard', { ...rest, ref }, children);
-});
-
 const FoundationInboxCounter = React.forwardRef(function FoundationInboxCounter(props, ref) {
   const { children, ...rest } = props;
   return React.createElement(customElements.getName(FoundationInboxCounterWC) ?? 'foundation-inbox-counter', { ...rest, ref }, children);
@@ -313,9 +313,9 @@ const TemplateConditionGroup = React.forwardRef(function TemplateConditionGroup(
 module.exports = {
   ReconciliationSandbox,
   FoundationInbox,
+  FoundationNotificationDashboard,
   FoundationSoundsPanel,
   FoundationSounds,
-  FoundationNotificationDashboard,
   FoundationInboxCounter,
   FoundationInboxFlyout,
   InboxSubscription,

package/dist/react.mjs

@@ -50,6 +50,11 @@ export const FoundationInbox = React.forwardRef(function FoundationInbox(props,
   return React.createElement(customElements.getName(FoundationInboxWC) ?? 'foundation-inbox', { ...rest, ref }, children);
 });
 
+export const FoundationNotificationDashboard = React.forwardRef(function FoundationNotificationDashboard(props, ref) {
+  const { children, ...rest } = props;
+  return React.createElement(customElements.getName(FoundationNotificationDashboardWC) ?? 'foundation-notification-dashboard', { ...rest, ref }, children);
+});
+
 export const FoundationSoundsPanel = React.forwardRef(function FoundationSoundsPanel(props, ref) {
   const { children, ...rest } = props;
   return React.createElement(customElements.getName(FoundationSoundsPanelWC) ?? 'foundation-sounds-panel', { ...rest, ref }, children);
@@ -60,11 +65,6 @@ export const FoundationSounds = React.forwardRef(function FoundationSounds(props
   return React.createElement(customElements.getName(FoundationSoundsWC) ?? 'foundation-sounds', { ...rest, ref }, children);
 });
 
-export const FoundationNotificationDashboard = React.forwardRef(function FoundationNotificationDashboard(props, ref) {
-  const { children, ...rest } = props;
-  return React.createElement(customElements.getName(FoundationNotificationDashboardWC) ?? 'foundation-notification-dashboard', { ...rest, ref }, children);
-});
-
 export const FoundationInboxCounter = React.forwardRef(function FoundationInboxCounter(props, ref) {
   const { children, ...rest } = props;
   return React.createElement(customElements.getName(FoundationInboxCounterWC) ?? 'foundation-inbox-counter', { ...rest, ref }, children);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/pbc-notify-ui",
   "description": "Genesis PBC Notify UI",
-  "version": "15.14.0",
+  "version": "15.14.2",
   "license": "SEE LICENSE IN license.txt",
   "workspaces": [
     "client"
@@ -81,30 +81,30 @@
     "@commitlint/cli": "^19.2.1",
     "@commitlint/config-conventional": "^19.1.0",
     "@commitlint/format": "^19.0.3",
-    "@genesislcap/design-system-configurator": "15.14.0",
-    "@genesislcap/eslint-config": "15.14.0",
-    "@genesislcap/eslint-stylelint-builder": "15.14.0",
-    "@genesislcap/foundation-testing": "15.14.0",
-    "@genesislcap/genx": "15.14.0",
-    "@genesislcap/prettier-config": "15.14.0",
-    "@genesislcap/stylelint-config": "15.14.0",
-    "@genesislcap/vite-builder": "15.14.0",
-    "@genesislcap/webpack-builder": "15.14.0",
+    "@genesislcap/design-system-configurator": "15.14.2",
+    "@genesislcap/eslint-config": "15.14.2",
+    "@genesislcap/eslint-stylelint-builder": "15.14.2",
+    "@genesislcap/foundation-testing": "15.14.2",
+    "@genesislcap/genx": "15.14.2",
+    "@genesislcap/prettier-config": "15.14.2",
+    "@genesislcap/stylelint-config": "15.14.2",
+    "@genesislcap/vite-builder": "15.14.2",
+    "@genesislcap/webpack-builder": "15.14.2",
     "dayjs": "^1.11.7"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "15.14.0",
-    "@genesislcap/foundation-criteria": "15.14.0",
-    "@genesislcap/foundation-entity-management": "15.14.0",
-    "@genesislcap/foundation-forms": "15.14.0",
-    "@genesislcap/foundation-layout": "15.14.0",
-    "@genesislcap/foundation-logger": "15.14.0",
-    "@genesislcap/foundation-notifications": "15.14.0",
-    "@genesislcap/foundation-ui": "15.14.0",
-    "@genesislcap/foundation-utils": "15.14.0",
-    "@genesislcap/rapid-design-system": "15.14.0",
-    "@genesislcap/rapid-grid-pro": "15.14.0",
-    "@genesislcap/web-core": "15.14.0",
+    "@genesislcap/foundation-comms": "15.14.2",
+    "@genesislcap/foundation-criteria": "15.14.2",
+    "@genesislcap/foundation-entity-management": "15.14.2",
+    "@genesislcap/foundation-forms": "15.14.2",
+    "@genesislcap/foundation-layout": "15.14.2",
+    "@genesislcap/foundation-logger": "15.14.2",
+    "@genesislcap/foundation-notifications": "15.14.2",
+    "@genesislcap/foundation-ui": "15.14.2",
+    "@genesislcap/foundation-utils": "15.14.2",
+    "@genesislcap/rapid-design-system": "15.14.2",
+    "@genesislcap/rapid-grid-pro": "15.14.2",
+    "@genesislcap/web-core": "15.14.2",
     "lodash.debounce": "^4.0.8",
     "rxjs": "^7.5.4"
   },
@@ -112,5 +112,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "d84656a0872b2274be6f6b20a87a28504b48ed2a"
+  "gitHead": "bd1cb4a789548d9c7c6777f8adb7bce3f43c3317"
 }

package/src/components/foundation-notification-dashboard/components/templates/template-dialog/template-condition-builder/template-condition-builder.ts

@@ -1,5 +1,5 @@
 import { FieldTypeEnum } from '@genesislcap/foundation-comms';
-import { attr, customElement, GenesisElement, observable } from '@genesislcap/web-core';
+import { customElement, GenesisElement, observable } from '@genesislcap/web-core';
 import {
   ConditionBuilderEntity,
   JoinOperator,
@@ -7,6 +7,7 @@ import {
   RightCriteria,
   nullAndBlankLogicalOperatorValues,
 } from '../../../../../../notify.types';
+import { Field } from '../../../../../../services/system.service';
 import { logger } from '../../../../../../utils';
 import { ConditionBuilderStyles } from '../../../../styles/condition-builder.styles';
 import { ParameterBuilderEntity } from '../template-dialog.types';
@@ -25,9 +26,9 @@ import { TemplateConditionBuilderTemplate } from './template-condition-builder.t
   styles: ConditionBuilderStyles,
 })
 export class TemplateConditionBuilder extends GenesisElement {
-  @attr condition: ConditionBuilderEntity;
-  @attr parameters: Array<ParameterBuilderEntity> = [];
-  @attr fields: Array<string> = [];
+  @observable condition: ConditionBuilderEntity;
+  @observable parameters: Array<ParameterBuilderEntity> = [];
+  @observable fields: Field[] = [];
 
   // Whether this is the first row in the condition list - it has nothing to
   // join to, so the AND/OR selector is hidden for it.

package/src/components/foundation-notification-dashboard/components/templates/template-dialog/template-dialog.ts

@@ -64,6 +64,7 @@ export class TemplateDialog extends AlertSoundAttachmentMixin(GenesisElement) {
   @observable resources: Array<string> = [];
   @observable fields: Array<Field> = [];
   @observable topics: Array<string> = [];
+  private hydrating = false;
 
   private requiredFields = () => [this.name, this.description, this.header, this.message];
 
@@ -82,23 +83,31 @@ export class TemplateDialog extends AlertSoundAttachmentMixin(GenesisElement) {
   }
 
   public async openDialog(params: any) {
-    this.topics = await this.notifyService.getNotifyRouteTopics();
-    this.resources = await this.systemService.getResources(); // TODO: Tables + Views
     this.templateDialogMode = params.mode;
+    this.hydrating = true;
+    this.dialog.show();
 
-    switch (params.mode) {
-      case TemplateDialogMode.CREATE:
-        await this.createTemplate();
-        break;
-      case TemplateDialogMode.EDIT:
-        await this.editTemplate(params.data);
-        break;
-      default:
-        logger.error('Error on TemplateDialogMode');
-        break;
+    try {
+      this.topics = await this.notifyService.getNotifyRouteTopics();
+      this.resources = await this.systemService.getResources(); // TODO: Tables + Views
+
+      switch (params.mode) {
+        case TemplateDialogMode.CREATE:
+          await this.createTemplate();
+          break;
+        case TemplateDialogMode.EDIT:
+          await this.editTemplate(params.data);
+          break;
+        default:
+          logger.error('Error on TemplateDialogMode');
+          break;
+      }
+    } catch (error) {
+      logger.error('Failed to initialize template dialog', error);
+      this.close();
+    } finally {
+      this.hydrating = false;
     }
-
-    this.dialog.show();
   }
 
   close() {
@@ -262,6 +271,10 @@ export class TemplateDialog extends AlertSoundAttachmentMixin(GenesisElement) {
   }
 
   async resourceChanged() {
+    if (this.hydrating) {
+      return;
+    }
+
     this.conditions = [DynamicRuleUtils.createEmptyCondition()];
     this.fields = await this.systemService.getFields(this.resource);
     this.refreshExpressionPreview();

package/src/services/system.service.ts

@@ -12,6 +12,27 @@ export interface SystemService {
   getFields(resource: string): Promise<Field[]>;
 }
 
+function schemaDefinitionToField(name: string, def: unknown): Field {
+  const raw = def && typeof def === 'object' ? (def as Record<string, unknown>) : {};
+  const oneOf = Array.isArray(raw.oneOf) ? raw.oneOf : [];
+  const concrete =
+    (oneOf.find((option) => {
+      if (!option || typeof option !== 'object') {
+        return false;
+      }
+      return (option as Record<string, unknown>).type !== 'null';
+    }) as Record<string, unknown> | undefined) ?? raw;
+  const genesisType = typeof concrete.genesisType === 'string' ? concrete.genesisType : undefined;
+  const jsonType = typeof concrete.type === 'string' ? concrete.type : undefined;
+  const enumValues = Array.isArray(concrete.enum) ? concrete.enum.map(String) : null;
+
+  return {
+    FIELD_NAME: name,
+    FIELD_TYPE: (genesisType ?? jsonType ?? 'STRING').toUpperCase(),
+    FIELD_VALUES: enumValues,
+  };
+}
+
 class SystemServiceImpl implements SystemService {
   @Connect private connect: Connect;
 
@@ -27,18 +48,24 @@ class SystemServiceImpl implements SystemService {
       return [];
     }
 
-    const response = await this.connect.request('SYSTEM_ENTITY_FIELDS', {
-      REQUEST: {
-        ENTITY_NAME: resource,
-      },
-    });
-    return response.REPLY.sort((a, b) => a.NAME.localeCompare(b.NAME)).map((entity) => ({
-      FIELD_NAME: entity.NAME,
-      FIELD_TYPE: entity.TYPE,
-      // Enum fields expose their allowed values (space-separated) so the condition
-      // builder can render a multiselect for them.
-      FIELD_VALUES: entity.VALUES ? entity.VALUES.split(' ').filter((v: string) => v.length) : null,
-    }));
+    try {
+      const schema = await this.connect.getJSONSchema(resource);
+      const reply = schema?.OUTBOUND?.properties?.REPLY;
+      if (!reply || typeof reply === 'boolean') {
+        return [];
+      }
+
+      const items = Array.isArray(reply.items) ? reply.items[0] : reply.items;
+      if (!items || typeof items === 'boolean' || !items.properties) {
+        return [];
+      }
+
+      return Object.entries(items.properties)
+        .map(([name, def]) => schemaDefinitionToField(name, def))
+        .sort((a, b) => a.FIELD_NAME.localeCompare(b.FIELD_NAME));
+    } catch {
+      return [];
+    }
   }
 }