[DSC-1650] fix showLabel flag after merge

Part of https://bitbucket.org/4Science/dspace-angular/commits/5b1619688bad2b0a5b927ffe811bdd825b5afab4
uniba-ub · Jul 29, 2024 · 44e69cf · 44e69cf
1 parent 7fe191d
commit 44e69cf
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/src/app/shared/browse-most-elements/browse-most-elements.component.html b/src/app/shared/browse-most-elements/browse-most-elements.component.html
@@ -2,6 +2,7 @@
 
   <ng-container *ngSwitchDefault>
     <ds-themed-default-browse-elements
+      [showMetrics]="showMetrics"
       [showThumbnails]="topSection.showThumbnails"
       [topSection]="topSection"
       [showLabel]="showLabel"

diff --git a/src/app/shared/browse-most-elements/browse-most-elements.component.ts b/src/app/shared/browse-most-elements/browse-most-elements.component.ts
@@ -15,10 +15,10 @@ export class BrowseMostElementsComponent implements OnInit, OnChanges {
   @Input() paginatedSearchOptions: PaginatedSearchOptions;
 
   @Input() context: Context;
-  /**
-   * Whether to show the badge label or not
-   */
-  @Input() showLabel: boolean;
+
+  showLabel: boolean;
+
+  showMetrics = true;
 
   @Input() topSection: TopSection;
 

diff --git a/...hared/browse-most-elements/default-browse-elements/default-browse-elements.component.html b/...hared/browse-most-elements/default-browse-elements/default-browse-elements.component.html
@@ -7,6 +7,7 @@
                                                    [listID]="paginatedSearchOptions.configuration"
                                                    [object]="object"
                                                    [showMetrics]="showMetrics"
+                                                   [showLabel]="showLabel"
                                                    [showThumbnails]="showThumbnails"
                                                    [viewMode]="paginatedSearchOptions.view"></ds-listable-object-component-loader>
           </li>

diff --git a/.../shared/browse-most-elements/default-browse-elements/default-browse-elements.component.ts b/.../shared/browse-most-elements/default-browse-elements/default-browse-elements.component.ts
@@ -18,5 +18,7 @@ export class DefaultBrowseElementsComponent extends AbstractBrowseElementsCompon
    */
   @Input() showThumbnails = this.appConfig.browseBy.showThumbnails;
 
+  @Input() showLabel: boolean;
+
   protected followThumbnailLink = true;
 }
diff --git a/.../browse-most-elements/default-browse-elements/themed-default-browse-elements.component.ts b/.../browse-most-elements/default-browse-elements/themed-default-browse-elements.component.ts
@@ -29,7 +29,9 @@ export class ThemedDefaultBrowseElementsComponent extends ThemedComponent<Defaul
 
   @Input() showThumbnails: boolean;
 
-  protected inAndOutputNames: (keyof DefaultBrowseElementsComponent & keyof this)[] = ['paginatedSearchOptions', 'context', 'topSection', 'showMetrics', 'showThumbnails'];
+  @Input() showLabel: boolean;
+
+  protected inAndOutputNames: (keyof DefaultBrowseElementsComponent & keyof this)[] = ['paginatedSearchOptions', 'context', 'topSection', 'showMetrics', 'showThumbnails', 'showLabel'];
 
   protected getComponentName(): string {
     return 'DefaultBrowseElementsComponent';

diff --git a/src/app/shared/browse-most-elements/themed-browse-most-elements.component.ts b/src/app/shared/browse-most-elements/themed-browse-most-elements.component.ts
@@ -21,9 +21,7 @@ export class ThemedBrowseMostElementsComponent extends ThemedComponent<BrowseMos
 
   @Input() topSection: TopSection;
 
-  @Input() showLabel: boolean;
-
-  protected inAndOutputNames: (keyof BrowseMostElementsComponent & keyof this)[] = ['context', 'paginatedSearchOptions', 'topSection', 'showLabel'];
+  protected inAndOutputNames: (keyof BrowseMostElementsComponent & keyof this)[] = ['context', 'paginatedSearchOptions', 'topSection'];
 
   protected getComponentName(): string {
     return 'BrowseMostElementsComponent';

diff --git a/src/app/shared/explore/section-component/top-section/top-section.component.html b/src/app/shared/explore/section-component/top-section/top-section.component.html
@@ -3,7 +3,7 @@
     <div *ngIf="topSection.titleKey" class="card-header">{{ 'explore.index.' + topSection.titleKey | translate }}</div>
     <div *ngIf="!topSection.titleKey" class="card-header">{{ 'explore.index.' + topSection.sortField | translate }}</div>
     <div class="card-body p-0">
-      <ds-themed-browse-most-elements [context]="context" [paginatedSearchOptions]="paginatedSearchOptions" [topSection]="topSection" [showLabel]="showLabel"></ds-themed-browse-most-elements>
+      <ds-themed-browse-most-elements [context]="context" [paginatedSearchOptions]="paginatedSearchOptions" [topSection]="topSection"></ds-themed-browse-most-elements>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/explore/section-component/top-section/top-section.component.ts b/src/app/shared/explore/section-component/top-section/top-section.component.ts
@@ -26,8 +26,6 @@ export class TopSectionComponent implements OnInit {
 
   paginatedSearchOptions: PaginatedSearchOptions;
 
-  showLabel: boolean;
-
   ngOnInit() {
     const order = this.topSection.order;
     const numberOfItems = this.topSection.numberOfItems;