@annalib/anna-core 9.1.2 → 9.1.3

package/fesm2020/annalib-anna-core.mjs

@@ -3630,25 +3630,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;
@@ -3666,14 +3680,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?.sortState) {
+            this.annaSortService.columnSortState = new Map(JSON.parse(filters.sortState));
+            usersTable = this.callSort(usersTable);
+        }
+        this.annaFilterService.updateStateOfAllTheKeys(this.annaSortService.columnSortState);
         return usersTable;
     }
     callSort(usersTable) {