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 { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-licen
 import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 import { WorkspaceitemSectionCcLicenseObject } from './workspaceitem-section-cc-license.model';
 import {WorkspaceitemSectionIdentifiersObject} from './workspaceitem-section-identifiers.model';
-import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
+import { WorkspaceitemSectionJiscOpfPoliciesObject } from './workspaceitem-section-opf-policies.model';
 
 /**
  * An interface to represent submission's section object.
@@ -23,6 +23,6 @@ export type WorkspaceitemSectionDataType
   | WorkspaceitemSectionLicenseObject
   | WorkspaceitemSectionCcLicenseObject
   | WorkspaceitemSectionAccessesObject
-  | WorkspaceitemSectionSherpaPoliciesObject
+  | WorkspaceitemSectionJiscOpfPoliciesObject
   | WorkspaceitemSectionIdentifiersObject
   | string;

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

@@ -55,10 +55,10 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       hierarchical: false
     }),
     Object.assign(new ExternalSource(), {
-      id: 'sherpaPublisher',
-      name: 'sherpaPublisher',
-      hierarchical: false
-    })
+      id: 'opfPublisher',
+      name: 'opfPublisher',
+      hierarchical: false,
+    }),
   ];
   const totalLocal = 10;
   const totalExternal = 8;
@@ -82,7 +82,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

@@ -1,11 +1,9 @@
-import {
-  WorkspaceitemSectionSherpaPoliciesObject
-} from '../../core/submission/models/workspaceitem-section-sherpa-policies.model';
+import { WorkspaceitemSectionJiscOpfPoliciesObject } from '../../core/submission/models/workspaceitem-section-opf-policies.model';
 
-export const SherpaDataResponse = {
-  'id': 'sherpaPolicies',
+export const OpfDataResponse = {
+  'id': 'opfPolicies',
   'retrievalTime': '2022-04-20T09:44:39.870+00:00',
-  'sherpaResponse':
+  'opfResponse':
   {
     'error': false,
     'message': null,
@@ -15,7 +13,7 @@ export const SherpaDataResponse = {
       'dateCreated': '2012-11-20 14:51:52',
       'dateModified': '2020-03-06 11:25:54',
       'inDOAJ': false,
-      'publiclyVisible': true
+      'publiclyVisible': true,
     },
     'journals': [{
       'titles': ['The Lancet', 'Lancet'],
@@ -31,7 +29,7 @@ export const SherpaDataResponse = {
         'identifier': null,
         'publicationCount': 0,
         'paidAccessDescription': 'Open access',
-        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access'
+        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
       },
       'publishers': [{
         'name': 'Elsevier',
@@ -41,7 +39,7 @@ export const SherpaDataResponse = {
         'identifier': null,
         'publicationCount': 0,
         'paidAccessDescription': 'Open access',
-        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access'
+        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
       }],
       'policies': [{
         'id': 0,
@@ -55,47 +53,47 @@ export const SherpaDataResponse = {
           'prerequisites': [],
           'locations': ['Author\'s Homepage', 'Preprint Repository'],
           'licenses': [],
-          'embargo': null
+          'embargo': null,
         }, {
           'articleVersion': 'accepted',
           'option': 1,
           'conditions': ['Publisher copyright and source must be acknowledged', 'Must link to publisher version'],
           'prerequisites': [],
           'locations': ['Author\'s Homepage', 'Institutional Website'],
           'licenses': ['CC BY-NC-ND'],
-          'embargo': null
+          'embargo': null,
         }, {
           'articleVersion': 'accepted',
           'option': 2,
           'conditions': ['Publisher copyright and source must be acknowledged', 'Must link to publisher version'],
           'prerequisites': ['If Required by Funder'],
           'locations': ['Non-Commercial Repository'],
           'licenses': ['CC BY-NC-ND'],
-          'embargo': { amount: 6, units: 'Months' }
+          'embargo': { amount: 6, units: 'Months' },
         }, {
           'articleVersion': 'accepted',
           'option': 3,
           'conditions': ['Publisher copyright and source must be acknowledged', 'Must link to publisher version'],
           'prerequisites': [],
           'locations': ['Non-Commercial Repository'],
           'licenses': [],
-          'embargo': null
+          'embargo': null,
         }],
         'urls': {
           'http://download.thelancet.com/flatcontentassets/authors/lancet-information-for-authors.pdf': 'Guidelines for Authors',
           'http://www.thelancet.com/journals/lancet/article/PIIS0140-6736%2813%2960720-5/fulltext': 'The Lancet journals welcome a new open access policy',
           'http://www.thelancet.com/lancet-information-for-authors/after-publication': 'What happens after publication?',
           'http://www.thelancet.com/lancet/information-for-authors/disclosure-of-results': 'Disclosure of results before publication',
           'https://www.elsevier.com/__data/assets/pdf_file/0005/78476/external-embargo-list.pdf': 'Journal Embargo Period List',
-          'https://www.elsevier.com/__data/assets/pdf_file/0011/78473/UK-Embargo-Periods.pdf': 'Journal Embargo List for UK Authors'
+          'https://www.elsevier.com/__data/assets/pdf_file/0011/78473/UK-Embargo-Periods.pdf': 'Journal Embargo List for UK Authors',
         },
         'openAccessProhibited': false,
         'publicationCount': 0,
         'preArchiving': 'can',
         'postArchiving': 'can',
-        'pubArchiving': 'cannot'
+        'pubArchiving': 'cannot',
       }],
-      'inDOAJ': false
-    }]
-  }
-} as WorkspaceitemSectionSherpaPoliciesObject;
+      'inDOAJ': false,
+    }],
+  },
+} as WorkspaceitemSectionJiscOpfPoliciesObject;

…/section-sherpa-policies.service.mock.ts …ing/section-opf-policies.service.mock.tssrc/app/shared/mocks/section-sherpa-policies.service.mock.ts renamed to src/app/shared/testing/section-opf-policies.service.mock.ts src/app/shared/mocks/section-sherpa-policies.service.mock.ts renamed to src/app/shared/testing/section-opf-policies.service.mock.ts

@@ -434,11 +434,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, [], []));
         }
       });
 

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

@@ -48,4 +48,4 @@
       </ng-template>
     </ngb-panel>
   </ngb-accordion>
-</div>
+</div>

src/app/submission/sections/container/section-container.component.html

@@ -3,7 +3,7 @@
         <div class="d-flex">
             <button type="button" class="btn btn-link p-0 mr-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>
@@ -13,7 +13,7 @@
                     {{version.embargo?.units[0]}}</span>
                 <ng-template #noEmbargoTitle>
                     <span><i class="fas fa-hourglass-half"></i> {{
-                        'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
+                        'submission.sections.jisc.publisher.policy.noembargo' | translate }}</span>
                 </ng-template>
 
                 <span class="m-1 ml-4">
@@ -24,7 +24,7 @@
                     </span>
                     <ng-template #noLocations>
                         <span>{{
-                            'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
+                            'submission.sections.jisc.publisher.policy.nolocation' | translate }}</span>
                     </ng-template>
                 </span>
             </div>
@@ -39,20 +39,20 @@
             <div class="row" *ngIf="!!version?.embargo && !!version?.embargo.amount">
                 <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">
                     <p class="m-1" *ngIf="!!version.embargo;else noEmbargo">{{version.embargo.amount}}
                         {{version.embargo.units}}</p>
                     <ng-template #noEmbargo>
-                        <p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
+                        <p class="m-1">{{ 'submission.sections.jisc.publisher.policy.noembargo' | translate }}</p>
                     </ng-template>
                 </div>
             </div>
             <div class="row" *ngIf="!!version?.licenses && version.licenses.length > 0">
                 <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">
                     <p class="m-1" *ngFor="let license of version.licenses">{{license}}</p>
@@ -61,7 +61,7 @@
             <div class="row" *ngIf="!!version?.prerequisites && version.prerequisites.length > 0">
                 <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">
                     <p class="m-1" *ngFor="let prerequisite of version.prerequisites">{{prerequisite}}</p>
@@ -70,7 +70,7 @@
             <div class="row" *ngIf="!!version?.locations && version.locations.length > 0">
                 <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">
                     <p class="m-1" *ngFor="let location of version.locations">{{location}}</p>
@@ -79,12 +79,12 @@
             <div class="row" *ngIf="!!version?.conditions && version.conditions.length > 0">
                 <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">
                     <p class="m-1" *ngFor="let condition of version.conditions">{{condition}}</p>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>