[DURACOM-426] refactor

Author: FrancescoMolinaro

config/config.example.yml

@@ -630,11 +630,10 @@ accessibility:
   # The duration in days after which the accessibility settings cookie expires
   cookieExpirationDuration: 7
 
-# CRIS Layout
-# Configuration for custom CRIS layout
-crisLayout:
+# Configuration for custom layout
+layout:
   # Configuration of icons and styles to be used for each authority controlled link
-  crisRef:
+  authorityRef:
     - entityType: DEFAULT
       entityStyle:
         default:
@@ -658,8 +657,6 @@ crisLayout:
         default:
           icon: fas fa-project-diagram
           style: text-success
-  crisRefStyleMetadata:
-    default: cris.entity.style
 
 # When the search results are retrieved, for each item type the metadata with a valid authority value are inspected.
 # Referenced items will be fetched with a find all by id strategy to avoid individual rest requests

src/app/shared/entity-icon/entity-icon.directive.ts

@@ -5,8 +5,8 @@ import {
   OnInit,
 } from '@angular/core';
 import {
-  CrisRefConfig,
-  CrisRefEntityStyleConfig,
+  AuthorityRefConfig,
+  AuthorityRefEntityStyleConfig,
 } from '@dspace/config/layout-config.interfaces';
 import {
   isEmpty,
@@ -46,9 +46,9 @@ export class EntityIconDirective implements OnInit {
   @Input() iconPosition = 'after';
 
   /**
-   * A configuration representing crisRef values
+   * A configuration representing authorityRef values
    */
-  confValue = environment.crisLayout.crisRef;
+  confValue = environment.layout.authorityRef;
 
   /**
    * Initialize instance variables
@@ -62,23 +62,23 @@ export class EntityIconDirective implements OnInit {
    * Adding icon to element oninit
    */
   ngOnInit() {
-    const crisRefConfig: CrisRefConfig = this.getCrisRefConfigByType(this.entityType);
+    const crisRefConfig: AuthorityRefConfig = this.getCrisRefConfigByType(this.entityType);
     if (isNotEmpty(crisRefConfig)) {
-      const crisStyle: CrisRefEntityStyleConfig = this.getCrisRefEntityStyleConfig(crisRefConfig, this.entityStyle);
+      const crisStyle: AuthorityRefEntityStyleConfig = this.getCrisRefEntityStyleConfig(crisRefConfig, this.entityStyle);
       if (isNotEmpty(crisStyle)) {
         this.addIcon(crisStyle);
       }
     }
   }
 
   /**
-   * Return the CrisRefConfig by the given type
+   * Return the AuthorityRefConfig by the given type
    *
    * @param type
    * @private
    */
-  private getCrisRefConfigByType(type: string): CrisRefConfig {
-    let filteredConf: CrisRefConfig = this.confValue.find((config) => config.entityType.toUpperCase() === type.toUpperCase());
+  private getCrisRefConfigByType(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');
     }
@@ -87,14 +87,14 @@ export class EntityIconDirective implements OnInit {
   }
 
   /**
-   * Return the CrisRefEntityStyleConfig by the given style
+   * Return the AuthorityRefEntityStyleConfig by the given style
    *
    * @param crisConfig
    * @param styles
    * @private
    */
-  private getCrisRefEntityStyleConfig(crisConfig: CrisRefConfig, styles: string|string[]): CrisRefEntityStyleConfig {
-    let filteredConf: CrisRefEntityStyleConfig;
+  private getCrisRefEntityStyleConfig(crisConfig: AuthorityRefConfig, styles: string|string[]): AuthorityRefEntityStyleConfig {
+    let filteredConf: AuthorityRefEntityStyleConfig;
     if (Array.isArray(styles)) {
       styles.forEach((style) => {
         if (Object.keys(crisConfig.entityStyle).includes(style)) {
@@ -118,8 +118,8 @@ export class EntityIconDirective implements OnInit {
    * @param crisStyle
    * @private
    */
-  private addIcon(crisStyle: CrisRefEntityStyleConfig): void {
-    const iconElement = `<i class="${crisStyle.icon} ${crisStyle.style}"></i>`;
+  private addIcon(entityStyle: AuthorityRefEntityStyleConfig): void {
+    const iconElement = `<i class="${entityStyle.icon} ${entityStyle.style}"></i>`;
     if (this.iconPosition === 'after') {
       this.elem.nativeElement.insertAdjacentHTML('afterend', '&nbsp;' + iconElement);
     } else {

src/config/app-config.interface.ts

@@ -23,7 +23,7 @@ import { IdentifierSubtypesConfig } from './identifier-subtypes-config.interface
 import { InfoConfig } from './info-config.interface';
 import { ItemConfig } from './item-config.interface';
 import { LangConfig } from './lang-config.interface';
-import { CrisLayoutConfig } from './layout-config.interfaces';
+import { LayoutConfig } from './layout-config.interfaces';
 import { LiveRegionConfig } from './live-region.config';
 import { MarkdownConfig } from './markdown-config.interface';
 import { MatomoConfig } from './matomo-config.interface';
@@ -74,7 +74,7 @@ interface AppConfig extends Config {
   matomo?: MatomoConfig;
   geospatialMapViewer: GeospatialMapConfig;
   accessibility: AccessibilitySettingsConfig;
-  crisLayout: CrisLayoutConfig;
+  layout: LayoutConfig;
   metadataLinkViewPopoverData: MetadataLinkViewPopoverDataConfig;
   identifierSubtypes: IdentifierSubtypesConfig[];
   searchResult: SearchResultConfig;

src/config/default-app-config.ts

@@ -1,3 +1,4 @@
+import { LayoutConfig } from '@dspace/config/layout-config.interfaces';
 import { SearchResultConfig } from '@dspace/config/search-result-config.interface';
 
 import { AccessibilitySettingsConfig } from './accessibility-settings.config';
@@ -23,7 +24,6 @@ import {
 import { InfoConfig } from './info-config.interface';
 import { ItemConfig } from './item-config.interface';
 import { LangConfig } from './lang-config.interface';
-import { CrisLayoutConfig } from './layout-config.interfaces';
 import { LiveRegionConfig } from './live-region.config';
 import { MarkdownConfig } from './markdown-config.interface';
 import { MatomoConfig } from './matomo-config.interface';
@@ -678,8 +678,8 @@ export class DefaultAppConfig implements AppConfig {
     cookieExpirationDuration: 7,
   };
 
-  crisLayout: CrisLayoutConfig = {
-    crisRef: [
+  layout: LayoutConfig = {
+    authorityRef: [
       {
         entityType: 'DEFAULT',
         entityStyle: {
@@ -717,9 +717,6 @@ export class DefaultAppConfig implements AppConfig {
         },
       },
     ],
-    crisRefStyleMetadata: {
-      default: 'cris.entity.style',
-    },
   };
 
   searchResult: SearchResultConfig = {

src/config/layout-config.interfaces.ts

@@ -1,24 +1,19 @@
 import { Config } from './config.interface';
 
-export interface CrisRefEntityStyleConfig extends Config {
+export interface AuthorityRefEntityStyleConfig extends Config {
   icon: string;
   style: string;
 }
 
-export interface CrisRefConfig extends Config {
+export interface AuthorityRefConfig extends Config {
   entityType: string;
   entityStyle: {
-    default: CrisRefEntityStyleConfig;
-    [entity: string]: CrisRefEntityStyleConfig;
+    default: AuthorityRefEntityStyleConfig;
+    [entity: string]: AuthorityRefEntityStyleConfig;
   };
 }
 
-export interface CrisRefStyleMetadata extends Config {
-  [metadata: string]: string;
-  default: string;
-}
 
-export interface CrisLayoutConfig extends Config {
-  crisRef: CrisRefConfig[];
-  crisRefStyleMetadata: CrisRefStyleMetadata;
+export interface LayoutConfig extends Config {
+  authorityRef: AuthorityRefConfig[];
 }

src/environments/environment.test.ts

@@ -477,8 +477,8 @@ export const environment: BuildConfig = {
     cookieExpirationDuration: 7,
   },
 
-  crisLayout: {
-    crisRef: [
+  layout: {
+    authorityRef: [
       {
         entityType: 'DEFAULT',
         entityStyle: {
@@ -515,9 +515,6 @@ export const environment: BuildConfig = {
         },
       },
     ],
-    crisRefStyleMetadata: {
-      default: 'cris.entity.style',
-    },
   },
 
   searchResult: {