Merged in task/dspace-cris-2023_02_x/DSC-2194 (pull request DSpace#2853)

Task/dspace cris 2023 02 x/DSC-2194

Approved-by: Giuseppe Digilio

Author: Mattia Vianelli

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/relation/cris-layout-relation-box.component.html

@@ -4,6 +4,8 @@
                               [renderOnServerSide]="false"
                               [searchEnabled]="searchEnabled"
                               [showCharts]="true"
+                              [collapseCharts]="true"
+                              [showChartsToggle]="true"
                               [showScopeSelector]="false"
                               [showSearchResultNotice]="showSearchResultNotice$ | async"
                               [searchResultNotice]="searchResultNotice">

src/app/lucky-search/search/lucky-search.component.spec.ts

@@ -203,7 +203,7 @@ describe('LuckySearchComponent', () => {
       spyOn((component as any), 'loadBitstreamsAndRedirectIfNeeded').and.returnValue(observableOf([bitstream]));
       spyOn((component as any), 'hasBitstreamFilters').and.returnValue(true);
       spyOn(component, 'redirect');
-      routerStub.parseUrl.and.returnValue(bitstreamSearchTree);
+      routerStub.parseUrl.and.returnValue(bitstreamSearchTree).and.callThrough();
 
       component.resultsRD$.next(data);
 

src/app/search-page/search-page.component.html

@@ -1 +1 @@
-<ds-themed-search [showCharts]="true" [showCsvExport]="false" [showExport]="true" [trackStatistics]="true"></ds-themed-search>
+<ds-themed-search [showCharts]="true" [collapseCharts]="true" [showChartsToggle]="true" [showCsvExport]="false" [showExport]="true" [trackStatistics]="true"></ds-themed-search>

src/app/search-page/themed-configuration-search-page.component.ts

@@ -53,6 +53,16 @@ export class ThemedConfigurationSearchPageComponent extends ThemedComponent<Conf
   @Input()
   context: Context;
 
+  /**
+   * Defines whether to start as showing the charts collapsed
+   */
+  @Input() collapseCharts = false;
+
+  /**
+   * Defines whether to show the toggle button to Show/Hide chart
+   */
+  @Input() showChartsToggle = false;
+
   protected inAndOutputNames: (keyof ConfigurationSearchPageComponent & keyof this)[] =
     ['context', 'configuration', 'fixedFilterQuery', 'inPlaceSearch', 'searchEnabled', 'sideBarWidth'];
 

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

@@ -7,7 +7,7 @@ <h2 class="m-0 text-break">{{'search.filters.applied.charts.' + ((configuration
         </div>
         <button class="btn btn-outline-secondary" data-test="search-charts-toggle"
                 ngbTooltip="{{'search.sidebar.show.hide.charts.tooltip' | translate}}"
-                (click)="toggleChart()" *ngIf="showChartsToggle">
+                (click)="toggleChart()" *ngIf="showChartsToggle && hasValidCharts">
           <i class="fa fa-chart-line mr-2"></i> {{"search.filters.applied.charts.show.hide" | translate}}</button>
       </div>
       <div *ngIf="!collapseChart && selectedFilter" @shrinkInOut data-test="search-charts">

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

@@ -69,6 +69,18 @@ export class SearchChartsComponent implements OnInit {
    */
   isPlatformBrowser: boolean;
 
+  /**
+   * Prop that provides the boolean value for an existing valid chart (true if at least one valid chart is found)
+   */
+  hasValidCharts = false;
+
+  /**
+   *
+   * @param cdr
+   * @param searchService
+   * @param platformId
+   * @param searchConfigService
+   */
   constructor(
     private cdr: ChangeDetectorRef,
     private searchService: SearchService,
@@ -89,6 +101,7 @@ export class SearchChartsComponent implements OnInit {
               this.selectedFilter = this.selectedFilter
                 ? this.selectedFilter
                 : rd.hasSucceeded && hasValues ? rd.payload[0] : null;
+              this.hasValidCharts = hasValues;
               this.cdr.detectChanges();
             })
           );