@genesislcap/pbc-notify-ui 1.0.60 → 1.0.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dts/components/foundation-inbox/inbox-base/inbox-base.d.ts +1 -1
- package/dist/dts/components/foundation-inbox/inbox-base/inbox-base.d.ts.map +1 -1
- package/dist/dts/components/foundation-inbox/inbox.template.d.ts.map +1 -1
- package/dist/dts/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.d.ts +2 -0
- package/dist/dts/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.d.ts.map +1 -1
- package/dist/dts/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.template.d.ts.map +1 -1
- package/dist/esm/components/foundation-inbox/inbox-base/inbox-base.js +9 -8
- package/dist/esm/components/foundation-inbox/inbox.template.js +12 -16
- package/dist/esm/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.js +25 -8
- package/dist/esm/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.template.js +5 -7
- package/package.json +1 -1
|
@@ -21,7 +21,6 @@ export declare class FoundationInboxBase extends GenesisElement {
|
|
|
21
21
|
templates: RuleTemplate[];
|
|
22
22
|
templatesFilter: RuleTemplate[];
|
|
23
23
|
searchAlertLog: string;
|
|
24
|
-
severitySearchValue: string;
|
|
25
24
|
titleSearchValue: string;
|
|
26
25
|
bodySearchValue: string;
|
|
27
26
|
searchSubscribe: string;
|
|
@@ -32,6 +31,7 @@ export declare class FoundationInboxBase extends GenesisElement {
|
|
|
32
31
|
criteriaMatchAlertStatus: Expression;
|
|
33
32
|
reverse: boolean;
|
|
34
33
|
showLoadingIndicator: boolean;
|
|
34
|
+
severityType: any[];
|
|
35
35
|
tabs: Tabs;
|
|
36
36
|
connectedCallback(): Promise<void>;
|
|
37
37
|
disconnectedCallback(): void;
|
|
@@ -1 +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,
|
|
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,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,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,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;IAkBvB,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"}
|
|
@@ -1 +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;
|
|
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;AAkK/C;;GAEG;AACH,eAAO,MAAM,uBAAuB,sEAoJnC,CAAC"}
|
|
@@ -26,5 +26,7 @@ export declare class RuleConditionBuilder extends GenesisElement {
|
|
|
26
26
|
rightValueSelectChanged(): void;
|
|
27
27
|
convertDateTime(dateTimeStr: string): number;
|
|
28
28
|
convertLongForDatePicker(value: number, time?: boolean): string;
|
|
29
|
+
getAllFields(): Field[];
|
|
30
|
+
getApplicableFields(): Field[];
|
|
29
31
|
}
|
|
30
32
|
//# sourceMappingURL=rule-condition-builder.d.ts.map
|
|
@@ -1 +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":"AACA,OAAO,EAAiB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAElF,OAAO,EACL,sBAAsB,EAKvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAMlE,qBAKa,oBAAqB,SAAQ,cAAc;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,MAAM,EAAE,KAAK,EAAE,CAAM;IAErB,SAAS,EAAE,MAAM,CAAQ;IACzB,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAEhC,eAAe,EAAE,MAAM,CAAQ;IAE/B,aAAa,EAAE,MAAM,CAAuB;IAC5C,cAAc,EAAE,MAAM,CAAQ;IAC9B,gBAAgB,EAAE,MAAM,CAAQ;IAE5C,eAAe;IAIT,gBAAgB;IAetB,aAAa;IASb,OAAO,CAAC,eAAe;IAiBvB,gBAAgB;IAwBhB,gBAAgB,IAAI,KAAK,CAAC,GAAG,CAAC;
|
|
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":"AACA,OAAO,EAAiB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAElF,OAAO,EACL,sBAAsB,EAKvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAMlE,qBAKa,oBAAqB,SAAQ,cAAc;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,MAAM,EAAE,KAAK,EAAE,CAAM;IAErB,SAAS,EAAE,MAAM,CAAQ;IACzB,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAEhC,eAAe,EAAE,MAAM,CAAQ;IAE/B,aAAa,EAAE,MAAM,CAAuB;IAC5C,cAAc,EAAE,MAAM,CAAQ;IAC9B,gBAAgB,EAAE,MAAM,CAAQ;IAE5C,eAAe;IAIT,gBAAgB;IAetB,aAAa;IASb,OAAO,CAAC,eAAe;IAiBvB,gBAAgB;IAwBhB,gBAAgB,IAAI,KAAK,CAAC,GAAG,CAAC;IAI9B,mBAAmB,IAAI,KAAK,CAAC,GAAG,CAAC;IAUjC,gBAAgB;IAkBhB,sBAAsB;IActB,oBAAoB;IA0BpB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,qBAAqB;IAI7B,qBAAqB;IAkBrB,uBAAuB;IASvB,eAAe,CAAC,WAAW,EAAE,MAAM;IAMnC,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,OAAe;IAI7D,YAAY;IAIZ,mBAAmB;CA8BpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-condition-builder.template.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.template.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGrE,eAAO,MAAM,4BAA4B,
|
|
1
|
+
{"version":3,"file":"rule-condition-builder.template.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/foundation-notification-dashboard/components/rules/rule-dialog/rule-condition-builder/rule-condition-builder.template.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGrE,eAAO,MAAM,4BAA4B,2EAmIxC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __awaiter, __decorate } from "tslib";
|
|
2
2
|
import { Auth } from '@genesislcap/foundation-comms';
|
|
3
|
-
import { CriteriaBuilder, ExpressionBuilder, Serialisers, } from '@genesislcap/foundation-criteria';
|
|
3
|
+
import { CriteriaBuilder, ExpressionBuilder, Join, Serialisers, } from '@genesislcap/foundation-criteria';
|
|
4
4
|
import { showNotificationDialog } from '@genesislcap/foundation-notifications';
|
|
5
5
|
import { GenesisElement, observable } from '@genesislcap/web-core';
|
|
6
6
|
import dayjs from 'dayjs';
|
|
@@ -33,7 +33,6 @@ export class FoundationInboxBase extends GenesisElement {
|
|
|
33
33
|
this.templates = [];
|
|
34
34
|
this.templatesFilter = [];
|
|
35
35
|
this.searchAlertLog = null;
|
|
36
|
-
this.severitySearchValue = null;
|
|
37
36
|
this.titleSearchValue = null;
|
|
38
37
|
this.bodySearchValue = null;
|
|
39
38
|
this.searchSubscribe = null;
|
|
@@ -43,6 +42,7 @@ export class FoundationInboxBase extends GenesisElement {
|
|
|
43
42
|
this.toDatePickerValue = null;
|
|
44
43
|
this.reverse = false;
|
|
45
44
|
this.showLoadingIndicator = false;
|
|
45
|
+
this.severityType = [];
|
|
46
46
|
// #endregion
|
|
47
47
|
// #region Changed Events
|
|
48
48
|
this.alertsChanged = () => (this.alertsFilter = this.alerts);
|
|
@@ -106,8 +106,9 @@ export class FoundationInboxBase extends GenesisElement {
|
|
|
106
106
|
if (this.bodySearchValue) {
|
|
107
107
|
filterCriteria.withExpression(expressionBuilder('MESSAGE', this.bodySearchValue, Serialisers.containsIgnoreCase));
|
|
108
108
|
}
|
|
109
|
-
if (this.
|
|
110
|
-
|
|
109
|
+
if (this.severityType.length > 0) {
|
|
110
|
+
const severityExpressions = this.severityType.map((severity) => expressionBuilder('NOTIFY_SEVERITY', severity, Serialisers.equals));
|
|
111
|
+
filterCriteria.withExpression(severityExpressions, { join: Join.Or() });
|
|
111
112
|
}
|
|
112
113
|
if (this.fromDatePickerValue) {
|
|
113
114
|
filterCriteria.withExpression(expressionBuilder('CREATED_AT', this.formatDateStrForMatchCriteria(this.fromDatePickerValue), Serialisers.dateIsGreaterEqual));
|
|
@@ -140,7 +141,7 @@ export class FoundationInboxBase extends GenesisElement {
|
|
|
140
141
|
clearSearch() {
|
|
141
142
|
this.titleSearchValue = '';
|
|
142
143
|
this.bodySearchValue = '';
|
|
143
|
-
this.
|
|
144
|
+
this.severityType = [];
|
|
144
145
|
this.fromDatePickerValue = undefined;
|
|
145
146
|
this.toDatePickerValue = undefined;
|
|
146
147
|
this.filterSearchAlertLog();
|
|
@@ -257,9 +258,6 @@ __decorate([
|
|
|
257
258
|
__decorate([
|
|
258
259
|
observable
|
|
259
260
|
], FoundationInboxBase.prototype, "searchAlertLog", void 0);
|
|
260
|
-
__decorate([
|
|
261
|
-
observable
|
|
262
|
-
], FoundationInboxBase.prototype, "severitySearchValue", void 0);
|
|
263
261
|
__decorate([
|
|
264
262
|
observable
|
|
265
263
|
], FoundationInboxBase.prototype, "titleSearchValue", void 0);
|
|
@@ -290,3 +288,6 @@ __decorate([
|
|
|
290
288
|
__decorate([
|
|
291
289
|
observable
|
|
292
290
|
], FoundationInboxBase.prototype, "showLoadingIndicator", void 0);
|
|
291
|
+
__decorate([
|
|
292
|
+
observable
|
|
293
|
+
], FoundationInboxBase.prototype, "severityType", void 0);
|
|
@@ -16,25 +16,21 @@ const alertsTab = (tab) => html `
|
|
|
16
16
|
<label part="label" for="control" class="search-label">
|
|
17
17
|
<slot>Severity ...</slot>
|
|
18
18
|
</label>
|
|
19
|
-
<rapid-
|
|
19
|
+
<rapid-multiselect
|
|
20
20
|
class="select-input"
|
|
21
|
-
:
|
|
22
|
-
@
|
|
23
|
-
x.
|
|
21
|
+
:selectedOptions=${(x) => x.severityType}
|
|
22
|
+
@selectionChange=${(x, c) => {
|
|
23
|
+
x.severityType = c.event.detail;
|
|
24
24
|
x.filterSearchAlertLog();
|
|
25
25
|
}}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
${(x) => x.text}
|
|
35
|
-
</rapid-option>
|
|
36
|
-
`)}
|
|
37
|
-
</rapid-select>
|
|
26
|
+
:options=${() => ALL_SEVERITIES.map((value) => ({
|
|
27
|
+
value: value.text,
|
|
28
|
+
label: value.text,
|
|
29
|
+
labelStyle: `color:${getSeverityColor(value.type)}`,
|
|
30
|
+
}))}
|
|
31
|
+
search="false"
|
|
32
|
+
all="false"
|
|
33
|
+
></rapid-multiselect>
|
|
38
34
|
</div>
|
|
39
35
|
|
|
40
36
|
<div style="display: flex; align-items: center;">
|
|
@@ -79,14 +79,7 @@ let RuleConditionBuilder = class RuleConditionBuilder extends GenesisElement {
|
|
|
79
79
|
this.rightValueSelect = null;
|
|
80
80
|
}
|
|
81
81
|
getRightCriteria() {
|
|
82
|
-
|
|
83
|
-
const leftFieldType = JSON.parse((_a = this.leftValue) !== null && _a !== void 0 ? _a : '{}').FIELD_TYPE;
|
|
84
|
-
if (leftFieldType === FieldTypeEnum.DATE || leftFieldType === FieldTypeEnum.DATETIME) {
|
|
85
|
-
return ['VALUE'];
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
return Object.values(RightCriteria);
|
|
89
|
-
}
|
|
82
|
+
return Object.values(RightCriteria);
|
|
90
83
|
}
|
|
91
84
|
getLogicalOperators() {
|
|
92
85
|
var _a;
|
|
@@ -184,6 +177,30 @@ let RuleConditionBuilder = class RuleConditionBuilder extends GenesisElement {
|
|
|
184
177
|
convertLongForDatePicker(value, time = false) {
|
|
185
178
|
return time ? dayjs(value).format('YYYY-MM-DDTHH:mm') : dayjs(value).format('YYYY-MM-DD');
|
|
186
179
|
}
|
|
180
|
+
getAllFields() {
|
|
181
|
+
return this.fields.filter((field) => field.FIELD_NAME != 'TIMESTAMP');
|
|
182
|
+
}
|
|
183
|
+
getApplicableFields() {
|
|
184
|
+
var _a, _b;
|
|
185
|
+
const leftFieldType = JSON.parse((_a = this.leftValue) !== null && _a !== void 0 ? _a : '{}').FIELD_TYPE;
|
|
186
|
+
const leftFieldName = JSON.parse((_b = this.leftValue) !== null && _b !== void 0 ? _b : '{}').FIELD_NAME;
|
|
187
|
+
// Prevent comparing the field to itself
|
|
188
|
+
const applicableFields = this.getAllFields().filter((field) => field.FIELD_NAME != leftFieldName);
|
|
189
|
+
switch (leftFieldType) {
|
|
190
|
+
case FieldTypeEnum.DATE:
|
|
191
|
+
case FieldTypeEnum.DATETIME:
|
|
192
|
+
return applicableFields.filter((field) => field.FIELD_TYPE === FieldTypeEnum.DATE || field.FIELD_TYPE === FieldTypeEnum.DATETIME);
|
|
193
|
+
case FieldTypeEnum.BOOLEAN:
|
|
194
|
+
return applicableFields.filter((field) => field.FIELD_TYPE === FieldTypeEnum.BOOLEAN);
|
|
195
|
+
case FieldTypeEnum.NUMBER:
|
|
196
|
+
return applicableFields.filter((field) => field.FIELD_TYPE === FieldTypeEnum.NUMBER);
|
|
197
|
+
default:
|
|
198
|
+
return applicableFields.filter((field) => field.FIELD_TYPE !== FieldTypeEnum.DATE &&
|
|
199
|
+
field.FIELD_TYPE !== FieldTypeEnum.DATETIME &&
|
|
200
|
+
field.FIELD_TYPE !== FieldTypeEnum.BOOLEAN &&
|
|
201
|
+
field.FIELD_TYPE !== FieldTypeEnum.NUMBER);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
187
204
|
};
|
|
188
205
|
__decorate([
|
|
189
206
|
observable
|
|
@@ -11,12 +11,10 @@ export const RuleConditionBuilderTemplate = html `
|
|
|
11
11
|
title=${(x) => (x.leftValue ? JSON.parse(x.leftValue).FIELD_NAME : '')}
|
|
12
12
|
class="left-value"
|
|
13
13
|
>
|
|
14
|
-
${repeat((x) => x.
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
</rapid-option>
|
|
19
|
-
`)}
|
|
14
|
+
${repeat((x) => x.getAllFields(), html `
|
|
15
|
+
<rapid-option value=${(x) => JSON.stringify(x)} title=${(x) => x.FIELD_NAME}>
|
|
16
|
+
${(x) => x.FIELD_NAME}
|
|
17
|
+
</rapid-option>
|
|
20
18
|
`)}
|
|
21
19
|
</rapid-select>
|
|
22
20
|
|
|
@@ -83,7 +81,7 @@ export const RuleConditionBuilderTemplate = html `
|
|
|
83
81
|
:value=${sync((x) => x.rightValueSelect)}
|
|
84
82
|
title=${(x) => x.rightValueSelect}
|
|
85
83
|
>
|
|
86
|
-
${repeat((x) => x.
|
|
84
|
+
${repeat((x) => x.getApplicableFields(), html `
|
|
87
85
|
<rapid-option value=${(x) => x.FIELD_NAME} title=${(x) => x.FIELD_NAME}>
|
|
88
86
|
${(x) => x.FIELD_NAME}
|
|
89
87
|
</rapid-option>
|