Skip to content

Commit b345e65

Browse files
bram-maegermanbram-maegerman
committed
140040: replaced all referenced to sherpa with jisc
1 parent cf13c14 commit b345e65

67 files changed

Lines changed: 3131 additions & 3096 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
/**
22
* An interface to represent an access condition.
33
*/
4-
export class SherpaPoliciesDetailsObject {
4+
export class JiscOpfPoliciesDetailsObject {
55

66
/**
7-
* The sherpa policies error
7+
* The Jisc Open Policy Finder policies error
88
*/
99
error: boolean;
1010

1111
/**
12-
* The sherpa policies journal details
12+
* The Jisc Open Policy Finder policies journal details
1313
*/
1414
journals: Journal[];
1515

1616
/**
17-
* The sherpa policies message
17+
* The Jisc Open Policy Finder policies message
1818
*/
1919
message: string;
2020

2121
/**
22-
* The sherpa policies metadata
22+
* The Jisc Open Policy Finder policies metadata
2323
*/
2424
metadata: Metadata;
2525

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { JiscOpfPoliciesDetailsObject } from './opf-policies-details.model';
2+
3+
/**
4+
* An interface to represent the submission's item accesses condition.
5+
*/
6+
export interface WorkspaceitemSectionJiscOpfPoliciesObject {
7+
8+
/**
9+
* The access condition id
10+
*/
11+
id: string;
12+
13+
/**
14+
* The Jisc Open Policy Finder policies retrievalTime
15+
*/
16+
retrievalTime: string;
17+
18+
/**
19+
* The Jisc Open Policy Finder policies details
20+
*/
21+
opfResponse: JiscOpfPoliciesDetailsObject;
22+
}

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { WorkspaceitemSectionDuplicatesObject } from './workspaceitem-section-du
44
import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
55
import { WorkspaceitemSectionIdentifiersObject } from './workspaceitem-section-identifiers.model';
66
import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
7-
import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
7+
import { WorkspaceitemSectionJiscOpfPoliciesObject } from './workspaceitem-section-opf-policies.model';
88
import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
99

1010
/**
@@ -24,7 +24,7 @@ export type WorkspaceitemSectionDataType
2424
| WorkspaceitemSectionLicenseObject
2525
| WorkspaceitemSectionCcLicenseObject
2626
| WorkspaceitemSectionAccessesObject
27-
| WorkspaceitemSectionSherpaPoliciesObject
27+
| WorkspaceitemSectionJiscOpfPoliciesObject
2828
| WorkspaceitemSectionIdentifiersObject
2929
| WorkspaceitemSectionDuplicatesObject
3030
| string;

‎src/app/core/submission/sections-type.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export enum SectionsType {
66
CcLicense = 'cclicense',
77
CustomUrl = 'custom-url',
88
AccessesCondition = 'accessCondition',
9-
SherpaPolicies = 'sherpaPolicy',
9+
OpfPolicies = 'opfPolicy',
1010
Identifiers = 'identifiers',
1111
Collection = 'collection',
1212
CoarNotify = 'coarnotify',

src/app/core/testing/section-sherpa-policies.service.mock.ts renamed to src/app/core/testing/section-opf-policies.service.mock.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { WorkspaceitemSectionSherpaPoliciesObject } from '../submission/models/workspaceitem-section-sherpa-policies.model';
1+
import { WorkspaceitemSectionJiscOpfPoliciesObject } from '../submission/models/workspaceitem-section-opf-policies.model';
22

3-
export const SherpaDataResponse = {
4-
'id': 'sherpaPolicies',
3+
export const OpfDataResponse = {
4+
'id': 'opfPolicies',
55
'retrievalTime': '2022-04-20T09:44:39.870+00:00',
6-
'sherpaResponse':
6+
'opfResponse':
77
{
88
'error': false,
99
'message': null,
@@ -96,4 +96,4 @@ export const SherpaDataResponse = {
9696
'inDOAJ': false,
9797
}],
9898
},
99-
} as WorkspaceitemSectionSherpaPoliciesObject;
99+
} as WorkspaceitemSectionJiscOpfPoliciesObject;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ describe('DsDynamicLookupRelationModalComponent', () => {
7676
hierarchical: false,
7777
}),
7878
Object.assign(new ExternalSource(), {
79-
id: 'sherpaPublisher',
80-
name: 'sherpaPublisher',
79+
id: 'opfPublisher',
80+
name: 'opfPublisher',
8181
hierarchical: false,
8282
}),
8383
];
@@ -103,7 +103,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
103103
relationshipType: 'isAuthorOfPublication',
104104
nameVariants: true,
105105
searchConfiguration: 'personConfig',
106-
externalSources: ['orcidV2', 'sherpaPublisher'],
106+
externalSources: ['orcidV2', 'opfPublisher'],
107107
});
108108
nameVariant = 'Doe, J.';
109109
metadataField = 'dc.contributor.author';

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -530,11 +530,11 @@ export class SubmissionObjectEffects {
530530
mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, filteredErrors, sectionErrors));
531531
}
532532

533-
// Sherpa Policies section needs to be updated when the rest response section is empty
534-
const sherpaPoliciesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.SherpaPolicies);
535-
if (isNotUndefined(sherpaPoliciesSectionId) && isNotEmpty(currentState.sections[sherpaPoliciesSectionId]?.data)
536-
&& isEmpty(sections[sherpaPoliciesSectionId])) {
537-
mappedActions.push(new UpdateSectionDataAction(submissionId, sherpaPoliciesSectionId, null, [], []));
533+
// Opf Policies section needs to be updated when the rest response section is empty
534+
const opfPoliciesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.OpfPolicies);
535+
if (isNotUndefined(opfPoliciesSectionId) && isNotEmpty(currentState.sections[opfPoliciesSectionId]?.data)
536+
&& isEmpty(sections[opfPoliciesSectionId])) {
537+
mappedActions.push(new UpdateSectionDataAction(submissionId, opfPoliciesSectionId, null, [], []));
538538
}
539539

540540
// When Duplicate Detection step is enabled, add it only if there are duplicates in the response section data

src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html renamed to src/app/submission/sections/opf-policies/content-accordion/content-accordion.component.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="d-flex">
44
<button type="button" class="btn btn-link p-0 me-4" (click)="$event.preventDefault()"
55
[attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
6-
{{version.articleVersion | titlecase}} {{ 'submission.sections.sherpa.publisher.policy.version' |
6+
{{version.articleVersion | titlecase}} {{ 'submission.sections.jisc.publisher.policy.version' |
77
translate
88
}}
99
</button>
@@ -14,7 +14,7 @@
1414
{{version.embargo?.units[0]}}</span>
1515
} @else {
1616
<span><i class="fas fa-hourglass-half"></i> {{
17-
'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
17+
'submission.sections.jisc.publisher.policy.noembargo' | translate }}</span>
1818
}
1919

2020
<span class="m-1 ms-4">
@@ -28,7 +28,7 @@
2828
</span>
2929
} @else {
3030
<span>{{
31-
'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
31+
'submission.sections.jisc.publisher.policy.nolocation' | translate }}</span>
3232
}
3333
</span>
3434
</div>
@@ -49,14 +49,14 @@
4949
<div class="row">
5050
<div class="col-4">
5151
<p class="m-1"><i class="fas fa-hourglass-half"></i> {{
52-
'submission.sections.sherpa.publisher.policy.embargo' | translate }}</p>
52+
'submission.sections.jisc.publisher.policy.embargo' | translate }}</p>
5353
</div>
5454
<div class="col-6">
5555
@if (!!version.embargo) {
5656
<p class="m-1">{{version.embargo.amount}}
5757
{{version.embargo.units}}</p>
5858
} @else {
59-
<p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
59+
<p class="m-1">{{ 'submission.sections.jisc.publisher.policy.noembargo' | translate }}</p>
6060
}
6161
</div>
6262
</div>
@@ -65,7 +65,7 @@
6565
<div class="row">
6666
<div class="col-4">
6767
<p class="m-1"><i class="fas fa-certificate"></i> {{
68-
'submission.sections.sherpa.publisher.policy.license' | translate }}</p>
68+
'submission.sections.jisc.publisher.policy.license' | translate }}</p>
6969
</div>
7070
<div class="col-6">
7171
@for (license of version.licenses; track license) {
@@ -78,7 +78,7 @@
7878
<div class="row">
7979
<div class="col-4">
8080
<p class="m-1"><i class="fas fa-exclamation-circle"></i> {{
81-
'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}</p>
81+
'submission.sections.jisc.publisher.policy.prerequisites' | translate }}</p>
8282
</div>
8383
<div class="col-6">
8484
@for (prerequisite of version.prerequisites; track prerequisite) {
@@ -91,7 +91,7 @@
9191
<div class="row">
9292
<div class="col-4">
9393
<p class="m-1"><i class="far fa-folder-open"></i> {{
94-
'submission.sections.sherpa.publisher.policy.location' | translate }}</p>
94+
'submission.sections.jisc.publisher.policy.location' | translate }}</p>
9595
</div>
9696
<div class="col-6">
9797
@for (location of version.locations; track location) {
@@ -104,7 +104,7 @@
104104
<div class="row">
105105
<div class="col-4">
106106
<p class="m-1"><i class="fas fa-tasks"></i> {{
107-
'submission.sections.sherpa.publisher.policy.conditions' | translate }}</p>
107+
'submission.sections.jisc.publisher.policy.conditions' | translate }}</p>
108108
</div>
109109
<div class="col-6">
110110
@for (condition of version.conditions; track condition) {

src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.scss renamed to src/app/submission/sections/opf-policies/content-accordion/content-accordion.component.scss

File renamed without changes.

0 commit comments

Comments
 (0)