140040: replaced all referenced to sherpa with jisc

(cherry picked from commit 5ce7c48)

Author: bram-maegerman

…/models/sherpa-policies-details.model.ts …ion/models/opf-policies-details.model.tssrc/app/core/submission/models/sherpa-policies-details.model.ts renamed to src/app/core/submission/models/opf-policies-details.model.ts src/app/core/submission/models/sherpa-policies-details.model.ts renamed to src/app/core/submission/models/opf-policies-details.model.ts

@@ -1,25 +1,25 @@
 /**
  * An interface to represent an access condition.
  */
-export class SherpaPoliciesDetailsObject {
+export class JiscOpfPoliciesDetailsObject {
 
   /**
-   * The sherpa policies error
+   * The Jisc Open Policy Finder policies error
    */
   error: boolean;
 
   /**
-   * The sherpa policies journal details
+   * The Jisc Open Policy Finder policies journal details
    */
   journals: Journal[];
 
   /**
-   * The sherpa policies message
+   * The Jisc Open Policy Finder policies message
    */
   message: string;
 
   /**
-   * The sherpa policies metadata
+   * The Jisc Open Policy Finder policies metadata
    */
   metadata: Metadata;
 

src/app/core/submission/models/workspaceitem-section-opf-policies.model.ts

@@ -0,0 +1,22 @@
+import { JiscOpfPoliciesDetailsObject } from './opf-policies-details.model';
+
+/**
+ * An interface to represent the submission's item accesses condition.
+ */
+export interface WorkspaceitemSectionJiscOpfPoliciesObject {
+
+  /**
+   * The access condition id
+   */
+  id: string;
+
+  /**
+   * The Jisc Open Policy Finder policies retrievalTime
+   */
+  retrievalTime: string;
+
+  /**
+   * The Jisc Open Policy Finder policies details
+   */
+  opfResponse: JiscOpfPoliciesDetailsObject;
+}

src/app/core/submission/models/workspaceitem-section-sherpa-policies.model.ts

@@ -4,7 +4,7 @@ import { WorkspaceitemSectionDuplicatesObject } from './workspaceitem-section-du
 import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
 import { WorkspaceitemSectionIdentifiersObject } from './workspaceitem-section-identifiers.model';
 import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
-import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
+import { WorkspaceitemSectionJiscOpfPoliciesObject } from './workspaceitem-section-opf-policies.model';
 import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 
 /**
@@ -24,7 +24,7 @@ export type WorkspaceitemSectionDataType
   | WorkspaceitemSectionLicenseObject
   | WorkspaceitemSectionCcLicenseObject
   | WorkspaceitemSectionAccessesObject
-  | WorkspaceitemSectionSherpaPoliciesObject
+  | WorkspaceitemSectionJiscOpfPoliciesObject
   | WorkspaceitemSectionIdentifiersObject
   | WorkspaceitemSectionDuplicatesObject
   | string;

src/app/core/submission/models/workspaceitem-sections.model.ts

@@ -75,8 +75,8 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       hierarchical: false,
     }),
     Object.assign(new ExternalSource(), {
-      id: 'sherpaPublisher',
-      name: 'sherpaPublisher',
+      id: 'opfPublisher',
+      name: 'opfPublisher',
       hierarchical: false,
     }),
   ];
@@ -102,7 +102,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       relationshipType: 'isAuthorOfPublication',
       nameVariants: true,
       searchConfiguration: 'personConfig',
-      externalSources: ['orcidV2', 'sherpaPublisher'],
+      externalSources: ['orcidV2', 'opfPublisher'],
     });
     nameVariant = 'Doe, J.';
     metadataField = 'dc.contributor.author';

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts

@@ -465,11 +465,11 @@ export class SubmissionObjectEffects {
           mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, filteredErrors, sectionErrors));
         }
 
-        // Sherpa Policies section needs to be updated when the rest response section is empty
-        const sherpaPoliciesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.SherpaPolicies);
-        if (isNotUndefined(sherpaPoliciesSectionId) && isNotEmpty(currentState.sections[sherpaPoliciesSectionId]?.data)
-          && isEmpty(sections[sherpaPoliciesSectionId])) {
-          mappedActions.push(new UpdateSectionDataAction(submissionId, sherpaPoliciesSectionId, null, [], []));
+        // Opf Policies section needs to be updated when the rest response section is empty
+        const opfPoliciesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.OpfPolicies);
+        if (isNotUndefined(opfPoliciesSectionId) && isNotEmpty(currentState.sections[opfPoliciesSectionId]?.data)
+          && isEmpty(sections[opfPoliciesSectionId])) {
+          mappedActions.push(new UpdateSectionDataAction(submissionId, opfPoliciesSectionId, null, [], []));
         }
 
         // When Duplicate Detection step is enabled, add it only if there are duplicates in the response section data

src/app/shared/mocks/section-sherpa-policies.service.mock.ts

@@ -7,7 +7,7 @@
       (panelChange)="sectionRef.sectionChange($event)" activeIds="{{ sectionData.id }}" [destroyOnHide]="false">
       <ngb-panel id="{{ sectionData.id }}" [type]="sectionRef.isInfo() ? 'info' : ''">
         <ng-template ngbPanelTitle class="d-flex">
-          <span [ngClass]="{ 'text-white' : sectionRef.isInfo()}" class="flex-grow-1 section-title" tabindex="0">{{
+          <span [ngClass]="{'text-info' : sectionRef.isInfo()}" class="flex-grow-1 section-title" tabindex="0">{{
             'submission.sections.'+sectionData.header | translate
           }}</span>
           <div class="d-inline-block">
@@ -30,7 +30,7 @@
               [attr.aria-label]="'submission.sections.status.valid.aria' | translate"></i>
             }
             @if (sectionRef.isInfo()) {
-              <i class="fas fa-info-circle me-3 text-white"
+              <i class="fas fa-info-circle me-3 text-info"
                 title="{{'submission.sections.status.info.title' | translate}}" role="img"
               [attr.aria-label]="'submission.sections.status.info.aria' | translate"></i>
             }

src/app/submission/objects/submission-objects.effects.ts

@@ -3,7 +3,7 @@
     <div class="d-flex">
       <button type="button" class="btn btn-link p-0 me-4" (click)="$event.preventDefault()"
         [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-        {{version.articleVersion | titlecase}} {{ 'submission.sections.sherpa.publisher.policy.version' |
+        {{version.articleVersion | titlecase}} {{ 'submission.sections.jisc.publisher.policy.version' |
         translate
         }}
       </button>
@@ -14,7 +14,7 @@
         {{version.embargo?.units[0]}}</span>
       } @else {
         <span><i class="fas fa-hourglass-half"></i> {{
-      'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
+      'submission.sections.jisc.publisher.policy.noembargo' | translate }}</span>
     }
 
     <span class="m-1 ms-4">
@@ -28,7 +28,7 @@
       </span>
     } @else {
       <span>{{
-      'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
+      'submission.sections.jisc.publisher.policy.nolocation' | translate }}</span>
     }
   </span>
 </div>
@@ -49,14 +49,14 @@
         <div class="row">
           <div class="col-4">
             <p class="m-1"><i class="fas fa-hourglass-half"></i> {{
-          'submission.sections.sherpa.publisher.policy.embargo' | translate }}</p>
+          'submission.sections.jisc.publisher.policy.embargo' | translate }}</p>
         </div>
         <div class="col-6">
           @if (!!version.embargo) {
             <p class="m-1">{{version.embargo.amount}}
             {{version.embargo.units}}</p>
           } @else {
-            <p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
+            <p class="m-1">{{ 'submission.sections.jisc.publisher.policy.noembargo' | translate }}</p>
           }
         </div>
       </div>
@@ -65,7 +65,7 @@
       <div class="row">
         <div class="col-4">
           <p class="m-1"><i class="fas fa-certificate"></i> {{
-        'submission.sections.sherpa.publisher.policy.license' | translate }}</p>
+        'submission.sections.jisc.publisher.policy.license' | translate }}</p>
       </div>
       <div class="col-6">
         @for (license of version.licenses; track license) {
@@ -78,7 +78,7 @@
     <div class="row">
       <div class="col-4">
         <p class="m-1"><i class="fas fa-exclamation-circle"></i> {{
-      'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}</p>
+      'submission.sections.jisc.publisher.policy.prerequisites' | translate }}</p>
     </div>
     <div class="col-6">
       @for (prerequisite of version.prerequisites; track prerequisite) {
@@ -91,7 +91,7 @@
   <div class="row">
     <div class="col-4">
       <p class="m-1"><i class="far fa-folder-open"></i> {{
-    'submission.sections.sherpa.publisher.policy.location' | translate }}</p>
+    'submission.sections.jisc.publisher.policy.location' | translate }}</p>
   </div>
   <div class="col-6">
     @for (location of version.locations; track location) {
@@ -104,7 +104,7 @@
   <div class="row">
     <div class="col-4">
       <p class="m-1"><i class="fas fa-tasks"></i> {{
-    'submission.sections.sherpa.publisher.policy.conditions' | translate }}</p>
+    'submission.sections.jisc.publisher.policy.conditions' | translate }}</p>
   </div>
   <div class="col-6">
     @for (condition of version.conditions; track condition) {