[DURACOM-507] remove cris layout references, rename crisRef into dynamicRef, fix layout loader names and imports

FrancescoMolinaro · FrancescoMolinaro · commit fc0ca88df659 · 2026-07-14T12:49:02.000+02:00
diff --git a/config/config.example.yml b/config/config.example.yml
@@ -707,7 +707,7 @@ accessibility:
   cookieExpirationDuration: 7
 
 # Configuration for layout customization of metadata rendering in Item page
-# Currently only the authority reference config is available, more will follow with the integration of the so called CRIS layout.
+# Currently only the authority reference config is available, more will follow with the integration of the so called Dynamic layout.
 layout:
   # Configuration of icons and styles to be used for each authority controlled link
   authorityRef:
diff --git a/src/app/core/layout/models/section.model.ts b/src/app/core/layout/models/section.model.ts
@@ -106,5 +106,5 @@ export interface TopSectionColumn {
  * Represents the type of template to use for the section
  */
 export enum TopSectionTemplateType {
-  DEFAULT = 'default', // CRIS default template
+  DEFAULT = 'default', // default template
 }
diff --git a/src/app/core/layout/tab-data.service.spec.ts b/src/app/core/layout/tab-data.service.spec.ts
@@ -231,7 +231,7 @@ describe('TabDataService', () => {
                             {
                               metadata: 'person.affiliation.name',
                               label: 'Main Affiliation',
-                              rendering: 'crisref',
+                              rendering: 'dynamicref',
                               fieldType: 'METADATA',
                               styleLabel: 'fw-bold col-3',
                               styleValue: null,
@@ -241,7 +241,7 @@ describe('TabDataService', () => {
                             {
                               metadata: 'crisrp.workgroup',
                               label: null,
-                              rendering: 'crisref',
+                              rendering: 'dynamicref',
                               fieldType: 'METADATA',
                               styleLabel: 'fw-bold col-3',
                               styleValue: null,
@@ -261,7 +261,7 @@ describe('TabDataService', () => {
                             {
                               metadata: 'person.email',
                               label: 'Email',
-                              rendering: 'crisref.email',
+                              rendering: 'dynamicref.email',
                               fieldType: 'METADATA',
                               styleLabel: 'fw-bold col-3',
                               styleValue: null,
@@ -470,7 +470,7 @@ describe('TabDataService', () => {
                             {
                               metadata: 'person.affiliation.name',
                               label: 'Main Affiliation',
-                              rendering: 'crisref',
+                              rendering: 'dynamicref',
                               fieldType: 'METADATA',
                               styleLabel: 'fw-bold col-3',
                               styleValue: null,
@@ -480,7 +480,7 @@ describe('TabDataService', () => {
                             {
                               metadata: 'crisrp.workgroup',
                               label: null,
-                              rendering: 'crisref',
+                              rendering: 'dynamicref',
                               fieldType: 'METADATA',
                               styleLabel: 'fw-bold col-3',
                               styleValue: null,
@@ -500,7 +500,7 @@ describe('TabDataService', () => {
                             {
                               metadata: 'person.email',
                               label: 'Email',
-                              rendering: 'crisref.email',
+                              rendering: 'dynamicref.email',
                               fieldType: 'METADATA',
                               styleLabel: 'fw-bold col-3',
                               styleValue: null,
diff --git a/src/app/core/testing/box-configurations.mock.ts b/src/app/core/testing/box-configurations.mock.ts
@@ -146,7 +146,7 @@ export const metadataBoxConfigurationMock: MetadataBoxConfiguration = {
                   {
                     'metadata': 'oairecerif.person.affiliation',
                     'label': 'Organisation',
-                    'rendering': 'crisref',
+                    'rendering': 'dynamicref',
                     'fieldType': 'METADATA',
                     'style': 'row',
                     'styleLabel': 'col',
@@ -206,7 +206,7 @@ export const metadataBoxConfigurationMock: MetadataBoxConfiguration = {
                   {
                     'metadata': 'crisrp.education',
                     'label': 'Organisation',
-                    'rendering': 'crisref',
+                    'rendering': 'dynamicref',
                     'fieldType': 'METADATA',
                     'style': 'row',
                     'styleLabel': 'col',
diff --git a/src/app/dynamic-item-page/dynamic-item-page.component.spec.ts b/src/app/dynamic-item-page/dynamic-item-page.component.spec.ts
@@ -103,7 +103,7 @@ describe('DynamicItemPageComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should display the cris layout component', () => {
+    it('should display the dynamic layout component', () => {
       const layout = fixture.debugElement.query(By.css('ds-dynamic-layout'));
       expect(layout.nativeElement).toBeDefined();
     });
@@ -117,7 +117,7 @@ describe('DynamicItemPageComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should not display the cris layout component', () => {
+    it('should not display the dynamic layout component', () => {
       const layout = fixture.debugElement.query(By.css('ds-dynamic-layout'));
       expect(layout).toBeNull();
     });
diff --git a/src/app/dynamic-layout/decorators/dynamic-layout-box.decorator.ts b/src/app/dynamic-layout/decorators/dynamic-layout-box.decorator.ts
@@ -8,19 +8,19 @@ import { DynamicLayoutMetadataBoxComponent } from '../dynamic-layout-matrix/dyna
 import { DynamicLayoutRelationBoxComponent } from '../dynamic-layout-matrix/dynamic-layout-box-container/boxes/relation/dynamic-layout-relation-box.component';
 import { LayoutBox } from '../enums/layout-box.enum';
 
-export interface CrisLayoutBoxRenderOptions {
+export interface DynamicLayoutBoxRenderOptions {
   componentRef: GenericConstructor<Component>;
   hasOwnContainer: boolean;
 }
 
-const layoutBoxesMap = new Map<LayoutBox, CrisLayoutBoxRenderOptions>([
-  [ LayoutBox.COLLECTIONS, { componentRef: DynamicLayoutCollectionBoxComponent, hasOwnContainer: false } as CrisLayoutBoxRenderOptions ],
-  [ LayoutBox.IIIFVIEWER, { componentRef: DynamicLayoutIiifViewerBoxComponent, hasOwnContainer: false } as CrisLayoutBoxRenderOptions ],
-  [ LayoutBox.METADATA, { componentRef: DynamicLayoutMetadataBoxComponent, hasOwnContainer: false } as CrisLayoutBoxRenderOptions ],
-  [ LayoutBox.RELATION, { componentRef: DynamicLayoutRelationBoxComponent, hasOwnContainer: false } as CrisLayoutBoxRenderOptions ],
-  [ LayoutBox.VERSIONING, { componentRef: ItemVersionsComponent, hasOwnContainer: false } as CrisLayoutBoxRenderOptions ],
+const layoutBoxesMap = new Map<LayoutBox, DynamicLayoutBoxRenderOptions>([
+  [ LayoutBox.COLLECTIONS, { componentRef: DynamicLayoutCollectionBoxComponent, hasOwnContainer: false } as DynamicLayoutBoxRenderOptions ],
+  [ LayoutBox.IIIFVIEWER, { componentRef: DynamicLayoutIiifViewerBoxComponent, hasOwnContainer: false } as DynamicLayoutBoxRenderOptions ],
+  [ LayoutBox.METADATA, { componentRef: DynamicLayoutMetadataBoxComponent, hasOwnContainer: false } as DynamicLayoutBoxRenderOptions ],
+  [ LayoutBox.RELATION, { componentRef: DynamicLayoutRelationBoxComponent, hasOwnContainer: false } as DynamicLayoutBoxRenderOptions ],
+  [ LayoutBox.VERSIONING, { componentRef: ItemVersionsComponent, hasOwnContainer: false } as DynamicLayoutBoxRenderOptions ],
 ]);
 
-export function getCrisLayoutBox(boxType: LayoutBox): CrisLayoutBoxRenderOptions {
+export function getDynamicLayoutBox(boxType: LayoutBox): DynamicLayoutBoxRenderOptions {
   return layoutBoxesMap.get(boxType);
 }
diff --git a/src/app/dynamic-layout/dynamic-layout-loader/shared/sidebar-item/dynamic-layout-sidebar-item.component.ts b/src/app/dynamic-layout/dynamic-layout-loader/shared/sidebar-item/dynamic-layout-sidebar-item.component.ts
@@ -19,7 +19,7 @@ import { slide } from '../../../../shared/animations/slide';
 /**
  * This component defines the default layout for all tabs of DSpace Items.
  * This component can be overwritten for a specific Item type using
- * CrisLayoutTabModelComponent decorator
+ * DynamicLayoutTabModelComponent decorator
  */
 @Component({
   selector: 'ds-dynamic-layout-sidebar-item',
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/dynamic-layout-metadata-box.component.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/dynamic-layout-metadata-box.component.ts
@@ -30,7 +30,7 @@ import { RowComponent } from './row/row.component';
   ],
 })
 /**
- * For overwrite this component create a new one that extends CrisLayoutBoxObj and
+ * For overwrite this component create a new one that extends DynamicLayoutBoxObj and
  * add the DynamicLayoutBoxModelComponent decorator indicating the type of box to overwrite
  */
 export class DynamicLayoutMetadataBoxComponent extends DynamicLayoutBoxModelComponent implements OnInit, OnDestroy {
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.html b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.html
@@ -1 +1 @@
-<ng-template #attachmentValue dsCrisLayoutLoader></ng-template>
+<ng-template #attachmentValue dsDynamicLayoutLoader></ng-template>
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.html b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.html
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.scss b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.scss
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.spec.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.spec.ts
@@ -21,11 +21,11 @@ import { of } from 'rxjs';
 import MetadataValue from '../../../../../../../core/shared/metadata.models';
 import { MetadataLinkViewComponent } from '../../../../../../../shared/metadata-link-view/metadata-link-view.component';
 import { FieldRenderingType } from '../field-rendering-type';
-import { CrisrefComponent } from './crisref.component';
+import { DynamicrefComponent } from './dynamicref.component';
 
-describe('CrisrefComponent', () => {
-  let component: CrisrefComponent;
-  let fixture: ComponentFixture<CrisrefComponent>;
+describe('DynamicrefComponent', () => {
+  let component: DynamicrefComponent;
+  let fixture: ComponentFixture<DynamicrefComponent>;
 
   const itemService = jasmine.createSpyObj('ItemDataService', {
     findByIdWithProjections: jasmine.createSpy('findByIdWithProjections'),
@@ -81,7 +81,7 @@ describe('CrisrefComponent', () => {
   const mockField: LayoutField = {
     'metadata': 'dc.title',
     'label': 'Title',
-    'rendering': FieldRenderingType.CRISREF,
+    'rendering': FieldRenderingType.DYNAMICREF,
     'fieldType': 'METADATA',
     'style': null,
     'styleLabel': 'test-style-label',
@@ -97,7 +97,7 @@ describe('CrisrefComponent', () => {
           provide: TranslateLoader,
           useClass: TranslateLoaderMock,
         },
-      }), BrowserAnimationsModule, CrisrefComponent, MetadataLinkViewComponent],
+      }), BrowserAnimationsModule, DynamicrefComponent, MetadataLinkViewComponent],
       providers: [
         { provide: 'fieldProvider', useValue: mockField },
         { provide: 'itemProvider', useValue: testItem },
@@ -107,11 +107,11 @@ describe('CrisrefComponent', () => {
         { provide: ItemDataService, useValue: itemService },
       ],
     })
-      .overrideComponent(CrisrefComponent, { remove: { imports: [MetadataLinkViewComponent] } }).compileComponents();
+      .overrideComponent(DynamicrefComponent, { remove: { imports: [MetadataLinkViewComponent] } }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CrisrefComponent);
+    fixture = TestBed.createComponent(DynamicrefComponent);
     component = fixture.componentInstance;
     itemService.findByIdWithProjections.and.returnValue(createSuccessfulRemoteDataObject$(testPerson));
     fixture.detectChanges();
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/dynamicref/dynamicref.component.ts
@@ -4,17 +4,17 @@ import { MetadataLinkViewComponent } from '../../../../../../../shared/metadata-
 import { RenderingTypeValueModelComponent } from '../rendering-type-value.model';
 
 /**
- * This component renders the crisref metadata fields
+ * This component renders the dynamicref metadata fields
  */
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
-  selector: 'span[ds-crisref]',
-  templateUrl: './crisref.component.html',
-  styleUrls: ['./crisref.component.scss'],
+  selector: 'span[ds-dynamicref]',
+  templateUrl: './dynamicref.component.html',
+  styleUrls: ['./dynamicref.component.scss'],
   imports: [
     MetadataLinkViewComponent,
   ],
 })
-export class CrisrefComponent extends RenderingTypeValueModelComponent {
+export class DynamicrefComponent extends RenderingTypeValueModelComponent {
 
 }
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/field-rendering-type.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/field-rendering-type.ts
@@ -5,7 +5,7 @@ export enum FieldRenderingType {
   DATE = 'DATE',
   LINK = 'LINK',
   IDENTIFIER = 'IDENTIFIER',
-  CRISREF = 'CRISREF',
+  DYNAMICREF = 'DYNAMICREF',
   THUMBNAIL = 'THUMBNAIL',
   ATTACHMENT = 'ATTACHMENT',
   TABLE = 'TABLE',
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadata-box-rendering-map.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadata-box-rendering-map.ts
@@ -2,8 +2,8 @@ import { AdvancedAttachmentComponent } from './advanced-attachment/advanced-atta
 import { AttachmentComponent } from './attachment/attachment.component';
 import { CcLicenseLargeComponent } from './cc-license-large/cc-license-large.component';
 import { CcLicenseSmallComponent } from './cc-license-small/cc-license-small.component';
-import { CrisrefComponent } from './crisref/crisref.component';
 import { DateComponent } from './date/date.component';
+import { DynamicrefComponent } from './dynamicref/dynamicref.component';
 import { FieldRenderingType } from './field-rendering-type';
 import { HeadingComponent } from './heading/heading.component';
 import { HtmlComponent } from './html/html.component';
@@ -34,7 +34,7 @@ export const layoutBoxesMap = new Map<FieldRenderingType, MetadataBoxFieldRender
     componentRef: IdentifierComponent,
     structured: false,
   } as MetadataBoxFieldRenderOptions],
-  [FieldRenderingType.CRISREF, { componentRef: CrisrefComponent, structured: false } as MetadataBoxFieldRenderOptions],
+  [FieldRenderingType.DYNAMICREF, { componentRef: DynamicrefComponent, structured: false } as MetadataBoxFieldRenderOptions],
   [FieldRenderingType.THUMBNAIL, {
     componentRef: ThumbnailRenderingComponent,
     structured: true,
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.service.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.service.ts
@@ -21,7 +21,7 @@ export class ThumbnailService {
   /**
    * Call this method once when Angular initializes on the client side.
    * It requests Thumbnail Maximum Size from the rest backend
-   * (property: cris.layout.thumbnail.maxsize)
+   * (property: dspace.layout.thumbnail.maxsize)
    */
   getConfig(): Observable<RemoteData<ConfigurationProperty>> {
     return this.configService.findByPropertyName('dynamic.layout.thumbnail.maxsize').pipe(
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts
@@ -118,7 +118,7 @@ export class MetadataContainerComponent implements OnInit {
       this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.${this.field.metadata}`) ?? // old syntax - do not use
       this.getTranslationIfExists(`${this.fieldI18nPrefix}.[${this.field.metadata}]`) ??
       this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.field.label}`) ?? // old syntax - do not use
-      this.field.label; // the untranslated value from the CRIS layout
+      this.field.label; // the untranslated value from the dynamic layout
     }
   }
 
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/row/metadata-container/metadata-render/metadata-render.component.html b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/row/metadata-container/metadata-render/metadata-render.component.html
@@ -1 +1 @@
-<ng-template #metadataValue dsCrisLayoutLoader></ng-template>
+<ng-template #metadataValue dsDynamicLayoutLoader></ng-template>
diff --git a/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/dynamic-layout-box-container.component.ts b/src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/dynamic-layout-box-container.component.ts
@@ -18,8 +18,8 @@ import {
 
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import {
-  CrisLayoutBoxRenderOptions,
-  getCrisLayoutBox,
+  DynamicLayoutBoxRenderOptions,
+  getDynamicLayoutBox,
 } from '../../decorators/dynamic-layout-box.decorator';
 import { LayoutBox } from '../../enums/layout-box.enum';
 
@@ -49,9 +49,9 @@ export class DynamicLayoutBoxContainerComponent implements OnInit {
   @Input() tabName: string;
 
   /**
-   * CrisLayoutBoxRenderOptions reference of the box that will be created
+   * DynamicLayoutBoxRenderOptions reference of the box that will be created
    */
-  componentLoader: CrisLayoutBoxRenderOptions;
+  componentLoader: DynamicLayoutBoxRenderOptions;
 
   /**
    * The prefix used for box header's i18n key
@@ -108,8 +108,8 @@ export class DynamicLayoutBoxContainerComponent implements OnInit {
   /**
    * Active tab utilized by accordion
    */
-  getComponent(): CrisLayoutBoxRenderOptions {
-    return getCrisLayoutBox(this.box.boxType as LayoutBox);
+  getComponent(): DynamicLayoutBoxRenderOptions {
+    return getDynamicLayoutBox(this.box.boxType as LayoutBox);
   }
   /**
    * Get component reference to be inserted in the ngComponentOutlet
diff --git a/src/app/dynamic-layout/models/dynamic-layout-tab-component.model.ts b/src/app/dynamic-layout/models/dynamic-layout-tab-component.model.ts
@@ -14,7 +14,7 @@ import { DynamicLayoutPageModelComponent } from './dynamic-layout-page-component
 @Component({
   template: '',
 })
-export abstract class CrisLayoutTabModelComponent extends DynamicLayoutPageModelComponent {
+export abstract class DynamicLayoutTabModelComponent extends DynamicLayoutPageModelComponent {
   /**
    * DynamicLayoutTab
    */
diff --git a/src/app/item-page/dynamic-item-page-tab.resolver.spec.ts b/src/app/item-page/dynamic-item-page-tab.resolver.spec.ts
@@ -24,7 +24,7 @@ import { HardRedirectService } from '../core/services/hard-redirect.service';
 import { Item } from '../core/shared/item.model';
 import { dynamicItemPageTabResolver } from './dynamic-item-page-tab.resolver';
 
-describe('CrisItemPageTabResolver', () => {
+describe('DynamicItemPageTabResolver', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [RouterTestingModule.withRoutes([{
diff --git a/src/app/shared/entity-icon/entity-icon.directive.ts b/src/app/shared/entity-icon/entity-icon.directive.ts
@@ -62,11 +62,11 @@ export class EntityIconDirective implements OnInit {
    * Adding icon to element oninit
    */
   ngOnInit() {
-    const crisRefConfig: AuthorityRefConfig = this.getCrisRefConfigByType(this.entityType);
-    if (isNotEmpty(crisRefConfig)) {
-      const crisStyle: AuthorityRefEntityStyleConfig = this.getCrisRefEntityStyleConfig(crisRefConfig, this.entityStyle);
-      if (isNotEmpty(crisStyle)) {
-        this.addIcon(crisStyle);
+    const dynamicRefConfig: AuthorityRefConfig = this.getDynamicRefConfigByType(this.entityType);
+    if (isNotEmpty(dynamicRefConfig)) {
+      const entityStyle: AuthorityRefEntityStyleConfig = this.getDynamicRefEntityStyleConfig(dynamicRefConfig, this.entityStyle);
+      if (isNotEmpty(entityStyle)) {
+        this.addIcon(entityStyle);
       }
     }
   }
@@ -77,7 +77,7 @@ export class EntityIconDirective implements OnInit {
    * @param type
    * @private
    */
-  private getCrisRefConfigByType(type: string): AuthorityRefConfig {
+  private getDynamicRefConfigByType(type: string): AuthorityRefConfig {
     let filteredConf: AuthorityRefConfig = this.confValue.find((config) => config.entityType.toUpperCase() === type.toUpperCase());
     if (isEmpty(filteredConf) && this.fallbackOnDefault) {
       filteredConf = this.confValue.find((config) => config.entityType.toUpperCase() === 'DEFAULT');
@@ -89,24 +89,24 @@ export class EntityIconDirective implements OnInit {
   /**
    * Return the AuthorityRefEntityStyleConfig by the given style
    *
-   * @param crisConfig
+   * @param dynamicConfig
    * @param styles
    * @private
    */
-  private getCrisRefEntityStyleConfig(crisConfig: AuthorityRefConfig, styles: string|string[]): AuthorityRefEntityStyleConfig {
+  private getDynamicRefEntityStyleConfig(dynamicConfig: AuthorityRefConfig, styles: string|string[]): AuthorityRefEntityStyleConfig {
     let filteredConf: AuthorityRefEntityStyleConfig;
     if (Array.isArray(styles)) {
       styles.forEach((style) => {
-        if (Object.keys(crisConfig.entityStyle).includes(style)) {
-          filteredConf = crisConfig.entityStyle[style];
+        if (Object.keys(dynamicConfig.entityStyle).includes(style)) {
+          filteredConf = dynamicConfig.entityStyle[style];
         }
       });
     } else {
-      filteredConf = crisConfig.entityStyle[styles];
+      filteredConf = dynamicConfig.entityStyle[styles];
     }
 
     if (isEmpty(filteredConf) && this.fallbackOnDefault) {
-      filteredConf = crisConfig.entityStyle.default;
+      filteredConf = dynamicConfig.entityStyle.default;
     }
 
     return filteredConf;
@@ -115,7 +115,7 @@ export class EntityIconDirective implements OnInit {
   /**
    * Attach icon to HTML element
    *
-   * @param crisStyle
+   * @param entityStyle
    * @private
    */
   private addIcon(entityStyle: AuthorityRefEntityStyleConfig): void {
diff --git a/src/app/shared/metadata-link-view/metadata-link-view.component.ts b/src/app/shared/metadata-link-view/metadata-link-view.component.ts

Original file line number	Diff line number	Diff line change
`@@ -106,5 +106,5 @@ export interface TopSectionColumn {`
`106`	`106`	`* Represents the type of template to use for the section`
`107`	`107`	`*/`
`108`	`108`	`export enum TopSectionTemplateType {`
`109`		`- DEFAULT = 'default', // CRIS default template`
	`109`	`+ DEFAULT = 'default', // default template`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<ng-template #attachmentValue dsCrisLayoutLoader></ng-template>`
	`1`	`+<ng-template #attachmentValue dsDynamicLayoutLoader></ng-template>`