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

Author: Andrea Barbasso

config/config.example.yml

@@ -275,6 +275,8 @@ browseBy:
   fiveYearLimit: 30
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
+  # Whether to add item badges to BOTH browse and search result lists.
+  showLabels: true
   # If true, thumbnail images for items will be added to BOTH search and browse result lists.
   showThumbnails: true
   # The number of entries in a paginated browse results list.

src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html

@@ -43,6 +43,8 @@
           <ds-themed-item-list-preview [item]="match"
                                        [object]="itemPreviewObject"
                                        [metadataList]="metadataList"
+                                       [showLabel]="showLabel"
+                                       [showMetrics]="showMetrics"
                                        [showThumbnails]="showThumbnails">
           </ds-themed-item-list-preview>
           <div class="offset-2">

src/app/shared/browse-most-elements/browse-most-elements.component.html

@@ -6,6 +6,7 @@
                                                      [index]="i"
                                                      [listID]="paginatedSearchOptions.configuration"
                                                      [object]="object"
+                                                     [showLabel]="showLabel"
                                                      [showMetrics]="showMetrics"
                                                      [showThumbnails]="showThumbnails"
                                                      [viewMode]="paginatedSearchOptions.view"></ds-listable-object-component-loader>

src/app/shared/browse-most-elements/browse-most-elements.component.ts

@@ -23,16 +23,20 @@ export class BrowseMostElementsComponent implements OnInit {
   @Input() paginatedSearchOptions: PaginatedSearchOptions;
 
   @Input() context: Context;
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel: boolean;
 
   /**
    * Whether to show the metrics badges
    */
-  @Input() showMetrics;
+  @Input() showMetrics: boolean;
 
   /**
    * Whether to show the thumbnail preview
    */
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>;
 

src/app/shared/browse-most-elements/themed-browse-most-elements.component.ts

@@ -18,11 +18,13 @@ export class ThemedBrowseMostElementsComponent extends ThemedComponent<BrowseMos
 
   @Input() paginatedSearchOptions: PaginatedSearchOptions;
 
-  @Input() showMetrics;
+  @Input() showLabel: boolean;
 
-  @Input() showThumbnails;
+  @Input() showMetrics: boolean;
 
-  protected inAndOutputNames: (keyof BrowseMostElementsComponent & keyof this)[] = ['context', 'paginatedSearchOptions', 'showMetrics', 'showThumbnails'];
+  @Input() showThumbnails: boolean;
+
+  protected inAndOutputNames: (keyof BrowseMostElementsComponent & keyof this)[] = ['context', 'paginatedSearchOptions', 'showLabel', 'showMetrics', 'showThumbnails'];
 
   protected getComponentName(): string {
     return 'BrowseMostElementsComponent';

src/app/shared/explore/section-component/top-section/top-section.component.html

@@ -3,7 +3,11 @@
     <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" [showThumbnails]="showThumbnails"></ds-themed-browse-most-elements>
+      <ds-themed-browse-most-elements [context]="context"
+                                      [paginatedSearchOptions]="paginatedSearchOptions"
+                                      [showLabel]="showLabel"
+                                      [showMetrics]="showMetrics"
+                                      [showThumbnails]="showThumbnails"></ds-themed-browse-most-elements>
     </div>
   </div>
 </div>

src/app/shared/explore/section-component/top-section/top-section.component.ts

@@ -26,6 +26,10 @@ export class TopSectionComponent implements OnInit {
 
   paginatedSearchOptions: PaginatedSearchOptions;
 
+  showLabel: boolean;
+
+  showMetrics = true;
+
   showThumbnails: boolean;
 
   ngOnInit() {

src/app/shared/object-collection/object-collection.component.html

@@ -7,6 +7,7 @@
                 [linkType]="linkType"
                 [context]="context"
                 [hidePaginationDetail]="hidePaginationDetail"
+                [showLabel]="showLabel"
                 [showMetrics]="showMetrics"
                 [showPaginator]="showPaginator"
                 [showThumbnails]="showThumbnails"
@@ -37,6 +38,7 @@
                 [linkType]="linkType"
                 [context]="context"
                 [hidePaginationDetail]="hidePaginationDetail"
+                [showLabel]="showLabel"
                 [showMetrics]="showMetrics"
                 [showPaginator]="showPaginator"
                 [showThumbnails]="showThumbnails"
@@ -55,6 +57,7 @@
                   [linkType]="linkType"
                   [context]="context"
                   [hidePaginationDetail]="hidePaginationDetail"
+                  [showLabel]="showLabel"
                   [showMetrics]="showMetrics"
                   [showPaginator]="showPaginator"
                   [showThumbnails]="showThumbnails"

src/app/shared/object-collection/object-collection.component.ts

@@ -110,6 +110,11 @@ export class ObjectCollectionComponent implements OnInit {
    */
   @Input() hidePaginationDetail = false;
 
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel: boolean;
+
   /**
    * Whether to show the metrics badges
    */
@@ -123,7 +128,7 @@ export class ObjectCollectionComponent implements OnInit {
   /**
    * Whether to show the thumbnail preview
    */
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   /**
    * Whether or not to show an alert for hidden related items

src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts

@@ -68,7 +68,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
   /**
    * Whether to show the badge label or not
    */
-  @Input() showLabel = true;
+  @Input() showLabel: boolean;
 
   /**
    * Whether to show the metrics badges
@@ -78,7 +78,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
   /**
    * Whether to show the thumbnail preview
    */
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   /**
    * The value to display for this element