Merge remote-tracking branch 'gitHub/main' into task/main/DURACOM-456

Author: FrancescoMolinaro

config/config.example.yml

@@ -164,6 +164,9 @@ form:
   validatorMap:
     required: required
     regex: pattern
+  # If true it enables the button "Duplicate" inside inline form groups.
+  # The button will give the possibility to duplicate the whole form section copying the metadata values as well.
+  showInlineGroupDuplicateButton: false
 
 # Notification settings
 notifications:
@@ -202,6 +205,10 @@ submission:
       # default configuration
       - name: default
         style: ''
+    # Icons that should remain visible even when no authority value is present for the metadata field.
+    # This is useful for fields where you want to display an icon regardless of whether the value has an authority link.
+    # Example: ['fas fa-user'] will show the user icon for author fields even without authority data.
+    iconsVisibleWithNoAuthority: ['fas fa-user']
     authority:
       confidence:
         # NOTE: example of configuration
@@ -380,6 +387,8 @@ communityList:
   pageSize: 20
 
 homePage:
+  # Whether to show the top footer section or not
+  showTopFooter: false
   recentSubmissions:
     # The number of item showing in recent submission components
     pageSize: 5
@@ -396,6 +405,20 @@ homePage:
 item:
   edit:
     undoTimeout: 10000 # 10 seconds
+    # Defines the security levels available for metadata fields.
+    # Each level maps to a numeric value stored on the metadata field in the backend and controls visibility of that field based on the user's role.
+    # Levels are displayed as toggle buttons in the metadata edit UI.
+    security:
+      levels:
+          - value: 0       # Public — visible to everyone
+            icon: fa fa-globe
+            color: green
+          - value: 1       # Registered users — visible to authenticated users only
+            icon: fa fa-key
+            color: orange
+          - value: 2       # Administrators only — restricted to admin users
+            icon: fa fa-lock
+            color: red
   # Show the item access status label in items lists
   showAccessStatuses: false
   bitstream:
@@ -410,7 +433,6 @@ item:
     # Metdadata list to be displayed for entities without a specific configuration
     fallbackMetdataList:
       - dc.description.abstract
-      - dc.description.note
     # Configuration for each entity type
     entityDataConfig:
       - entityType: Person
@@ -430,6 +452,8 @@ item:
         iconPosition: IdentifierSubtypesIconPositionEnum.LEFT
         link: https://ror.org
 
+  # Enable authority based relations in item page
+  showAuthorityRelations: false
 # Community Page Config
 community:
   # Default tab to be shown when browsing a Community. Valid values are: comcols, search, or browse_<field>
@@ -706,6 +730,28 @@ layout:
         default:
           icon: fas fa-project-diagram
           style: text-success
+  # If true the download link in item page will be rendered as an advanced attachment, the view can be then configured with the layout.advancedAttachmentRendering config
+  showDownloadLinkAsAttachment: false
+  # Configuration for advanced attachment rendering in item pages. This controls how files are displayed when showDownloadLinkAsAttachment is enabled.
+  # Defines which metadata/attributes to display for bitstream attachments.
+  advancedAttachmentRendering:
+    # Metadata and attributes to display for each attachment
+    metadata:
+      - name: dc.title
+        type: metadata
+        truncatable: false
+      - name: dc.type
+        type: metadata
+        truncatable: false
+      - name: dc.description
+        type: metadata
+        truncatable: true
+      - name: size
+        type: attribute
+      - name: format
+        type: attribute
+      - name: checksum
+        type: attribute
 
 # Configuration for customization of search results
 searchResults:
@@ -736,3 +782,22 @@ searchResults:
   followAuthorityMetadataValuesLimit: 5
 
 
+# Configuration of social links using AddToAny plugin
+addToAnyPlugin:
+  # This is enabled flag
+  socialNetworksEnabled: false
+  # If you want to self-host check https://www.addtoany.com/buttons/customize/host_cache
+  scriptUrl: "https://static.addtoany.com/menu/page.js"
+  # Check available integrations, visit https://www.addtoany.com/buttons/for/website
+  # 1. Click "Choose Services", select integrations, then click Done
+  # 2. Get Button Code
+  # 3. You will get a HTML e.g. <a class="a2a_button_facebook"></a> where "facebook" is part you want to include in list
+  buttons:
+    - facebook
+    - twitter
+    - linkedin
+    - email
+    - copy_link
+  showPlusButton: true
+  showCounters: true
+  title: DSpace demo

src/app/admin/admin-edit-cms-metadata/admin-edit-cms-metadata.component.html

@@ -0,0 +1,65 @@
+@if (editMode | async) {
+    <ng-container *ngTemplateOutlet="editMetadataTemplate"></ng-container>
+}
+@else {
+    <ng-container *ngTemplateOutlet="selectMetadataTemplate"></ng-container>
+}
+
+<ng-template #selectMetadataTemplate>
+  <div class="container">
+    <h3 class="mb-4">{{'menu.section.cms.edit.metadata.head' | translate}}</h3>
+    <div class="input-group">
+      <select class="form-control col-md-4 mr-3 mb-2" aria-label="Select metadata" [(ngModel)]="selectedMetadata">
+        <option [ngValue]="undefined" disabled selected>{{'admin.edit-cms-metadata.select-metadata' | translate}}</option>
+        @for (md of metadataList; track $index) {
+           <option [value]="md">{{md}}</option>
+        }
+      </select>
+      <span class="input-group-btn">
+        <button id="edit-metadata-btn" class="btn btn-primary" (click)="editSelectedMetadata()" [dsBtnDisabled]="!selectedMetadata">
+          <i class="fas fa-edit mr-1"></i>
+          {{'admin.edit-cms-metadata.edit-button' | translate}}
+        </button>
+    </span>
+    </div>
+  </div>
+</ng-template>
+
+
+<ng-template #editMetadataTemplate>
+  <div class="container">
+    <h2 class=" mb-5">{{'admin.edit-cms-metadata.title' | translate}} '{{selectedMetadata}}'</h2>
+    <ds-alert [type]="'alert-info'" [dismissible]="true" [content]="'admin.edit-cms-metadata.markdown' | translate"></ds-alert>
+    <div class="row">
+      <div class="col-md">
+        @for (lang of (languageMap | keyvalue); track lang.key) {
+          <div class="form-group">
+            <label>{{languageLabel(lang.value)}}</label>
+            <textarea class="col-md-12 m-2" [ngModel]="selectedMetadataValues.get(lang.key)" (ngModelChange)="selectedMetadataValues.set(lang.key, $event)" rows="10"></textarea>
+          </div>
+        }
+      </div>
+    </div>
+    <ng-container *ngTemplateOutlet="editMetadataButtonsTemplate"></ng-container>
+  </div>
+</ng-template>
+
+
+<ng-template #editMetadataButtonsTemplate>
+  <div class="row">
+    <div class="col-md">
+      <button id="save-metadata-btn" class="btn btn-primary float-right m-2" (click)="saveMetadata()">
+          <span>
+            <i class="fas fa-save mr-1"></i>
+            {{ 'admin.edit-cms-metadata.save-button' | translate }}
+          </span>
+      </button>
+      <button id="back-metadata-btn" class="btn btn-outline-secondary float-right m-2" (click)="back()">
+          <span>
+            <i class="fas fa-arrow-left mr-1"></i>
+            {{ 'admin.edit-cms-metadata.back-button' | translate }}
+          </span>
+      </button>
+    </div>
+  </div>
+</ng-template>

src/app/admin/admin-edit-cms-metadata/admin-edit-cms-metadata.component.scss

@@ -0,0 +1,163 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { provideNoopAnimations } from '@angular/platform-browser/animations';
+import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
+import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
+import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { environment } from '../../../environments/environment.test';
+import { SiteDataService } from '../../core/data/site-data.service';
+import { Site } from '../../core/shared/site.model';
+import { AdminEditCmsMetadataComponent } from './admin-edit-cms-metadata.component';
+
+describe('AdminEditCmsMetadataComponent', () => {
+
+  let component: AdminEditCmsMetadataComponent;
+  let fixture: ComponentFixture<AdminEditCmsMetadataComponent>;
+  const site = Object.assign(new Site(), {
+    metadata: { },
+  });
+
+  const siteServiceStub = jasmine.createSpyObj('SiteDataService', {
+    find: jasmine.createSpy('find'),
+    patch: jasmine.createSpy('patch'),
+  });
+
+  const metadataValueMap = new Map([
+    ['en', ''],
+    ['de', ''],
+    ['cs', ''],
+    ['nl', ''],
+    ['pt', ''],
+    ['fr', ''],
+    ['lv', ''],
+    ['bn', ''],
+    ['el', ''],
+  ]);
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        AdminEditCmsMetadataComponent,
+      ],
+      providers: [
+        { provide: NotificationsService, useValue: NotificationsServiceStub },
+        { provide: SiteDataService, useValue: siteServiceStub },
+        provideNoopAnimations(),
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdminEditCmsMetadataComponent);
+    component = fixture.componentInstance;
+    siteServiceStub.find.and.returnValue(of(site));
+    siteServiceStub.patch.and.returnValue(of(site));
+  });
+
+  describe('', () => {
+
+    beforeEach(() => {
+      // component.editMode = false;
+      fixture.detectChanges();
+    });
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should show metadata cms list correctly', () => {
+      // Substract 1 because the top footer is not included in the list if it is not enabled (and it's not, by default)
+      const metadataListLength = environment.cms.metadataList.length - 1;
+      const selectMetadata = fixture.debugElement.query(By.css('select'));
+      expect(selectMetadata.children).toHaveSize(metadataListLength + 1);
+    });
+
+  });
+
+  describe('when the edit button is clicked', () => {
+    beforeEach(() => {
+      spyOn(component, 'editSelectedMetadata');
+      component.selectedMetadata = 'metadata';
+      fixture.detectChanges();
+    });
+    it('should call selectMetadataToEdit', () => {
+      const editButton = fixture.debugElement.query(By.css('#edit-metadata-btn'));
+      editButton.nativeElement.click();
+      expect(component.editSelectedMetadata).toHaveBeenCalled();
+    });
+  });
+
+  describe('after the button edit is clicked', () => {
+
+    beforeEach(() => {
+      component.selectedMetadata = environment.cms.metadataList[0];
+      component.selectedMetadataValues = metadataValueMap;
+      component.editMode.next(true);
+      fixture.detectChanges();
+    });
+
+    it('should render textareas of the languages', () => {
+      const languagesLength = environment.languages.filter((l) => l.active).length;
+      const textareas = fixture.debugElement.queryAll(By.css('textarea'));
+      console.log(textareas.length, languagesLength);
+      expect(textareas).toHaveSize(languagesLength);
+    });
+
+    describe('after the button save is clicked', () => {
+
+      it('should call method edit', () => {
+        spyOn(component, 'saveMetadata');
+        const saveButton = fixture.debugElement.query(By.css('#save-metadata-btn'));
+        saveButton.nativeElement.click();
+        expect(component.saveMetadata).toHaveBeenCalled();
+      });
+
+      it('should call method patch of service', () => {
+        component.selectedMetadata = environment.cms.metadataList[0];
+        const saveButton = fixture.debugElement.query(By.css('#save-metadata-btn'));
+        saveButton.nativeElement.click();
+        const operations = [];
+        operations.push({
+          op: 'replace',
+          path: '/metadata/' + component.selectedMetadata,
+          value: {
+            value: component.selectedMetadataValues.get(environment.languages[0].code),
+            language: environment.languages[0].code,
+          },
+        });
+        component.selectedMetadataValues.forEach((value, key) => {
+          if (key !== environment.languages[0].code) {
+            operations.push({
+              op: 'add',
+              path: '/metadata/' + component.selectedMetadata,
+              value: {
+                value: value,
+                language: key,
+              },
+            });
+          }
+        });
+        expect(siteServiceStub.patch).toHaveBeenCalledWith(site, operations);
+      });
+
+    });
+  });
+});