From 922172d9aef30d4a84afa467cb9e2d1c04e772c5 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 13 Dec 2023 11:55:10 +0100
Subject: [PATCH] refactor, improve code according to suggestions

---
 .../admin-notifications-routing.module.ts     |  2 +-
 .../admin-notifications.module.ts             |  4 +--
 ...quality-assurance-source-data.resolver.ts} |  4 +--
 src/app/core/core.module.ts                   |  6 ++--
 ...ality-assurance-event-data.service.spec.ts |  0
 .../quality-assurance-event-data.service.ts   |  0
 ...ty-assurance-event-object.resource-type.ts |  0
 .../models/quality-assurance-event.model.ts   |  0
 ...y-assurance-source-object.resource-type.ts |  0
 .../models/quality-assurance-source.model.ts  |  0
 ...ty-assurance-topic-object.resource-type.ts |  0
 .../models/quality-assurance-topic.model.ts   |  0
 ...lity-assurance-source-data.service.spec.ts |  0
 .../quality-assurance-source-data.service.ts  |  0
 ...ality-assurance-topic-data.service.spec.ts |  0
 .../quality-assurance-topic-data.service.ts   |  0
 .../notifications-effects.ts}                 |  2 +-
 .../notifications-state.service.spec.ts}      | 30 ++++++++--------
 .../notifications-state.service.ts}           |  8 ++---
 .../notifications.module.ts}                  | 18 +++++-----
 .../notifications.reducer.ts}                 |  0
 .../quality-assurance-events.component.html   |  7 ++--
 .../quality-assurance-events.component.scss   |  0
 ...quality-assurance-events.component.spec.ts |  4 +--
 .../quality-assurance-events.component.ts     |  8 +++--
 .../project-entry-import-modal.component.html |  4 +--
 .../project-entry-import-modal.component.scss |  0
 ...oject-entry-import-modal.component.spec.ts |  0
 .../project-entry-import-modal.component.ts   |  2 +-
 .../quality-assurance-source.actions.ts       |  8 ++---
 .../quality-assurance-source.component.html   |  0
 .../quality-assurance-source.component.scss   |  0
 ...quality-assurance-source.component.spec.ts |  4 +--
 .../quality-assurance-source.component.ts     |  8 ++---
 .../quality-assurance-source.effects.ts       |  4 +--
 .../quality-assurance-source.reducer.spec.ts  |  0
 .../quality-assurance-source.reducer.ts       |  2 +-
 .../quality-assurance-source.service.spec.ts  |  2 +-
 .../quality-assurance-source.service.ts       |  4 +--
 .../quality-assurance-topics.actions.ts       |  8 ++---
 .../quality-assurance-topics.component.html   |  0
 .../quality-assurance-topics.component.scss   |  0
 ...quality-assurance-topics.component.spec.ts |  4 +--
 .../quality-assurance-topics.component.ts     |  8 ++---
 .../quality-assurance-topics.effects.ts       |  4 +--
 .../quality-assurance-topics.reducer.spec.ts  |  0
 .../quality-assurance-topics.reducer.ts       |  2 +-
 .../quality-assurance-topics.service.spec.ts  |  2 +-
 .../quality-assurance-topics.service.ts       |  4 +--
 .../selectors.ts                              |  6 ++--
 src/app/shared/mocks/notifications.mock.ts    | 34 +++++++++----------
 51 files changed, 104 insertions(+), 99 deletions(-)
 rename src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/{admin-quality-assurance-source-data.reslover.ts => admin-quality-assurance-source-data.resolver.ts} (87%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/events/quality-assurance-event-data.service.spec.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/events/quality-assurance-event-data.service.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/models/quality-assurance-event-object.resource-type.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/models/quality-assurance-event.model.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/models/quality-assurance-source-object.resource-type.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/models/quality-assurance-source.model.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/models/quality-assurance-topic-object.resource-type.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/models/quality-assurance-topic.model.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/source/quality-assurance-source-data.service.spec.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/source/quality-assurance-source-data.service.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topic-data.service.spec.ts (100%)
 rename src/app/core/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topic-data.service.ts (100%)
 rename src/app/{suggestion-notifications/suggestion-notifications-effects.ts => notifications/notifications-effects.ts} (84%)
 rename src/app/{suggestion-notifications/suggestion-notifications-state.service.spec.ts => notifications/notifications-state.service.spec.ts} (93%)
 rename src/app/{suggestion-notifications/suggestion-notifications-state.service.ts => notifications/notifications-state.service.ts} (95%)
 rename src/app/{suggestion-notifications/suggestion-notifications.module.ts => notifications/notifications.module.ts} (78%)
 rename src/app/{suggestion-notifications/suggestion-notifications.reducer.ts => notifications/notifications.reducer.ts} (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/events/quality-assurance-events.component.html (96%)
 rename src/app/{suggestion-notifications => notifications}/qa/events/quality-assurance-events.component.scss (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/events/quality-assurance-events.component.spec.ts (98%)
 rename src/app/{suggestion-notifications => notifications}/qa/events/quality-assurance-events.component.ts (98%)
 rename src/app/{suggestion-notifications => notifications}/qa/project-entry-import-modal/project-entry-import-modal.component.html (94%)
 rename src/app/{suggestion-notifications => notifications}/qa/project-entry-import-modal/project-entry-import-modal.component.scss (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/project-entry-import-modal/project-entry-import-modal.component.ts (98%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.actions.ts (85%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.component.html (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.component.scss (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.component.spec.ts (96%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.component.ts (92%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.effects.ts (94%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.reducer.spec.ts (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.reducer.ts (93%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.service.spec.ts (96%)
 rename src/app/{suggestion-notifications => notifications}/qa/source/quality-assurance-source.service.ts (91%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.actions.ts (84%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.component.html (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.component.scss (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.component.spec.ts (96%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.component.ts (93%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.effects.ts (94%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.reducer.spec.ts (100%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.reducer.ts (93%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.service.spec.ts (96%)
 rename src/app/{suggestion-notifications => notifications}/qa/topics/quality-assurance-topics.service.ts (92%)
 rename src/app/{suggestion-notifications => notifications}/selectors.ts (95%)

diff --git a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
index dc0d82c1d9..de12a48ade 100644
--- a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
+++ b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
@@ -11,7 +11,7 @@ import { AdminQualityAssuranceTopicsPageResolver } from './admin-quality-assuran
 import { AdminQualityAssuranceEventsPageResolver } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.resolver';
 import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
 import { AdminQualityAssuranceSourcePageResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service';
-import { SourceDataResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover';
+import { SourceDataResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver';
 
 @NgModule({
   imports: [
diff --git a/src/app/admin/admin-notifications/admin-notifications.module.ts b/src/app/admin/admin-notifications/admin-notifications.module.ts
index 159baedfec..84475a1623 100644
--- a/src/app/admin/admin-notifications/admin-notifications.module.ts
+++ b/src/app/admin/admin-notifications/admin-notifications.module.ts
@@ -6,7 +6,7 @@ import { AdminNotificationsRoutingModule } from './admin-notifications-routing.m
 import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
 import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
 import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
-import {SuggestionNotificationsModule} from '../../suggestion-notifications/suggestion-notifications.module';
+import {NotificationsModule} from '../../notifications/notifications.module';
 
 @NgModule({
   imports: [
@@ -14,7 +14,7 @@ import {SuggestionNotificationsModule} from '../../suggestion-notifications/sugg
     SharedModule,
     CoreModule.forRoot(),
     AdminNotificationsRoutingModule,
-    SuggestionNotificationsModule
+    NotificationsModule
   ],
   declarations: [
     AdminQualityAssuranceTopicsPageComponent,
diff --git a/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts b/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver.ts
similarity index 87%
rename from src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts
rename to src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver.ts
index 8475732aed..6201e0a743 100644
--- a/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts
+++ b/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver.ts
@@ -3,8 +3,8 @@ import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot, Router } from '@a
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
-import { QualityAssuranceSourceService } from '../../../suggestion-notifications/qa/source/quality-assurance-source.service';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceService } from '../../../notifications/qa/source/quality-assurance-source.service';
 /**
  * This class represents a resolver that retrieve the route data before the route is activated.
  */
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index e176af7d55..b3abf5f877 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -157,9 +157,9 @@ import { SequenceService } from './shared/sequence.service';
 import { CoreState } from './core-state.model';
 import { GroupDataService } from './eperson/group-data.service';
 import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
-import { QualityAssuranceTopicObject } from './suggestion-notifications/qa/models/quality-assurance-topic.model';
-import { QualityAssuranceEventObject } from './suggestion-notifications/qa/models/quality-assurance-event.model';
-import { QualityAssuranceSourceObject } from './suggestion-notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
 import { RatingAdvancedWorkflowInfo } from './tasks/models/rating-advanced-workflow-info.model';
 import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model';
 import { SelectReviewerAdvancedWorkflowInfo } from './tasks/models/select-reviewer-advanced-workflow-info.model';
diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.spec.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.spec.ts
rename to src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts
diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts
rename to src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
diff --git a/src/app/core/suggestion-notifications/qa/models/quality-assurance-event-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/models/quality-assurance-event-object.resource-type.ts
rename to src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts
diff --git a/src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts
rename to src/app/core/notifications/qa/models/quality-assurance-event.model.ts
diff --git a/src/app/core/suggestion-notifications/qa/models/quality-assurance-source-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/models/quality-assurance-source-object.resource-type.ts
rename to src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts
diff --git a/src/app/core/suggestion-notifications/qa/models/quality-assurance-source.model.ts b/src/app/core/notifications/qa/models/quality-assurance-source.model.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/models/quality-assurance-source.model.ts
rename to src/app/core/notifications/qa/models/quality-assurance-source.model.ts
diff --git a/src/app/core/suggestion-notifications/qa/models/quality-assurance-topic-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/models/quality-assurance-topic-object.resource-type.ts
rename to src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts
diff --git a/src/app/core/suggestion-notifications/qa/models/quality-assurance-topic.model.ts b/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/models/quality-assurance-topic.model.ts
rename to src/app/core/notifications/qa/models/quality-assurance-topic.model.ts
diff --git a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.spec.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.spec.ts
rename to src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts
diff --git a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/source/quality-assurance-source-data.service.ts
rename to src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts
diff --git a/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service.spec.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service.spec.ts
rename to src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts
diff --git a/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts
similarity index 100%
rename from src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service.ts
rename to src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts
diff --git a/src/app/suggestion-notifications/suggestion-notifications-effects.ts b/src/app/notifications/notifications-effects.ts
similarity index 84%
rename from src/app/suggestion-notifications/suggestion-notifications-effects.ts
rename to src/app/notifications/notifications-effects.ts
index ac5d9f8f92..bf70a05855 100644
--- a/src/app/suggestion-notifications/suggestion-notifications-effects.ts
+++ b/src/app/notifications/notifications-effects.ts
@@ -1,7 +1,7 @@
 import { QualityAssuranceSourceEffects } from './qa/source/quality-assurance-source.effects';
 import { QualityAssuranceTopicsEffects } from './qa/topics/quality-assurance-topics.effects';
 
-export const suggestionNotificationsEffects = [
+export const notificationsEffects = [
   QualityAssuranceTopicsEffects,
   QualityAssuranceSourceEffects
 ];
diff --git a/src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts b/src/app/notifications/notifications-state.service.spec.ts
similarity index 93%
rename from src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts
rename to src/app/notifications/notifications-state.service.spec.ts
index ac669ed954..f07b4f5697 100644
--- a/src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts
+++ b/src/app/notifications/notifications-state.service.spec.ts
@@ -2,8 +2,8 @@ import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
 import { cold } from 'jasmine-marbles';
-import { suggestionNotificationsReducers } from './suggestion-notifications.reducer';
-import { SuggestionNotificationsStateService } from './suggestion-notifications-state.service';
+import { suggestionNotificationsReducers } from './notifications.reducer';
+import { NotificationsStateService } from './notifications-state.service';
 import {
   qualityAssuranceSourceObjectMissingPid,
   qualityAssuranceSourceObjectMoreAbstract,
@@ -16,7 +16,7 @@ import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.ac
 import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
 
 describe('NotificationsStateService', () => {
-  let service: SuggestionNotificationsStateService;
+  let service: NotificationsStateService;
   let serviceAsAny: any;
   let store: any;
   let initialState: any;
@@ -67,14 +67,14 @@ describe('NotificationsStateService', () => {
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: SuggestionNotificationsStateService, useValue: service }
+            { provide: NotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new SuggestionNotificationsStateService(store);
+        service = new NotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -159,14 +159,14 @@ describe('NotificationsStateService', () => {
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: SuggestionNotificationsStateService, useValue: service }
+            { provide: NotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new SuggestionNotificationsStateService(store);
+        service = new NotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -255,14 +255,14 @@ describe('NotificationsStateService', () => {
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: SuggestionNotificationsStateService, useValue: service }
+            { provide: NotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new SuggestionNotificationsStateService(store);
+        service = new NotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -325,14 +325,14 @@ describe('NotificationsStateService', () => {
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: SuggestionNotificationsStateService, useValue: service }
+            { provide: NotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new SuggestionNotificationsStateService(store);
+        service = new NotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -417,14 +417,14 @@ describe('NotificationsStateService', () => {
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: SuggestionNotificationsStateService, useValue: service }
+            { provide: NotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new SuggestionNotificationsStateService(store);
+        service = new NotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -513,14 +513,14 @@ describe('NotificationsStateService', () => {
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: SuggestionNotificationsStateService, useValue: service }
+            { provide: NotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new SuggestionNotificationsStateService(store);
+        service = new NotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
diff --git a/src/app/suggestion-notifications/suggestion-notifications-state.service.ts b/src/app/notifications/notifications-state.service.ts
similarity index 95%
rename from src/app/suggestion-notifications/suggestion-notifications-state.service.ts
rename to src/app/notifications/notifications-state.service.ts
index ec1ea2e039..c123cfa304 100644
--- a/src/app/suggestion-notifications/suggestion-notifications-state.service.ts
+++ b/src/app/notifications/notifications-state.service.ts
@@ -16,17 +16,17 @@ import {
   getQualityAssuranceSourceCurrentPageSelector,
   getQualityAssuranceSourceTotalsSelector
 } from './selectors';
-import { QualityAssuranceTopicObject } from '../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
-import { SuggestionNotificationsState } from './suggestion-notifications.reducer';
+import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
+import { SuggestionNotificationsState } from './notifications.reducer';
 import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
-import { QualityAssuranceSourceObject } from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
 import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
 
 /**
  * The service handling the Notifications State.
  */
 @Injectable()
-export class SuggestionNotificationsStateService {
+export class NotificationsStateService {
 
   /**
    * Initialize the service variables.
diff --git a/src/app/suggestion-notifications/suggestion-notifications.module.ts b/src/app/notifications/notifications.module.ts
similarity index 78%
rename from src/app/suggestion-notifications/suggestion-notifications.module.ts
rename to src/app/notifications/notifications.module.ts
index eac527d672..7003ed3cc8 100644
--- a/src/app/suggestion-notifications/suggestion-notifications.module.ts
+++ b/src/app/notifications/notifications.module.ts
@@ -8,16 +8,16 @@ import { SharedModule } from '../shared/shared.module';
 import { storeModuleConfig } from '../app.reducer';
 import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component';
 import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component';
-import { SuggestionNotificationsStateService } from './suggestion-notifications-state.service';
-import { suggestionNotificationsReducers, SuggestionNotificationsState } from './suggestion-notifications.reducer';
-import { suggestionNotificationsEffects } from './suggestion-notifications-effects';
+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/suggestion-notifications/qa/topics/quality-assurance-topic-data.service';
+} from '../core/notifications/qa/topics/quality-assurance-topic-data.service';
 import {
   QualityAssuranceEventDataService
-} from '../core/suggestion-notifications/qa/events/quality-assurance-event-data.service';
+} 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';
@@ -25,7 +25,7 @@ import { QualityAssuranceSourceComponent } from './qa/source/quality-assurance-s
 import { QualityAssuranceSourceService } from './qa/source/quality-assurance-source.service';
 import {
   QualityAssuranceSourceDataService
-} from '../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
+} from '../core/notifications/qa/source/quality-assurance-source-data.service';
 
 const MODULES = [
   CommonModule,
@@ -33,7 +33,7 @@ const MODULES = [
   SearchModule,
   CoreModule.forRoot(),
   StoreModule.forFeature('suggestionNotifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig<SuggestionNotificationsState, Action>),
-  EffectsModule.forFeature(suggestionNotificationsEffects),
+  EffectsModule.forFeature(notificationsEffects),
   TranslateModule
 ];
 
@@ -50,7 +50,7 @@ const ENTRY_COMPONENTS = [
 ];
 
 const PROVIDERS = [
-  SuggestionNotificationsStateService,
+  NotificationsStateService,
   QualityAssuranceTopicsService,
   QualityAssuranceSourceService,
   QualityAssuranceTopicDataService,
@@ -82,5 +82,5 @@ const PROVIDERS = [
 /**
  * This module handles all components that are necessary for the OpenAIRE components
  */
-export class SuggestionNotificationsModule {
+export class NotificationsModule {
 }
diff --git a/src/app/suggestion-notifications/suggestion-notifications.reducer.ts b/src/app/notifications/notifications.reducer.ts
similarity index 100%
rename from src/app/suggestion-notifications/suggestion-notifications.reducer.ts
rename to src/app/notifications/notifications.reducer.ts
diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
similarity index 96%
rename from src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html
rename to src/app/notifications/qa/events/quality-assurance-events.component.html
index 7f1b166d24..d6bd828ed4 100644
--- a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -52,13 +52,14 @@
                   </td>
                   <td><a *ngIf="eventElement?.target"
                          target="_blank"
+                         rel="noopener noreferrer"
                          [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
                     <span *ngIf="!eventElement?.target">{{eventElement.title}}</span>
                   </td>
                   <td *ngIf="showTopic.indexOf('/PID') !== -1">
                     <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.type}}</span></p>
                     <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
-                      <a *ngIf="hasPIDHref(eventElement.event.message); else noPID" href="{{getPIDHref(eventElement.event.message)}}" target="_blank">
+                      <a *ngIf="hasPIDHref(eventElement.event.message); else noPID" href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
                         {{eventElement.event.message.value}}
                       </a>
                       <ng-template #noPID><span class="badge badge-info">{{eventElement.event.message.value}}</span></ng-template>
@@ -84,7 +85,7 @@
                     </p>
                     <p>
                       <span class="small">{{'quality-assurance.event.table.project' | translate}}</span><br>
-                      <a href="https://explore.openaire.eu/search/project?projectId={{ eventElement.event.message.openaireId}}" target="_blank">{{eventElement.event.message.title}}</a>
+                      <a href="{{openAireUrl}}{{ eventElement.event.message.openaireId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
                     </p>
                     <p>
                       <span *ngIf="eventElement.event.message.acronym"><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.acronym}}</span><br></span>
@@ -96,7 +97,7 @@
                     <hr>
                     <div>
                       {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
-                      <a target="_blank" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
+                      <a target="_blank" rel="noopener noreferrer" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
                       <div class="btn-group">
                         <button *ngIf="!eventElement.hasProject"
                                 class="btn btn-outline-primary btn-sm"
diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.scss b/src/app/notifications/qa/events/quality-assurance-events.component.scss
similarity index 100%
rename from src/app/suggestion-notifications/qa/events/quality-assurance-events.component.scss
rename to src/app/notifications/qa/events/quality-assurance-events.component.scss
diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
similarity index 98%
rename from src/app/suggestion-notifications/qa/events/quality-assurance-events.component.spec.ts
rename to src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
index 04ece87fbb..3349dd3154 100644
--- a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.spec.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -7,7 +7,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { of as observableOf } from 'rxjs';
 import {
   QualityAssuranceEventDataService
-} from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-data.service';
+} from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
 import { QualityAssuranceEventsComponent } from './quality-assurance-events.component';
 import {
   getMockQualityAssuranceEventRestService,
@@ -26,7 +26,7 @@ import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import {
   QualityAssuranceEventObject
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
+} from '../../../core/notifications/qa/models/quality-assurance-event.model';
 import { QualityAssuranceEventData } from '../project-entry-import-modal/project-entry-import-modal.component';
 import { TestScheduler } from 'rxjs/testing';
 import { cold, getTestScheduler } from 'jasmine-marbles';
diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
similarity index 98%
rename from src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts
rename to src/app/notifications/qa/events/quality-assurance-events.component.ts
index e34c121f35..a0e328538e 100644
--- a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -12,10 +12,10 @@ import { RemoteData } from '../../../core/data/remote-data';
 import {
   OpenaireQualityAssuranceEventMessageObject,
   QualityAssuranceEventObject
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
+} from '../../../core/notifications/qa/models/quality-assurance-event.model';
 import {
   QualityAssuranceEventDataService
-} from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-data.service';
+} from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -95,6 +95,10 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
    * @type {boolean}
    */
   public showMore = false;
+  /**
+   * The Open Aire base url for project search
+   */
+  public openAireUrl = 'https://explore.openaire.eu/search/project?projectId=';
   /**
    * The FindListOptions object
    */
diff --git a/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
similarity index 94%
rename from src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
rename to src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index 42eb7e4b16..0622e08ab0 100644
--- a/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -9,7 +9,7 @@
   <small>{{ (labelPrefix + label + '.publication' | translate) }}</small>
   <div class="mb-3">
     <div class="text-truncate">
-      <a target="_blank" href="/items/{{(externalSourceEntry.event.target|async)?.payload?.id}}">
+      <a target="_blank" [routerLink]="'/items/{{(externalSourceEntry.event.target|async)?.payload?.id}}'">
         {{externalSourceEntry.title}}
       </a>
     </div>
@@ -18,7 +18,7 @@
     <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
     <div class="mb-3">
       <div class="text-truncate">
-        <a target="_blank" href="/items/{{externalSourceEntry.projectId}}">
+        <a target="_blank" [routerLink]="'/items/{{externalSourceEntry.projectId}}'">
           {{externalSourceEntry.projectTitle}}
         </a>
       </div>
diff --git a/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
similarity index 100%
rename from src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
rename to src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
diff --git a/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
similarity index 100%
rename from src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
rename to src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
diff --git a/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
similarity index 98%
rename from src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
rename to src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 1a43f59a1f..6872baeb90 100644
--- a/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -15,7 +15,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import {
   OpenaireQualityAssuranceEventMessageObject,
   QualityAssuranceEventObject,
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
+} from '../../../core/notifications/qa/models/quality-assurance-event.model';
 import { hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { Item } from '../../../core/shared/item.model';
 
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts b/src/app/notifications/qa/source/quality-assurance-source.actions.ts
similarity index 85%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
rename to src/app/notifications/qa/source/quality-assurance-source.actions.ts
index 06db9dda06..f6d9c19eaa 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.actions.ts
@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
-import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -12,9 +12,9 @@ import { QualityAssuranceSourceObject } from '../../../core/suggestion-notificat
  * action types in the application are unique.
  */
 export const QualityAssuranceSourceActionTypes = {
-  ADD_SOURCE: type('dspace/integration/suggestion-notifications/qa/ADD_SOURCE'),
-  RETRIEVE_ALL_SOURCE: type('dspace/integration/suggestion-notifications/qa/RETRIEVE_ALL_SOURCE'),
-  RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/suggestion-notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
+  ADD_SOURCE: type('dspace/integration/notifications/qa/ADD_SOURCE'),
+  RETRIEVE_ALL_SOURCE: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE'),
+  RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
 };
 
 /**
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
similarity index 100%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.component.html
rename to src/app/notifications/qa/source/quality-assurance-source.component.html
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.scss b/src/app/notifications/qa/source/quality-assurance-source.component.scss
similarity index 100%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.component.scss
rename to src/app/notifications/qa/source/quality-assurance-source.component.scss
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
similarity index 96%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
rename to src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
index 2f588125b2..ba3a903cc5 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -11,7 +11,7 @@ import {
   qualityAssuranceSourceObjectMorePid
 } from '../../../shared/mocks/notifications.mock';
 import { QualityAssuranceSourceComponent } from './quality-assurance-source.component';
-import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
+import { NotificationsStateService } from '../../notifications-state.service';
 import { cold } from 'jasmine-marbles';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -40,7 +40,7 @@ describe('QualityAssuranceSourceComponent test suite', () => {
         TestComponent,
       ],
       providers: [
-        { provide: SuggestionNotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
         { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), params: observableOf({}) } },
         { provide: PaginationService, useValue: paginationService },
         QualityAssuranceSourceComponent
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
similarity index 92%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.component.ts
rename to src/app/notifications/qa/source/quality-assurance-source.component.ts
index f6f02d9ab9..aef56d09c7 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -3,9 +3,9 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
 import { Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, take } from 'rxjs/operators';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
+import { NotificationsStateService } from '../../notifications-state.service';
 import { AdminQualityAssuranceSourcePageParams } from '../../../admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service';
 import { hasValue } from '../../../shared/empty.util';
 
@@ -50,11 +50,11 @@ export class QualityAssuranceSourceComponent implements OnInit {
   /**
    * Initialize the component variables.
    * @param {PaginationService} paginationService
-   * @param {SuggestionNotificationsStateService} notificationsStateService
+   * @param {NotificationsStateService} notificationsStateService
    */
   constructor(
     private paginationService: PaginationService,
-    private notificationsStateService: SuggestionNotificationsStateService,
+    private notificationsStateService: NotificationsStateService,
   ) { }
 
   /**
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.effects.ts b/src/app/notifications/qa/source/quality-assurance-source.effects.ts
similarity index 94%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.effects.ts
rename to src/app/notifications/qa/source/quality-assurance-source.effects.ts
index fd78911ab4..bd85fb18a0 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.effects.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.effects.ts
@@ -14,13 +14,13 @@ import {
 } from './quality-assurance-source.actions';
 import {
   QualityAssuranceSourceObject
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+} from '../../../core/notifications/qa/models/quality-assurance-source.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { QualityAssuranceSourceService } from './quality-assurance-source.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   QualityAssuranceSourceDataService
-} from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
+} from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
 
 /**
  * Provides effect methods for the Quality Assurance source actions.
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts
similarity index 100%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.spec.ts
rename to src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.ts b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts
similarity index 93%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.ts
rename to src/app/notifications/qa/source/quality-assurance-source.reducer.ts
index d83a0e4341..08e26a177a 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts
@@ -1,4 +1,4 @@
-import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
 import { QualityAssuranceSourceActionTypes, QualityAssuranceSourceActions } from './quality-assurance-source.actions';
 
 /**
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
similarity index 96%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.service.spec.ts
rename to src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
index 745a2baef7..5ce2ed8ee0 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.spec.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
@@ -13,7 +13,7 @@ import { cold } from 'jasmine-marbles';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import {
   QualityAssuranceSourceDataService
-} from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
+} from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 describe('QualityAssuranceSourceService', () => {
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.ts b/src/app/notifications/qa/source/quality-assurance-source.service.ts
similarity index 91%
rename from src/app/suggestion-notifications/qa/source/quality-assurance-source.service.ts
rename to src/app/notifications/qa/source/quality-assurance-source.service.ts
index 5c16fb1a03..ea0cb2e5c5 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.service.ts
@@ -5,13 +5,13 @@ import { map } from 'rxjs/operators';
 
 import {
   QualityAssuranceSourceDataService
-} from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
+} from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import {
   QualityAssuranceSourceObject
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+} from '../../../core/notifications/qa/models/quality-assurance-source.model';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
similarity index 84%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
index 2459d4352a..6b83b1d349 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
-import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -12,9 +12,9 @@ import { QualityAssuranceTopicObject } from '../../../core/suggestion-notificati
  * action types in the application are unique.
  */
 export const QualityAssuranceTopicActionTypes = {
-  ADD_TOPICS: type('dspace/integration/suggestion-notifications/qa/topic/ADD_TOPICS'),
-  RETRIEVE_ALL_TOPICS: type('dspace/integration/suggestion-notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
-  RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/suggestion-notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
+  ADD_TOPICS: type('dspace/integration/notifications/qa/topic/ADD_TOPICS'),
+  RETRIEVE_ALL_TOPICS: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
+  RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
 };
 
 /**
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
similarity index 100%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html
rename to src/app/notifications/qa/topics/quality-assurance-topics.component.html
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.scss b/src/app/notifications/qa/topics/quality-assurance-topics.component.scss
similarity index 100%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.scss
rename to src/app/notifications/qa/topics/quality-assurance-topics.component.scss
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
similarity index 96%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
index c80d2bce20..fd64b82ce7 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -12,7 +12,7 @@ import {
   qualityAssuranceTopicObjectMorePid
 } from '../../../shared/mocks/notifications.mock';
 import { QualityAssuranceTopicsComponent } from './quality-assurance-topics.component';
-import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
+import { NotificationsStateService } from '../../notifications-state.service';
 import { cold } from 'jasmine-marbles';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -42,7 +42,7 @@ describe('QualityAssuranceTopicsComponent test suite', () => {
         TestComponent,
       ],
       providers: [
-        { provide: SuggestionNotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
         { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), snapshot: {
           paramMap: {
             get: () => 'openaire',
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
similarity index 93%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.component.ts
index 3c8b4f8f38..542d36a9ed 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -6,10 +6,10 @@ import { distinctUntilChanged, take } from 'rxjs/operators';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import {
   QualityAssuranceTopicObject
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+} from '../../../core/notifications/qa/models/quality-assurance-topic.model';
 import { hasValue } from '../../../shared/empty.util';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
+import { NotificationsStateService } from '../../notifications-state.service';
 import {
   AdminQualityAssuranceTopicsPageParams
 } from '../../../admin/admin-notifications/admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service';
@@ -64,13 +64,13 @@ export class QualityAssuranceTopicsComponent implements OnInit {
    * Initialize the component variables.
    * @param {PaginationService} paginationService
    * @param {ActivatedRoute} activatedRoute
-   * @param {SuggestionNotificationsStateService} notificationsStateService
+   * @param {NotificationsStateService} notificationsStateService
    * @param {QualityAssuranceTopicsService} qualityAssuranceTopicsService
    */
   constructor(
     private paginationService: PaginationService,
     private activatedRoute: ActivatedRoute,
-    private notificationsStateService: SuggestionNotificationsStateService,
+    private notificationsStateService: NotificationsStateService,
     private qualityAssuranceTopicsService: QualityAssuranceTopicsService
   ) {
   }
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
similarity index 94%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
index 13e3670000..a7b4dddd62 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
@@ -14,13 +14,13 @@ import {
 } from './quality-assurance-topics.actions';
 import {
   QualityAssuranceTopicObject
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+} from '../../../core/notifications/qa/models/quality-assurance-topic.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   QualityAssuranceTopicDataService
-} from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service';
+} from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
 
 /**
  * Provides effect methods for the Quality Assurance topics actions.
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
similarity index 100%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
similarity index 93%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
index 355ace977d..ff94f1b8bb 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
@@ -1,4 +1,4 @@
-import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
 import { QualityAssuranceTopicActionTypes, QualityAssuranceTopicsActions } from './quality-assurance-topics.actions';
 
 /**
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
similarity index 96%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.spec.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
index 1e4e3fcffd..c6aae27a88 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.spec.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
@@ -4,7 +4,7 @@ import { QualityAssuranceTopicsService } from './quality-assurance-topics.servic
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import {
   QualityAssuranceTopicDataService
-} from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service';
+} from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import {
   getMockQualityAssuranceTopicRestService,
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts
similarity index 92%
rename from src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts
rename to src/app/notifications/qa/topics/quality-assurance-topics.service.ts
index 6820791dff..9dd581ebed 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts
@@ -3,13 +3,13 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import {
   QualityAssuranceTopicDataService
-} from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service';
+} from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import {
   QualityAssuranceTopicObject
-} from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+} from '../../../core/notifications/qa/models/quality-assurance-topic.model';
 import { RequestParam } from '../../../core/cache/models/request-param.model';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
diff --git a/src/app/suggestion-notifications/selectors.ts b/src/app/notifications/selectors.ts
similarity index 95%
rename from src/app/suggestion-notifications/selectors.ts
rename to src/app/notifications/selectors.ts
index d98c023ee4..63b2da7a10 100644
--- a/src/app/suggestion-notifications/selectors.ts
+++ b/src/app/notifications/selectors.ts
@@ -1,12 +1,12 @@
 import { createFeatureSelector, createSelector, MemoizedSelector } from '@ngrx/store';
 import { subStateSelector } from '../shared/selector.util';
-import { suggestionNotificationsSelector, SuggestionNotificationsState } from './suggestion-notifications.reducer';
-import { QualityAssuranceTopicObject } from '../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+import { suggestionNotificationsSelector, SuggestionNotificationsState } from './notifications.reducer';
+import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
 import { QualityAssuranceTopicState } from './qa/topics/quality-assurance-topics.reducer';
 import { QualityAssuranceSourceState } from './qa/source/quality-assurance-source.reducer';
 import {
   QualityAssuranceSourceObject
-} from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+} from '../core/notifications/qa/models/quality-assurance-source.model';
 
 /**
  * Returns the Notifications state.
diff --git a/src/app/shared/mocks/notifications.mock.ts b/src/app/shared/mocks/notifications.mock.ts
index dc1c98c7b9..8c8193071a 100644
--- a/src/app/shared/mocks/notifications.mock.ts
+++ b/src/app/shared/mocks/notifications.mock.ts
@@ -2,16 +2,16 @@ import { of as observableOf } from 'rxjs';
 import { ResourceType } from '../../core/shared/resource-type';
 import {
   QualityAssuranceTopicObject
-} from '../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+} from '../../core/notifications/qa/models/quality-assurance-topic.model';
 import {
   QualityAssuranceEventObject
-} from '../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
+} from '../../core/notifications/qa/models/quality-assurance-event.model';
 import {
   QualityAssuranceTopicDataService
-} from '../../core/suggestion-notifications/qa/topics/quality-assurance-topic-data.service';
+} from '../../core/notifications/qa/topics/quality-assurance-topic-data.service';
 import {
   QualityAssuranceEventDataService
-} from '../../core/suggestion-notifications/qa/events/quality-assurance-event-data.service';
+} from '../../core/notifications/qa/events/quality-assurance-event-data.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { Item } from '../../core/shared/item.model';
 import {
@@ -22,7 +22,7 @@ import {
 import { SearchResult } from '../search/models/search-result.model';
 import {
   QualityAssuranceSourceObject
-} from '../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+} from '../../core/notifications/qa/models/quality-assurance-source.model';
 
 // REST Mock ---------------------------------------------------------------------
 // -------------------------------------------------------------------------------
@@ -80,7 +80,7 @@ const ItemMockPid1: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -199,7 +199,7 @@ const ItemMockPid2: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -318,7 +318,7 @@ const ItemMockPid3: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -437,7 +437,7 @@ const ItemMockPid4: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -556,7 +556,7 @@ const ItemMockPid5: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -675,7 +675,7 @@ const ItemMockPid6: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -794,7 +794,7 @@ const ItemMockPid7: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -913,7 +913,7 @@ export const ItemMockPid8: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -1032,7 +1032,7 @@ export const ItemMockPid9: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -1151,7 +1151,7 @@ export const ItemMockPid10: Item = Object.assign(
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -1270,7 +1270,7 @@ export const NotificationsMockDspaceObject: SearchResult<DSpaceObject> = Object.
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+          value: 'https://demo.dspace.org/handle/10673/6'
         }
       ],
       'dc.description.abstract': [
@@ -1799,7 +1799,7 @@ export const qualityAssuranceEventObjectMissingProjectNotFound: QualityAssurance
 // -------------------------------------------------------------------------------
 
 /**
- * Mock for [[SuggestionNotificationsStateService]]
+ * Mock for [[NotificationsStateService]]
  */
 export function getMockNotificationsStateService(): any {
   return jasmine.createSpyObj('NotificationsStateService', {