@annalib/anna-core 5.1.4 → 5.1.6

package/fesm2020/annalib-anna-core.mjs

@@ -1005,6 +1005,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
                 type: Output
             }] } });
 
+var SortTypeEnum;
+(function (SortTypeEnum) {
+    SortTypeEnum["DEFAULT"] = "DEFAULT";
+    SortTypeEnum["ASC"] = "ASC";
+    SortTypeEnum["DESC"] = "DESC";
+})(SortTypeEnum || (SortTypeEnum = {}));
+
 class TooltipModel {
     constructor(obj, id) {
         this.label = obj ? obj.toString() : null;
@@ -1303,11 +1310,12 @@ class AnnaFilterService {
     }
     isTooltipActive(header, sortMap) {
         let set = new Set(this.appliedFiltersArray);
+        let isSortMapForHeader0Active = sortMap.get(header[0]) != SortTypeEnum.DEFAULT;
+        let isSortMapForHeader1Active = sortMap.get(header[1]) != SortTypeEnum.DEFAULT;
         if (header.length == 1) {
-            return ((sortMap.size > 0 && sortMap.get(header[0]) != "DEFAULT") || set.has(header[0]));
+            return ((sortMap.size > 0 && isSortMapForHeader0Active) || set.has(header[0]));
         }
-        // return ( (sortMap.size > 0 && sortMap.get(header[0]) != "DEFAULT") || (sortMap.size > 0 && sortMap.get(header[1]) != "DEFAULT") || set.has(header[0]) || set.has(header[1])); 
-        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]));
+        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]));
     }
     clearColumnFilter() {
         if (this.tooltipSelectedMap.has(this.selectedRadio)) {
@@ -1317,7 +1325,7 @@ class AnnaFilterService {
             this.appliedFiltersArray = [...appliedFilterSet];
         }
         if (this.annaSortService.columnSortState.has(this.selectedRadio)) {
-            this.annaSortService.columnSortState.set(this.selectedRadio, "DEFAULT");
+            this.annaSortService.columnSortState.delete(this.selectedRadio);
         }
     }
     setOptionValues(minValue, maxValue) {
@@ -1638,17 +1646,17 @@ class AnnaSortComponent {
         this.sortOptionClicked = new EventEmitter();
         this.sortOptions = [
             {
-                sortType: 'ASC',
+                sortType: SortTypeEnum.ASC,
                 isOptionActive: false,
                 text: 'A to Z',
             },
             {
-                sortType: 'DESC',
+                sortType: SortTypeEnum.DESC,
                 isOptionActive: false,
                 text: 'Z to A',
             },
             {
-                sortType: 'DEFAULT',
+                sortType: SortTypeEnum.DEFAULT,
                 isOptionActive: false,
                 text: 'DEFAULT',
             },
@@ -1676,6 +1684,7 @@ class AnnaSortComponent {
         });
     }
     setSortType(option) {
+        option = option ? option : SortTypeEnum.DEFAULT;
         this.sortOptions.forEach(item => item.isOptionActive = false);
         let index = this.sortOptions.findIndex(item => item.sortType == option);
         this.sortOptions[index].isOptionActive = true;
@@ -1782,7 +1791,7 @@ class AnnaNonEditableGenericTableComponent {
         if (changes['tableHeaders'] && !isEqual(changes['tableHeaders'].currentValue, changes['tableHeaders'].previousValue)) {
             this.tableColumns = this.tableHeaders.filter(x => x.visible).map(x => x.headerInfo[0].objectKey);
             this.annaSortService.columnSortState = new Map();
-            this.setColumnSortStateMap();
+            // this.setColumnSortStateMap();
             this.setActiveStateObject();
         }
         if (changes['totalRowInfo'] && changes['totalRowInfo'].currentValue) {
@@ -2112,7 +2121,8 @@ class AnnaNonEditableGenericTableComponent {
     }
     disableActiveFilterClearButton() {
         let selectedFilterSet = new Set(this.annaFilterService.appliedFiltersArray);
-        let isSortPresent = (this.annaSortService.columnSortState.size > 0 && this.annaSortService.columnSortState.get(this.annaFilterService.selectedRadio) != "DEFAULT");
+        let currentColumnSortFilter = this.getColumnSortStateForSelectedRadio();
+        let isSortPresent = (this.annaSortService.columnSortState.size > 0 && currentColumnSortFilter != SortTypeEnum.DEFAULT);
         this.disableColumnClearAllBtn = selectedFilterSet.has(this.annaFilterService.selectedRadio) || isSortPresent ? false : true;
     }
     getSliderData(header) {
@@ -2584,7 +2594,7 @@ class AnnaNonEditableGenericTableComponent {
         this.applySortingOnFilteredData();
         this.emitData();
         this.setInitialRowsForTable();
-        this.annaFilterService.updateStateOfTheCurrentFilterTab(this.annaSortService.columnSortState);
+        this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
         this.closeTooltip();
     }
     applySliderFilterOnData() {
@@ -2616,9 +2626,7 @@ class AnnaNonEditableGenericTableComponent {
         this.closeTooltip();
     }
     updateSortMap() {
-        for (let [key, value] of this.annaSortService.columnSortState.entries()) {
-            this.annaSortService.columnSortState.set(key, "DEFAULT");
-        }
+        this.annaSortService.columnSortState = new Map();
         this.annaSortService.columnSortState.set(this.annaFilterService.selectedRadio, this.tempSortOrder);
         this.applySorting(this.annaFilterService.selectedRadio);
     }
@@ -2627,7 +2635,7 @@ class AnnaNonEditableGenericTableComponent {
         this.applySortingOnFilteredData();
         this.emitData();
         this.setInitialRowsForTable();
-        this.annaFilterService.updateStateOfTheCurrentFilterTab(this.annaSortService.columnSortState);
+        this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
         this.closeTooltip();
     }
     applyDateFilterOnData() {
@@ -2740,7 +2748,7 @@ class AnnaNonEditableGenericTableComponent {
         this.applySortingOnFilteredData();
         this.emitData();
         this.setInitialRowsForTable();
-        this.annaFilterService.updateStateOfTheCurrentFilterTab(this.annaSortService.columnSortState);
+        this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
         this.closeTooltip();
     }
     applyTimeFilterOnData() {
@@ -2907,19 +2915,19 @@ class AnnaNonEditableGenericTableComponent {
     viewDetailsClicked(rowData) {
         this.gtViewDetailClicked.emit({ data: rowData });
     }
-    setColumnSortStateMap() {
-        this.tableHeaders.forEach(column => {
-            column.headerInfo.forEach((header) => {
-                if (header.showTooltipIcon && header.isSortRequired) {
-                    header.isSortRequired.forEach((item, index) => {
-                        if (item) {
-                            this.annaSortService.columnSortState.set(header.filterSortObjectKeys[index], "DEFAULT");
-                        }
-                    });
-                }
-            });
-        });
-    }
+    // setColumnSortStateMap(){
+    //   this.tableHeaders.forEach(column => {
+    //       column.headerInfo.forEach( (header) => {
+    //           if(header.showTooltipIcon && header.isSortRequired){
+    //               header.isSortRequired.forEach( (item,index) => {
+    //                 if(item){
+    //                   this.annaSortService.columnSortState.set(header.filterSortObjectKeys[index], "DEFAULT");  
+    //                 }
+    //               })
+    //           }
+    //       })
+    //   });
+    // }
     storeSortTypeInTempVariable(event) {
         this.tempSortOrder = event;
         this.disableApplyButtonOfSelectedFilter();
@@ -3261,10 +3269,15 @@ class AnnaNonEditableGenericTableComponent {
         this.annaFilterService.initialValueMap.set(this.annaFilterService.selectedRadio, sliderData);
     }
     checkIfSortingChanged() {
-        this.isSortChanged = this.tempSortOrder != null && this.tempSortOrder != this.annaSortService.columnSortState.get(this.annaFilterService.selectedRadio);
-        ;
+        let currentColumnSortFilter = this.getColumnSortStateForSelectedRadio();
+        this.isSortChanged = this.tempSortOrder != null && this.tempSortOrder != currentColumnSortFilter;
         return this.isSortChanged;
     }
+    getColumnSortStateForSelectedRadio() {
+        let currentColumnSortFilter = this.annaSortService.columnSortState.get(this.annaFilterService.selectedRadio);
+        currentColumnSortFilter = currentColumnSortFilter ? currentColumnSortFilter : SortTypeEnum.DEFAULT;
+        return currentColumnSortFilter;
+    }
     disableApplyButtonOfSelectedFilter() {
         let header = this.annaFilterService.selectedRadio;
         if (this.annaFilterService.calendarSet.has(header)) {
@@ -3522,9 +3535,7 @@ class AnnaGtHelperService {
         this.annaFilterService.tooltipSelectedMap = new Map();
         this.annaFilterService.selectedRadio = null;
         this.annaFilterService.appliedFiltersArray = [];
-        for (let [key, _value] of this.annaSortService.columnSortState.entries()) {
-            this.annaSortService.columnSortState.set(key, "DEFAULT");
-        }
+        this.annaSortService.columnSortState = new Map();
         this.annaSortService.noSortingAppliedData = cloneDeep(clonedTableData);
         this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
     }
@@ -4775,7 +4786,8 @@ Constants.USER_ORIGIN = "ANNA";
 Constants.ACTIVE_USER_STATUS = "active";
 Constants.DELETED_USER_STATUS = "deleted";
 Constants.INACTIVE_USER_STATUS = "inactive";
-Constants.OGAdminRole = "OG-admin";
+Constants.OGAdminRole = "Ownership Group Admin";
+Constants.ASARole = "Anna Station Admin";
 Constants.dollars = "$";
 class ErrorCodes {
 }
@@ -4806,5 +4818,5 @@ var Days;
  * Generated bundle index. Do not edit.
  */
 
-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 };
+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 };
 //# sourceMappingURL=annalib-anna-core.mjs.map