Fix lint issues

This commit is contained in:
Zahraa Chreim
2025-03-14 13:45:43 +02:00
parent 681efd9f52
commit da2c98aa32
15 changed files with 119 additions and 119 deletions

View File

@@ -1,10 +1,10 @@
<div class="submission-submit-container" >
<ds-themed-submission-form [collectionId]="collectionId"
<ds-submission-form [collectionId]="collectionId"
[sections]="sections"
[selfUrl]="selfUrl"
[submissionDefinition]="submissionDefinition"
[submissionErrors]="submissionErrors"
[item]="item"
[collectionModifiable]="collectionModifiable"
[submissionId]="submissionId"></ds-themed-submission-form>
[submissionId]="submissionId"></ds-submission-form>
</div>

View File

@@ -36,7 +36,7 @@ import {
isNotNull,
} from '../../shared/empty.util';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { SubmissionFormComponent } from '../form/submission-form.component';
import { ThemedSubmissionFormComponent } from '../form/themed-submission-form.component';
import { SubmissionError } from '../objects/submission-error.model';
import { SubmissionService } from '../submission.service';
import parseSectionErrors from '../utils/parseSectionErrors';
@@ -50,7 +50,7 @@ import parseSectionErrors from '../utils/parseSectionErrors';
templateUrl: './submission-edit.component.html',
standalone: true,
imports: [
SubmissionFormComponent,
ThemedSubmissionFormComponent,
],
})
export class SubmissionEditComponent implements OnDestroy, OnInit {

View File

@@ -24,7 +24,7 @@ import { SubmissionService } from '../../submission.service';
* This component represents submission form footer bar.
*/
@Component({
selector: 'ds-submission-form-footer',
selector: 'ds-base-submission-form-footer',
styleUrls: ['./submission-form-footer.component.scss'],
templateUrl: './submission-form-footer.component.html',
standalone: true,

View File

@@ -1,11 +1,17 @@
import {
Component,
Input,
} from '@angular/core';
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
import { SubmissionFormFooterComponent } from './submission-form-footer.component';
import { Component, Input } from '@angular/core';
@Component({
selector: 'ds-themed-submission-form-footer',
selector: 'ds-submission-form-footer',
styleUrls: [],
templateUrl: '../../../shared/theme-support/themed.component.html',
standalone: true,
imports: [SubmissionFormFooterComponent],
})
export class ThemedSubmissionFormFooterComponent extends ThemedComponent<SubmissionFormFooterComponent> {
@Input() submissionId: string;

View File

@@ -31,18 +31,18 @@
<div class="submission-form-content">
@if ((isLoading() | async)) {
<ds-themed-loading message="Loading..."></ds-themed-loading>
<ds-loading message="Loading..."></ds-loading>
}
@for (object of $any(submissionSections | async); track object) {
<ds-themed-submission-section-container [collectionId]="collectionId"
<ds-submission-section-container [collectionId]="collectionId"
[submissionId]="submissionId"
[sectionData]="$any(object)">
</ds-themed-submission-section-container>
</ds-submission-section-container>
}
</div>
@if ((isLoading() | async) !== true) {
<div class="submission-form-footer mt-3 mb-3 position-sticky">
<ds-themed-submission-form-footer [submissionId]="submissionId"></ds-themed-submission-form-footer>
<ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
</div>
}
</div>

View File

@@ -38,14 +38,14 @@ import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.m
import { SectionVisibility } from '../objects/section-visibility.model';
import { SubmissionError } from '../objects/submission-error.model';
import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
import { SubmissionSectionContainerComponent } from '../sections/container/section-container.component';
import { ThemedSubmissionSectionContainerComponent } from '../sections/container/themed-section-container.component';
import { SectionDataObject } from '../sections/models/section-data.model';
import { SectionsService } from '../sections/sections.service';
import { SectionsType } from '../sections/sections-type';
import { VisibilityType } from '../sections/visibility-type';
import { SubmissionService } from '../submission.service';
import { SubmissionFormCollectionComponent } from './collection/submission-form-collection.component';
import { SubmissionFormFooterComponent } from './footer/submission-form-footer.component';
import { ThemedSubmissionFormFooterComponent } from './footer/themed-submission-form-footer.component';
import { SubmissionFormSectionAddComponent } from './section-add/submission-form-section-add.component';
import { ThemedSubmissionUploadFilesComponent } from './submission-upload-files/themed-submission-upload-files.component';
@@ -53,14 +53,14 @@ import { ThemedSubmissionUploadFilesComponent } from './submission-upload-files/
* This component represents the submission form.
*/
@Component({
selector: 'ds-submission-form',
selector: 'ds-base-submission-form',
styleUrls: ['./submission-form.component.scss'],
templateUrl: './submission-form.component.html',
imports: [
CommonModule,
ThemedLoadingComponent,
SubmissionSectionContainerComponent,
SubmissionFormFooterComponent,
ThemedSubmissionSectionContainerComponent,
ThemedSubmissionFormFooterComponent,
ThemedSubmissionUploadFilesComponent,
SubmissionFormCollectionComponent,
SubmissionFormSectionAddComponent,

View File

@@ -1,15 +1,21 @@
import { ThemedComponent } from '../../shared/theme-support/themed.component';
import { SubmissionFormComponent } from './submission-form.component';
import { Component, Input } from '@angular/core';
import {
Component,
Input,
} from '@angular/core';
import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
import { Item } from '../../core/shared/item.model';
import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
import { ThemedComponent } from '../../shared/theme-support/themed.component';
import { SubmissionError } from '../objects/submission-error.model';
import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
import { SubmissionFormComponent } from './submission-form.component';
@Component({
selector: 'ds-themed-submission-form',
selector: 'ds-submission-form',
styleUrls: [],
templateUrl: '../../shared/theme-support/themed.component.html',
standalone: true,
imports: [SubmissionFormComponent],
})
export class ThemedSubmissionFormComponent extends ThemedComponent<SubmissionFormComponent> {
@Input() collectionId: string;

View File

@@ -23,7 +23,7 @@ import { rendersSectionType } from '../sections-decorator';
* This component represents a section that contains the submission license form.
*/
@Component({
selector: 'ds-submission-section-container',
selector: 'ds-base-submission-section-container',
templateUrl: './section-container.component.html',
styleUrls: ['./section-container.component.scss'],
imports: [

View File

@@ -1,12 +1,18 @@
import {
Component,
Input,
} from '@angular/core';
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
import { SubmissionSectionContainerComponent } from './section-container.component';
import { Component, Input } from '@angular/core';
import { SectionDataObject } from '../models/section-data.model';
import { SubmissionSectionContainerComponent } from './section-container.component';
@Component({
selector: 'ds-themed-submission-section-container',
selector: 'ds-submission-section-container',
styleUrls: [],
templateUrl: '../../../shared/theme-support/themed.component.html',
standalone: true,
imports: [SubmissionSectionContainerComponent],
})
export class ThemedSubmissionSectionContainerComponent extends ThemedComponent<SubmissionSectionContainerComponent> {
@Input() collectionId: string;

View File

@@ -1,75 +1,64 @@
import { NgModule } from '@angular/core';
import { CoreModule } from '../core/core.module';
import { SharedModule } from '../shared/shared.module';
import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
import { SectionsDirective } from './sections/sections.directive';
import { SectionsService } from './sections/sections.service';
import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
import { SubmissionFormComponent } from './form/submission-form.component';
import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
import { CommonModule } from '@angular/common';
import { Action, StoreConfig, StoreModule } from '@ngrx/store';
import { NgModule } from '@angular/core';
import {
NgbAccordionModule,
NgbCollapseModule,
NgbModalModule,
} from '@ng-bootstrap/ng-bootstrap';
import { EffectsModule } from '@ngrx/effects';
import { submissionReducers, SubmissionState } from './submission.reducers';
import { submissionEffects } from './submission.effects';
import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
import { SectionUploadService } from './sections/upload/section-upload.service';
import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
import {
Action,
StoreConfig,
StoreModule,
} from '@ngrx/store';
import { storeModuleConfig } from '../app.reducer';
import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.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 { 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 { 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';
import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
import { ThemedSubmissionFormFooterComponent } from './form/footer/themed-submission-form-footer.component';
import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
import { SubmissionFormComponent } from './form/submission-form.component';
import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
import { ThemedSubmissionFormComponent } from './form/themed-submission-form.component';
import { SubmissionImportExternalCollectionComponent } from './import-external/import-external-collection/submission-import-external-collection.component';
import { SubmissionImportExternalPreviewComponent } from './import-external/import-external-preview/submission-import-external-preview.component';
import { SubmissionImportExternalSearchbarComponent } from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
import { FormModule } from '../shared/form/form.module';
import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
import { SectionAccessesService } from './sections/accesses/section-accesses.service';
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 { UploadModule } from '../shared/upload/upload.module';
import {
MetadataInformationComponent
} from './sections/sherpa-policies/metadata-information/metadata-information.component';
import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
import { ThemedSubmissionSectionContainerComponent } from './sections/container/themed-section-container.component';
import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
import { SubmissionSectionIdentifiersComponent } from './sections/identifiers/section-identifiers.component';
import { ThemedSubmissionSectionContainerComponent } from './sections/container/themed-section-container.component';
import { ThemedSubmissionFormFooterComponent } from './form/footer/themed-submission-form-footer.component';
import { ThemedSubmissionFormComponent } from './form/themed-submission-form.component';
import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
import { SectionsDirective } from './sections/sections.directive';
import { SectionsService } from './sections/sections.service';
import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
import { MetadataInformationComponent } from './sections/sherpa-policies/metadata-information/metadata-information.component';
import { PublicationInformationComponent } from './sections/sherpa-policies/publication-information/publication-information.component';
import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.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 { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
import { SubmissionSectionUploadFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
import { SectionUploadService } from './sections/upload/section-upload.service';
import { submissionEffects } from './submission.effects';
import {
submissionReducers,
SubmissionState,
} from './submission.reducers';
import { SubmissionSubmitComponent } from './submit/submission-submit.component';
import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
const ENTRY_COMPONENTS = [
// put only entry components that use custom decorator
@@ -117,22 +106,15 @@ const DECLARATIONS = [
@NgModule({
imports: [
CommonModule,
CoreModule.forRoot(),
SharedModule,
StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
EffectsModule.forFeature(submissionEffects),
JournalEntitiesModule.withEntryComponents(),
ResearchEntitiesModule.withEntryComponents(),
FormModule,
NgbModalModule,
NgbCollapseModule,
NgbAccordionModule,
UploadModule,
],
declarations: DECLARATIONS,
exports: [
...DECLARATIONS,
FormModule,
],
providers: [
SectionUploadService,
@@ -141,7 +123,7 @@ const DECLARATIONS = [
SubmissionAccessesConfigDataService,
SectionAccessesService,
SectionFormOperationsService,
]
],
})
/**
@@ -155,7 +137,7 @@ export class SubmissionModule {
static withEntryComponents() {
return {
ngModule: SubmissionModule,
providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
};
}
}

View File

@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { SubmissionEditComponent as BaseComponent } from '../../../../../app/submission/edit/submission-edit.component';
import { SubmissionFormComponent } from '../../../../../app/submission/form/submission-form.component';
import { ThemedSubmissionFormComponent } from '../../../../../app/submission/form/themed-submission-form.component';
/**
* This component allows to edit an existing workspaceitem/workflowitem.
@@ -14,7 +14,7 @@ import { SubmissionFormComponent } from '../../../../../app/submission/form/subm
templateUrl: '../../../../../app/submission/edit/submission-edit.component.html',
standalone: true,
imports: [
SubmissionFormComponent,
ThemedSubmissionFormComponent,
],
})
export class SubmissionEditComponent extends BaseComponent {

View File

@@ -1,14 +1,14 @@
import {
SubmissionFormFooterComponent as BaseComponent
} from '../../../../../../app/submission/form/footer/submission-form-footer.component';
import { Component } from '@angular/core';
import { SubmissionFormFooterComponent as BaseComponent } from '../../../../../../app/submission/form/footer/submission-form-footer.component';
@Component({
selector: 'ds-submission-form-footer',
selector: 'ds-themed-submission-form-footer',
// styleUrls: ['./submission-form-footer.component.scss'],
styleUrls: ['../../../../../../app/submission/form/footer/submission-form-footer.component.scss'],
// templateUrl: './submission-form-footer.component.html'
templateUrl: '../../../../../../app/submission/form/footer/submission-form-footer.component.html'
templateUrl: '../../../../../../app/submission/form/footer/submission-form-footer.component.html',
standalone: true,
})
export class SubmissionFormFooterComponent extends BaseComponent {

View File

@@ -1,14 +1,14 @@
import {
SubmissionFormComponent as BaseComponent
} from '../../../../../app/submission/form/submission-form.component';
import { Component } from '@angular/core';
import { SubmissionFormComponent as BaseComponent } from '../../../../../app/submission/form/submission-form.component';
@Component({
selector: 'ds-submission-form',
selector: 'ds-themed-submission-form',
// styleUrls: ['./submission-form.component.scss'],
styleUrls: ['../../../../../app/submission/form/submission-form.component.scss'],
// templateUrl: './submission-form.component.html'
templateUrl: '../../../../../app/submission/form/submission-form.component.html'
templateUrl: '../../../../../app/submission/form/submission-form.component.html',
standalone: true,
})
export class SubmissionFormComponent extends BaseComponent {

View File

@@ -1,14 +1,14 @@
import {
SubmissionSectionContainerComponent as BaseComponent
} from '../../../../../../app/submission/sections/container/section-container.component';
import { Component } from '@angular/core';
import { SubmissionSectionContainerComponent as BaseComponent } from '../../../../../../app/submission/sections/container/section-container.component';
@Component({
selector: 'ds-submission-upload-section-file',
selector: 'ds-themed-submission-upload-section-file',
// styleUrls: ['./section-container.component.scss'],
styleUrls: ['../../../../../../app/submission/sections/container/section-container.component.scss'],
// templateUrl: './section-container.component.html'
templateUrl: '../../../../../../app/submission/sections/container/section-container.component.html'
templateUrl: '../../../../../../app/submission/sections/container/section-container.component.html',
standalone: true,
})
export class SubmissionSectionContainerComponent extends BaseComponent {

View File

@@ -100,17 +100,17 @@ import { CommunityStatisticsPageComponent } from './app/statistics-page/communit
import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
import { SubmissionFormFooterComponent } from './app/submission/form/footer/submission-form-footer.component';
import { SubmissionFormComponent } from './app/submission/form/submission-form.component';
import { SubmissionUploadFilesComponent } from './app/submission/form/submission-upload-files/submission-upload-files.component';
import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
import { SubmissionSectionContainerComponent } from './app/submission/sections/container/section-container.component';
import { SubmissionSectionUploadFileComponent } from './app/submission/sections/upload/file/section-upload-file.component';
import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
import { WorkspaceItemsDeletePageComponent } from './app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component';
import { SubmissionSectionContainerComponent } from './app/submission/sections/container/section-container.component';
import { SubmissionFormFooterComponent } from './app/submission/form/footer/submission-form-footer.component';
import { SubmissionFormComponent } from './app/submission/form/submission-form.component';
const DECLARATIONS = [
FileSectionComponent,