Skip to content

Commit da2c98a

Browse files
author
Zahraa Chreim
committed
Fix lint issues
1 parent 681efd9 commit da2c98a

15 files changed

Lines changed: 113 additions & 113 deletions

‎src/app/submission/edit/submission-edit.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="submission-submit-container" >
2-
<ds-themed-submission-form [collectionId]="collectionId"
2+
<ds-submission-form [collectionId]="collectionId"
33
[sections]="sections"
44
[selfUrl]="selfUrl"
55
[submissionDefinition]="submissionDefinition"
66
[submissionErrors]="submissionErrors"
77
[item]="item"
88
[collectionModifiable]="collectionModifiable"
9-
[submissionId]="submissionId"></ds-themed-submission-form>
9+
[submissionId]="submissionId"></ds-submission-form>
1010
</div>

‎src/app/submission/edit/submission-edit.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
isNotNull,
3737
} from '../../shared/empty.util';
3838
import { NotificationsService } from '../../shared/notifications/notifications.service';
39-
import { SubmissionFormComponent } from '../form/submission-form.component';
39+
import { ThemedSubmissionFormComponent } from '../form/themed-submission-form.component';
4040
import { SubmissionError } from '../objects/submission-error.model';
4141
import { SubmissionService } from '../submission.service';
4242
import parseSectionErrors from '../utils/parseSectionErrors';
@@ -50,7 +50,7 @@ import parseSectionErrors from '../utils/parseSectionErrors';
5050
templateUrl: './submission-edit.component.html',
5151
standalone: true,
5252
imports: [
53-
SubmissionFormComponent,
53+
ThemedSubmissionFormComponent,
5454
],
5555
})
5656
export class SubmissionEditComponent implements OnDestroy, OnInit {

‎src/app/submission/form/footer/submission-form-footer.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { SubmissionService } from '../../submission.service';
2424
* This component represents submission form footer bar.
2525
*/
2626
@Component({
27-
selector: 'ds-submission-form-footer',
27+
selector: 'ds-base-submission-form-footer',
2828
styleUrls: ['./submission-form-footer.component.scss'],
2929
templateUrl: './submission-form-footer.component.html',
3030
standalone: true,

‎src/app/submission/form/footer/themed-submission-form-footer.component.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
import {
2+
Component,
3+
Input,
4+
} from '@angular/core';
5+
16
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
27
import { SubmissionFormFooterComponent } from './submission-form-footer.component';
3-
import { Component, Input } from '@angular/core';
48

59
@Component({
6-
selector: 'ds-themed-submission-form-footer',
10+
selector: 'ds-submission-form-footer',
711
styleUrls: [],
812
templateUrl: '../../../shared/theme-support/themed.component.html',
13+
standalone: true,
14+
imports: [SubmissionFormFooterComponent],
915
})
1016
export class ThemedSubmissionFormFooterComponent extends ThemedComponent<SubmissionFormFooterComponent> {
1117
@Input() submissionId: string;

‎src/app/submission/form/submission-form.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@
3131

3232
<div class="submission-form-content">
3333
@if ((isLoading() | async)) {
34-
<ds-themed-loading message="Loading..."></ds-themed-loading>
34+
<ds-loading message="Loading..."></ds-loading>
3535
}
3636
@for (object of $any(submissionSections | async); track object) {
37-
<ds-themed-submission-section-container [collectionId]="collectionId"
37+
<ds-submission-section-container [collectionId]="collectionId"
3838
[submissionId]="submissionId"
3939
[sectionData]="$any(object)">
40-
</ds-themed-submission-section-container>
40+
</ds-submission-section-container>
4141
}
4242
</div>
4343
@if ((isLoading() | async) !== true) {
4444
<div class="submission-form-footer mt-3 mb-3 position-sticky">
45-
<ds-themed-submission-form-footer [submissionId]="submissionId"></ds-themed-submission-form-footer>
45+
<ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
4646
</div>
4747
}
4848
</div>

‎src/app/submission/form/submission-form.component.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,29 @@ import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.m
3838
import { SectionVisibility } from '../objects/section-visibility.model';
3939
import { SubmissionError } from '../objects/submission-error.model';
4040
import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
41-
import { SubmissionSectionContainerComponent } from '../sections/container/section-container.component';
41+
import { ThemedSubmissionSectionContainerComponent } from '../sections/container/themed-section-container.component';
4242
import { SectionDataObject } from '../sections/models/section-data.model';
4343
import { SectionsService } from '../sections/sections.service';
4444
import { SectionsType } from '../sections/sections-type';
4545
import { VisibilityType } from '../sections/visibility-type';
4646
import { SubmissionService } from '../submission.service';
4747
import { SubmissionFormCollectionComponent } from './collection/submission-form-collection.component';
48-
import { SubmissionFormFooterComponent } from './footer/submission-form-footer.component';
48+
import { ThemedSubmissionFormFooterComponent } from './footer/themed-submission-form-footer.component';
4949
import { SubmissionFormSectionAddComponent } from './section-add/submission-form-section-add.component';
5050
import { ThemedSubmissionUploadFilesComponent } from './submission-upload-files/themed-submission-upload-files.component';
5151

5252
/**
5353
* This component represents the submission form.
5454
*/
5555
@Component({
56-
selector: 'ds-submission-form',
56+
selector: 'ds-base-submission-form',
5757
styleUrls: ['./submission-form.component.scss'],
5858
templateUrl: './submission-form.component.html',
5959
imports: [
6060
CommonModule,
6161
ThemedLoadingComponent,
62-
SubmissionSectionContainerComponent,
63-
SubmissionFormFooterComponent,
62+
ThemedSubmissionSectionContainerComponent,
63+
ThemedSubmissionFormFooterComponent,
6464
ThemedSubmissionUploadFilesComponent,
6565
SubmissionFormCollectionComponent,
6666
SubmissionFormSectionAddComponent,

‎src/app/submission/form/themed-submission-form.component.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
import { ThemedComponent } from '../../shared/theme-support/themed.component';
2-
import { SubmissionFormComponent } from './submission-form.component';
3-
import { Component, Input } from '@angular/core';
1+
import {
2+
Component,
3+
Input,
4+
} from '@angular/core';
5+
6+
import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
47
import { Item } from '../../core/shared/item.model';
58
import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
9+
import { ThemedComponent } from '../../shared/theme-support/themed.component';
610
import { SubmissionError } from '../objects/submission-error.model';
7-
import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
11+
import { SubmissionFormComponent } from './submission-form.component';
812

913
@Component({
10-
selector: 'ds-themed-submission-form',
14+
selector: 'ds-submission-form',
1115
styleUrls: [],
1216
templateUrl: '../../shared/theme-support/themed.component.html',
17+
standalone: true,
18+
imports: [SubmissionFormComponent],
1319
})
1420
export class ThemedSubmissionFormComponent extends ThemedComponent<SubmissionFormComponent> {
1521
@Input() collectionId: string;

‎src/app/submission/sections/container/section-container.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { rendersSectionType } from '../sections-decorator';
2323
* This component represents a section that contains the submission license form.
2424
*/
2525
@Component({
26-
selector: 'ds-submission-section-container',
26+
selector: 'ds-base-submission-section-container',
2727
templateUrl: './section-container.component.html',
2828
styleUrls: ['./section-container.component.scss'],
2929
imports: [

‎src/app/submission/sections/container/themed-section-container.component.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
import {
2+
Component,
3+
Input,
4+
} from '@angular/core';
5+
16
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
2-
import { SubmissionSectionContainerComponent } from './section-container.component';
3-
import { Component, Input } from '@angular/core';
47
import { SectionDataObject } from '../models/section-data.model';
8+
import { SubmissionSectionContainerComponent } from './section-container.component';
59

610
@Component({
7-
selector: 'ds-themed-submission-section-container',
11+
selector: 'ds-submission-section-container',
812
styleUrls: [],
913
templateUrl: '../../../shared/theme-support/themed.component.html',
14+
standalone: true,
15+
imports: [SubmissionSectionContainerComponent],
1016
})
1117
export class ThemedSubmissionSectionContainerComponent extends ThemedComponent<SubmissionSectionContainerComponent> {
1218
@Input() collectionId: string;

‎src/app/submission/submission.module.ts‎

Lines changed: 50 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,64 @@
1+
import { CommonModule } from '@angular/common';
12
import { NgModule } from '@angular/core';
2-
import { CoreModule } from '../core/core.module';
3-
import { SharedModule } from '../shared/shared.module';
3+
import {
4+
NgbAccordionModule,
5+
NgbCollapseModule,
6+
NgbModalModule,
7+
} from '@ng-bootstrap/ng-bootstrap';
8+
import { EffectsModule } from '@ngrx/effects';
9+
import {
10+
Action,
11+
StoreConfig,
12+
StoreModule,
13+
} from '@ngrx/store';
414

5-
import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
6-
import { SectionsDirective } from './sections/sections.directive';
7-
import { SectionsService } from './sections/sections.service';
15+
import { storeModuleConfig } from '../app.reducer';
16+
import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
17+
import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
18+
import { SubmissionEditComponent } from './edit/submission-edit.component';
19+
import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
820
import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
921
import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
10-
import { SubmissionFormComponent } from './form/submission-form.component';
22+
import { ThemedSubmissionFormFooterComponent } from './form/footer/themed-submission-form-footer.component';
1123
import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
12-
import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
13-
import { CommonModule } from '@angular/common';
14-
import { Action, StoreConfig, StoreModule } from '@ngrx/store';
15-
import { EffectsModule } from '@ngrx/effects';
16-
import { submissionReducers, SubmissionState } from './submission.reducers';
17-
import { submissionEffects } from './submission.effects';
18-
import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
19-
import { SectionUploadService } from './sections/upload/section-upload.service';
24+
import { SubmissionFormComponent } from './form/submission-form.component';
2025
import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
21-
import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
22-
import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
23-
import { SubmissionEditComponent } from './edit/submission-edit.component';
24-
import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
25-
import {
26-
SubmissionSectionUploadFileEditComponent
27-
} from './sections/upload/file/edit/section-upload-file-edit.component';
28-
import {
29-
SubmissionSectionUploadFileViewComponent
30-
} from './sections/upload/file/view/section-upload-file-view.component';
31-
import {
32-
SubmissionSectionUploadAccessConditionsComponent
33-
} from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
34-
import { SubmissionSubmitComponent } from './submit/submission-submit.component';
35-
import { storeModuleConfig } from '../app.reducer';
26+
import { ThemedSubmissionFormComponent } from './form/themed-submission-form.component';
27+
import { SubmissionImportExternalCollectionComponent } from './import-external/import-external-collection/submission-import-external-collection.component';
28+
import { SubmissionImportExternalPreviewComponent } from './import-external/import-external-preview/submission-import-external-preview.component';
29+
import { SubmissionImportExternalSearchbarComponent } from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
3630
import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
37-
import {
38-
SubmissionImportExternalSearchbarComponent
39-
} from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
40-
import {
41-
SubmissionImportExternalPreviewComponent
42-
} from './import-external/import-external-preview/submission-import-external-preview.component';
43-
import {
44-
SubmissionImportExternalCollectionComponent
45-
} from './import-external/import-external-collection/submission-import-external-collection.component';
46-
import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
47-
import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
48-
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
49-
import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
50-
import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
5131
import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
52-
import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
53-
import { FormModule } from '../shared/form/form.module';
54-
import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
5532
import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
56-
import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
5733
import { SectionAccessesService } from './sections/accesses/section-accesses.service';
58-
import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
34+
import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
35+
import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
36+
import { ThemedSubmissionSectionContainerComponent } from './sections/container/themed-section-container.component';
37+
import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
38+
import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
39+
import { SubmissionSectionIdentifiersComponent } from './sections/identifiers/section-identifiers.component';
40+
import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
41+
import { SectionsDirective } from './sections/sections.directive';
42+
import { SectionsService } from './sections/sections.service';
5943
import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
44+
import { MetadataInformationComponent } from './sections/sherpa-policies/metadata-information/metadata-information.component';
45+
import { PublicationInformationComponent } from './sections/sherpa-policies/publication-information/publication-information.component';
6046
import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
47+
import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
48+
import { SubmissionSectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
49+
import { SubmissionSectionUploadFileEditComponent } from './sections/upload/file/edit/section-upload-file-edit.component';
50+
import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
51+
import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
52+
import { SubmissionSectionUploadFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
53+
import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
54+
import { SectionUploadService } from './sections/upload/section-upload.service';
55+
import { submissionEffects } from './submission.effects';
6156
import {
62-
PublicationInformationComponent
63-
} from './sections/sherpa-policies/publication-information/publication-information.component';
64-
import { UploadModule } from '../shared/upload/upload.module';
65-
import {
66-
MetadataInformationComponent
67-
} from './sections/sherpa-policies/metadata-information/metadata-information.component';
68-
import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
69-
import {SubmissionSectionIdentifiersComponent} from './sections/identifiers/section-identifiers.component';
70-
import { ThemedSubmissionSectionContainerComponent } from './sections/container/themed-section-container.component';
71-
import { ThemedSubmissionFormFooterComponent } from './form/footer/themed-submission-form-footer.component';
72-
import { ThemedSubmissionFormComponent } from './form/themed-submission-form.component';
57+
submissionReducers,
58+
SubmissionState,
59+
} from './submission.reducers';
60+
import { SubmissionSubmitComponent } from './submit/submission-submit.component';
61+
import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
7362

7463
const ENTRY_COMPONENTS = [
7564
// put only entry components that use custom decorator
@@ -117,22 +106,15 @@ const DECLARATIONS = [
117106
@NgModule({
118107
imports: [
119108
CommonModule,
120-
CoreModule.forRoot(),
121-
SharedModule,
122109
StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
123110
EffectsModule.forFeature(submissionEffects),
124-
JournalEntitiesModule.withEntryComponents(),
125-
ResearchEntitiesModule.withEntryComponents(),
126-
FormModule,
127111
NgbModalModule,
128112
NgbCollapseModule,
129113
NgbAccordionModule,
130-
UploadModule,
131114
],
132115
declarations: DECLARATIONS,
133116
exports: [
134117
...DECLARATIONS,
135-
FormModule,
136118
],
137119
providers: [
138120
SectionUploadService,
@@ -141,7 +123,7 @@ const DECLARATIONS = [
141123
SubmissionAccessesConfigDataService,
142124
SectionAccessesService,
143125
SectionFormOperationsService,
144-
]
126+
],
145127
})
146128

147129
/**
@@ -155,7 +137,7 @@ export class SubmissionModule {
155137
static withEntryComponents() {
156138
return {
157139
ngModule: SubmissionModule,
158-
providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
140+
providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
159141
};
160142
}
161143
}

0 commit comments

Comments
 (0)