From a9c975b72a8cb1a5edc9177cf12fa0359571de11 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Fri, 8 Mar 2024 15:59:50 +0100 Subject: [PATCH] [DURACOM-191] fix runtime errors for store features --- .../admin-notifications-routes.ts | 4 +- .../quality-assurance-topic-data.service.ts | 2 +- .../source/suggestion-source-data.service.ts | 2 +- src/app/home-page/home-page-routes.ts | 4 +- .../import-external-page-routes.ts | 2 + .../my-dspace-page/my-dspace-page-routes.ts | 2 + .../my-dspace-page/my-dspace-page.module.ts | 2 - .../notifications-state.service.ts | 2 +- src/app/notifications/notifications.module.ts | 108 ------------------ .../provide-suggestion-notifications.ts | 15 +++ .../quality-assurance-source.service.ts | 2 +- .../quality-assurance-topics.service.ts | 2 +- src/app/profile-page/profile-page-routes.ts | 2 + .../notifications-pages-routes.ts | 11 +- .../notifications-pages.module.ts | 26 ----- src/app/submission/provide-submission.ts | 15 +++ src/app/submit-page/submit-page-routes.ts | 4 + .../suggestions-page-routes.ts | 4 +- .../suggestions-page.module.ts | 19 --- .../workflowitems-edit-page-routes.ts | 3 +- .../workflowitems-edit-page.module.ts | 57 --------- .../workspaceitems-edit-page-routes.ts | 11 +- src/themes/custom/lazy-theme.module.ts | 2 - 23 files changed, 68 insertions(+), 233 deletions(-) delete mode 100644 src/app/notifications/notifications.module.ts create mode 100644 src/app/notifications/provide-suggestion-notifications.ts delete mode 100644 src/app/quality-assurance-notifications-pages/notifications-pages.module.ts create mode 100644 src/app/submission/provide-submission.ts delete mode 100644 src/app/suggestions-page/suggestions-page.module.ts delete mode 100644 src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts diff --git a/src/app/admin/admin-notifications/admin-notifications-routes.ts b/src/app/admin/admin-notifications/admin-notifications-routes.ts index bc343e6afa..02ffdb0249 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routes.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routes.ts @@ -33,6 +33,7 @@ import { import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component'; +import { provideSuggestionNotifications } from '../../notifications/provide-suggestion-notifications'; const providers = [ I18nBreadcrumbResolver, @@ -42,7 +43,8 @@ const providers = [ QualityAssuranceEventsPageResolver, QualityAssuranceSourcePageResolver, QualityAssuranceBreadcrumbResolver, - QualityAssuranceBreadcrumbService + QualityAssuranceBreadcrumbService, + provideSuggestionNotifications(), ]; export const ROUTES: Route[] = [ diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts index 919aaac71a..f553d7b7a3 100644 --- a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts +++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts @@ -21,7 +21,7 @@ import { FindAllData, FindAllDataImpl } from '../../../data/base/find-all-data'; /** * The service handling all Quality Assurance topic REST requests. */ -@Injectable() +@Injectable({providedIn: 'root'}) @dataService(QUALITY_ASSURANCE_TOPIC_OBJECT) export class QualityAssuranceTopicDataService extends IdentifiableDataService { diff --git a/src/app/core/notifications/source/suggestion-source-data.service.ts b/src/app/core/notifications/source/suggestion-source-data.service.ts index f00a84c95b..25aaae028d 100644 --- a/src/app/core/notifications/source/suggestion-source-data.service.ts +++ b/src/app/core/notifications/source/suggestion-source-data.service.ts @@ -22,7 +22,7 @@ import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.servic /** * Service that retrieves Suggestion Source data */ -@Injectable() +@Injectable({providedIn: 'root'}) @dataService(SUGGESTION_SOURCE) export class SuggestionSourceDataService extends IdentifiableDataService { diff --git a/src/app/home-page/home-page-routes.ts b/src/app/home-page/home-page-routes.ts index d083dac47b..04abc5bae9 100644 --- a/src/app/home-page/home-page-routes.ts +++ b/src/app/home-page/home-page-routes.ts @@ -3,13 +3,15 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { ThemedHomePageComponent } from './themed-home-page.component'; import { MenuItemType } from '../shared/menu/menu-item-type.model'; import { Route } from '@angular/router'; +import { provideSuggestionNotifications } from '../notifications/provide-suggestion-notifications'; export const ROUTES: Route[] = [ { path: '', component: ThemedHomePageComponent, providers: [ - HomePageResolver + HomePageResolver, + provideSuggestionNotifications() ], pathMatch: 'full', data: { diff --git a/src/app/import-external-page/import-external-page-routes.ts b/src/app/import-external-page/import-external-page-routes.ts index a368863000..6308f4c57b 100644 --- a/src/app/import-external-page/import-external-page-routes.ts +++ b/src/app/import-external-page/import-external-page-routes.ts @@ -3,12 +3,14 @@ import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; import { ThemedSubmissionImportExternalComponent } from '../submission/import-external/themed-submission-import-external.component'; +import { provideSubmission } from '../submission/provide-submission'; export const ROUTES: Route[] = [ { canActivate: [AuthenticatedGuard], path: '', component: ThemedSubmissionImportExternalComponent, + providers: [provideSubmission()], pathMatch: 'full', data: { title: 'submission.import-external.page.title' diff --git a/src/app/my-dspace-page/my-dspace-page-routes.ts b/src/app/my-dspace-page/my-dspace-page-routes.ts index 5bc58b2a6f..45c23e5cd8 100644 --- a/src/app/my-dspace-page/my-dspace-page-routes.ts +++ b/src/app/my-dspace-page/my-dspace-page-routes.ts @@ -2,6 +2,7 @@ import { MyDSpaceGuard } from './my-dspace.guard'; import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { Route } from '@angular/router'; +import { provideSuggestionNotifications } from '../notifications/provide-suggestion-notifications'; export const ROUTES: Route[] = [ { @@ -10,6 +11,7 @@ export const ROUTES: Route[] = [ resolve: { breadcrumb: I18nBreadcrumbResolver }, + providers: [provideSuggestionNotifications()], data: {title: 'mydspace.title', breadcrumbKey: 'mydspace'}, canActivate: [ MyDSpaceGuard diff --git a/src/app/my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts index ab6654f511..542b5d0c33 100644 --- a/src/app/my-dspace-page/my-dspace-page.module.ts +++ b/src/app/my-dspace-page/my-dspace-page.module.ts @@ -17,7 +17,6 @@ import { UploadModule } from '../shared/upload/upload.module'; import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component'; -import { NotificationsModule } from '../notifications/notifications.module'; const DECLARATIONS = [ MyDSpacePageComponent, @@ -34,7 +33,6 @@ const DECLARATIONS = [ CommonModule, SearchModule, UploadModule, - NotificationsModule, ...DECLARATIONS ], providers: [ diff --git a/src/app/notifications/notifications-state.service.ts b/src/app/notifications/notifications-state.service.ts index 3cdaa589d6..59eb6b00af 100644 --- a/src/app/notifications/notifications-state.service.ts +++ b/src/app/notifications/notifications-state.service.ts @@ -25,7 +25,7 @@ import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.ac /** * The service handling the Notifications State. */ -@Injectable() +@Injectable({providedIn: 'root'}) export class NotificationsStateService { /** diff --git a/src/app/notifications/notifications.module.ts b/src/app/notifications/notifications.module.ts deleted file mode 100644 index 7a9a733b2f..0000000000 --- a/src/app/notifications/notifications.module.ts +++ /dev/null @@ -1,108 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { Action, StoreConfig, StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; - -import { storeModuleConfig } from '../app.reducer'; -import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component'; -import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component'; -import { NotificationsStateService } from './notifications-state.service'; -import { suggestionNotificationsReducers, SuggestionNotificationsState } from './notifications.reducer'; -import { notificationsEffects } from './notifications-effects'; -import { QualityAssuranceTopicsService } from './qa/topics/quality-assurance-topics.service'; -import { - QualityAssuranceTopicDataService -} from '../core/notifications/qa/topics/quality-assurance-topic-data.service'; -import { - QualityAssuranceEventDataService -} from '../core/notifications/qa/events/quality-assurance-event-data.service'; -import { ProjectEntryImportModalComponent } from './qa/project-entry-import-modal/project-entry-import-modal.component'; -import { TranslateModule } from '@ngx-translate/core'; -import { SearchModule } from '../shared/search/search.module'; -import { QualityAssuranceSourceComponent } from './qa/source/quality-assurance-source.component'; -import { QualityAssuranceSourceService } from './qa/source/quality-assurance-source.service'; -import { - QualityAssuranceSourceDataService -} from '../core/notifications/qa/source/quality-assurance-source-data.service'; -import { EPersonDataComponent } from './qa/events/ePerson-data/ePerson-data.component'; -import { SuggestionActionsComponent } from './suggestion-actions/suggestion-actions.component'; -import { PublicationClaimComponent } from './suggestion-targets/publication-claim/publication-claim.component'; -import { SuggestionListElementComponent } from './suggestion-list-element/suggestion-list-element.component'; -import { - SuggestionEvidencesComponent -} from './suggestion-list-element/suggestion-evidences/suggestion-evidences.component'; -import { SuggestionsPopupComponent } from './suggestions-popup/suggestions-popup.component'; -import { SuggestionsNotificationComponent } from './suggestions-notification/suggestions-notification.component'; -import { SuggestionsService } from './suggestions.service'; -import { SuggestionSourceDataService } from '../core/notifications/source/suggestion-source-data.service'; -import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service'; -import { SuggestionTargetsStateService } from './suggestion-targets/suggestion-targets.state.service'; -import { SuggestionsDataService } from '../core/notifications/suggestions-data.service'; - - - -const MODULES = [ - CommonModule, - SearchModule, - StoreModule.forFeature('suggestionNotifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig), - EffectsModule.forFeature(notificationsEffects), - TranslateModule -]; - -const COMPONENTS = [ - QualityAssuranceTopicsComponent, - QualityAssuranceEventsComponent, - QualityAssuranceSourceComponent, - EPersonDataComponent, - PublicationClaimComponent, - SuggestionActionsComponent, - SuggestionListElementComponent, - SuggestionEvidencesComponent, - SuggestionsPopupComponent, - SuggestionsNotificationComponent -]; - -const DIRECTIVES = [ ]; - -const ENTRY_COMPONENTS = [ - ProjectEntryImportModalComponent -]; - -const PROVIDERS = [ - NotificationsStateService, - QualityAssuranceTopicsService, - QualityAssuranceSourceService, - QualityAssuranceTopicDataService, - QualityAssuranceSourceDataService, - QualityAssuranceEventDataService, - SuggestionsService, - SuggestionSourceDataService, - SuggestionTargetDataService, - SuggestionTargetsStateService, - SuggestionsDataService -]; - -@NgModule({ - imports: [ - ...MODULES, - ...COMPONENTS, - ...DIRECTIVES, - ...ENTRY_COMPONENTS, - ], - providers: [ - ...PROVIDERS - ], - entryComponents: [ - ...ENTRY_COMPONENTS - ], - exports: [ - ...COMPONENTS, - ...DIRECTIVES, - ] -}) - -/** - * This module handles all components that are necessary for the OpenAIRE components - */ -export class NotificationsModule { -} diff --git a/src/app/notifications/provide-suggestion-notifications.ts b/src/app/notifications/provide-suggestion-notifications.ts new file mode 100644 index 0000000000..64c77440dd --- /dev/null +++ b/src/app/notifications/provide-suggestion-notifications.ts @@ -0,0 +1,15 @@ +import { importProvidersFrom, makeEnvironmentProviders } from '@angular/core'; +import { EffectsModule } from '@ngrx/effects'; +import { Action, StoreConfig, StoreModule } from '@ngrx/store'; +import { storeModuleConfig } from '../app.reducer'; +import { suggestionNotificationsReducers, SuggestionNotificationsState } from './notifications.reducer'; +import { notificationsEffects } from './notifications-effects'; + +export const provideSuggestionNotifications = () => { + return makeEnvironmentProviders([ + importProvidersFrom( + StoreModule.forFeature('suggestionNotifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig), + EffectsModule.forFeature(notificationsEffects), + ), + ]); +}; diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.ts b/src/app/notifications/qa/source/quality-assurance-source.service.ts index ea0cb2e5c5..4589d9e346 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.service.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.service.ts @@ -18,7 +18,7 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; /** * The service handling all Quality Assurance source requests to the REST service. */ -@Injectable() +@Injectable({providedIn: 'root'}) export class QualityAssuranceSourceService { /** diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts index 131be400ca..cde775baf7 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts @@ -18,7 +18,7 @@ import { hasValue } from '../../../shared/empty.util'; /** * The service handling all Quality Assurance topic requests to the REST service. */ -@Injectable() +@Injectable({providedIn: 'root'}) export class QualityAssuranceTopicsService { /** diff --git a/src/app/profile-page/profile-page-routes.ts b/src/app/profile-page/profile-page-routes.ts index 3cd9134253..f187033513 100644 --- a/src/app/profile-page/profile-page-routes.ts +++ b/src/app/profile-page/profile-page-routes.ts @@ -1,12 +1,14 @@ import { Route } from '@angular/router'; import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedProfilePageComponent } from './themed-profile-page.component'; +import { provideSuggestionNotifications } from '../notifications/provide-suggestion-notifications'; export const ROUTES: Route[] = [ { path: '', pathMatch: 'full', component: ThemedProfilePageComponent, + providers: [provideSuggestionNotifications()], resolve: {breadcrumb: I18nBreadcrumbResolver}, data: {breadcrumbKey: 'profile', title: 'profile.title'} } diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts b/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts index 27b587286e..260a93a920 100644 --- a/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts +++ b/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts @@ -34,6 +34,7 @@ import { import { QualityAssuranceBreadcrumbResolver } from '../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; import { QualityAssuranceBreadcrumbService } from '../core/breadcrumbs/quality-assurance-breadcrumb.service'; import { SourceDataResolver } from './quality-assurance-source-page-component/quality-assurance-source-data.resolver'; +import { provideSuggestionNotifications } from '../notifications/provide-suggestion-notifications'; const providers = [ I18nBreadcrumbResolver, @@ -45,7 +46,8 @@ const providers = [ QualityAssuranceEventsPageResolver, QualityAssuranceSourcePageResolver, QualityAssuranceBreadcrumbResolver, - QualityAssuranceBreadcrumbService + QualityAssuranceBreadcrumbService, + provideSuggestionNotifications() ]; export const ROUTES: Route[] = [ @@ -131,10 +133,3 @@ export const ROUTES: Route[] = [ } } ]; - -/** - * Routing module for the Notifications section of the admin sidebar - */ -export class NotificationsPageRoutingModule { - -} diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts b/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts deleted file mode 100644 index 49fdae45ab..0000000000 --- a/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { - QualityAssuranceTopicsPageComponent -} from './quality-assurance-topics-page/quality-assurance-topics-page.component'; -import { - QualityAssuranceEventsPageComponent -} from './quality-assurance-events-page/quality-assurance-events-page.component'; -import { NotificationsModule } from '../notifications/notifications.module'; - - -@NgModule({ - imports: [ - CommonModule, - NotificationsModule, - QualityAssuranceEventsPageComponent, - QualityAssuranceTopicsPageComponent - ], - entryComponents: [] -}) -/** - * This module handles all components related to the notifications pages - */ -export class NotificationsPageModule { - -} diff --git a/src/app/submission/provide-submission.ts b/src/app/submission/provide-submission.ts new file mode 100644 index 0000000000..f7e74b05b4 --- /dev/null +++ b/src/app/submission/provide-submission.ts @@ -0,0 +1,15 @@ +import { importProvidersFrom, makeEnvironmentProviders } from '@angular/core'; +import { EffectsModule } from '@ngrx/effects'; +import { submissionEffects } from './submission.effects'; +import { submissionReducers, SubmissionState } from './submission.reducers'; +import { Action, StoreConfig, StoreModule } from '@ngrx/store'; +import { storeModuleConfig } from '../app.reducer'; + +export const provideSubmission = () => { + return makeEnvironmentProviders([ + importProvidersFrom( + StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig), + EffectsModule.forFeature(submissionEffects), + ), + ]); +}; diff --git a/src/app/submit-page/submit-page-routes.ts b/src/app/submit-page/submit-page-routes.ts index 30d1bc0f90..d6b9512d2f 100644 --- a/src/app/submit-page/submit-page-routes.ts +++ b/src/app/submit-page/submit-page-routes.ts @@ -3,6 +3,7 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component'; import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { provideSubmission } from '../submission/provide-submission'; export const ROUTES: Route[] = [ { @@ -13,6 +14,9 @@ export const ROUTES: Route[] = [ resolve: { breadcrumb: I18nBreadcrumbResolver }, + providers: [ + provideSubmission(), + ], data: {title: 'submission.submit.title', breadcrumbKey: 'submission.submit'} } ]; diff --git a/src/app/suggestions-page/suggestions-page-routes.ts b/src/app/suggestions-page/suggestions-page-routes.ts index 481ba82d36..251361fa03 100644 --- a/src/app/suggestions-page/suggestions-page-routes.ts +++ b/src/app/suggestions-page/suggestions-page-routes.ts @@ -3,6 +3,7 @@ import { SuggestionsPageComponent } from './suggestions-page.component'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; import { PublicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver'; import { Route } from '@angular/router'; +import { provideSuggestionNotifications } from '../notifications/provide-suggestion-notifications'; export const ROUTES: Route[] = [ { @@ -18,7 +19,8 @@ export const ROUTES: Route[] = [ }, providers: [ SuggestionsPageResolver, - PublicationClaimBreadcrumbResolver + PublicationClaimBreadcrumbResolver, + provideSuggestionNotifications() ], canActivate: [AuthenticatedGuard], runGuardsAndResolvers: 'always', diff --git a/src/app/suggestions-page/suggestions-page.module.ts b/src/app/suggestions-page/suggestions-page.module.ts deleted file mode 100644 index 12ab4c1dbe..0000000000 --- a/src/app/suggestions-page/suggestions-page.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { NotificationsModule } from '../notifications/notifications.module'; -import { SuggestionsDataService } from '../core/notifications/suggestions-data.service'; -import { SuggestionsService } from '../notifications/suggestions.service'; -import { TranslateModule } from '@ngx-translate/core'; - -@NgModule({ - imports: [ - CommonModule, - NotificationsModule, - TranslateModule - ], - providers: [ - SuggestionsDataService, - SuggestionsService - ] -}) -export class SuggestionsPageModule { } diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts index c1fc0b1d57..7b372df7e3 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts @@ -20,12 +20,13 @@ import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item- import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component'; +import { provideSubmission } from '../submission/provide-submission'; export const ROUTES: Routes = [ { path: ':id', resolve: {wfi: WorkflowItemPageResolver}, - providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver], + providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver, provideSubmission()], children: [ { canActivate: [AuthenticatedGuard], diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts deleted file mode 100644 index 58df060b21..0000000000 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { SubmissionModule } from '../submission/submission.module'; -import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-item-delete.component'; -import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component'; -import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component'; -import { - ThemedWorkflowItemSendBackComponent -} from './workflow-item-send-back/themed-workflow-item-send-back.component'; -import { StatisticsModule } from '../statistics/statistics.module'; -import { ItemPageModule } from '../item-page/item-page.module'; -import { - AdvancedWorkflowActionsLoaderComponent -} from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component'; -import { - AdvancedWorkflowActionRatingComponent -} from './advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component'; -import { - AdvancedWorkflowActionSelectReviewerComponent -} from './advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; -import { - AdvancedWorkflowActionPageComponent -} from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component'; -import { AccessControlModule } from '../access-control/access-control.module'; -import { - ReviewersListComponent -} from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component'; -import { FormModule } from '../shared/form/form.module'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - -@NgModule({ - imports: [ - CommonModule, - SubmissionModule, - StatisticsModule, - ItemPageModule, - AccessControlModule, - FormModule, - NgbModule, - WorkflowItemDeleteComponent, - ThemedWorkflowItemDeleteComponent, - WorkflowItemSendBackComponent, - ThemedWorkflowItemSendBackComponent, - AdvancedWorkflowActionsLoaderComponent, - AdvancedWorkflowActionRatingComponent, - AdvancedWorkflowActionSelectReviewerComponent, - AdvancedWorkflowActionPageComponent, - - ReviewersListComponent - ] -}) -/** - * This module handles all modules that need to access the workflowitems edit page. - */ -export class WorkflowItemsEditPageModule { - -} diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts index 7ef4288b52..9664e5c954 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts @@ -10,16 +10,23 @@ import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component'; +import { provideSubmission } from '../submission/provide-submission'; + +const providers = [ + WorkspaceItemPageResolver, + ItemFromWorkspaceResolver, + provideSubmission(), +]; export const ROUTES: Route[] = [ { path: '', - providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver], + providers, redirectTo: '/home', pathMatch: 'full' }, { path: ':id', - providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver], + providers, resolve: {wsi: WorkspaceItemPageResolver}, children: [ { diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 9a41533391..fef2aa0854 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -159,7 +159,6 @@ import { import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component'; import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component'; import { FormModule } from '../../app/shared/form/form.module'; -import { NotificationsModule } from '../../app/notifications/notifications.module'; import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component'; import { BrowseByComponent } from './app/shared/browse-by/browse-by.component'; import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component'; @@ -285,7 +284,6 @@ const DECLARATIONS = [ SystemWideAlertModule, NgxGalleryModule, FormModule, - NotificationsModule, ...DECLARATIONS ], })