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

Mattia Vianelli · vins01-4science · commit 67ba3dc2d209 · 2025-11-26T17:40:25.000Z
Task/dspace cris 2024 02 x/DSC-1817 fix

Approved-by: Andrea Barbasso
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.html b/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>
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.scss b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.scss
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.spec.ts b/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,53 @@
+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: [
+        CcLicenseLargeComponent,
+        TranslateModule.forRoot(),
+      ],
+      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();
+  });
+});
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.ts b/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,40 @@
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { LayoutField } from '../../../../../../../core/layout/models/box.model';
+import { Item } from '../../../../../../../core/shared/item.model';
+import { ItemPageCcLicenseFieldComponent } from '../../../../../../../item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component';
+import { MetadataGroupComponent } from '../metadataGroup/metadata-group.component';
+
+@Component({
+  selector: 'ds-cc-license-large',
+  standalone: true,
+  imports: [ItemPageCcLicenseFieldComponent],
+  templateUrl: './cc-license-large.component.html',
+  styleUrl: './cc-license-large.component.scss',
+})
+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);
+
+  }
+}
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.html b/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,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>
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.scss b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.scss
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.spec.ts
@@ -0,0 +1,54 @@
+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: [
+        CcLicenseSmallComponent,
+        TranslateModule.forRoot(),
+      ],
+      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();
+  });
+});
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.ts
@@ -0,0 +1,40 @@
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { LayoutField } from '../../../../../../../core/layout/models/box.model';
+import { Item } from '../../../../../../../core/shared/item.model';
+import { ItemPageCcLicenseFieldComponent } from '../../../../../../../item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component';
+import { MetadataGroupComponent } from '../metadataGroup/metadata-group.component';
+
+@Component({
+  selector: 'ds-cc-license-small',
+  standalone: true,
+  imports: [ItemPageCcLicenseFieldComponent],
+  templateUrl: './cc-license-small.component.html',
+  styleUrl: './cc-license-small.component.scss',
+})
+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);
+
+  }
+}
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/field-rendering-type.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/field-rendering-type.ts
@@ -18,4 +18,7 @@ export enum FieldRenderingType {
   ADVANCEDATTACHMENT = 'ADVANCEDATTACHMENT',
   SIMPLEATTACHMENT = 'SIMPLEATTACHMENT',
   AUTHORITYLINK = 'AUTHORITYLINK',
+  CCLICENSEFULL = 'CCLICENSEFULL',
+  CCLICENSE = 'CCLICENSE',
+
 }
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box-rendering-map.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box-rendering-map.ts
@@ -1,5 +1,7 @@
 import { AdvancedAttachmentComponent } from './advanced-attachment/advanced-attachment.component';
 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 { FieldRenderingType } from './field-rendering-type';
@@ -65,4 +67,12 @@ export const layoutBoxesMap = new Map<FieldRenderingType, MetadataBoxFieldRender
     componentRef: LonghtmlComponent,
     structured: false,
   } as MetadataBoxFieldRenderOptions],
+  [FieldRenderingType.CCLICENSEFULL, {
+    componentRef: CcLicenseLargeComponent,
+    structured: false,
+  } as MetadataBoxFieldRenderOptions],
+  [FieldRenderingType.CCLICENSE, {
+    componentRef: CcLicenseSmallComponent,
+    structured: false,
+  } as MetadataBoxFieldRenderOptions],
 ]);
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="uri && name" class="item-page-field">
-  <ds-metadata-field-wrapper [label]="'item.page.cc.license.title' | translate">
+  <ds-metadata-field-wrapper [hideIfNoTextContent]="false" [label]="showLabel && ('item.page.cc.license.title' | translate)">
     <div [ngClass]="{'row': variant === 'full', 'col': variant === 'small'}">
 
       <!-- 'img' tag is not rendered if any errors occurs when loading it -->
@@ -20,7 +20,7 @@
       <div [ngClass]="{ 'row': variant === 'small', 'col': variant === 'full' }">
         <span>
           {{ variant === 'full' && showDisclaimer ? ('item.page.cc.license.disclaimer' | translate) : '' }}
-          <a *ngIf="showName || !showImage" [href]="uri" target="_blank" id="cc-name">{{ name }}</a>
+          <a *ngIf="(showName || !showImage) && showUrl" [href]="uri" target="_blank" id="cc-name">{{ name }}</a>
         </span>
       </div>
     </div>
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
@@ -55,6 +55,21 @@ export class ItemPageCcLicenseFieldComponent implements OnInit {
    */
   @Input() showDisclaimer? = true;
 
+  /**
+   * Shows the title
+   */
+  @Input() showTitle? = true;
+
+  /**
+   * Shows the label
+   */
+  @Input() showLabel? = true;
+
+  /**
+   * Shows the url
+   */
+  @Input() showUrl? = true;
+
   uri: string;
   name: string;
   showImage = true;

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,7 @@ export enum FieldRenderingType {`
`18`	`18`	`ADVANCEDATTACHMENT = 'ADVANCEDATTACHMENT',`
`19`	`19`	`SIMPLEATTACHMENT = 'SIMPLEATTACHMENT',`
`20`	`20`	`AUTHORITYLINK = 'AUTHORITYLINK',`
	`21`	`+ CCLICENSEFULL = 'CCLICENSEFULL',`
	`22`	`+ CCLICENSE = 'CCLICENSE',`
	`23`	`+`
`21`	`24`	`}`