[CST-18016] Create suggestions folder to better organize the code relative to notifications functionalities

src/app/home-page/home-page.component.ts

@@ -18,7 +18,7 @@ import {
 } from 'src/config/app-config.interface';
 
 import { Site } from '../core/shared/site.model';
-import { SuggestionsPopupComponent } from '../notifications/suggestions-popup/suggestions-popup.component';
+import { SuggestionsPopupComponent } from '../notifications/suggestions/popup/suggestions-popup.component';
 import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component';
 import { ThemedSearchFormComponent } from '../shared/search-form/themed-search-form.component';
 import { PageWithSidebarComponent } from '../shared/sidebar/page-with-sidebar.component';

src/app/my-dspace-page/my-dspace-page.component.spec.ts

@@ -28,7 +28,7 @@ import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-
 import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component';
 import { MyDSpacePageComponent } from './my-dspace-page.component';
 import SpyObj = jasmine.SpyObj;
-import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { SuggestionsNotificationComponent } from '../notifications/suggestions/notification/suggestions-notification.component';
 import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component';
 
 describe('MyDSpacePageComponent', () => {

src/app/my-dspace-page/my-dspace-page.component.ts

@@ -14,7 +14,7 @@ import { RoleType } from '../core/roles/role-types';
 import { Context } from '../core/shared/context.model';
 import { SearchService } from '../core/shared/search/search.service';
 import { ViewMode } from '../core/shared/view-mode.model';
-import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { SuggestionsNotificationComponent } from '../notifications/suggestions/notification/suggestions-notification.component';
 import { RoleDirective } from '../shared/roles/role.directive';
 import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
 import { ThemedSearchComponent } from '../shared/search/themed-search.component';

src/app/notifications/notifications-effects.ts

@@ -1,6 +1,6 @@
 import { QualityAssuranceSourceEffects } from './qa/source/quality-assurance-source.effects';
 import { QualityAssuranceTopicsEffects } from './qa/topics/quality-assurance-topics.effects';
-import { SuggestionTargetsEffects } from './suggestion-targets/suggestion-targets.effects';
+import { SuggestionTargetsEffects } from './suggestions/targets/suggestion-targets.effects';
 
 export const notificationsEffects = [
   QualityAssuranceTopicsEffects,

src/app/notifications/notifications.reducer.ts

@@ -14,7 +14,7 @@ import {
 import {
   SuggestionTargetsReducer,
   SuggestionTargetState,
-} from './suggestion-targets/suggestion-targets.reducer';
+} from './suggestions/targets/suggestion-targets.reducer';
 
 /**
  * The OpenAIRE State

src/app/notifications/suggestions/actions/suggestion-actions.component.ts

@@ -12,13 +12,13 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 import { take } from 'rxjs/operators';
 
-import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
-import { Collection } from '../../core/shared/collection.model';
-import { ItemType } from '../../core/shared/item-relationships/item-type.model';
-import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
-import { ThemedCreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
-import { EntityDropdownComponent } from '../../shared/entity-dropdown/entity-dropdown.component';
-import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-approve-and-import';
+import { Suggestion } from '../../../core/notifications/suggestions/models/suggestion.model';
+import { Collection } from '../../../core/shared/collection.model';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
+import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
+import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
+import { SuggestionApproveAndImport } from '../list-element/suggestion-approve-and-import';
 
 /**
  * Show and trigger the actions to submit for a suggestion

src/app/notifications/suggestions/list-element/suggestion-approve-and-import.ts

@@ -1,4 +1,4 @@
-import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
+import { Suggestion } from '../../../core/notifications/suggestions/models/suggestion.model';
 
 /**
  * A simple interface to unite a specific suggestion and the id of the chosen collection

src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.ts

@@ -5,9 +5,9 @@ import {
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { SuggestionEvidences } from '../../../core/notifications/suggestions/models/suggestion.model';
-import { fadeIn } from '../../../shared/animations/fade';
-import { ObjectKeysPipe } from '../../../shared/utils/object-keys-pipe';
+import { SuggestionEvidences } from '../../../../core/notifications/suggestions/models/suggestion.model';
+import { fadeIn } from '../../../../shared/animations/fade';
+import { ObjectKeysPipe } from '../../../../shared/utils/object-keys-pipe';
 
 /**
  * Show suggestion evidences such as score (authorScore, dateScore)

src/app/notifications/suggestions/list-element/suggestion-list-element.component.spec.ts

@@ -9,10 +9,10 @@ import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 
-import { Item } from '../../core/shared/item.model';
-import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock';
-import { ItemSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
+import { Item } from '../../../core/shared/item.model';
+import { mockSuggestionPublicationOne } from '../../../shared/mocks/publication-claim.mock';
+import { ItemSearchResultListElementComponent } from '../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { SuggestionActionsComponent } from '../actions/suggestion-actions.component';
 import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
 import { SuggestionListElementComponent } from './suggestion-list-element.component';
 

src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts

@@ -9,11 +9,11 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 import { Suggestion } from 'src/app/core/notifications/suggestions/models/suggestion.model';
 
-import { Item } from '../../core/shared/item.model';
-import { fadeIn } from '../../shared/animations/fade';
-import { isNotEmpty } from '../../shared/empty.util';
-import { ItemSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
+import { Item } from '../../../core/shared/item.model';
+import { fadeIn } from '../../../shared/animations/fade';
+import { isNotEmpty } from '../../../shared/empty.util';
+import { ItemSearchResultListElementComponent } from '../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { SuggestionActionsComponent } from '../actions/suggestion-actions.component';
 import { SuggestionApproveAndImport } from './suggestion-approve-and-import';
 import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
 

src/app/notifications/suggestions/notification/suggestions-notification.component.ts

@@ -7,9 +7,9 @@ import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 
-import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
-import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
 import { SuggestionsService } from '../suggestions.service';
+import { SuggestionTargetsStateService } from '../targets/suggestion-targets.state.service';
 
 /**
  * Show suggestions notification, used on myDSpace and Profile pages

src/app/notifications/suggestions/popup/suggestions-popup.component.spec.ts

@@ -8,10 +8,10 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { mockSuggestionTargetsObjectOne } from '../../shared/mocks/publication-claim-targets.mock';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { mockSuggestionTargetsObjectOne } from '../../../shared/mocks/publication-claim-targets.mock';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { SuggestionsService } from '../suggestions.service';
+import { SuggestionTargetsStateService } from '../targets/suggestion-targets.state.service';
 import { SuggestionsPopupComponent } from './suggestions-popup.component';
 
 describe('SuggestionsPopupComponent', () => {

src/app/notifications/suggestions/popup/suggestions-popup.component.ts

@@ -19,11 +19,11 @@ import {
   takeUntil,
 } from 'rxjs/operators';
 
-import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
-import { fromTopEnter } from '../../shared/animations/fromTop';
-import { isNotEmpty } from '../../shared/empty.util';
-import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
+import { fromTopEnter } from '../../../shared/animations/fromTop';
+import { isNotEmpty } from '../../../shared/empty.util';
 import { SuggestionsService } from '../suggestions.service';
+import { SuggestionTargetsStateService } from '../targets/suggestion-targets.state.service';
 
 /**
  * Show suggestions on a popover window, used on the homepage

src/app/notifications/suggestions/suggestions.service.spec.ts

@@ -5,18 +5,18 @@ import { TestScheduler } from 'rxjs/testing';
 import {
   SortDirection,
   SortOptions,
-} from '../core/cache/models/sort-options.model';
-import { FindListOptions } from '../core/data/find-list-options.model';
-import { SuggestionTarget } from '../core/notifications/suggestions/models/suggestion-target.model';
-import { SuggestionDataService } from '../core/notifications/suggestions/suggestion-data.service';
-import { SuggestionTargetDataService } from '../core/notifications/suggestions/target/suggestion-target-data.service';
-import { ResearcherProfile } from '../core/profile/model/researcher-profile.model';
-import { ResearcherProfileDataService } from '../core/profile/researcher-profile-data.service';
-import { ResourceType } from '../core/shared/resource-type';
-import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
-import { mockSuggestionPublicationOne } from '../shared/mocks/publication-claim.mock';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { followLink } from '../shared/utils/follow-link-config.model';
+} from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
+import { SuggestionDataService } from '../../core/notifications/suggestions/suggestion-data.service';
+import { SuggestionTargetDataService } from '../../core/notifications/suggestions/target/suggestion-target-data.service';
+import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { ResourceType } from '../../core/shared/resource-type';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { SuggestionsService } from './suggestions.service';
 
 describe('SuggestionsService test', () => {

src/app/notifications/suggestions/suggestions.service.ts

@@ -12,37 +12,37 @@ import {
   take,
 } from 'rxjs/operators';
 
-import { SuggestionConfig } from '../../config/suggestion-config.interfaces';
-import { environment } from '../../environments/environment';
+import { SuggestionConfig } from '../../../config/suggestion-config.interfaces';
+import { environment } from '../../../environments/environment';
 import {
   SortDirection,
   SortOptions,
-} from '../core/cache/models/sort-options.model';
-import { FindListOptions } from '../core/data/find-list-options.model';
-import { PaginatedList } from '../core/data/paginated-list.model';
-import { RemoteData } from '../core/data/remote-data';
-import { Suggestion } from '../core/notifications/suggestions/models/suggestion.model';
-import { SuggestionTarget } from '../core/notifications/suggestions/models/suggestion-target.model';
-import { SuggestionDataService } from '../core/notifications/suggestions/suggestion-data.service';
-import { SuggestionTargetDataService } from '../core/notifications/suggestions/target/suggestion-target-data.service';
-import { ResearcherProfile } from '../core/profile/model/researcher-profile.model';
-import { ResearcherProfileDataService } from '../core/profile/researcher-profile-data.service';
-import { NoContent } from '../core/shared/NoContent.model';
+} from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
+import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
+import { SuggestionDataService } from '../../core/notifications/suggestions/suggestion-data.service';
+import { SuggestionTargetDataService } from '../../core/notifications/suggestions/target/suggestion-target-data.service';
+import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { NoContent } from '../../core/shared/NoContent.model';
 import {
   getFinishedRemoteData,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteListPayload,
-} from '../core/shared/operators';
-import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
-import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+} from '../../core/shared/operators';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import {
   hasNoValue,
   hasValue,
   isNotEmpty,
-} from '../shared/empty.util';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { getSuggestionPageRoute } from '../suggestions-page/suggestions-page-routing-paths';
+} from '../../shared/empty.util';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { getSuggestionPageRoute } from '../../suggestions-page/suggestions-page-routing-paths';
 
 /**
  * useful for multiple approvals and ignores operation

src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.ts

@@ -20,13 +20,13 @@ import {
   take,
 } from 'rxjs/operators';
 
-import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { hasValue } from '../../../shared/empty.util';
-import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
-import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { getSuggestionPageRoute } from '../../../suggestions-page/suggestions-page-routing-paths';
+import { SuggestionTarget } from '../../../../core/notifications/suggestions/models/suggestion-target.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { hasValue } from '../../../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { getSuggestionPageRoute } from '../../../../suggestions-page/suggestions-page-routing-paths';
 import { SuggestionsService } from '../../suggestions.service';
 import { SuggestionTargetsStateService } from '../suggestion-targets.state.service';
 

src/app/notifications/suggestions/targets/selectors.ts

@@ -4,12 +4,12 @@ import {
   MemoizedSelector,
 } from '@ngrx/store';
 
-import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
-import { subStateSelector } from '../../submission/selectors';
+import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
+import { subStateSelector } from '../../../submission/selectors';
 import {
   suggestionNotificationsSelector,
   SuggestionNotificationsState,
-} from '../notifications.reducer';
+} from '../../notifications.reducer';
 import {
   SuggestionTargetEntry,
   SuggestionTargetState,

src/app/notifications/suggestions/targets/suggestion-targets.actions.ts

@@ -1,8 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 
-import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
-import { type } from '../../shared/ngrx/type';
+import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
+import { type } from '../../../shared/ngrx/type';
 
 /**
  * For each action type in an action group, make a simple

src/app/notifications/suggestions/targets/suggestion-targets.effects.ts

@@ -21,10 +21,10 @@ import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
 import {
   AuthActionTypes,
   RetrieveAuthenticatedEpersonSuccessAction,
-} from '../../core/auth/auth.actions';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+} from '../../../core/auth/auth.actions';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { SuggestionsService } from '../suggestions.service';
 import {
   AddTargetAction,

src/app/notifications/suggestions/targets/suggestion-targets.reducer.ts

@@ -1,4 +1,4 @@
-import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
+import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
 import {
   SuggestionTargetActionTypes,
   SuggestionTargetsActions,

src/app/notifications/suggestions/targets/suggestion-targets.state.service.ts

@@ -6,8 +6,8 @@ import {
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
-import { SuggestionNotificationsState } from '../notifications.reducer';
+import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model';
+import { SuggestionNotificationsState } from '../../notifications.reducer';
 import {
   getCurrentUserSuggestionTargetsSelector,
   getCurrentUserSuggestionTargetsVisitedSelector,

src/app/profile-page/profile-page.component.spec.ts

@@ -29,7 +29,7 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { SuggestionsNotificationComponent } from '../notifications/suggestions/notification/suggestions-notification.component';
 import { ErrorComponent } from '../shared/error/error.component';
 import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';

src/app/profile-page/profile-page.component.ts

@@ -40,7 +40,7 @@ import {
   getFirstCompletedRemoteData,
   getRemoteDataPayload,
 } from '../core/shared/operators';
-import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { SuggestionsNotificationComponent } from '../notifications/suggestions/notification/suggestions-notification.component';
 import {
   hasValue,
   isNotEmpty,

src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts

@@ -9,7 +9,7 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { AdminNotificationsPublicationClaimPageComponent } from '../../admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
-import { PublicationClaimComponent } from '../../notifications/suggestion-targets/publication-claim/publication-claim.component';
+import { PublicationClaimComponent } from '../../notifications/suggestions/targets/publication-claim/publication-claim.component';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page.component';
 

src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { PublicationClaimComponent } from '../../notifications/suggestion-targets/publication-claim/publication-claim.component';
+import { PublicationClaimComponent } from '../../notifications/suggestions/targets/publication-claim/publication-claim.component';
 
 @Component({
   selector: 'ds-notifications-reciter-page',

src/app/suggestions-page/suggestions-page.component.spec.ts

@@ -22,11 +22,11 @@ import { TestScheduler } from 'rxjs/testing';
 import { AuthService } from '../core/auth/auth.service';
 import { PaginationService } from '../core/pagination/pagination.service';
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
-import { SuggestionApproveAndImport } from '../notifications/suggestion-list-element/suggestion-approve-and-import';
-import { SuggestionEvidencesComponent } from '../notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
-import { SuggestionListElementComponent } from '../notifications/suggestion-list-element/suggestion-list-element.component';
-import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service';
-import { SuggestionsService } from '../notifications/suggestions.service';
+import { SuggestionApproveAndImport } from '../notifications/suggestions/list-element/suggestion-approve-and-import';
+import { SuggestionEvidencesComponent } from '../notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component';
+import { SuggestionListElementComponent } from '../notifications/suggestions/list-element/suggestion-list-element.component';
+import { SuggestionsService } from '../notifications/suggestions/suggestions.service';
+import { SuggestionTargetsStateService } from '../notifications/suggestions/targets/suggestion-targets.state.service';
 import {
   mockSuggestionPublicationOne,
   mockSuggestionPublicationTwo,

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

@@ -43,14 +43,14 @@ import {
 } from '../core/shared/operators';
 import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
-import { SuggestionActionsComponent } from '../notifications/suggestion-actions/suggestion-actions.component';
-import { SuggestionApproveAndImport } from '../notifications/suggestion-list-element/suggestion-approve-and-import';
-import { SuggestionListElementComponent } from '../notifications/suggestion-list-element/suggestion-list-element.component';
-import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service';
+import { SuggestionActionsComponent } from '../notifications/suggestions/actions/suggestion-actions.component';
+import { SuggestionApproveAndImport } from '../notifications/suggestions/list-element/suggestion-approve-and-import';
+import { SuggestionListElementComponent } from '../notifications/suggestions/list-element/suggestion-list-element.component';
 import {
   SuggestionBulkResult,
   SuggestionsService,
-} from '../notifications/suggestions.service';
+} from '../notifications/suggestions/suggestions.service';
+import { SuggestionTargetsStateService } from '../notifications/suggestions/targets/suggestion-targets.state.service';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';

src/themes/custom/app/home-page/home-page.component.ts

@@ -11,7 +11,7 @@ import { ThemedHomeNewsComponent } from '../../../../app/home-page/home-news/the
 import { HomePageComponent as BaseComponent } from '../../../../app/home-page/home-page.component';
 import { RecentItemListComponent } from '../../../../app/home-page/recent-item-list/recent-item-list.component';
 import { ThemedTopLevelCommunityListComponent } from '../../../../app/home-page/top-level-community-list/themed-top-level-community-list.component';
-import { SuggestionsPopupComponent } from '../../../../app/notifications/suggestions-popup/suggestions-popup.component';
+import { SuggestionsPopupComponent } from '../../../../app/notifications/suggestions/popup/suggestions-popup.component';
 import { ThemedConfigurationSearchPageComponent } from '../../../../app/search-page/themed-configuration-search-page.component';
 import { ThemedSearchFormComponent } from '../../../../app/shared/search-form/themed-search-form.component';
 import { PageWithSidebarComponent } from '../../../../app/shared/sidebar/page-with-sidebar.component';

src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts

@@ -11,7 +11,7 @@ import {
 import { MyDSpaceNewSubmissionComponent } from '../../../../app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component';
 import { MyDSpacePageComponent as BaseComponent } from '../../../../app/my-dspace-page/my-dspace-page.component';
 import { MyDspaceQaEventsNotificationsComponent } from '../../../../app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component';
-import { SuggestionsNotificationComponent } from '../../../../app/notifications/suggestions-notification/suggestions-notification.component';
+import { SuggestionsNotificationComponent } from '../../../../app/notifications/suggestions/notification/suggestions-notification.component';
 import { pushInOut } from '../../../../app/shared/animations/push';
 import { RoleDirective } from '../../../../app/shared/roles/role.directive';
 import { ThemedSearchComponent } from '../../../../app/shared/search/themed-search.component';

src/themes/custom/app/profile-page/profile-page.component.ts

@@ -5,7 +5,7 @@ import {
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { SuggestionsNotificationComponent } from '../../../../app/notifications/suggestions-notification/suggestions-notification.component';
+import { SuggestionsNotificationComponent } from '../../../../app/notifications/suggestions/notification/suggestions-notification.component';
 import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-page/profile-page.component';
 import { ThemedProfilePageMetadataFormComponent } from '../../../../app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component';
 import { ProfilePageResearcherFormComponent } from '../../../../app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component';