[UXP-184] Fix merge

Author: atarix83

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

@@ -20,6 +20,7 @@ import { APP_CONFIG } from '../../../config/app-config.interface';
 import { BehaviorSubject, Observable, mergeMap } from 'rxjs';
 import { Item } from '../../core/shared/item.model';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { LayoutModeEnum, TopSection } from '../../core/layout/models/section.model';
 
 @Component({
   template: ''
@@ -48,6 +49,8 @@ export abstract class AbstractBrowseElementsComponent implements OnInit, OnChang
    */
   @Input() projection = 'preventMetadataSecurity';
 
+  @Input() mode: LayoutModeEnum;
+
   /**
    * Whether to show the badge label or not
    */
@@ -63,6 +66,11 @@ export abstract class AbstractBrowseElementsComponent implements OnInit, OnChang
    */
   @Input() showThumbnails = this.appConfig.browseBy.showThumbnails;
 
+  /**
+   * TopSection object
+   */
+  @Input() topSection: TopSection;
+
   public collectionElementLinkTypeEnum = CollectionElementLinkType;
 
   paginatedSearchOptions$: BehaviorSubject<PaginatedSearchOptions>;

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

@@ -3,7 +3,7 @@
   <ng-container *ngSwitchCase="templateTypeEnum.CARD">
     <ds-themed-cards-browse-elements
       [topSection]="topSection"
-      [paginatedSearchOptions]="paginatedSearchOptionsBS.asObservable() | async"
+      [paginatedSearchOptions]="paginatedSearchOptions$.asObservable() | async"
       [context]="context"
     >
     </ds-themed-cards-browse-elements>

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

@@ -57,6 +57,11 @@ export class BrowseMostElementsComponent implements OnInit, OnChanges {
 
   sectionTemplateType: TopSectionTemplateType;
 
+  /**
+   * The type of the template to render
+   */
+  templateTypeEnum = TopSectionTemplateType;
+
   ngOnInit(): void {
     this.sectionTemplateType = this.topSection?.template
       ?? (this.mode === LayoutModeEnum.CARD ? TopSectionTemplateType.CARD : TopSectionTemplateType.DEFAULT);

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

@@ -11,4 +11,13 @@ export class CardsBrowseElementsComponent extends AbstractBrowseElementsComponen
 
   public collectionElementLinkTypeEnum = CollectionElementLinkType;
 
+  protected followMetricsLink: boolean;
+  protected followThumbnailLink: boolean;
+
+  ngOnInit() {
+    this.followMetricsLink = this.showMetrics ?? this.appConfig.browseBy.showMetrics;
+    this.followThumbnailLink = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
+    super.ngOnInit();
+  }
+
 }

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

@@ -2,7 +2,7 @@ import {Component, Input} from '@angular/core';
 import { ThemedComponent } from '../../theme-support/themed.component';
 import { Context } from '../../../core/shared/context.model';
 import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
-import { TopSection } from '../../../core/layout/models/section.model';
+import { LayoutModeEnum, TopSection } from '../../../core/layout/models/section.model';
 import {CardsBrowseElementsComponent} from './cards-browse-elements.component';
 
 /**
@@ -23,7 +23,19 @@ export class ThemedCardsBrowseElementsComponent extends ThemedComponent<CardsBro
 
   @Input() topSection: TopSection;
 
-  protected inAndOutputNames: (keyof CardsBrowseElementsComponent & keyof this)[] = ['paginatedSearchOptions', 'context', 'topSection'];
+  // CardsBrowseElementsComponent I/O variables
+
+  @Input() projection: string;
+
+  @Input() mode: LayoutModeEnum;
+
+  @Input() showMetrics: boolean;
+
+  @Input() showThumbnails: boolean;
+
+  @Input() showLabel: boolean;
+
+  protected inAndOutputNames: (keyof CardsBrowseElementsComponent & keyof this)[] = ['paginatedSearchOptions', 'context', 'showMetrics', 'showThumbnails', 'showLabel', 'projection', 'mode'];
 
   protected getComponentName(): string {
     return 'CardsBrowseElementsComponent';