Merged dspace-cris-2023_02_x into DSC-1433

Author: Yevhenii-Lohatskyi

bitbucket-pipelines.yml

@@ -20,7 +20,7 @@ definitions:
 
 pipelines:
   branches:
-    'dspace-cris-7':
+    'dspace-cris-2023_02_x':
       - step: *unittest-code-checks
   pull-requests:
     '**':

src/app/shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component.ts

@@ -31,7 +31,7 @@ import { FeatureID } from '../../../../core/data/feature-authorization/feature-i
   templateUrl: '../dso-selector-modal-wrapper.component.html',
 })
 export class ExportMetadataCsvSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
-  configuration = 'backend';
+  configuration = 'communityOrCollection';
   objectType = DSpaceObjectType.DSPACEOBJECT;
   selectorTypes = [DSpaceObjectType.COLLECTION, DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.EXPORT_METADATA_CSV;

src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.ts

@@ -28,7 +28,7 @@ import { getProcessDetailRoute } from '../../../../process-page/process-page-rou
   templateUrl: '../dso-selector-modal-wrapper.component.html',
 })
 export class ExportMetadataXlsSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
-  configuration = 'backend';
+  configuration = 'communityOrCollection';
   objectType = DSpaceObjectType.DSPACEOBJECT;
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.EXPORT_METADATA_XLS;

src/app/shared/search/search-filters/search-filters.component.html

@@ -1,4 +1,4 @@
-<div [class.d-none]="!availableFilters">
+<div [class.d-none]="searchFilterCount === 0">
     <h3>{{"search.filters.head" | translate}}</h3>
     <div *ngIf="(filters | async)?.hasSucceeded">
         <div #searchFilter *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">

src/app/shared/search/search-filters/search-filters.component.spec.ts

@@ -76,7 +76,7 @@ describe('SearchFiltersComponent', () => {
     it('should not render component', () => {
       const menu = fixture.debugElement.query(By.css('div.d-none'));
       expect(menu).not.toBeNull();
-      expect(comp.availableFilters).toBeFalse();
+      expect(comp.searchFilterCount).toEqual(0);
     });
 
   });

src/app/shared/search/search-filters/search-filters.component.ts

@@ -63,7 +63,7 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr
   /**
    * counts for the active filters
    */
-  availableFilters = false;
+  searchFilterCount = 0;
 
   /**
    * Link to the search page
@@ -112,9 +112,11 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr
   }
 
   ngAfterViewChecked() {
-    this.availableFilters = false;
+    this.searchFilterCount = 0;
     this.searchFilter._results.forEach(element => {
-      this.availableFilters = element.nativeElement?.children[0]?.children.length > 0;
+      if (element.nativeElement?.children[0]?.children.length > 0) {
+        this.searchFilterCount++;
+      }
     });
   }