[Port dspace-9_x] Replace old SHERPA/ROMEO references by Open Policy Finder

src/app/core/submission/models/sherpa-policies-details.model.ts → 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-sections.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/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.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/mocks/section-opf-policies.service.mock.ts

@@ -0,0 +1,99 @@
+import { WorkspaceitemSectionJiscOpfPoliciesObject } from '../../core/submission/models/workspaceitem-section-opf-policies.model';
+
+export const OpfDataResponse = {
+  'id': 'opfPolicies',
+  'retrievalTime': '2022-04-20T09:44:39.870+00:00',
+  'opfResponse':
+    {
+      'error': false,
+      'message': null,
+      'metadata': {
+        'id': 23803,
+        'uri': 'http://v2.sherpa.ac.uk/id/publication/23803',
+        'dateCreated': '2012-11-20 14:51:52',
+        'dateModified': '2020-03-06 11:25:54',
+        'inDOAJ': false,
+        'publiclyVisible': true,
+      },
+      'journals': [{
+        'titles': ['The Lancet', 'Lancet'],
+        'url': 'http://www.thelancet.com/journals/lancet/issue/current',
+        'issns': ['0140-6736', '1474-547X'],
+        'romeoPub': 'Elsevier: The Lancet',
+        'zetoPub': 'Elsevier: The Lancet',
+        'publisher': {
+          'name': 'Elsevier',
+          'relationshipType': null,
+          'country': null,
+          'uri': 'http://www.elsevier.com/',
+          'identifier': null,
+          'publicationCount': 0,
+          'paidAccessDescription': 'Open access',
+          'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
+        },
+        'publishers': [{
+          'name': 'Elsevier',
+          'relationshipType': null,
+          'country': null,
+          'uri': 'http://www.elsevier.com/',
+          'identifier': null,
+          'publicationCount': 0,
+          'paidAccessDescription': 'Open access',
+          'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
+        }],
+        'policies': [{
+          'id': 0,
+          'openAccessPermitted': false,
+          'uri': null,
+          'internalMoniker': 'Lancet',
+          'permittedVersions': [{
+            'articleVersion': 'submitted',
+            'option': 1,
+            'conditions': ['Upon publication publisher copyright and source must be acknowledged', 'Upon publication must link to publisher version'],
+            'prerequisites': [],
+            'locations': ['Author\'s Homepage', 'Preprint Repository'],
+            'licenses': [],
+            '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,
+          }, {
+            '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' },
+          }, {
+            '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,
+          }],
+          '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',
+          },
+          'openAccessProhibited': false,
+          'publicationCount': 0,
+          'preArchiving': 'can',
+          'postArchiving': 'can',
+          'pubArchiving': 'cannot',
+        }],
+        'inDOAJ': false,
+      }],
+    },
+} as WorkspaceitemSectionJiscOpfPoliciesObject;

src/app/submission/objects/submission-objects.effects.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/submission/sections/container/section-container.component.html

@@ -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>
             }