@annalib/anna-core 5.1.4 → 5.1.6
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/esm2020/lib/anna-core-shared-lib/constants/shared.constant.mjs +3 -2
- package/esm2020/lib/anna-core-shared-lib/models/anna-sort.model.mjs +7 -2
- package/esm2020/lib/anna-core-shared-lib/services/anna-filter.service.mjs +7 -5
- package/esm2020/lib/anna-core-shared-lib/services/anna-generic-table.service.mjs +2 -4
- package/esm2020/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.mjs +29 -24
- package/esm2020/lib/anna-generic-table-lib/components/anna-sort/anna-sort.component.mjs +6 -4
- package/fesm2015/annalib-anna-core.mjs +47 -35
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +47 -35
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/lib/anna-core-shared-lib/constants/shared.constant.d.ts +2 -1
- package/lib/anna-core-shared-lib/models/anna-sort.model.d.ts +5 -0
- package/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.d.ts +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Angular import statements
|
|
2
2
|
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
|
|
3
|
+
import { SortTypeEnum } from '../../../anna-core-shared-lib/models/anna-sort.model';
|
|
3
4
|
import { AnnaSortService } from '../../../anna-core-shared-lib/services/anna-sort.service';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "../../../anna-core-shared-lib/services/anna-sort.service";
|
|
@@ -11,17 +12,17 @@ export class AnnaSortComponent {
|
|
|
11
12
|
this.sortOptionClicked = new EventEmitter();
|
|
12
13
|
this.sortOptions = [
|
|
13
14
|
{
|
|
14
|
-
sortType:
|
|
15
|
+
sortType: SortTypeEnum.ASC,
|
|
15
16
|
isOptionActive: false,
|
|
16
17
|
text: 'A to Z',
|
|
17
18
|
},
|
|
18
19
|
{
|
|
19
|
-
sortType:
|
|
20
|
+
sortType: SortTypeEnum.DESC,
|
|
20
21
|
isOptionActive: false,
|
|
21
22
|
text: 'Z to A',
|
|
22
23
|
},
|
|
23
24
|
{
|
|
24
|
-
sortType:
|
|
25
|
+
sortType: SortTypeEnum.DEFAULT,
|
|
25
26
|
isOptionActive: false,
|
|
26
27
|
text: 'DEFAULT',
|
|
27
28
|
},
|
|
@@ -49,6 +50,7 @@ export class AnnaSortComponent {
|
|
|
49
50
|
});
|
|
50
51
|
}
|
|
51
52
|
setSortType(option) {
|
|
53
|
+
option = option ? option : SortTypeEnum.DEFAULT;
|
|
52
54
|
this.sortOptions.forEach(item => item.isOptionActive = false);
|
|
53
55
|
let index = this.sortOptions.findIndex(item => item.sortType == option);
|
|
54
56
|
this.sortOptions[index].isOptionActive = true;
|
|
@@ -64,4 +66,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
|
|
|
64
66
|
}], sortOptionClicked: [{
|
|
65
67
|
type: Output
|
|
66
68
|
}] } });
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5uYS1zb3J0LmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FubmEtY29yZS9zcmMvbGliL2FubmEtZ2VuZXJpYy10YWJsZS1saWIvY29tcG9uZW50cy9hbm5hLXNvcnQvYW5uYS1zb3J0LmNvbXBvbmVudC50cyIsIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FubmEtY29yZS9zcmMvbGliL2FubmEtZ2VuZXJpYy10YWJsZS1saWIvY29tcG9uZW50cy9hbm5hLXNvcnQvYW5uYS1zb3J0LmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUE0QjtBQUM1QixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQWEsTUFBTSxFQUFpQixNQUFNLGVBQWUsQ0FBQztBQUMxSCxPQUFPLEVBQXdCLFlBQVksRUFBRSxNQUFNLHNEQUFzRCxDQUFDO0FBQzFHLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwREFBMEQsQ0FBQzs7OztBQUUzRixvQ0FBb0M7QUFPcEMsTUFBTSxPQUFPLGlCQUFpQjtJQXVCNUIsWUFBb0IsZUFBZ0M7UUFBaEMsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBcEIxQyxzQkFBaUIsR0FBRyxJQUFJLFlBQVksRUFBWSxDQUFDO1FBRTNELGdCQUFXLEdBQWlCO1lBQzFCO2dCQUNFLFFBQVEsRUFBRSxZQUFZLENBQUMsR0FBRztnQkFDMUIsY0FBYyxFQUFFLEtBQUs7Z0JBQ3JCLElBQUksRUFBRSxRQUFRO2FBQ2Y7WUFDRDtnQkFDRSxRQUFRLEVBQUUsWUFBWSxDQUFDLElBQUk7Z0JBQzNCLGNBQWMsRUFBRSxLQUFLO2dCQUNyQixJQUFJLEVBQUUsUUFBUTthQUNmO1lBQ0Q7Z0JBQ0UsUUFBUSxFQUFFLFlBQVksQ0FBQyxPQUFPO2dCQUM5QixjQUFjLEVBQUUsS0FBSztnQkFDckIsSUFBSSxFQUFFLFNBQVM7YUFDaEI7U0FDRixDQUFDO0lBRXFELENBQUM7SUFFeEQsV0FBVyxDQUFDLE9BQXNCO1FBQ2hDLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztRQUMxQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNoQyxJQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsWUFBWSxFQUFDO1lBQ25FLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztZQUN2QyxJQUFJLFFBQVEsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBQzVFLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7U0FDNUI7SUFFSCxDQUFDO0lBRUQsaUJBQWlCLENBQUMsS0FBYSxFQUFFLFFBQWtCO1FBQ2pELElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxjQUFjLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUNsRSxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUM7UUFDOUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztRQUN2QyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDLGVBQWUsQ0FBQyxxQkFBcUIsQ0FBQyxTQUFTLENBQUMsQ0FBQyxJQUFZLEVBQUUsRUFBRTtZQUNwRSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3pCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELFdBQVcsQ0FBQyxNQUFjO1FBQ3hCLE1BQU0sR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUEsWUFBWSxDQUFDLE9BQU8sQ0FBQztRQUMvQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxjQUFjLEdBQUcsS0FBSyxDQUFDLENBQUM7UUFDOUQsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxJQUFJLE1BQU0sQ0FBQyxDQUFDO1FBQ3hFLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQztJQUNoRCxDQUFDOzs4R0F2RFUsaUJBQWlCO2tHQUFqQixpQkFBaUIsZ0xDWjlCLCtUQVNJOzJGREdTLGlCQUFpQjtrQkFON0IsU0FBUzsrQkFDRSxvQkFBb0IsbUJBR2IsdUJBQXVCLENBQUMsTUFBTTtzR0FJdEMsYUFBYTtzQkFBckIsS0FBSztnQkFDSSxpQkFBaUI7c0JBQTFCLE1BQU0iLCJzb3VyY2VzQ29udGVudCI6WyIvLyBBbmd1bGFyIGltcG9ydCBzdGF0ZW1lbnRzXHJcbmltcG9ydCB7IENoYW5nZURldGVjdGlvblN0cmF0ZWd5LCBDb21wb25lbnQsIEV2ZW50RW1pdHRlciwgSW5wdXQsIE9uQ2hhbmdlcywgT3V0cHV0LCBTaW1wbGVDaGFuZ2VzIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IFNvcnRPcHRpb24sIFNvcnRUeXBlLCBTb3J0VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi9hbm5hLWNvcmUtc2hhcmVkLWxpYi9tb2RlbHMvYW5uYS1zb3J0Lm1vZGVsJztcclxuaW1wb3J0IHsgQW5uYVNvcnRTZXJ2aWNlIH0gZnJvbSAnLi4vLi4vLi4vYW5uYS1jb3JlLXNoYXJlZC1saWIvc2VydmljZXMvYW5uYS1zb3J0LnNlcnZpY2UnO1xyXG5cclxuLy9BZGQgb25DaGFuZ2UgcHVzaCBjaGFuZ2UgZGV0ZWN0aW9uXHJcbkBDb21wb25lbnQoe1xyXG4gIHNlbGVjdG9yOiAnYW5uYS1jb3JlLXNvcnQtbGliJyxcclxuICB0ZW1wbGF0ZVVybDogJy4vYW5uYS1zb3J0LmNvbXBvbmVudC5odG1sJyxcclxuICBzdHlsZVVybHM6IFsnLi9hbm5hLXNvcnQuY29tcG9uZW50LnNjc3MnXSxcclxuICBjaGFuZ2VEZXRlY3Rpb246IENoYW5nZURldGVjdGlvblN0cmF0ZWd5Lk9uUHVzaFxyXG59KVxyXG5leHBvcnQgY2xhc3MgQW5uYVNvcnRDb21wb25lbnQgaW1wbGVtZW50cyBPbkNoYW5nZXN7XHJcbiAgXHJcbiAgQElucHV0KCkgc29ydE9iamVjdEtleTogc3RyaW5nO1xyXG4gIEBPdXRwdXQoKSBzb3J0T3B0aW9uQ2xpY2tlZCA9IG5ldyBFdmVudEVtaXR0ZXI8U29ydFR5cGU+KCk7XHJcblxyXG4gIHNvcnRPcHRpb25zOiBTb3J0T3B0aW9uW10gPSBbXHJcbiAgICB7XHJcbiAgICAgIHNvcnRUeXBlOiBTb3J0VHlwZUVudW0uQVNDLFxyXG4gICAgICBpc09wdGlvbkFjdGl2ZTogZmFsc2UsXHJcbiAgICAgIHRleHQ6ICdBIHRvIFonLFxyXG4gICAgfSxcclxuICAgIHtcclxuICAgICAgc29ydFR5cGU6IFNvcnRUeXBlRW51bS5ERVNDLFxyXG4gICAgICBpc09wdGlvbkFjdGl2ZTogZmFsc2UsXHJcbiAgICAgIHRleHQ6ICdaIHRvIEEnLFxyXG4gICAgfSxcclxuICAgIHtcclxuICAgICAgc29ydFR5cGU6IFNvcnRUeXBlRW51bS5ERUZBVUxULFxyXG4gICAgICBpc09wdGlvbkFjdGl2ZTogZmFsc2UsXHJcbiAgICAgIHRleHQ6ICdERUZBVUxUJyxcclxuICAgIH0sXHJcbiAgXTtcclxuXHJcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBhbm5hU29ydFNlcnZpY2U6IEFubmFTb3J0U2VydmljZSkge31cclxuICBcclxuICBuZ09uQ2hhbmdlcyhjaGFuZ2VzOiBTaW1wbGVDaGFuZ2VzKTogdm9pZCB7XHJcbiAgICBjb25zb2xlLmxvZyhcInNvcnQgY29tcG9uZW50IG5nT25DaGFuZ2VzXCIpO1xyXG4gICAgY29uc29sZS5sb2codGhpcy5zb3J0T2JqZWN0S2V5KTtcclxuICAgIGlmKGNoYW5nZXNbXCJzb3J0T2JqZWN0S2V5XCJdICYmIGNoYW5nZXNbXCJzb3J0T2JqZWN0S2V5XCJdLmN1cnJlbnRWYWx1ZSl7XHJcbiAgICAgIGNvbnNvbGUubG9nKFwiaW5zaWRlIHNvcnQgYWN0aXZlIGZ1bmNcIik7XHJcbiAgICAgIGxldCBzb3J0VHlwZSA9IHRoaXMuYW5uYVNvcnRTZXJ2aWNlLmNvbHVtblNvcnRTdGF0ZS5nZXQodGhpcy5zb3J0T2JqZWN0S2V5KTtcclxuICAgICAgdGhpcy5zZXRTb3J0VHlwZShzb3J0VHlwZSk7XHJcbiAgICB9XHJcblxyXG4gIH1cclxuXHJcbiAgc29ydE9wdGlvbkNoYW5nZWQoaW5kZXg6IG51bWJlciwgc29ydFR5cGU6IFNvcnRUeXBlKSB7XHJcbiAgICB0aGlzLnNvcnRPcHRpb25zLmZvckVhY2goKGl0ZW0pID0+IChpdGVtLmlzT3B0aW9uQWN0aXZlID0gZmFsc2UpKTtcclxuICAgIHRoaXMuc29ydE9wdGlvbnNbaW5kZXhdLmlzT3B0aW9uQWN0aXZlID0gdHJ1ZTtcclxuICAgIHRoaXMuc29ydE9wdGlvbkNsaWNrZWQuZW1pdChzb3J0VHlwZSk7XHJcbiAgfVxyXG5cclxuICBuZ09uSW5pdCgpOiB2b2lkIHtcclxuICAgIGNvbnNvbGUubG9nKFwic29ydCBjb21wb25lbnQgbmdPbkluaXRcIik7XHJcbiAgICBjb25zb2xlLmxvZyh0aGlzLmFubmFTb3J0U2VydmljZS5jb2x1bW5Tb3J0U3RhdGUpO1xyXG4gICAgdGhpcy5hbm5hU29ydFNlcnZpY2UudXBkYXRlU29ydFR5cGVTdWJqZWN0LnN1YnNjcmliZSgoaXRlbTogc3RyaW5nKSA9PiB7XHJcbiAgICAgIHRoaXMuc2V0U29ydFR5cGUoaXRlbSk7XHJcbiAgICB9KTtcclxuICB9XHJcblxyXG4gIHNldFNvcnRUeXBlKG9wdGlvbjogc3RyaW5nKXtcclxuICAgIG9wdGlvbiA9IG9wdGlvbiA/IG9wdGlvbiA6U29ydFR5cGVFbnVtLkRFRkFVTFQ7XHJcbiAgICB0aGlzLnNvcnRPcHRpb25zLmZvckVhY2goaXRlbSA9PiBpdGVtLmlzT3B0aW9uQWN0aXZlID0gZmFsc2UpO1xyXG4gICAgbGV0IGluZGV4ID0gdGhpcy5zb3J0T3B0aW9ucy5maW5kSW5kZXgoaXRlbSA9PiBpdGVtLnNvcnRUeXBlID09IG9wdGlvbik7XHJcbiAgICB0aGlzLnNvcnRPcHRpb25zW2luZGV4XS5pc09wdGlvbkFjdGl2ZSA9IHRydWU7XHJcbiAgfVxyXG59XHJcbiIsIjxwIGNsYXNzPVwic29ydC1jb250YWluZXJcIj5cclxuICAgIDxidXR0b25cclxuICAgICAgICBjbGFzcz1cInNvcnQtYnRuXCJcclxuICAgICAgICAqbmdGb3I9XCJsZXQgb3B0aW9uIG9mIHNvcnRPcHRpb25zOyBsZXQgaSA9IGluZGV4XCJcclxuICAgICAgICAoY2xpY2spPVwic29ydE9wdGlvbkNoYW5nZWQoaSwgb3B0aW9uLnNvcnRUeXBlKVwiXHJcbiAgICAgICAgW25nQ2xhc3NdPVwieyBhY3RpdmU6IG9wdGlvbi5pc09wdGlvbkFjdGl2ZSB9XCJcclxuICAgID5cclxuICAgICAgICB7e29wdGlvbi50ZXh0fX1cclxuICAgIDwvYnV0dG9uPlxyXG48L3A+Il19
|
|
@@ -1007,6 +1007,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
|
|
|
1007
1007
|
type: Output
|
|
1008
1008
|
}] } });
|
|
1009
1009
|
|
|
1010
|
+
var SortTypeEnum;
|
|
1011
|
+
(function (SortTypeEnum) {
|
|
1012
|
+
SortTypeEnum["DEFAULT"] = "DEFAULT";
|
|
1013
|
+
SortTypeEnum["ASC"] = "ASC";
|
|
1014
|
+
SortTypeEnum["DESC"] = "DESC";
|
|
1015
|
+
})(SortTypeEnum || (SortTypeEnum = {}));
|
|
1016
|
+
|
|
1010
1017
|
class TooltipModel {
|
|
1011
1018
|
constructor(obj, id) {
|
|
1012
1019
|
this.label = obj ? obj.toString() : null;
|
|
@@ -1305,11 +1312,12 @@ class AnnaFilterService {
|
|
|
1305
1312
|
}
|
|
1306
1313
|
isTooltipActive(header, sortMap) {
|
|
1307
1314
|
let set = new Set(this.appliedFiltersArray);
|
|
1315
|
+
let isSortMapForHeader0Active = sortMap.get(header[0]) != SortTypeEnum.DEFAULT;
|
|
1316
|
+
let isSortMapForHeader1Active = sortMap.get(header[1]) != SortTypeEnum.DEFAULT;
|
|
1308
1317
|
if (header.length == 1) {
|
|
1309
|
-
return ((sortMap.size > 0 &&
|
|
1318
|
+
return ((sortMap.size > 0 && isSortMapForHeader0Active) || set.has(header[0]));
|
|
1310
1319
|
}
|
|
1311
|
-
|
|
1312
|
-
return ((sortMap.size > 0 && sortMap.has(header[0]) && sortMap.get(header[0]) != "DEFAULT") || (sortMap.size > 0 && sortMap.has(header[1]) && sortMap.get(header[1]) != "DEFAULT") || set.has(header[0]) || set.has(header[1]));
|
|
1320
|
+
return ((sortMap.size > 0 && sortMap.has(header[0]) && isSortMapForHeader0Active) || (sortMap.size > 0 && sortMap.has(header[1]) && isSortMapForHeader1Active) || set.has(header[0]) || set.has(header[1]));
|
|
1313
1321
|
}
|
|
1314
1322
|
clearColumnFilter() {
|
|
1315
1323
|
if (this.tooltipSelectedMap.has(this.selectedRadio)) {
|
|
@@ -1319,7 +1327,7 @@ class AnnaFilterService {
|
|
|
1319
1327
|
this.appliedFiltersArray = [...appliedFilterSet];
|
|
1320
1328
|
}
|
|
1321
1329
|
if (this.annaSortService.columnSortState.has(this.selectedRadio)) {
|
|
1322
|
-
this.annaSortService.columnSortState.
|
|
1330
|
+
this.annaSortService.columnSortState.delete(this.selectedRadio);
|
|
1323
1331
|
}
|
|
1324
1332
|
}
|
|
1325
1333
|
setOptionValues(minValue, maxValue) {
|
|
@@ -1640,17 +1648,17 @@ class AnnaSortComponent {
|
|
|
1640
1648
|
this.sortOptionClicked = new EventEmitter();
|
|
1641
1649
|
this.sortOptions = [
|
|
1642
1650
|
{
|
|
1643
|
-
sortType:
|
|
1651
|
+
sortType: SortTypeEnum.ASC,
|
|
1644
1652
|
isOptionActive: false,
|
|
1645
1653
|
text: 'A to Z',
|
|
1646
1654
|
},
|
|
1647
1655
|
{
|
|
1648
|
-
sortType:
|
|
1656
|
+
sortType: SortTypeEnum.DESC,
|
|
1649
1657
|
isOptionActive: false,
|
|
1650
1658
|
text: 'Z to A',
|
|
1651
1659
|
},
|
|
1652
1660
|
{
|
|
1653
|
-
sortType:
|
|
1661
|
+
sortType: SortTypeEnum.DEFAULT,
|
|
1654
1662
|
isOptionActive: false,
|
|
1655
1663
|
text: 'DEFAULT',
|
|
1656
1664
|
},
|
|
@@ -1678,6 +1686,7 @@ class AnnaSortComponent {
|
|
|
1678
1686
|
});
|
|
1679
1687
|
}
|
|
1680
1688
|
setSortType(option) {
|
|
1689
|
+
option = option ? option : SortTypeEnum.DEFAULT;
|
|
1681
1690
|
this.sortOptions.forEach(item => item.isOptionActive = false);
|
|
1682
1691
|
let index = this.sortOptions.findIndex(item => item.sortType == option);
|
|
1683
1692
|
this.sortOptions[index].isOptionActive = true;
|
|
@@ -1784,7 +1793,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
1784
1793
|
if (changes['tableHeaders'] && !isEqual(changes['tableHeaders'].currentValue, changes['tableHeaders'].previousValue)) {
|
|
1785
1794
|
this.tableColumns = this.tableHeaders.filter(x => x.visible).map(x => x.headerInfo[0].objectKey);
|
|
1786
1795
|
this.annaSortService.columnSortState = new Map();
|
|
1787
|
-
this.setColumnSortStateMap();
|
|
1796
|
+
// this.setColumnSortStateMap();
|
|
1788
1797
|
this.setActiveStateObject();
|
|
1789
1798
|
}
|
|
1790
1799
|
if (changes['totalRowInfo'] && changes['totalRowInfo'].currentValue) {
|
|
@@ -2114,7 +2123,8 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2114
2123
|
}
|
|
2115
2124
|
disableActiveFilterClearButton() {
|
|
2116
2125
|
let selectedFilterSet = new Set(this.annaFilterService.appliedFiltersArray);
|
|
2117
|
-
let
|
|
2126
|
+
let currentColumnSortFilter = this.getColumnSortStateForSelectedRadio();
|
|
2127
|
+
let isSortPresent = (this.annaSortService.columnSortState.size > 0 && currentColumnSortFilter != SortTypeEnum.DEFAULT);
|
|
2118
2128
|
this.disableColumnClearAllBtn = selectedFilterSet.has(this.annaFilterService.selectedRadio) || isSortPresent ? false : true;
|
|
2119
2129
|
}
|
|
2120
2130
|
getSliderData(header) {
|
|
@@ -2586,7 +2596,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2586
2596
|
this.applySortingOnFilteredData();
|
|
2587
2597
|
this.emitData();
|
|
2588
2598
|
this.setInitialRowsForTable();
|
|
2589
|
-
this.annaFilterService.
|
|
2599
|
+
this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
|
|
2590
2600
|
this.closeTooltip();
|
|
2591
2601
|
}
|
|
2592
2602
|
applySliderFilterOnData() {
|
|
@@ -2618,9 +2628,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2618
2628
|
this.closeTooltip();
|
|
2619
2629
|
}
|
|
2620
2630
|
updateSortMap() {
|
|
2621
|
-
|
|
2622
|
-
this.annaSortService.columnSortState.set(key, "DEFAULT");
|
|
2623
|
-
}
|
|
2631
|
+
this.annaSortService.columnSortState = new Map();
|
|
2624
2632
|
this.annaSortService.columnSortState.set(this.annaFilterService.selectedRadio, this.tempSortOrder);
|
|
2625
2633
|
this.applySorting(this.annaFilterService.selectedRadio);
|
|
2626
2634
|
}
|
|
@@ -2629,7 +2637,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2629
2637
|
this.applySortingOnFilteredData();
|
|
2630
2638
|
this.emitData();
|
|
2631
2639
|
this.setInitialRowsForTable();
|
|
2632
|
-
this.annaFilterService.
|
|
2640
|
+
this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
|
|
2633
2641
|
this.closeTooltip();
|
|
2634
2642
|
}
|
|
2635
2643
|
applyDateFilterOnData() {
|
|
@@ -2742,7 +2750,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2742
2750
|
this.applySortingOnFilteredData();
|
|
2743
2751
|
this.emitData();
|
|
2744
2752
|
this.setInitialRowsForTable();
|
|
2745
|
-
this.annaFilterService.
|
|
2753
|
+
this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
|
|
2746
2754
|
this.closeTooltip();
|
|
2747
2755
|
}
|
|
2748
2756
|
applyTimeFilterOnData() {
|
|
@@ -2909,19 +2917,19 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2909
2917
|
viewDetailsClicked(rowData) {
|
|
2910
2918
|
this.gtViewDetailClicked.emit({ data: rowData });
|
|
2911
2919
|
}
|
|
2912
|
-
setColumnSortStateMap()
|
|
2913
|
-
|
|
2914
|
-
|
|
2915
|
-
|
|
2916
|
-
|
|
2917
|
-
|
|
2918
|
-
|
|
2919
|
-
|
|
2920
|
-
|
|
2921
|
-
|
|
2922
|
-
|
|
2923
|
-
|
|
2924
|
-
}
|
|
2920
|
+
// setColumnSortStateMap(){
|
|
2921
|
+
// this.tableHeaders.forEach(column => {
|
|
2922
|
+
// column.headerInfo.forEach( (header) => {
|
|
2923
|
+
// if(header.showTooltipIcon && header.isSortRequired){
|
|
2924
|
+
// header.isSortRequired.forEach( (item,index) => {
|
|
2925
|
+
// if(item){
|
|
2926
|
+
// this.annaSortService.columnSortState.set(header.filterSortObjectKeys[index], "DEFAULT");
|
|
2927
|
+
// }
|
|
2928
|
+
// })
|
|
2929
|
+
// }
|
|
2930
|
+
// })
|
|
2931
|
+
// });
|
|
2932
|
+
// }
|
|
2925
2933
|
storeSortTypeInTempVariable(event) {
|
|
2926
2934
|
this.tempSortOrder = event;
|
|
2927
2935
|
this.disableApplyButtonOfSelectedFilter();
|
|
@@ -3263,10 +3271,15 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
3263
3271
|
this.annaFilterService.initialValueMap.set(this.annaFilterService.selectedRadio, sliderData);
|
|
3264
3272
|
}
|
|
3265
3273
|
checkIfSortingChanged() {
|
|
3266
|
-
|
|
3267
|
-
;
|
|
3274
|
+
let currentColumnSortFilter = this.getColumnSortStateForSelectedRadio();
|
|
3275
|
+
this.isSortChanged = this.tempSortOrder != null && this.tempSortOrder != currentColumnSortFilter;
|
|
3268
3276
|
return this.isSortChanged;
|
|
3269
3277
|
}
|
|
3278
|
+
getColumnSortStateForSelectedRadio() {
|
|
3279
|
+
let currentColumnSortFilter = this.annaSortService.columnSortState.get(this.annaFilterService.selectedRadio);
|
|
3280
|
+
currentColumnSortFilter = currentColumnSortFilter ? currentColumnSortFilter : SortTypeEnum.DEFAULT;
|
|
3281
|
+
return currentColumnSortFilter;
|
|
3282
|
+
}
|
|
3270
3283
|
disableApplyButtonOfSelectedFilter() {
|
|
3271
3284
|
let header = this.annaFilterService.selectedRadio;
|
|
3272
3285
|
if (this.annaFilterService.calendarSet.has(header)) {
|
|
@@ -3524,9 +3537,7 @@ class AnnaGtHelperService {
|
|
|
3524
3537
|
this.annaFilterService.tooltipSelectedMap = new Map();
|
|
3525
3538
|
this.annaFilterService.selectedRadio = null;
|
|
3526
3539
|
this.annaFilterService.appliedFiltersArray = [];
|
|
3527
|
-
|
|
3528
|
-
this.annaSortService.columnSortState.set(key, "DEFAULT");
|
|
3529
|
-
}
|
|
3540
|
+
this.annaSortService.columnSortState = new Map();
|
|
3530
3541
|
this.annaSortService.noSortingAppliedData = cloneDeep(clonedTableData);
|
|
3531
3542
|
this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
|
|
3532
3543
|
}
|
|
@@ -4782,7 +4793,8 @@ Constants.USER_ORIGIN = "ANNA";
|
|
|
4782
4793
|
Constants.ACTIVE_USER_STATUS = "active";
|
|
4783
4794
|
Constants.DELETED_USER_STATUS = "deleted";
|
|
4784
4795
|
Constants.INACTIVE_USER_STATUS = "inactive";
|
|
4785
|
-
Constants.OGAdminRole = "
|
|
4796
|
+
Constants.OGAdminRole = "Ownership Group Admin";
|
|
4797
|
+
Constants.ASARole = "Anna Station Admin";
|
|
4786
4798
|
Constants.dollars = "$";
|
|
4787
4799
|
class ErrorCodes {
|
|
4788
4800
|
}
|
|
@@ -4813,5 +4825,5 @@ var Days;
|
|
|
4813
4825
|
* Generated bundle index. Do not edit.
|
|
4814
4826
|
*/
|
|
4815
4827
|
|
|
4816
|
-
export { AllSelectedStatus, AnnaBuyerApprovalIconTemplateComponent, AnnaCalendarFilterComponent, AnnaConvertZeroOrNullOrUndefinedPipe, AnnaCoreModule, AnnaDateTimeFormatService, AnnaFilterSearchedTextPipe, AnnaFilterService, AnnaFixedRowSizeTableVirtualScrollStrategy, AnnaFixedRowSizeTableVirtualScrollStrategyDirective, AnnaGlobalConfigService, AnnaGtHelperService, AnnaIconColumnComponent, AnnaLiveIconTemplateComponent, AnnaNoDataComponent, AnnaNonEditableGenericTableComponent, AnnaNotifyIconTemplateComponent, AnnaNumberFormatService, AnnaPayForPerformanceIconTemplateComponent, AnnaRejectedIconTemplateComponent, AnnaReplaceCharPipe, AnnaSortComponent, AnnaSortService, AnnaTableVirtualScrollViewportComponent, AnnaTypeofDataPipe, AnnaVirtualTableDirective, AnnaWeekCalendarComponent, Constants, Days, DigitOnlyDirective, ErrorCodes, TooltipModel, fixedSizeVirtualScrollStrategyFactory, radioButtonModel, showEllipsisTextOnHoverDirective, tooltipModelForColumnLevelFiltering };
|
|
4828
|
+
export { AllSelectedStatus, AnnaBuyerApprovalIconTemplateComponent, AnnaCalendarFilterComponent, AnnaConvertZeroOrNullOrUndefinedPipe, AnnaCoreModule, AnnaDateTimeFormatService, AnnaFilterSearchedTextPipe, AnnaFilterService, AnnaFixedRowSizeTableVirtualScrollStrategy, AnnaFixedRowSizeTableVirtualScrollStrategyDirective, AnnaGlobalConfigService, AnnaGtHelperService, AnnaIconColumnComponent, AnnaLiveIconTemplateComponent, AnnaNoDataComponent, AnnaNonEditableGenericTableComponent, AnnaNotifyIconTemplateComponent, AnnaNumberFormatService, AnnaPayForPerformanceIconTemplateComponent, AnnaRejectedIconTemplateComponent, AnnaReplaceCharPipe, AnnaSortComponent, AnnaSortService, AnnaTableVirtualScrollViewportComponent, AnnaTypeofDataPipe, AnnaVirtualTableDirective, AnnaWeekCalendarComponent, Constants, Days, DigitOnlyDirective, ErrorCodes, SortTypeEnum, TooltipModel, fixedSizeVirtualScrollStrategyFactory, radioButtonModel, showEllipsisTextOnHoverDirective, tooltipModelForColumnLevelFiltering };
|
|
4817
4829
|
//# sourceMappingURL=annalib-anna-core.mjs.map
|