Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-1516

Author: vins01-4science

src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html

@@ -20,10 +20,10 @@
         <i class="fa fa-chevron-circle-{{(isSideBarHidden() | async) ? 'right' : 'left'}} fa-2x" aria-hidden="true"></i>
       </button>
     </div>
-    <div class="d-flex flex-column">
+    <div class="d-flex flex-column" [ngClass]="{'pl-4': (hasSidebar() | async)}">
       <ng-content></ng-content>
     </div>
 
   </div>
 
-</div>
+</div>

src/app/shared/search/search-charts/search-chart/search-chart-filter/search-chart-filter.component.ts

@@ -90,6 +90,18 @@ export class SearchChartFilterComponent extends SearchFacetFilterComponent imple
         }
         queryParam[str[0]] = queryParam[str[0]] ? [...queryParam[str[0]], str[1]] : [str[1]];
       });
+
+      if (this.currentUrl) {
+        const currentQueryParams = this.currentUrl.split('?')[1].split('&');
+        const pageParam = currentQueryParams.filter((param) => param.includes('page'));
+        if (pageParam.length > 0) {
+          const paramName = pageParam[0].split('=')[0];
+          queryParam[paramName] = [1];
+        }
+      } else {
+        queryParam['spc.page'] = [1];
+      }
+
       this.router.navigate(this.getSearchLinkParts(), {
         queryParams: queryParam,
         queryParamsHandling: 'merge',