Merge remote-tracking branch 'origin/main' into CST-4506_item_embargo

# Conflicts:
#	src/app/core/core.module.ts
#	src/app/submission/objects/submission-objects.effects.ts
#	src/app/submission/submission.module.ts
This commit is contained in:
Giuseppe Digilio
2022-01-24 19:58:50 +01:00
346 changed files with 4818 additions and 3383 deletions

View File

@@ -37,6 +37,8 @@ import { ResearchEntitiesModule } from '../entity-groups/research-entities/resea
import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
import { FormModule } from '../shared/form/form.module';
import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
import { SubmissionAccessesConfigService } from '../core/config/submission-accesses-config.service';
import { SectionAccessesService } from './sections/accesses/section-accesses.service';
@@ -75,15 +77,17 @@ const DECLARATIONS = [
];
@NgModule({
imports: [
CommonModule,
CoreModule.forRoot(),
SharedModule,
StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
EffectsModule.forFeature(submissionEffects),
JournalEntitiesModule.withEntryComponents(),
ResearchEntitiesModule.withEntryComponents(),
],
imports: [
CommonModule,
CoreModule.forRoot(),
SharedModule,
StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
EffectsModule.forFeature(submissionEffects),
JournalEntitiesModule.withEntryComponents(),
ResearchEntitiesModule.withEntryComponents(),
FormModule,
NgbAccordionModule
],
declarations: DECLARATIONS,
exports: DECLARATIONS,
providers: [