@genesislcap/pbc-notify-ui 1.0.61 → 1.0.63

package/dist/dts/components/foundation-inbox/inbox-base/inbox-base.d.ts

@@ -21,7 +21,6 @@ export declare class FoundationInboxBase extends GenesisElement {
     templates: RuleTemplate[];
     templatesFilter: RuleTemplate[];
     searchAlertLog: string;
-    severitySearchValue: string;
     titleSearchValue: string;
     bodySearchValue: string;
     searchSubscribe: string;
@@ -32,6 +31,7 @@ export declare class FoundationInboxBase extends GenesisElement {
     criteriaMatchAlertStatus: Expression;
     reverse: boolean;
     showLoadingIndicator: boolean;
+    severityType: any[];
     tabs: Tabs;
     connectedCallback(): Promise<void>;
     disconnectedCallback(): void;

package/dist/dts/components/foundation-inbox/inbox-base/inbox-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inbox-base.d.ts","sourceRoot":"","sources":["../../../../../src/components/foundation-inbox/inbox-base/inbox-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAEL,UAAU,EAIX,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAInE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAGrE,OAAO,EACL,KAAK,EACL,QAAQ,EACR,6BAA6B,EAC7B,IAAI,EAEJ,YAAY,EACb,MAAM,gBAAgB,CAAC;AAgBxB,qBAAa,mBAAoB,SAAQ,cAAc;IAC/C,IAAI,EAAE,IAAI,CAAC;IAEH,YAAY,EAAE,YAAY,CAAC;IACjB,YAAY,EAAE,sBAAsB,CAAC;IAC7D,OAAO,CAAC,iBAAiB,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAe;IAC7B,YAAY,EAAE,KAAK,EAAE,CAAM;IAE1B,WAAW,EAAE,WAAW,CAAC;IAC1B,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,WAAW,EAAE,IAAI,EAAE,CAAM;IAEpB,eAAe,EAAE,eAAe,CAAC;IACtC,SAAS,EAAE,YAAY,EAAE,CAAM;IAC/B,eAAe,EAAE,YAAY,EAAE,CAAM;IAErC,cAAc,EAAE,MAAM,CAAQ;IAC9B,mBAAmB,EAAE,MAAM,CAAQ;IACnC,gBAAgB,EAAE,MAAM,CAAQ;IAChC,eAAe,EAAE,MAAM,CAAQ;IAE/B,eAAe,EAAE,MAAM,CAAQ;IAC/B,mBAAmB,EAAE,6BAA6B,CAAQ;IAC1D,WAAW,EAAE,QAAQ,CAAuB;IAE5C,mBAAmB,EAAE,MAAM,CAAQ;IACnC,iBAAiB,EAAE,MAAM,CAAQ;IAEjC,wBAAwB,EAAE,UAAU,CAAC;IACrC,OAAO,EAAE,OAAO,CAAS;IACzB,oBAAoB,EAAE,OAAO,CAAS;IAE3C,IAAI,EAAE,IAAI,CAAC;IAEZ,iBAAiB;IAkBvB,oBAAoB;IAMd,eAAe,CAAC,QAAQ,EAAE,QAAQ;IA+BxC,aAAa,gBAA2C;IAExD,YAAY,eAAyC;IAErD,gBAAgB,uBAAiD;IAEjE,6BAA6B,MAAsD;IAEnF,oBAAoB;IA2DpB,YAAY,CAAC,OAAO,EAAE,OAAO;IAO7B,qBAAqB;IAWrB,WAAW;IAaX,YAAY,CAAC,OAAO,EAAE,MAAM;IAI5B,gBAAgB,CAAC,QAAQ,KAAA;IASzB,gBAAgB;IA4BhB,SAAS;IAEH,cAAc,CAAC,WAAW,EAAE,IAAI;IAgBhC,WAAW,CAAC,WAAW,EAAE,IAAI;IAO7B,wBAAwB,CAAC,YAAY,EAAE,GAAG;IAYhD,6BAA6B,CAAC,IAAI,CAAC,EAAE,MAAM;CAG5C"}
+{"version":3,"file":"inbox-base.d.ts","sourceRoot":"","sources":["../../../../../src/components/foundation-inbox/inbox-base/inbox-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAEL,UAAU,EAKX,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAInE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAqB,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAGrE,OAAO,EACL,KAAK,EACL,QAAQ,EACR,6BAA6B,EAC7B,IAAI,EAEJ,YAAY,EACb,MAAM,gBAAgB,CAAC;AAgBxB,qBAAa,mBAAoB,SAAQ,cAAc;IAC/C,IAAI,EAAE,IAAI,CAAC;IAEH,YAAY,EAAE,YAAY,CAAC;IACjB,YAAY,EAAE,sBAAsB,CAAC;IAE7D,OAAO,CAAC,iBAAiB,CAAoB;IAEjC,OAAO,CAAC,MAAM,CAAe;IAC7B,YAAY,EAAE,KAAK,EAAE,CAAM;IAE1B,WAAW,EAAE,WAAW,CAAC;IAC1B,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,WAAW,EAAE,IAAI,EAAE,CAAM;IAEpB,eAAe,EAAE,eAAe,CAAC;IACtC,SAAS,EAAE,YAAY,EAAE,CAAM;IAC/B,eAAe,EAAE,YAAY,EAAE,CAAM;IAErC,cAAc,EAAE,MAAM,CAAQ;IAC9B,gBAAgB,EAAE,MAAM,CAAQ;IAChC,eAAe,EAAE,MAAM,CAAQ;IAE/B,eAAe,EAAE,MAAM,CAAQ;IAC/B,mBAAmB,EAAE,6BAA6B,CAAQ;IAC1D,WAAW,EAAE,QAAQ,CAAuB;IAE5C,mBAAmB,EAAE,MAAM,CAAQ;IACnC,iBAAiB,EAAE,MAAM,CAAQ;IAEjC,wBAAwB,EAAE,UAAU,CAAC;IACrC,OAAO,EAAE,OAAO,CAAS;IACzB,oBAAoB,EAAE,OAAO,CAAS;IAEtC,YAAY,QAAM;IAEvB,IAAI,EAAE,IAAI,CAAC;IAEZ,iBAAiB;IAoBvB,oBAAoB;IAMd,eAAe,CAAC,QAAQ,EAAE,QAAQ;IA+BxC,aAAa,gBAA2C;IAExD,YAAY,eAAyC;IAErD,gBAAgB,uBAAiD;IAEjE,6BAA6B,MAAsD;IAEnF,oBAAoB;IA4DpB,YAAY,CAAC,OAAO,EAAE,OAAO;IAO7B,qBAAqB;IAWrB,WAAW;IAaX,YAAY,CAAC,OAAO,EAAE,MAAM;IAI5B,gBAAgB,CAAC,QAAQ,KAAA;IASzB,gBAAgB;IA4BhB,SAAS;IAEH,cAAc,CAAC,WAAW,EAAE,IAAI;IAgBhC,WAAW,CAAC,WAAW,EAAE,IAAI;IAO7B,wBAAwB,CAAC,YAAY,EAAE,GAAG;IAYhD,6BAA6B,CAAC,IAAI,CAAC,EAAE,MAAM;CAG5C"}

package/dist/dts/components/foundation-inbox/inbox.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inbox.template.d.ts","sourceRoot":"","sources":["../../../../src/components/foundation-inbox/inbox.template.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAwK/C;;GAEG;AACH,eAAO,MAAM,uBAAuB,sEAoJnC,CAAC"}
+{"version":3,"file":"inbox.template.d.ts","sourceRoot":"","sources":["../../../../src/components/foundation-inbox/inbox.template.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkK/C;;GAEG;AACH,eAAO,MAAM,uBAAuB,sEAoJnC,CAAC"}

package/dist/dts/services/inbox.service.d.ts

@@ -1,9 +1,14 @@
+import { SocketSubscription } from '@genesislcap/foundation-comms';
 export interface FoundationInboxServiceStore {
     items: Array<any>;
 }
 export type SubscribeCallback = ({ store }: {
     store: FoundationInboxServiceStore;
 }) => any;
+export type Subscription = {
+    callback: SubscribeCallback;
+    socketSubscription: SocketSubscription;
+};
 export interface FoundationInboxService {
     subscribe(callback: SubscribeCallback, reverse: boolean, criteriaMatch: string): void;
     unsubscribe(callback: SubscribeCallback): void;

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

@@ -1 +1 @@
-{"version":3,"file":"inbox.service.d.ts","sourceRoot":"","sources":["../../../src/services/inbox.service.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,2BAA2B,CAAA;CAAE,KAAK,GAAG,CAAC;AAE3F,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtF,WAAW,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAChD;AAqED,eAAO,MAAM,sBAAsB,8EAElC,CAAC"}
+{"version":3,"file":"inbox.service.d.ts","sourceRoot":"","sources":["../../../src/services/inbox.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAIpG,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,2BAA2B,CAAA;CAAE,KAAK,GAAG,CAAC;AAE3F,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtF,WAAW,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAChD;AAgED,eAAO,MAAM,sBAAsB,8EAElC,CAAC"}

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

@@ -1,6 +1,6 @@
 import { __awaiter, __decorate } from "tslib";
 import { Auth } from '@genesislcap/foundation-comms';
-import { CriteriaBuilder, ExpressionBuilder, Serialisers, } from '@genesislcap/foundation-criteria';
+import { CriteriaBuilder, ExpressionBuilder, Join, Serialisers, } from '@genesislcap/foundation-criteria';
 import { showNotificationDialog } from '@genesislcap/foundation-notifications';
 import { GenesisElement, observable } from '@genesislcap/web-core';
 import dayjs from 'dayjs';
@@ -33,7 +33,6 @@ export class FoundationInboxBase extends GenesisElement {
         this.templates = [];
         this.templatesFilter = [];
         this.searchAlertLog = null;
-        this.severitySearchValue = null;
         this.titleSearchValue = null;
         this.bodySearchValue = null;
         this.searchSubscribe = null;
@@ -43,6 +42,7 @@ export class FoundationInboxBase extends GenesisElement {
         this.toDatePickerValue = null;
         this.reverse = false;
         this.showLoadingIndicator = false;
+        this.severityType = [];
         // #endregion
         // #region Changed Events
         this.alertsChanged = () => (this.alertsFilter = this.alerts);
@@ -106,8 +106,9 @@ export class FoundationInboxBase extends GenesisElement {
         if (this.bodySearchValue) {
             filterCriteria.withExpression(expressionBuilder('MESSAGE', this.bodySearchValue, Serialisers.containsIgnoreCase));
         }
-        if (this.severitySearchValue) {
-            filterCriteria.withExpression(expressionBuilder('NOTIFY_SEVERITY', this.severitySearchValue, Serialisers.equals));
+        if (this.severityType.length > 0) {
+            const severityExpressions = this.severityType.map((severity) => expressionBuilder('NOTIFY_SEVERITY', severity, Serialisers.equals));
+            filterCriteria.withExpression(severityExpressions, { join: Join.Or() });
         }
         if (this.fromDatePickerValue) {
             filterCriteria.withExpression(expressionBuilder('CREATED_AT', this.formatDateStrForMatchCriteria(this.fromDatePickerValue), Serialisers.dateIsGreaterEqual));
@@ -121,7 +122,6 @@ export class FoundationInboxBase extends GenesisElement {
         }
         // Refresh the data subscription
         this.inboxService.unsubscribe(this.alertSubscription);
-        this.alerts = [];
         this.inboxService.subscribe(this.alertSubscription, this.reverse, filterCriteria.build());
     }
     reverseOrder(reverse) {
@@ -140,7 +140,7 @@ export class FoundationInboxBase extends GenesisElement {
     clearSearch() {
         this.titleSearchValue = '';
         this.bodySearchValue = '';
-        this.severitySearchValue = undefined;
+        this.severityType = [];
         this.fromDatePickerValue = undefined;
         this.toDatePickerValue = undefined;
         this.filterSearchAlertLog();
@@ -257,9 +257,6 @@ __decorate([
 __decorate([
     observable
 ], FoundationInboxBase.prototype, "searchAlertLog", void 0);
-__decorate([
-    observable
-], FoundationInboxBase.prototype, "severitySearchValue", void 0);
 __decorate([
     observable
 ], FoundationInboxBase.prototype, "titleSearchValue", void 0);
@@ -290,3 +287,6 @@ __decorate([
 __decorate([
     observable
 ], FoundationInboxBase.prototype, "showLoadingIndicator", void 0);
+__decorate([
+    observable
+], FoundationInboxBase.prototype, "severityType", void 0);

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

@@ -16,25 +16,21 @@ const alertsTab = (tab) => html `
           <label part="label" for="control" class="search-label">
             <slot>Severity ...</slot>
           </label>
-          <rapid-select
+          <rapid-multiselect
             class="select-input"
-            :value=${(x) => x.severitySearchValue}
-            @input=${(x, c) => {
-    x.severitySearchValue = c.event.target.value;
+            :selectedOptions=${(x) => x.severityType}
+            @selectionChange=${(x, c) => {
+    x.severityType = c.event.detail;
     x.filterSearchAlertLog();
 }}
-            autocomplete="off"
-          >
-            <rapid-option value="">--Select--</rapid-option>
-            ${repeat((x) => ALL_SEVERITIES, html `
-                <rapid-option
-                  value=${(x) => x.text}
-                  style="color: ${(x) => getSeverityColor(x.type)}"
-                >
-                  ${(x) => x.text}
-                </rapid-option>
-              `)}
-          </rapid-select>
+            :options=${() => ALL_SEVERITIES.map((value) => ({
+    value: value.text,
+    label: value.text,
+    labelStyle: `color:${getSeverityColor(value.type)}`,
+}))}
+            search="false"
+            all="false"
+          ></rapid-multiselect>
         </div>
 
         <div style="display: flex; align-items: center;">

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

@@ -15,34 +15,32 @@ class FoundationInboxServiceImpl {
                 logger.error(result.ERROR);
                 return;
             }
-            this.sourceRef = result.SOURCE_REF;
             this.store.items = updateArray(result === null || result === void 0 ? void 0 : result.ROW, this.store.items);
-            this.subscriptions.forEach((callback) => callback({ store: this.store }));
+            this.subscriptions.forEach((subscription) => {
+                subscription.callback({ store: this.store });
+            });
         }, (response) => logger.error(response), Object.assign({ REVERSE: reverse }, (criteriaMatch != '' && { CRITERIA_MATCH: criteriaMatch })));
     }
     subscribe(callback, reverse, criteriaMatch) {
-        this.subscriptions.push(callback);
         if (this.stream) {
             callback({ store: this.store });
             return;
         }
         this.stream = this.getStream(reverse, criteriaMatch);
-        this.stream.subscribe();
+        const socketSubscription = this.stream.subscribe();
+        this.subscriptions.push({ callback, socketSubscription });
     }
     unsubscribe(callback) {
-        const index = this.subscriptions.indexOf(callback);
+        const index = this.subscriptions.findIndex((subscription) => subscription.callback === callback);
         if (index >= 0) {
-            this.subscriptions.splice(index, 1);
-        }
-        this.dataLogoff();
-    }
-    dataLogoff() {
-        if (this.sourceRef && this.auth.isLoggedIn) {
-            this.connect.dataLogoff(this.sourceRef);
+            const found = this.subscriptions.splice(index, 1);
+            found.forEach((subscription) => {
+                subscription.socketSubscription.unsubscribe();
+                subscription.callback({ store: { items: [] } });
+            });
         }
         this.stream = undefined;
         this.store = { items: [] };
-        this.sourceRef = undefined;
     }
 }
 __decorate([

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/pbc-notify-ui",
   "description": "Genesis PBC Notify UI",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "license": "SEE LICENSE IN license.txt",
   "workspaces": [
     "client"