Skip to content

Commit e0ae83b

Browse files
bram-maegermanbram-maegerman
committed
140040: replaced all referenced to sherpa with jisc
(cherry picked from commit 5ce7c48)
1 parent 1c572c7 commit e0ae83b

59 files changed

Lines changed: 2321 additions & 2765 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/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
@@ -75,8 +75,8 @@ describe('DsDynamicLookupRelationModalComponent', () => {
7575
hierarchical: false,
7676
}),
7777
Object.assign(new ExternalSource(), {
78-
id: 'sherpaPublisher',
79-
name: 'sherpaPublisher',
78+
id: 'opfPublisher',
79+
name: 'opfPublisher',
8080
hierarchical: false,
8181
}),
8282
];
@@ -102,7 +102,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
102102
relationshipType: 'isAuthorOfPublication',
103103
nameVariants: true,
104104
searchConfiguration: 'personConfig',
105-
externalSources: ['orcidV2', 'sherpaPublisher'],
105+
externalSources: ['orcidV2', 'opfPublisher'],
106106
});
107107
nameVariant = 'Doe, J.';
108108
metadataField = 'dc.contributor.author';

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

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

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

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

468-
// Sherpa Policies section needs to be updated when the rest response section is empty
469-
const sherpaPoliciesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.SherpaPolicies);
470-
if (isNotUndefined(sherpaPoliciesSectionId) && isNotEmpty(currentState.sections[sherpaPoliciesSectionId]?.data)
471-
&& isEmpty(sections[sherpaPoliciesSectionId])) {
472-
mappedActions.push(new UpdateSectionDataAction(submissionId, sherpaPoliciesSectionId, null, [], []));
468+
// Opf Policies section needs to be updated when the rest response section is empty
469+
const opfPoliciesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.OpfPolicies);
470+
if (isNotUndefined(opfPoliciesSectionId) && isNotEmpty(currentState.sections[opfPoliciesSectionId]?.data)
471+
&& isEmpty(sections[opfPoliciesSectionId])) {
472+
mappedActions.push(new UpdateSectionDataAction(submissionId, opfPoliciesSectionId, null, [], []));
473473
}
474474

475475
// 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‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
[title]="(sectionRef.isOpen() ? 'submission.sections.toggle.close' : 'submission.sections.toggle.open') | translate">
3030
<span *ngIf="sectionRef.isOpen()" [ngClass]="{ 'text-white' : sectionRef.isInfo()}"
3131
class="fas fa-chevron-up fa-fw"></span>
32-
<span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"></span>
32+
<span *ngIf="!sectionRef.isOpen()" [ngClass]="{ 'text-white' : sectionRef.isInfo()}"
33+
class="fas fa-chevron-down fa-fw"></span>
3334
</a>
3435
<a href="javascript:void(0);" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
3536
(click)="removeSection($event)">

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: 10 additions & 10 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 mr-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>
@@ -13,7 +13,7 @@
1313
{{version.embargo?.units[0]}}</span>
1414
<ng-template #noEmbargoTitle>
1515
<span><i class="fas fa-hourglass-half"></i> {{
16-
'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
16+
'submission.sections.jisc.publisher.policy.noembargo' | translate }}</span>
1717
</ng-template>
1818

1919
<span class="m-1 ml-4">
@@ -24,7 +24,7 @@
2424
</span>
2525
<ng-template #noLocations>
2626
<span>{{
27-
'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
27+
'submission.sections.jisc.publisher.policy.nolocation' | translate }}</span>
2828
</ng-template>
2929
</span>
3030
</div>
@@ -39,20 +39,20 @@
3939
<div class="row" *ngIf="!!version?.embargo && !!version?.embargo.amount">
4040
<div class="col-4">
4141
<p class="m-1"><i class="fas fa-hourglass-half"></i> {{
42-
'submission.sections.sherpa.publisher.policy.embargo' | translate }}</p>
42+
'submission.sections.jisc.publisher.policy.embargo' | translate }}</p>
4343
</div>
4444
<div class="col-6">
4545
<p class="m-1" *ngIf="!!version.embargo;else noEmbargo">{{version.embargo.amount}}
4646
{{version.embargo.units}}</p>
4747
<ng-template #noEmbargo>
48-
<p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
48+
<p class="m-1">{{ 'submission.sections.jisc.publisher.policy.noembargo' | translate }}</p>
4949
</ng-template>
5050
</div>
5151
</div>
5252
<div class="row" *ngIf="!!version?.licenses && version.licenses.length > 0">
5353
<div class="col-4">
5454
<p class="m-1"><i class="fas fa-certificate"></i> {{
55-
'submission.sections.sherpa.publisher.policy.license' | translate }}</p>
55+
'submission.sections.jisc.publisher.policy.license' | translate }}</p>
5656
</div>
5757
<div class="col-6">
5858
<p class="m-1" *ngFor="let license of version.licenses">{{license}}</p>
@@ -61,7 +61,7 @@
6161
<div class="row" *ngIf="!!version?.prerequisites && version.prerequisites.length > 0">
6262
<div class="col-4">
6363
<p class="m-1"><i class="fas fa-exclamation-circle"></i> {{
64-
'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}</p>
64+
'submission.sections.jisc.publisher.policy.prerequisites' | translate }}</p>
6565
</div>
6666
<div class="col-6">
6767
<p class="m-1" *ngFor="let prerequisite of version.prerequisites">{{prerequisite}}</p>
@@ -70,7 +70,7 @@
7070
<div class="row" *ngIf="!!version?.locations && version.locations.length > 0">
7171
<div class="col-4">
7272
<p class="m-1"><i class="far fa-folder-open"></i> {{
73-
'submission.sections.sherpa.publisher.policy.location' | translate }}</p>
73+
'submission.sections.jisc.publisher.policy.location' | translate }}</p>
7474
</div>
7575
<div class="col-6">
7676
<p class="m-1" *ngFor="let location of version.locations">{{location}}</p>
@@ -79,12 +79,12 @@
7979
<div class="row" *ngIf="!!version?.conditions && version.conditions.length > 0">
8080
<div class="col-4">
8181
<p class="m-1"><i class="fas fa-tasks"></i> {{
82-
'submission.sections.sherpa.publisher.policy.conditions' | translate }}</p>
82+
'submission.sections.jisc.publisher.policy.conditions' | translate }}</p>
8383
</div>
8484
<div class="col-6">
8585
<p class="m-1" *ngFor="let condition of version.conditions">{{condition}}</p>
8686
</div>
8787
</div>
8888
</div>
8989
</div>
90-
</div>
90+
</div>

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)