@annalib/anna-core 9.1.2 → 9.1.3

package/esm2020/lib/anna-core-shared-lib/services/anna-generic-table.service.mjs

@@ -53,25 +53,39 @@ export class AnnaGtHelperService {
     }
     updateFiltersInURL() {
         let latestQueryParams = this.prepareQueryParamsOnFilter();
-        this.router.navigate([], {
-            queryParams: { filters: JSON.stringify(latestQueryParams) },
-            relativeTo: this.route.parent,
-            queryParamsHandling: 'merge'
-        });
+        if (Object.keys(latestQueryParams).length > 0) {
+            this.router.navigate([], {
+                queryParams: { filters: JSON.stringify(latestQueryParams) },
+                relativeTo: this.route.parent,
+                queryParamsHandling: 'merge'
+            });
+        }
+        else {
+            this.router.navigate([], {
+                relativeTo: this.route.parent,
+            });
+        }
     }
     prepareQueryParamsOnFilter() {
-        if (!this.annaFilterService.appliedFiltersArray.length &&
-            !this.annaFilterService.tooltipSelectedMap.size &&
-            !this.annaSortService.columnSortState.size) {
-            return null;
+        let query = {};
+        if (this.annaFilterService.appliedFiltersArray.length > 0) {
+            query["appliedFilters"] = this.annaFilterService.appliedFiltersArray;
+            query["selectedFilterData"] = JSON.stringify(Array.from(this.annaFilterService.tooltipSelectedMap));
+        }
+        if (this.checkIfSortingIsApplied()) {
+            query["sortState"] = JSON.stringify(Array.from(this.annaSortService.columnSortState));
         }
-        let query = {
-            appliedFilters: this.annaFilterService.appliedFiltersArray,
-            selectedFilterData: JSON.stringify(Array.from(this.annaFilterService.tooltipSelectedMap)),
-            sortState: JSON.stringify(Array.from(this.annaSortService.columnSortState))
-        };
         return query;
     }
+    checkIfSortingIsApplied() {
+        let isSortingApplied = false;
+        for (let val of this.annaSortService.columnSortState.values()) {
+            if (val == "ASC" || val == "DESC") {
+                isSortingApplied = true;
+            }
+        }
+        return isSortingApplied;
+    }
     initTableFilters(clonedTableData) {
         this.annaFilterService.tooltipSelectedMap = new Map();
         this.annaFilterService.selectedRadio = null;
@@ -89,14 +103,16 @@ export class AnnaGtHelperService {
         if (isPersistingFilter) {
             usersTable = this.annaFilterService.filterData(clonedTable, "");
             this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);
-            this.annaSortService.columnSortState = new Map(JSON.parse(filters.sortState));
-            this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
-            usersTable = this.callSort(usersTable);
         }
         else {
             usersTable = clonedTable;
             this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);
         }
+        if (filters?.sortState) {
+            this.annaSortService.columnSortState = new Map(JSON.parse(filters.sortState));
+            usersTable = this.callSort(usersTable);
+        }
+        this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
         return usersTable;
     }
     callSort(usersTable) {
@@ -119,4 +135,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
                     providedIn: "root",
                 }]
         }], ctorParameters: function () { return [{ type: i1.AnnaFilterService }, { type: i2.Router }, { type: i2.ActivatedRoute }, { type: i3.AnnaSortService }]; } });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"anna-generic-table.service.js","sourceRoot":"","sources":["../../../../../../projects/anna-core/src/lib/anna-core-shared-lib/services/anna-generic-table.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Angular import statements\r\nimport { Injectable } from \"@angular/core\";\r\nimport { ActivatedRoute, Router } from '@angular/router';\r\n\r\n// Third party import statements\r\nimport { Subject } from \"rxjs\";\r\nimport { cloneDeep } from \"lodash-es\";\r\n\r\n//sub-entries of anna lib import statement\r\nimport { AnnaFilterService } from \"./anna-filter.service\";\r\nimport { AnnaSortService } from \"./anna-sort.service\";\r\n\r\n@Injectable({\r\n  providedIn: \"root\",\r\n})\r\nexport class AnnaGtHelperService {\r\n\r\n  virtualScrollSubject = new Subject();\r\n  constructor(\r\n    private annaFilterService: AnnaFilterService,\r\n    private router: Router,\r\n    private route: ActivatedRoute,\r\n    private annaSortService: AnnaSortService){\r\n    }\r\n\r\n  calculateNumberOfSkeletonColumnsForTable(tableHeaders: any[]): number[][] {\r\n    let numberOfSkeletonColumns: any[][] = [];\r\n    var headersInEachColumn = 0;\r\n    tableHeaders.forEach((column) => {\r\n        if (column.visible) {\r\n            headersInEachColumn = 0;\r\n            column.headerInfo.forEach(() => {\r\n            headersInEachColumn++;\r\n            })\r\n            numberOfSkeletonColumns.push(Array(headersInEachColumn).fill(0));\r\n        }\r\n    })\r\n    return numberOfSkeletonColumns;\r\n  }\r\n\r\n  initColumnFilterAndSorting() {\r\n    this.annaFilterService.tooltipSelectedMap = new Map();\r\n    this.annaFilterService.selectedRadio = null;\r\n    this.annaFilterService.appliedFiltersArray = [];\r\n    this.annaFilterService.initialValueMap = new Map();\r\n    this.annaSortService.columnSortState = new Map();\r\n    this.annaSortService.noSortingAppliedData = [];\r\n  }\r\n\r\n  \r\n  enableOrDisableClearAllBtn(): boolean {\r\n    let isFilterApplied = this.annaFilterService.appliedFiltersArray.length > 0;\r\n\r\n    let isSortApplied = false;\r\n    for (let val of this.annaSortService.columnSortState.values()) {\r\n      if (val == \"ASC\" || val == \"DESC\") {\r\n        isSortApplied = true;\r\n      }\r\n    }\r\n    return isFilterApplied || isSortApplied ? false : true;\r\n  }\r\n\r\n  updateFiltersInURL(){\r\n    let latestQueryParams = this.prepareQueryParamsOnFilter();\r\n    this.router.navigate([],{\r\n        queryParams: { filters: JSON.stringify(latestQueryParams) },\r\n        relativeTo: this.route.parent,\r\n        queryParamsHandling: 'merge'\r\n    });\r\n  }\r\n\r\n  prepareQueryParamsOnFilter() {\r\n    if(!this.annaFilterService.appliedFiltersArray.length && \r\n      !this.annaFilterService.tooltipSelectedMap.size && \r\n      !this.annaSortService.columnSortState.size) {\r\n      return null;\r\n    } \r\n\r\n    let query = {\r\n      appliedFilters: this.annaFilterService.appliedFiltersArray,\r\n      selectedFilterData: JSON.stringify(Array.from(this.annaFilterService.tooltipSelectedMap)),\r\n      sortState: JSON.stringify(Array.from(this.annaSortService.columnSortState))\r\n    }\r\n    return query;\r\n  }\r\n\r\n  initTableFilters(clonedTableData: any) {\r\n    this.annaFilterService.tooltipSelectedMap = new Map();\r\n    this.annaFilterService.selectedRadio = null;\r\n    this.annaFilterService.appliedFiltersArray = [];\r\n\r\n    this.annaSortService.columnSortState = new Map();\r\n\r\n    this.annaSortService.noSortingAppliedData = cloneDeep(clonedTableData);\r\n    this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);\r\n  }\r\n\r\n  initFilters(){\r\n    this.annaFilterService.tooltipSelectedMap = new Map();\r\n    this.annaFilterService.appliedFiltersArray = [];\r\n  }\r\n\r\n  setDataAsPerPersistingFilter(isPersistingFilter: boolean, clonedTable: any, filters: any): any{\r\n    let usersTable;\r\n    if(isPersistingFilter){\r\n      usersTable = this.annaFilterService.filterData(clonedTable, \"\");\r\n      this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);\r\n\r\n      this.annaSortService.columnSortState = new Map(JSON.parse(filters.sortState));\r\n      this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);\r\n      usersTable = this.callSort(usersTable);\r\n    }\r\n    else {\r\n      usersTable = clonedTable;\r\n      this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);\r\n    }\r\n    return usersTable;\r\n  }\r\n\r\n  callSort(usersTable: any): any {\r\n    for (let [key, value] of this.annaSortService.columnSortState) {\r\n      if (value == \"ASC\") {\r\n        usersTable = this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(true, usersTable, key);\r\n      }\r\n      else if (value == \"DESC\") {\r\n        usersTable = this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(false, usersTable, key);\r\n      }\r\n    }\r\n    return usersTable;\r\n  }\r\n\r\n\r\n\r\n}\r\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"anna-generic-table.service.js","sourceRoot":"","sources":["../../../../../../projects/anna-core/src/lib/anna-core-shared-lib/services/anna-generic-table.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Angular import statements\r\nimport { Injectable } from \"@angular/core\";\r\nimport { ActivatedRoute, Router } from '@angular/router';\r\n\r\n// Third party import statements\r\nimport { Subject } from \"rxjs\";\r\nimport { cloneDeep } from \"lodash-es\";\r\n\r\n//sub-entries of anna lib import statement\r\nimport { AnnaFilterService } from \"./anna-filter.service\";\r\nimport { AnnaSortService } from \"./anna-sort.service\";\r\n\r\n@Injectable({\r\n  providedIn: \"root\",\r\n})\r\nexport class AnnaGtHelperService {\r\n\r\n  virtualScrollSubject = new Subject();\r\n  constructor(\r\n    private annaFilterService: AnnaFilterService,\r\n    private router: Router,\r\n    private route: ActivatedRoute,\r\n    private annaSortService: AnnaSortService){\r\n    }\r\n\r\n  calculateNumberOfSkeletonColumnsForTable(tableHeaders: any[]): number[][] {\r\n    let numberOfSkeletonColumns: any[][] = [];\r\n    var headersInEachColumn = 0;\r\n    tableHeaders.forEach((column) => {\r\n        if (column.visible) {\r\n            headersInEachColumn = 0;\r\n            column.headerInfo.forEach(() => {\r\n            headersInEachColumn++;\r\n            })\r\n            numberOfSkeletonColumns.push(Array(headersInEachColumn).fill(0));\r\n        }\r\n    })\r\n    return numberOfSkeletonColumns;\r\n  }\r\n\r\n  initColumnFilterAndSorting() {\r\n    this.annaFilterService.tooltipSelectedMap = new Map();\r\n    this.annaFilterService.selectedRadio = null;\r\n    this.annaFilterService.appliedFiltersArray = [];\r\n    this.annaFilterService.initialValueMap = new Map();\r\n    this.annaSortService.columnSortState = new Map();\r\n    this.annaSortService.noSortingAppliedData = [];\r\n  }\r\n\r\n  \r\n  enableOrDisableClearAllBtn(): boolean {\r\n    let isFilterApplied = this.annaFilterService.appliedFiltersArray.length > 0;\r\n\r\n    let isSortApplied = false;\r\n    for (let val of this.annaSortService.columnSortState.values()) {\r\n      if (val == \"ASC\" || val == \"DESC\") {\r\n        isSortApplied = true;\r\n      }\r\n    }\r\n    return isFilterApplied || isSortApplied ? false : true;\r\n  }\r\n\r\n  updateFiltersInURL(){\r\n    let latestQueryParams = this.prepareQueryParamsOnFilter();\r\n\r\n    if(Object.keys(latestQueryParams).length > 0){\r\n      this.router.navigate([],{\r\n        queryParams: { filters: JSON.stringify(latestQueryParams) },\r\n        relativeTo: this.route.parent,\r\n        queryParamsHandling: 'merge'\r\n      });\r\n    }\r\n    else{\r\n      this.router.navigate([],{\r\n        relativeTo: this.route.parent,\r\n      });\r\n    }\r\n\r\n  }\r\n\r\n  prepareQueryParamsOnFilter() {\r\n\r\n    let query:any = {};\r\n\r\n    if(this.annaFilterService.appliedFiltersArray.length > 0){\r\n      query[\"appliedFilters\"] = this.annaFilterService.appliedFiltersArray;\r\n      query[\"selectedFilterData\"] = JSON.stringify(Array.from(this.annaFilterService.tooltipSelectedMap));\r\n    }\r\n\r\n    if(this.checkIfSortingIsApplied()){\r\n      query[\"sortState\"] = JSON.stringify(Array.from(this.annaSortService.columnSortState));\r\n    }\r\n\r\n    return query;\r\n  }\r\n\r\n  checkIfSortingIsApplied(){\r\n    let isSortingApplied = false;\r\n    for(let val of this.annaSortService.columnSortState.values()){\r\n        if(val == \"ASC\" || val == \"DESC\"){\r\n            isSortingApplied = true;\r\n        }\r\n    }\r\n\r\n    return isSortingApplied;\r\n  }\r\n\r\n  initTableFilters(clonedTableData: any) {\r\n    this.annaFilterService.tooltipSelectedMap = new Map();\r\n    this.annaFilterService.selectedRadio = null;\r\n    this.annaFilterService.appliedFiltersArray = [];\r\n\r\n    this.annaSortService.columnSortState = new Map();\r\n\r\n    this.annaSortService.noSortingAppliedData = cloneDeep(clonedTableData);\r\n    this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);\r\n  }\r\n\r\n  initFilters(){\r\n    this.annaFilterService.tooltipSelectedMap = new Map();\r\n    this.annaFilterService.appliedFiltersArray = [];\r\n  }\r\n\r\n  setDataAsPerPersistingFilter(isPersistingFilter: boolean, clonedTable: any, filters: any): any{\r\n    let usersTable;\r\n    if(isPersistingFilter){\r\n      usersTable = this.annaFilterService.filterData(clonedTable, \"\");\r\n      this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);\r\n    }\r\n    else{\r\n      usersTable = clonedTable;\r\n      this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);\r\n    }\r\n\r\n    if(filters?.sortState)\r\n    {\r\n      this.annaSortService.columnSortState = new Map(JSON.parse(filters.sortState));\r\n      usersTable = this.callSort(usersTable);\r\n    }\r\n\r\n    this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);\r\n\r\n    return usersTable;\r\n  }\r\n\r\n\r\n  callSort(usersTable: any): any {\r\n    for (let [key, value] of this.annaSortService.columnSortState) {\r\n      if (value == \"ASC\") {\r\n        usersTable = this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(true, usersTable, key);\r\n      }\r\n      else if (value == \"DESC\") {\r\n        usersTable = this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(false, usersTable, key);\r\n      }\r\n    }\r\n    return usersTable;\r\n  }\r\n\r\n\r\n\r\n\r\n}\r\n"]}

package/fesm2015/annalib-anna-core.mjs

@@ -3632,25 +3632,39 @@ class AnnaGtHelperService {
     }
     updateFiltersInURL() {
         let latestQueryParams = this.prepareQueryParamsOnFilter();
-        this.router.navigate([], {
-            queryParams: { filters: JSON.stringify(latestQueryParams) },
-            relativeTo: this.route.parent,
-            queryParamsHandling: 'merge'
-        });
+        if (Object.keys(latestQueryParams).length > 0) {
+            this.router.navigate([], {
+                queryParams: { filters: JSON.stringify(latestQueryParams) },
+                relativeTo: this.route.parent,
+                queryParamsHandling: 'merge'
+            });
+        }
+        else {
+            this.router.navigate([], {
+                relativeTo: this.route.parent,
+            });
+        }
     }
     prepareQueryParamsOnFilter() {
-        if (!this.annaFilterService.appliedFiltersArray.length &&
-            !this.annaFilterService.tooltipSelectedMap.size &&
-            !this.annaSortService.columnSortState.size) {
-            return null;
-        }
-        let query = {
-            appliedFilters: this.annaFilterService.appliedFiltersArray,
-            selectedFilterData: JSON.stringify(Array.from(this.annaFilterService.tooltipSelectedMap)),
-            sortState: JSON.stringify(Array.from(this.annaSortService.columnSortState))
-        };
+        let query = {};
+        if (this.annaFilterService.appliedFiltersArray.length > 0) {
+            query["appliedFilters"] = this.annaFilterService.appliedFiltersArray;
+            query["selectedFilterData"] = JSON.stringify(Array.from(this.annaFilterService.tooltipSelectedMap));
+        }
+        if (this.checkIfSortingIsApplied()) {
+            query["sortState"] = JSON.stringify(Array.from(this.annaSortService.columnSortState));
+        }
         return query;
     }
+    checkIfSortingIsApplied() {
+        let isSortingApplied = false;
+        for (let val of this.annaSortService.columnSortState.values()) {
+            if (val == "ASC" || val == "DESC") {
+                isSortingApplied = true;
+            }
+        }
+        return isSortingApplied;
+    }
     initTableFilters(clonedTableData) {
         this.annaFilterService.tooltipSelectedMap = new Map();
         this.annaFilterService.selectedRadio = null;
@@ -3668,14 +3682,16 @@ class AnnaGtHelperService {
         if (isPersistingFilter) {
             usersTable = this.annaFilterService.filterData(clonedTable, "");
             this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);
-            this.annaSortService.columnSortState = new Map(JSON.parse(filters.sortState));
-            this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
-            usersTable = this.callSort(usersTable);
         }
         else {
             usersTable = clonedTable;
             this.annaSortService.noSortingAppliedData = cloneDeep(usersTable);
         }
+        if (filters === null || filters === void 0 ? void 0 : filters.sortState) {
+            this.annaSortService.columnSortState = new Map(JSON.parse(filters.sortState));
+            usersTable = this.callSort(usersTable);
+        }
+        this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
         return usersTable;
     }
     callSort(usersTable) {