Merged in task/dspace-cris-2023_02_x/DSC-1817_fix (pull request DSpace#3789)

Task/dspace cris 2023 02 x/DSC-1817 fix

Approved-by: Andrea Barbasso

Author: Mattia Vianelli

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.html

@@ -0,0 +1,8 @@
+<ds-item-page-cc-license-field
+  [item]="item"
+  [variant]="'full'"
+  [ccLicenseUriField]="dcRightsUri"
+  [ccLicenseNameField]="dcRights"
+  [showLabel]="false"
+  [showUrl]="true">
+</ds-item-page-cc-license-field>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.scss

@@ -0,0 +1,47 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { CcLicenseLargeComponent } from './cc-license-large.component';
+
+describe('CcLicenseLargeComponent', () => {
+  let component: CcLicenseLargeComponent;
+  let fixture: ComponentFixture<CcLicenseLargeComponent>;
+
+  const mockItem = {
+    firstMetadataValue: jasmine.createSpy('firstMetadataValue').and.returnValue(''),
+    metadata: {},
+    findMetadataSortedByPlace: jasmine.createSpy('findMetadataSortedByPlace').and.returnValue([]),
+  };
+
+  const mockField = {
+    metadataGroup: { elements: [] },
+    styleValue: '',
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [CcLicenseLargeComponent],
+      providers: [
+        { provide: 'fieldProvider', useValue: mockField },
+        { provide: 'itemProvider', useValue: mockItem },
+        { provide: 'metadataValueProvider', useValue: {} },
+        { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CcLicenseLargeComponent);
+    component = fixture.componentInstance;
+
+    component.componentsToBeRenderedMap.set(0, [
+      { field: { metadata: 'dc.rights' } as any, value: {} as any },
+      { field: { metadata: 'dc.rights.uri' } as any, value: {} as any },
+    ] as any);
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.spec.ts

@@ -0,0 +1,34 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {FieldRenderingType, MetadataBoxFieldRendering} from '../metadata-box.decorator';
+import {MetadataGroupComponent} from '../metadataGroup/metadata-group.component';
+import {LayoutField} from '../../../../../../../core/layout/models/box.model';
+import {Item} from '../../../../../../../core/shared/item.model';
+import {TranslateService} from '@ngx-translate/core';
+
+@Component({
+  selector: 'ds-cc-license-large',
+  templateUrl: './cc-license-large.component.html',
+  styleUrls: ['./cc-license-large.component.scss']
+})
+@MetadataBoxFieldRendering(FieldRenderingType.CCLICENSEFULL)
+export class CcLicenseLargeComponent extends MetadataGroupComponent implements OnInit {
+
+  dcRights: any;
+  dcRightsUri: any;
+
+  constructor(
+    @Inject('fieldProvider') public fieldProvider: LayoutField,
+    @Inject('itemProvider') public itemProvider: Item,
+    @Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
+    @Inject('tabNameProvider') public tabNameProvider: string,
+    protected translateService: TranslateService,
+  ) {
+    super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, translateService);
+  }
+  ngOnInit(): void {
+    super.ngOnInit();
+    const ccLicenseEntryMetadata = this.componentsToBeRenderedMap.get(0);
+    [this.dcRights, this.dcRightsUri] = ccLicenseEntryMetadata.map((entryMeta) => entryMeta.field.metadata);
+
+  }
+}

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.ts

@@ -0,0 +1,8 @@
+<ds-item-page-cc-license-field
+  [item]="item"
+  [variant]="'small'"
+  [ccLicenseUriField]="dcRightsUri"
+  [ccLicenseNameField]="dcRights"
+  [showLabel]="false"
+  [showUrl]="false">
+</ds-item-page-cc-license-field>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.html

@@ -0,0 +1,49 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CcLicenseSmallComponent } from './cc-license-small.component';
+
+describe('CcLicenseSmallComponent', () => {
+  let component: CcLicenseSmallComponent;
+  let fixture: ComponentFixture<CcLicenseSmallComponent>;
+
+  const mockItem = {
+    firstMetadataValue: jasmine.createSpy('firstMetadataValue').and.returnValue(''),
+    metadata: {},
+    findMetadataSortedByPlace: jasmine.createSpy('findMetadataSortedByPlace').and.returnValue([]),
+  };
+
+  const mockField = {
+    metadataGroup: { elements: [] },
+    styleValue: '',
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [CcLicenseSmallComponent],
+      providers: [
+        { provide: 'fieldProvider', useValue: mockField },
+        { provide: 'itemProvider', useValue: mockItem },
+        { provide: 'metadataValueProvider', useValue: {} },
+        { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CcLicenseSmallComponent);
+    component = fixture.componentInstance;
+
+    component.componentsToBeRenderedMap.set(0, [
+      { field: { metadata: 'dc.rights' } as any, value: {} as any },
+      { field: { metadata: 'dc.rights.uri' } as any, value: {} as any },
+    ] as any);
+
+    fixture.detectChanges();
+
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.scss

@@ -0,0 +1,35 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {FieldRenderingType, MetadataBoxFieldRendering} from '../metadata-box.decorator';
+import {MetadataGroupComponent} from '../metadataGroup/metadata-group.component';
+import {LayoutField} from '../../../../../../../core/layout/models/box.model';
+import {Item} from '../../../../../../../core/shared/item.model';
+import {TranslateService} from '@ngx-translate/core';
+
+@Component({
+  selector: 'ds-cc-license-small',
+  templateUrl: './cc-license-small.component.html',
+  styleUrls: ['./cc-license-small.component.scss']
+})
+@MetadataBoxFieldRendering(FieldRenderingType.CCLICENSE)
+export class CcLicenseSmallComponent extends MetadataGroupComponent implements OnInit  {
+
+
+  dcRights: any;
+  dcRightsUri: any;
+
+  constructor(
+  @Inject('fieldProvider') public fieldProvider: LayoutField,
+  @Inject('itemProvider') public itemProvider: Item,
+  @Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
+  @Inject('tabNameProvider') public tabNameProvider: string,
+  protected translateService: TranslateService,
+) {
+  super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, translateService);
+}
+  ngOnInit(): void {
+    super.ngOnInit();
+    const ccLicenseEntryMetadata = this.componentsToBeRenderedMap.get(0);
+    [this.dcRights, this.dcRightsUri] = ccLicenseEntryMetadata.map((entryMeta) => entryMeta.field.metadata);
+
+  }
+}

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.spec.ts

@@ -21,6 +21,8 @@ export enum FieldRenderingType {
   ADVANCEDATTACHMENT = 'ADVANCEDATTACHMENT',
   SIMPLEATTACHMENT = 'SIMPLEATTACHMENT',
   AUTHORITYLINK = 'AUTHORITYLINK',
+  CCLICENSEFULL = 'CCLICENSEFULL',
+  CCLICENSE = 'CCLICENSE'
 }
 
 const fieldType = new Map();

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.ts

@@ -120,6 +120,13 @@ import {
 import {
   LonghtmlComponent
 } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longhtml/longhtml.component';
+import {
+  CcLicenseLargeComponent
+} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component';
+import {ItemSharedModule} from '../item-page/item-shared.module';
+import {
+  CcLicenseSmallComponent
+} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -136,6 +143,8 @@ const ENTRY_COMPONENTS = [
   LinkComponent,
   IdentifierComponent,
   CrisrefComponent,
+  CcLicenseLargeComponent,
+  CcLicenseSmallComponent,
   ThumbnailComponent,
   AttachmentComponent,
   CrisLayoutMetricsBoxComponent,
@@ -186,11 +195,14 @@ const ENTRY_COMPONENTS = [
     MiradorViewerModule,
     MetricsModule,
     AttachmentRenderingModule,
-    FormModule
+    FormModule,
+    ItemSharedModule
   ],
   exports: [
     CrisLayoutComponent,
     CrisrefComponent,
+    CcLicenseLargeComponent,
+    CcLicenseSmallComponent
   ]
 })
 export class CrisLayoutModule {