@genesislcap/pbc-notify-ui 1.0.16 → 1.0.18

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

@@ -10,7 +10,7 @@ export declare class RuleConditionBuilder extends FASTElement {
     logicalOperator: string;
     rightCriteria: RightCriteria;
     rightValueText: string;
-    rightValueField: string;
+    rightValueUserEntry: string;
     formActive: boolean;
     conditionChanged(): Promise<void>;
     assignLeftValue(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"rule-condition-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,WAAW,EAAc,MAAM,yBAAyB,CAAC;AAGjF,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAkB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC9G,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAI1E,qBAKa,oBAAqB,SAAQ,WAAW;IAEpC,aAAa,EAAE,aAAa,CAAC;IAEhC,SAAS,EAAE,sBAAsB,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,KAAK,EAAE,CAAC;IAExB,SAAS,EAAE,MAAM,CAAC;IAElB,eAAe,EAAE,MAAM,CAAC;IAExB,aAAa,EAAE,aAAa,CAAwB;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IAGpC,UAAU,EAAE,OAAO,CAAQ;IAErB,gBAAgB;IAYhB,eAAe;IASrB,gBAAgB;IAShB,gBAAgB;IAOhB,sBAAsB;IAOtB,oBAAoB;IAcpB,qBAAqB;IAOrB,0BAA0B;IAO1B,eAAe;CAGhB"}
+{"version":3,"file":"rule-condition-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,WAAW,EAAc,MAAM,yBAAyB,CAAC;AAGjF,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAkB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC9G,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAI1E,qBAKa,oBAAqB,SAAQ,WAAW;IAEpC,aAAa,EAAE,aAAa,CAAC;IAEhC,SAAS,EAAE,sBAAsB,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,KAAK,EAAE,CAAC;IAExB,SAAS,EAAE,MAAM,CAAC;IAElB,eAAe,EAAE,MAAM,CAAC;IAExB,aAAa,EAAE,aAAa,CAAwB;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAGxC,UAAU,EAAE,OAAO,CAAQ;IAErB,gBAAgB;IAYhB,eAAe;IASrB,gBAAgB;IAShB,gBAAgB;IAOhB,sBAAsB;IAOtB,oBAAoB;IAcpB,qBAAqB;IAOrB,0BAA0B;IAO1B,eAAe;CAGhB"}

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

@@ -18,30 +18,24 @@ export declare function createAssignment(field: string, value: string): {
 export declare function getAssignmentValue(assignments: any[], field: string): string;
 export declare function createConditions(conditions: ConditionBuilderEntity[], parameters?: any): any;
 export declare function getLeftExpression(condition: ConditionBuilderEntity): {
-    TYPE: string;
-    VALUE: any;
-    NAME?: undefined;
-} | {
     TYPE: string;
     NAME: any;
-    VALUE?: undefined;
 };
-export declare function getLeftType(condition: ConditionBuilderEntity): "FIELD" | "NUMBER" | "STRING";
 export declare function getRightExpression(condition: ConditionBuilderEntity, parameters?: any): {
     TYPE: string;
     KEY: any;
-    VALUE?: undefined;
     NAME?: undefined;
+    VALUE?: undefined;
 } | {
     TYPE: string;
-    VALUE: string;
+    NAME: string;
     KEY?: undefined;
-    NAME?: undefined;
+    VALUE?: undefined;
 } | {
     TYPE: string;
-    NAME: string;
+    VALUE: string;
     KEY?: undefined;
-    VALUE?: undefined;
+    NAME?: undefined;
 };
 export declare function createParameterDetails(parameters: any): {};
 //# sourceMappingURL=template-dialog.utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"template-dialog.utils.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/templates/template-dialog/template-dialog.utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAGzF,qBAAa,aAAa;IAElB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAO;IAEhC,MAAM,CAAC,UAAU,IAAI,MAAM;CAG5B;AAED,wBAAgB,oBAAoB,IAAI,sBAAsB,CAQ7D;AAED,wBAAgB,oBAAoB,IAAI,sBAAsB,CAS7D;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;;;;;;;;;EAYd;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,sBAAsB,EAAE,EAAE,UAAU,CAAC,KAAA,GAAG,GAAG,CAQvF;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,sBAAsB;;;;;;;;EAclE;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,sBAAsB,iCAa5D;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,sBAAsB,EAAE,UAAU,CAAC,KAAA;;;;;;;;;;;;;;;EAmBhF;AAED,wBAAgB,sBAAsB,CAAC,UAAU,KAAA,MAYhD"}
+{"version":3,"file":"template-dialog.utils.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/foundation-notification-dashboard/components/templates/template-dialog/template-dialog.utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAGzF,qBAAa,aAAa;IAElB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAO;IAEhC,MAAM,CAAC,UAAU,IAAI,MAAM;CAG5B;AAED,wBAAgB,oBAAoB,IAAI,sBAAsB,CAQ7D;AAED,wBAAgB,oBAAoB,IAAI,sBAAsB,CAS7D;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;;;;;;;;;EAYd;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,sBAAsB,EAAE,EAAE,UAAU,CAAC,KAAA,GAAG,GAAG,CAQvF;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,sBAAsB;;;EAKlE;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,sBAAsB,EAAE,UAAU,CAAC,KAAA;;;;;;;;;;;;;;;EAyChF;AAED,wBAAgB,sBAAsB,CAAC,UAAU,KAAA,MAYhD"}

package/dist/dts/utils/notifyPermissions.d.ts

@@ -1,7 +1,7 @@
 export declare const NotifyPermission: {
-    NOTIFY_RULE_VIEW: string;
-    NOTIFICATION_RULE_TEMPLATE_VIEW: string;
-    NOTIFY_ROUTE_VIEW: string;
-    NOTIFY_AUDIT_VIEW: string;
+    NotificationRuleView: string;
+    NotificationRuleTemplateView: string;
+    NotificationRouteView: string;
+    NotificationAuditView: string;
 };
 //# sourceMappingURL=notifyPermissions.d.ts.map

package/dist/esm/components/foundation-inbox/inbox.template.js

@@ -21,7 +21,7 @@ export const FoundationInboxTemplate = html `
       >
         Alert Log
       </zero-tab>
-      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NOTIFY_RULE_VIEW), html `
+      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NotificationRuleView), html `
           <zero-tab
             slot="my-alerts-tab"
             id=${InboxTab.MyAlerts}
@@ -31,7 +31,7 @@ export const FoundationInboxTemplate = html `
             My Alerts
           </zero-tab>
         `)}
-      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NOTIFICATION_RULE_TEMPLATE_VIEW), html `
+      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NotificationRuleTemplateView), html `
           <zero-tab
             slot="subscribe-tab"
             id=${InboxTab.Subscribe}
@@ -73,7 +73,7 @@ export const FoundationInboxTemplate = html `
             `)}
         </div>
       </zero-tab-panel>
-      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NOTIFY_RULE_VIEW), html `
+      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NotificationRuleView), html `
           <!-- Rules -->
           <zero-tab-panel
             slot="my-alerts-tab"
@@ -110,7 +110,7 @@ export const FoundationInboxTemplate = html `
             </div>
           </zero-tab-panel>
         `)}
-      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NOTIFICATION_RULE_TEMPLATE_VIEW), html `
+      ${when((x) => x.auth.currentUser.hasPermission(NotifyPermission.NotificationRuleTemplateView), html `
           <!-- Templates -->
           <zero-tab-panel
             slot="subscribe-tab"

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

@@ -40,7 +40,7 @@ let RuleConditionBuilder = class RuleConditionBuilder extends FASTElement {
             this.rightValueText = this.condition.RIGHT_VALUE;
         }
         else {
-            this.rightValueField = null;
+            this.rightValueUserEntry = null;
         }
         this.$emit('edit', this.condition);
     }
@@ -63,7 +63,7 @@ let RuleConditionBuilder = class RuleConditionBuilder extends FASTElement {
                 this.rightValueText = '';
             }
             else {
-                this.rightValueField = null;
+                this.rightValueUserEntry = this.resourceFields[0].FIELD_NAME;
             }
             this.$emit('edit', this.condition);
         }
@@ -76,7 +76,7 @@ let RuleConditionBuilder = class RuleConditionBuilder extends FASTElement {
     }
     rightValueUserEntryChanged() {
         if (this.condition) {
-            this.condition.RIGHT_VALUE = this.rightValueField;
+            this.condition.RIGHT_VALUE = this.rightValueUserEntry;
             this.$emit('edit', this.condition);
         }
     }
@@ -110,7 +110,7 @@ __decorate([
 ], RuleConditionBuilder.prototype, "rightValueText", void 0);
 __decorate([
     observable
-], RuleConditionBuilder.prototype, "rightValueField", void 0);
+], RuleConditionBuilder.prototype, "rightValueUserEntry", void 0);
 RuleConditionBuilder = __decorate([
     customElement({
         name,

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

@@ -43,7 +43,7 @@ export const ConditionBuilderTemplate = html `
     
     <zero-select
       class="right-criteria-user-entry ${x => classNames(['display-none', x.rightCriteria !== RIGHT_CRITERIA.FIELD])}"
-      :value=${sync(x => x.rightValueField)}
+      :value=${sync(x => x.rightValueUserEntry)}
     >
       ${repeat(x => x.resourceFields, html `
           <zero-option value=${x => x.FIELD_NAME}>${x => x.FIELD_NAME}</zero-option>

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

@@ -1,9 +1,8 @@
 import { __decorate } from "tslib";
-import { EXPRESSION_TYPE_FIELD, EXPRESSION_TYPE_PLACEHOLDER, EXPRESSION_TYPE_STRING } from "../../../types/expression-type";
 import { LOGICAL_OPERATOR_EQUALS } from "../../../types/logical-operator";
 import { PARAM_SOURCE_TYPE_USER_TEXT } from "../../../types/param-source-type";
-import { PARAM_TYPE_BOOLEAN, PARAM_TYPE_FIELD, PARAM_TYPE_NUMBER, PARAM_TYPE_STRING } from "../../../types/param-type";
-import { RIGHT_CRITERIA_USER_ENTRY, RIGHT_CRITERIA_VALUE } from "../../../types/right-criteria";
+import { PARAM_TYPE_FIELD, PARAM_TYPE_STRING } from "../../../types/param-type";
+import { RIGHT_CRITERIA_VALUE } from "../../../types/right-criteria";
 import { UUID } from '@genesislcap/foundation-utils';
 export class UUIDGenerator {
     static createUuid() {
@@ -57,49 +56,52 @@ export function createConditions(conditions, parameters) {
     });
 }
 export function getLeftExpression(condition) {
-    const leftType = getLeftType(condition);
-    if (PARAM_TYPE_STRING === leftType) {
-        return {
-            TYPE: PARAM_TYPE_STRING,
-            VALUE: condition.LEFT_VALUE.FIELD_NAME
-        };
-    }
     return {
         TYPE: PARAM_TYPE_FIELD,
         NAME: condition.LEFT_VALUE.FIELD_NAME
     };
 }
-export function getLeftType(condition) {
-    switch (condition.LEFT_VALUE.FIELD_TYPE) {
-        case PARAM_TYPE_BOOLEAN:
-            return PARAM_TYPE_FIELD;
-        case 'INTEGER':
-        case 'DOUBLE':
-        case 'LONG':
-        case 'SHORT':
-        case 'BIGDECIMAL':
-            return PARAM_TYPE_NUMBER;
-        default:
-            return PARAM_TYPE_STRING;
-    }
-}
 export function getRightExpression(condition, parameters) {
-    if (condition.RIGHT_CRITERIA === RIGHT_CRITERIA_USER_ENTRY) {
-        return {
-            TYPE: EXPRESSION_TYPE_PLACEHOLDER,
-            KEY: parameters.find(parameter => parameter.UUID === condition.RIGHT_VALUE).PARAM_NAME
-        };
-    }
-    if (condition.LEFT_VALUE.FIELD_TYPE === EXPRESSION_TYPE_STRING) {
-        return {
-            TYPE: EXPRESSION_TYPE_STRING,
-            VALUE: condition.RIGHT_VALUE
-        };
+    switch (condition.RIGHT_CRITERIA) {
+        case 'USER_ENTRY':
+            return {
+                TYPE: 'PLACEHOLDER',
+                KEY: parameters.find(parameter => parameter.UUID === condition.RIGHT_VALUE).PARAM_NAME
+            };
+        case 'FIELD': // Only for Rules
+            return {
+                TYPE: 'FIELD',
+                NAME: condition.RIGHT_VALUE
+            };
+        default:
+            switch (condition.LEFT_VALUE.FIELD_TYPE) {
+                case 'BOOLEAN':
+                    return {
+                        TYPE: 'BOOLEAN',
+                        VALUE: condition.RIGHT_VALUE
+                    };
+                case 'STRING':
+                case 'ENUM':
+                    return {
+                        TYPE: 'STRING',
+                        VALUE: condition.RIGHT_VALUE
+                    };
+                case 'INT':
+                case 'SHORT':
+                case 'DOUBLE':
+                case 'LONG':
+                case 'BIGDECIMAL':
+                    return {
+                        TYPE: 'NUMBER',
+                        VALUE: condition.RIGHT_VALUE
+                    };
+                default:
+                    return {
+                        TYPE: 'FIELD',
+                        NAME: condition.RIGHT_VALUE
+                    };
+            }
     }
-    return {
-        TYPE: EXPRESSION_TYPE_FIELD,
-        NAME: condition.RIGHT_VALUE
-    };
 }
 export function createParameterDetails(parameters) {
     const map = {};

package/dist/esm/components/foundation-notification-dashboard/notification-dashboard.tabs.js

@@ -5,24 +5,24 @@ export const NOTIFICATION_DASHBOARD_TABS = [
         id: 'rules',
         name: 'Rules',
         component: 'rule-management',
-        right: 'NOTIFY_RULE_VIEW'
+        right: 'NotificationRuleView'
     },
     {
         id: 'templates',
         name: 'Templates',
         component: 'template-management',
-        right: 'NOTIFICATION_RULE_TEMPLATE_VIEW'
+        right: 'NotificationRuleTemplateView'
     },
     {
         id: 'routes',
         name: 'Routes',
         component: 'route-management',
-        right: 'NOTIFY_ROUTE_VIEW'
+        right: 'NotificationRouteView'
     },
     {
         id: 'notify-audit',
         name: 'Notify Audit',
         component: 'notify-audit-management',
-        right: 'NOTIFY_AUDIT_VIEW'
+        right: 'NotificationAuditView'
     }
 ];

package/dist/esm/utils/notifyPermissions.js

@@ -1,6 +1,6 @@
 export const NotifyPermission = {
-    NOTIFY_RULE_VIEW: "NOTIFY_RULE_VIEW",
-    NOTIFICATION_RULE_TEMPLATE_VIEW: "NOTIFICATION_RULE_TEMPLATE_VIEW",
-    NOTIFY_ROUTE_VIEW: "NOTIFY_ROUTE_VIEW",
-    NOTIFY_AUDIT_VIEW: "NOTIFY_AUDIT_VIEW",
+    NotificationRuleView: "NotificationRuleView",
+    NotificationRuleTemplateView: "NotificationRuleTemplateView",
+    NotificationRouteView: "NotificationRouteView",
+    NotificationAuditView: "NotificationAuditView",
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/pbc-notify-ui",
   "description": "Genesis PBC Notify UI",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
   "types": "dist/dts/index.d.ts",