[DURACOM-191] fix runtime errors for store features

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[] = [

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<QualityAssuranceTopicObject> {
 

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<SuggestionSource> {
 

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: {

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'

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

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: [

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 {
 
   /**

src/app/notifications/notifications.module.ts

@@ -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<SuggestionNotificationsState, Action>),
-  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 {
-}

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<SuggestionNotificationsState, Action>),
+      EffectsModule.forFeature(notificationsEffects),
+    ),
+  ]);
+};

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 {
 
   /**

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 {
 
   /**

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'}
   }

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 {
-
-}

src/app/quality-assurance-notifications-pages/notifications-pages.module.ts

@@ -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 {
-
-}

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<SubmissionState, Action>),
+      EffectsModule.forFeature(submissionEffects),
+    ),
+  ]);
+};

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'}
   }
 ];

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',

src/app/suggestions-page/suggestions-page.module.ts

@@ -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 { }

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],

src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts

@@ -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 {
-
-}

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: [
       {

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
 ],
 })