Merge remote-tracking branch 'github/main' into task/main/CST-15074

# Conflicts: # src/assets/i18n/en.json5
2025-10-07 01:54:15 +00:00 · 2025-03-23 15:44:38 +01:00
parent d6776a8a1e a18e03d754
commit c1b951b18c
14 changed files with 5235 additions and 833 deletions
--- a/cypress/e2e/admin-sidebar.cy.ts
+++ b/cypress/e2e/admin-sidebar.cy.ts
@@ -1,5 +1,4 @@
 import { testA11y } from 'cypress/support/utils';
-import { Options } from 'cypress-axe';

 describe('Admin Sidebar', () => {
  beforeEach(() => {
@@ -16,13 +15,6 @@ describe('Admin Sidebar', () => {
    cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });

    // Analyze <ds-admin-sidebar> for accessibility
-    testA11y('ds-admin-sidebar',
-        {
-          rules: {
-            // Currently all expandable sections have nested interactive elements
-            // See https://github.com/DSpace/dspace-angular/issues/2178
-            'nested-interactive': { enabled: false },
-          },
-        } as Options);
+    testA11y('ds-admin-sidebar');
  });
 });
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -1,10 +1,16 @@
 {
  "extends": "../tsconfig.json",
  "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../cypress.config.ts"
  ],
  "compilerOptions": {
    "sourceMap": false,
+    "typeRoots": [
+      "../node_modules",
+      "../node_modules/@types",
+      "../src/typings.d.ts"
+    ],
    "types": [
      "cypress",
      "cypress-axe",
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -128,6 +128,22 @@
      }
    </div>

+    <!-- In the usesActorEmailId section -->
+    <div class="mb-5 mt-5">
+      <label class="status-label font-weight-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
+      <div>
+        <input formControlName="usesActorEmailId" hidden id="usesActorEmailId"
+               name="usesActorEmailId" type="checkbox">
+        <div (click)="toggleUsesActorEmailId()"
+             [class.checked]="formModel.get('usesActorEmailId').value" class="toggle-switch">
+          <div class="slider"></div>
+        </div>
+        <div class="text-muted">
+          {{ 'ldn-service-usesActorEmailId-description' | translate }}
+        </div>
+      </div>
+    </div>
+

    <!-- In the Inbound Patterns Labels section -->
    @if (areControlsInitialized) {
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -125,6 +125,7 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
      score: ['', [Validators.required, Validators.pattern('^0*(\.[0-9]+)?$|^1(\.0+)?$')]], inboundPattern: [''],
      constraintPattern: [''],
      enabled: [''],
+      usesActorEmailId: [''],
      type: LDN_SERVICE.value,
    });
  }
@@ -178,7 +179,8 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
      return rest;
    });

-    const values = { ...this.formModel.value, enabled: true };
+    const values = { ...this.formModel.value, enabled: true,
+      usesActorEmailId: this.formModel.get('usesActorEmailId').value };

    const ldnServiceData = this.ldnServicesService.create(values);

@@ -237,6 +239,7 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
            ldnUrl: this.ldnService.ldnUrl,
            type: this.ldnService.type,
            enabled: this.ldnService.enabled,
+            usesActorEmailId: this.ldnService.usesActorEmailId,
            lowerIp: this.ldnService.lowerIp,
            upperIp: this.ldnService.upperIp,
          });
@@ -384,6 +387,32 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
    );
  }

+  /**
+   * Toggles the usesActorEmailId field of the LDN service by sending a patch request
+   */
+  toggleUsesActorEmailId() {
+    const newStatus = !this.formModel.get('usesActorEmailId').value;
+    if (!this.isNewService) {
+      const patchOperation: Operation = {
+        op: 'replace',
+        path: '/usesActorEmailId',
+        value: newStatus,
+      };
+
+      this.ldnServicesService.patch(this.ldnService, [patchOperation]).pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe(
+        () => {
+          this.formModel.get('usesActorEmailId').setValue(newStatus);
+          this.cdRef.detectChanges();
+        },
+      );
+    } else {
+      this.formModel.get('usesActorEmailId').setValue(newStatus);
+      this.cdRef.detectChanges();
+    }
+  }
+
  /**
   * Closes the modal
   */
--- a/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts
@@ -12,6 +12,7 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
 export const mockLdnService: LdnService = {
  uuid: '1',
  enabled: false,
+  usesActorEmailId: false,
  score: 0,
  id: 1,
  lowerIp: '192.0.2.146',
@@ -49,6 +50,7 @@ export const mockLdnServiceRD$ = createSuccessfulRemoteDataObject$(mockLdnServic
 export const mockLdnServices: LdnService[] = [{
  uuid: '1',
  enabled: false,
+  usesActorEmailId: false,
  score: 0,
  id: 1,
  lowerIp: '192.0.2.146',
@@ -81,6 +83,7 @@ export const mockLdnServices: LdnService[] = [{
 }, {
  uuid: '2',
  enabled: false,
+  usesActorEmailId: false,
  score: 0,
  id: 2,
  lowerIp: '192.0.2.146',
--- a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
@@ -52,6 +52,9 @@ export class LdnService extends CacheableObject {
  @autoserialize
  enabled: boolean;

+  @autoserialize
+  usesActorEmailId: boolean;
+
  @autoserialize
  ldnUrl: string;

--- a/src/app/core/data/signposting-links.model.ts
+++ b/src/app/core/data/signposting-links.model.ts
@@ -4,5 +4,6 @@
 export interface SignpostingLink {
    href?: string,
    rel?: string,
-    type?: string
+    type?: string,
+    profile?: string
 }
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -166,7 +166,8 @@ export class ItemPageComponent implements OnInit, OnDestroy {
          this.signpostingLinks = signpostingLinks;

          signpostingLinks.forEach((link: SignpostingLink) => {
-            links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ');
+            links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ')
+              + (isNotEmpty(link.profile) ? ` ; profile="${link.profile}" ` : '');
            let tag: LinkDefinition = {
              href: link.href,
              rel: link.rel,
@@ -176,6 +177,11 @@ export class ItemPageComponent implements OnInit, OnDestroy {
                type: link.type,
              });
            }
+            if (isNotEmpty(link.profile)) {
+              tag = Object.assign(tag, {
+                profile: link.profile,
+              });
+            }
            this.linkHeadService.addTag(tag);
          });

--- a/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts
+++ b/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts
@@ -2,4 +2,5 @@ export enum RequestStatusEnum {
  ACCEPTED = 'ACCEPTED',
  REJECTED = 'REJECTED',
  REQUESTED = 'REQUESTED',
+  TENTATIVE_REJECT = 'TENTATIVE_REJECT',
 }
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
@@ -68,6 +68,13 @@ export class RequestStatusAlertBoxComponent implements OnInit {
        };
        break;

+      case RequestStatusEnum.TENTATIVE_REJECT:
+        this.displayOptions = {
+          alertType: 'alert-warning',
+          text: 'request-status-alert-box.tentative_rejected',
+        };
+        break;
+
      case RequestStatusEnum.REQUESTED:
        this.displayOptions = {
          alertType: 'alert-warning',
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4576,6 +4576,12 @@

  "search.filters.filter.supervisedBy.label": "Search Supervised By",

+  "search.filters.filter.access_status.head": "Access type",
+
+  "search.filters.filter.access_status.placeholder": "Access type",
+
+  "search.filters.filter.access_status.label": "Search by access type",
+
  "search.filters.entityType.JournalIssue": "Journal Issue",

  "search.filters.entityType.JournalVolume": "Journal Volume",
@@ -6330,7 +6336,7 @@

  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",

-  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "Actor:",

  "quality-assurance.event.table.event.message.link": "Link:",

@@ -6394,6 +6400,8 @@

  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",

+  "request-status-alert-box.tentative_rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been tentatively rejected. Revisions are required",
+
  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",

  "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
@@ -6410,6 +6418,10 @@

  "ldn-service-overview-close-modal": "Close modal",

+  "ldn-service-usesActorEmailId": "Requires actor email in notifications",
+
+  "ldn-service-usesActorEmailId-description": "If enabled, initial notifications sent will include the submitter email rather than the repository URL. This is usually the case for endorsement or review services.",
+
  "a-common-or_statement.label": "Item type is Journal Article or Dataset",

  "always_true_filter.label": "Always true",
@@ -6538,6 +6550,8 @@

  "search.filters.applied.f.notifyRelation": "Notify Relation",

+  "search.filters.applied.f.access_status": "Access type",
+
  "search.filters.filter.queue_last_start_time.head": "Last processing time ",

  "search.filters.filter.queue_last_start_time.min.label": "Min range",
@@ -6886,4 +6900,13 @@

  "external-login-page.orcid-confirmation.email.label": "Email",

+  "search.filters.access_status.open.access": "Open access",
+
+  "search.filters.access_status.restricted": "Restricted access",
+
+  "search.filters.access_status.embargo": "Embargoed access",
+
+  "search.filters.access_status.metadata.only": "Metadata only",
+
+  "search.filters.access_status.unknown": "Unknown",
 }
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -5474,6 +5474,15 @@
  // "search.filters.filter.submitter.label": "Search submitter",
  "search.filters.filter.submitter.label": "Recherche d'un déposant",

+  // "search.filters.filter.access_status.head": "Access type",
+  "search.filters.filter.access_status.head": "Type d'accès",
+
+  // "search.filters.filter.access_status.placeholder": "Access type",
+  "search.filters.filter.access_status.placeholder": "Accès",
+
+  // "search.filters.filter.access_status.label": "Search by access type",
+  "search.filters.filter.access_status.label": "Rechercher par type d'accès",
+
  // "search.filters.entityType.JournalIssue": "Journal Issue",
  "search.filters.entityType.JournalIssue": "Numéro de revue",

@@ -8182,6 +8191,9 @@
  //"search.filters.applied.f.notifyRelation": "Notify Relation",
  "search.filters.applied.f.notifyRelation": "Relation Notify",

+  //"search.filters.applied.f.access_status": "Access type",
+  "search.filters.applied.f.access_status": "Type d'accès",
+
  //"search.filters.filter.queue_last_start_time.head": "Last processing time ",
  "search.filters.filter.queue_last_start_time.head": "Dernière heure de traitement ",

@@ -8556,5 +8568,20 @@

  //"browse.search-form.placeholder": "Search the repository",
  "browse.search-form.placeholder": "Chercher dans le dépôt",
-}

+  //"search.filters.access_status.open.access": "Open access",
+  "search.filters.access_status.open.access": "Accès libre",
+
+  //"search.filters.access_status.restricted": "Restricted access",
+  "search.filters.access_status.restricted": "Restreint",
+
+  //"search.filters.access_status.embargo": "Embargoed access",
+  "search.filters.access_status.embargo": "Restriction temporaire",
+
+  //"search.filters.access_status.metadata.only": "Metadata only",
+  "search.filters.access_status.metadata.only": "Métadonnées seulement",
+
+  //"search.filters.access_status.unknown": "Unknown",
+  "search.filters.access_status.unknown": "Inconnu",
+
+}
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -6817,6 +6817,15 @@
  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
  "search.filters.filter.supervisedBy.label": "Pesquisar supervisionado por",

+  // "search.filters.filter.access_status.head": "Access type",
+  "search.filters.filter.access_status.head": "Tipo de acesso",
+
+  // "search.filters.filter.access_status.placeholder": "Access type",
+  "search.filters.filter.access_status.placeholder": "Acesso",
+
+  // "search.filters.filter.access_status.label": "Search by access type",
+  "search.filters.filter.access_status.label": "Pesquisar por tipo de acesso",
+
  // "search.filters.entityType.JournalIssue": "Journal Issue",
  "search.filters.entityType.JournalIssue": "Número de revista",

@@ -9930,6 +9939,9 @@
  // "search.filters.applied.f.notifyRelation": "Notify Relation",
  "search.filters.applied.f.notifyRelation": "Notificar relação",

+  // "search.filters.applied.f.access_status": "Access type",
+  "search.filters.applied.f.access_status": "Tipo de acesso",
+
  // "search.filters.filter.queue_last_start_time.head": "Last processing time",
  "search.filters.filter.queue_last_start_time.head": "Última hora de processamento",

@@ -10361,4 +10373,19 @@
  // "item.preview.dc.identifier.eisbn": "EISBN",
  "item.preview.dc.identifier.eisbn": "EISBN",

+  // "search.filters.access_status.open.access": "Open access",
+  "search.filters.access_status.open.access": "Acesso aberto",
+
+  // "search.filters.access_status.restricted": "Restricted access",
+  "search.filters.access_status.restricted": "Acesso restrito",
+
+  // "search.filters.access_status.embargo": "Embargoed access",
+  "search.filters.access_status.embargo": "Acesso embargado",
+
+  // "search.filters.access_status.metadata.only": "Metadata only",
+  "search.filters.access_status.metadata.only": "Apenas metadados",
+
+  // "search.filters.access_status.unknown": "Unknown",
+  "search.filters.access_status.unknown": "Desconhecido",
+
 }