diff --git a/src/app/core/submission/models/workspaceitem-section-sherpa-policies.model.ts b/src/app/core/submission/models/workspaceitem-section-sherpa-policies.model.ts
index cbef185090..c57beadbb9 100644
--- a/src/app/core/submission/models/workspaceitem-section-sherpa-policies.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-sherpa-policies.model.ts
@@ -18,5 +18,5 @@ export interface WorkspaceitemSectionSherpaPoliciesObject {
/**
* The sherpa policies details
*/
- sherpaResponse: SherpaPoliciesDetailsObject[];
+ sherpaResponse: SherpaPoliciesDetailsObject;
}
diff --git a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
index 895e518d96..b4947ea5b4 100644
--- a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
+++ b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
@@ -1,11 +1,11 @@
-import { WorkspaceitemSectionSherpaPoliciesObject } from './../../core/submission/models/workspaceitem-section-sherpa-policies.model';
-import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
-import { of as observableOf } from 'rxjs';
+import {
+ WorkspaceitemSectionSherpaPoliciesObject
+} from '../../core/submission/models/workspaceitem-section-sherpa-policies.model';
-export const dataRes = {
+export const SherpaDataResponse = {
'id': 'sherpaPolicies',
'retrievalTime': '2022-04-20T09:44:39.870+00:00',
- 'sherpaResponse': [
+ 'sherpaResponse':
{
'error': false,
'message': null,
@@ -98,11 +98,4 @@ export const dataRes = {
'inDOAJ': false
}]
}
- ]
} as WorkspaceitemSectionSherpaPoliciesObject;
-
-export function getSherpaPoliciesData() {
- return jasmine.createSpyObj('SectionAccessesService', {
- getSherpaPoliciesData: observableOf(dataRes),
- });
-}
diff --git a/src/app/submission/sections/sections-type.ts b/src/app/submission/sections/sections-type.ts
index f998ef4554..6b6f839b7c 100644
--- a/src/app/submission/sections/sections-type.ts
+++ b/src/app/submission/sections/sections-type.ts
@@ -6,5 +6,5 @@ export enum SectionsType {
CcLicense = 'cclicense',
collection = 'collection',
AccessesCondition = 'accessCondition',
- SherpaPolicies = 'sherpaPolicies',
+ SherpaPolicies = 'sherpaPolicy',
}
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
index ec1180a6c9..382450fbd3 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
@@ -1,12 +1,13 @@
import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoaderMock } from './../../../../shared/testing/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ContentAccordionComponent } from './content-accordion.component';
-import { dataRes } from './../../../../shared/mocks/section-sherpa-policies.service.mock';
+
import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
describe('ContentAccordionComponent', () => {
let component: ContentAccordionComponent;
@@ -33,7 +34,7 @@ describe('ContentAccordionComponent', () => {
fixture = TestBed.createComponent(ContentAccordionComponent);
component = fixture.componentInstance;
de = fixture.debugElement;
- component.version = dataRes.sherpaResponse[0].journals[0].policies[0].permittedVersions[0];
+ component.version = SherpaDataResponse.sherpaResponse.journals[0].policies[0].permittedVersions[0];
fixture.detectChanges();
});
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
index 378f08c8bc..a2decc38e1 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
@@ -1,6 +1,7 @@
-import { PermittedVersions } from './../../../../core/submission/models/sherpa-policies-details.model';
import { Component, Input } from '@angular/core';
+import { PermittedVersions } from '../../../../core/submission/models/sherpa-policies-details.model';
+
@Component({
selector: 'ds-content-accordion',
templateUrl: './content-accordion.component.html',
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
index b329fb1821..9a60a6d010 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
@@ -1,11 +1,12 @@
-import { TranslateLoaderMock } from './../../../../shared/testing/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MetadataInformationComponent } from './metadata-information.component';
-import { dataRes } from './../../../../shared/mocks/section-sherpa-policies.service.mock';
+
import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
describe('MetadataInformationComponent', () => {
let component: MetadataInformationComponent;
@@ -31,7 +32,7 @@ describe('MetadataInformationComponent', () => {
fixture = TestBed.createComponent(MetadataInformationComponent);
component = fixture.componentInstance;
de = fixture.debugElement;
- component.metadata = dataRes.sherpaResponse[0].metadata;
+ component.metadata = SherpaDataResponse.sherpaResponse.metadata;
fixture.detectChanges();
});
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
index 8b85237762..cced669024 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
@@ -1,5 +1,6 @@
import { Component, Input } from '@angular/core';
-import { Metadata } from './../../../../core/submission/models/sherpa-policies-details.model';
+
+import { Metadata } from '../../../../core/submission/models/sherpa-policies-details.model';
@Component({
selector: 'ds-metadata-information',
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
index e1acc016ab..c5dc896858 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
@@ -1,11 +1,11 @@
-import { TranslateLoaderMock } from './../../../../shared/testing/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { PublicationInformationComponent } from './publication-information.component';
-import { dataRes } from './../../../../shared/mocks/section-sherpa-policies.service.mock';
import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
describe('PublicationInformationComponent', () => {
let component: PublicationInformationComponent;
@@ -32,7 +32,7 @@ describe('PublicationInformationComponent', () => {
fixture = TestBed.createComponent(PublicationInformationComponent);
component = fixture.componentInstance;
de = fixture.debugElement;
- component.journal = dataRes.sherpaResponse[0].journals[0];
+ component.journal = SherpaDataResponse.sherpaResponse.journals[0];
fixture.detectChanges();
});
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
index a5306406af..54973eba02 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
@@ -1,5 +1,6 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Journal } from './../../../../core/submission/models/sherpa-policies-details.model';
+import { Component, Input } from '@angular/core';
+
+import { Journal } from '../../../../core/submission/models/sherpa-policies-details.model';
@Component({
selector: 'ds-publication-information',
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
index 9ba77adf94..da97f824b1 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
@@ -1,12 +1,11 @@
-import { TranslateLoaderMock } from './../../../../shared/testing/translate-loader.mock';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-
import { PublisherPolicyComponent } from './publisher-policy.component';
-import { dataRes } from './../../../../shared/mocks/section-sherpa-policies.service.mock';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+
+import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
describe('PublisherPolicyComponent', () => {
let component: PublisherPolicyComponent;
@@ -32,7 +31,7 @@ describe('PublisherPolicyComponent', () => {
fixture = TestBed.createComponent(PublisherPolicyComponent);
component = fixture.componentInstance;
de = fixture.debugElement;
- component.policy = dataRes.sherpaResponse[0].journals[0].policies[0];
+ component.policy = SherpaDataResponse.sherpaResponse.journals[0].policies[0];
fixture.detectChanges();
});
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
index dcbc115ddd..639361beb0 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
@@ -1,5 +1,6 @@
-import { Policy } from './../../../../core/submission/models/sherpa-policies-details.model';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
+
+import { Policy } from '../../../../core/submission/models/sherpa-policies-details.model';
@Component({
selector: 'ds-publisher-policy',
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
index 6756793fd5..94553dd4c3 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
@@ -1,10 +1,13 @@
+
+
+
-
+
@@ -38,11 +41,11 @@
-
+
-
-
+
+
{{'submission.sections.sherpa.record.information'
| translate}}
@@ -51,4 +54,4 @@
-
\ No newline at end of file
+
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
index ce64406486..fb8f8ba355 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
@@ -1,25 +1,21 @@
import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { SubmissionServiceStub } from './../../../shared/testing/submission-service.stub';
-import { dataRes, getSherpaPoliciesData } from './../../../shared/mocks/section-sherpa-policies.service.mock';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock';
import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
import { SectionsService } from '../sections.service';
import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { BrowserModule, By } from '@angular/platform-browser';
import { Store } from '@ngrx/store';
import { AppState } from '../../../app.reducer';
-import { SectionSherpaPoliciesService } from './section-sherpa-policies.service';
import { SubmissionSectionSherpaPoliciesComponent } from './section-sherpa-policies.component';
import { SubmissionService } from '../../submission.service';
import { DebugElement } from '@angular/core';
-import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { of as observableOf } from 'rxjs';
describe('SubmissionSectionSherpaPoliciesComponent', () => {
let component: SubmissionSectionSherpaPoliciesComponent;
@@ -27,10 +23,6 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
let de: DebugElement;
const sectionsServiceStub = new SectionsServiceStub();
- // const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
-
- const builderService: FormBuilderService = getMockFormBuilderService();
- const sectionSherpaPoliciesService = getSherpaPoliciesData();
const operationsBuilder = jasmine.createSpyObj('operationsBuilder', {
add: undefined,
@@ -47,7 +39,7 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
sectionType: 'sherpaPolicies',
collapsed: false,
enabled: true,
- data: dataRes,
+ data: SherpaDataResponse,
errorsToShow: [],
serverValidationErrors: [],
isLoading: false,
@@ -71,7 +63,6 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
declarations: [SubmissionSectionSherpaPoliciesComponent],
providers: [
{ provide: SectionsService, useValue: sectionsServiceStub },
- { provide: SectionSherpaPoliciesService, useValue: sectionSherpaPoliciesService },
{ provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
{ provide: SubmissionService, useValue: SubmissionServiceStub },
{ provide: Store, useValue: storeStub },
@@ -86,6 +77,7 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
fixture = TestBed.createComponent(SubmissionSectionSherpaPoliciesComponent);
component = fixture.componentInstance;
de = fixture.debugElement;
+ sectionsServiceStub.getSectionData.and.returnValue(observableOf(SherpaDataResponse))
fixture.detectChanges();
}));
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
index f5eaaa773a..d287a182ba 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
@@ -1,18 +1,19 @@
-import { JsonPatchOperationPathCombiner } from './../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { JsonPatchOperationsBuilder } from './../../../core/json-patch/builder/json-patch-operations-builder';
-import { WorkspaceitemSectionSherpaPoliciesObject } from './../../../core/submission/models/workspaceitem-section-sherpa-policies.model';
-import { SectionSherpaPoliciesService } from './section-sherpa-policies.service';
-import { Component, Inject, ViewChildren, QueryList } from '@angular/core';
+import { Component, Inject, QueryList, ViewChildren } from '@angular/core';
-import { Observable, of, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, of, Subscription } from 'rxjs';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import {
+ WorkspaceitemSectionSherpaPoliciesObject
+} from '../../../core/submission/models/workspaceitem-section-sherpa-policies.model';
import { renderSectionFor } from '../sections-decorator';
import { SectionsType } from '../sections-type';
import { SectionDataObject } from '../models/section-data.model';
import { SectionsService } from '../sections.service';
import { SectionModelComponent } from '../models/section.model';
import { SubmissionService } from '../../submission.service';
-import { hasValue } from '../../../shared/empty.util';
+import { hasValue, isEmpty } from '../../../shared/empty.util';
/**
* This component represents a section for managing item's access conditions.
@@ -31,7 +32,7 @@ export class SubmissionSectionSherpaPoliciesComponent extends SectionModelCompon
* The accesses section data
* @type {WorkspaceitemSectionAccessesObject}
*/
- public sherpaPoliciesData: WorkspaceitemSectionSherpaPoliciesObject;
+ public sherpaPoliciesData$: BehaviorSubject = new BehaviorSubject(null);
/**
* The [[JsonPatchOperationPathCombiner]] object
@@ -50,14 +51,12 @@ export class SubmissionSectionSherpaPoliciesComponent extends SectionModelCompon
*
* @param {SectionsService} sectionService
* @param {SectionDataObject} injectedSectionData
- * @param {SectionSherpaPoliciesService} sectionSherpaPoliciesService
* @param {JsonPatchOperationsBuilder} operationsBuilder
* @param {SubmissionService} submissionService
* @param {string} injectedSubmissionId
*/
constructor(
protected sectionService: SectionsService,
- private sectionSherpaPoliciesService: SectionSherpaPoliciesService,
protected operationsBuilder: JsonPatchOperationsBuilder,
private submissionService: SubmissionService,
@Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
@@ -88,11 +87,14 @@ export class SubmissionSectionSherpaPoliciesComponent extends SectionModelCompon
* Initialize all instance variables and retrieve collection default access conditions
*/
protected onSectionInit(): void {
+
this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionData.id);
this.subs.push(
- this.sectionSherpaPoliciesService.getSherpaPoliciesData(this.submissionId, this.sectionData.id).subscribe((sherpaPolicies: WorkspaceitemSectionSherpaPoliciesObject) => {
- this.sherpaPoliciesData = sherpaPolicies;
- })
+ this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType)
+ .subscribe((sherpaPolicies: WorkspaceitemSectionSherpaPoliciesObject) => {
+ this.sherpaPoliciesData$.next(sherpaPolicies);
+ console.log(this.sherpaPoliciesData$.value)
+ })
);
}
@@ -106,6 +108,13 @@ export class SubmissionSectionSherpaPoliciesComponent extends SectionModelCompon
return of(true);
}
+ /**
+ * Check if section has no data
+ */
+ hasNoData(): boolean {
+ return isEmpty(this.sherpaPoliciesData$.value);
+ }
+
/**
* Refresh sherpa information
*/
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.service.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.service.ts
deleted file mode 100644
index 4ddf4509cb..0000000000
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.service.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { WorkspaceitemSectionSherpaPoliciesObject } from './../../../core/submission/models/workspaceitem-section-sherpa-policies.model';
-import { Injectable } from '@angular/core';
-
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter } from 'rxjs/operators';
-import { Store } from '@ngrx/store';
-
-import { SubmissionState } from '../../submission.reducers';
-import { isNotUndefined } from '../../../shared/empty.util';
-import { submissionSectionDataFromIdSelector } from '../../selectors';
-
-/**
- * A service that provides methods to handle submission item's sherpa policies state.
- */
-@Injectable()
-export class SectionSherpaPoliciesService {
-
- /**
- * Initialize service variables
- *
- * @param {Store} store
- */
- constructor(private store: Store) { }
-
-
- /**
- * Return item's sherpa policies state.
- *
- * @param submissionId
- * The submission id
- * @param sectionId
- * The section id
- * @returns {Observable}
- * Emits bitstream's metadata
- */
- public getSherpaPoliciesData(submissionId: string, sectionId: string): Observable {
-
- return this.store.select(submissionSectionDataFromIdSelector(submissionId, sectionId)).pipe(
- filter((state) => isNotUndefined(state)),
- distinctUntilChanged());
- }
-}
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 85b8067d0e..b0b6d5195d 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -1,4 +1,3 @@
-import { SectionSherpaPoliciesService } from './sections/sherpa-policies/section-sherpa-policies.service';
import { NgModule } from '@angular/core';
import { CoreModule } from '../core/core.module';
import { SharedModule } from '../shared/shared.module';
@@ -23,15 +22,27 @@ import { SubmissionSectionLicenseComponent } from './sections/license/section-li
import { SubmissionUploadsConfigService } from '../core/config/submission-uploads-config.service';
import { SubmissionEditComponent } from './edit/submission-edit.component';
import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
-import { SubmissionSectionUploadFileEditComponent } from './sections/upload/file/edit/section-upload-file-edit.component';
-import { SubmissionSectionUploadFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
-import { SubmissionSectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
+import {
+ SubmissionSectionUploadFileEditComponent
+} from './sections/upload/file/edit/section-upload-file-edit.component';
+import {
+ SubmissionSectionUploadFileViewComponent
+} from './sections/upload/file/view/section-upload-file-view.component';
+import {
+ SubmissionSectionUploadAccessConditionsComponent
+} from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
import { SubmissionSubmitComponent } from './submit/submission-submit.component';
import { storeModuleConfig } from '../app.reducer';
import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
-import { SubmissionImportExternalSearchbarComponent } from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
-import { SubmissionImportExternalPreviewComponent } from './import-external/import-external-preview/submission-import-external-preview.component';
-import { SubmissionImportExternalCollectionComponent } from './import-external/import-external-collection/submission-import-external-collection.component';
+import {
+ SubmissionImportExternalSearchbarComponent
+} from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
+import {
+ SubmissionImportExternalPreviewComponent
+} from './import-external/import-external-preview/submission-import-external-preview.component';
+import {
+ SubmissionImportExternalCollectionComponent
+} from './import-external/import-external-collection/submission-import-external-collection.component';
import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
@@ -46,8 +57,12 @@ import { SectionAccessesService } from './sections/accesses/section-accesses.ser
import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
-import { PublicationInformationComponent } from './sections/sherpa-policies/publication-information/publication-information.component';
-import { MetadataInformationComponent } from './sections/sherpa-policies/metadata-information/metadata-information.component';
+import {
+ PublicationInformationComponent
+} from './sections/sherpa-policies/publication-information/publication-information.component';
+import {
+ MetadataInformationComponent
+} from './sections/sherpa-policies/metadata-information/metadata-information.component';
const ENTRY_COMPONENTS = [
// put only entry components that use custom decorator
@@ -108,8 +123,7 @@ const DECLARATIONS = [
SectionsService,
SubmissionUploadsConfigService,
SubmissionAccessesConfigService,
- SectionAccessesService,
- SectionSherpaPoliciesService
+ SectionAccessesService
]
})
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ec9bc5b3a0..d9f6523ed4 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3874,10 +3874,14 @@
"submission.sections.submit.progressbar.license": "Deposit license",
+ "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+
"submission.sections.submit.progressbar.upload": "Upload files",
+ "submission.sections.sherpa-policy.title-empty": "No information available",
+
"submission.sections.status.errors.title": "Errors",
"submission.sections.status.valid.title": "Valid",
@@ -3990,7 +3994,7 @@
"submission.sections.sherpa.publication.information": "Publication information",
-
+
"submission.sections.sherpa.publication.information.title": "Title",
"submission.sections.sherpa.publication.information.issns": "ISSNs",