From 2df409ca63da18ae3fb27d773217ae2c6924bb05 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 13 Mar 2025 13:41:53 +0100 Subject: [PATCH] [CST-18016] Create suggestions folder to better organize the code relative to notifications functionalities --- src/app/home-page/home-page.component.ts | 2 +- .../my-dspace-page.component.spec.ts | 2 +- .../my-dspace-page.component.ts | 2 +- .../notifications/notifications-effects.ts | 2 +- .../notifications/notifications.reducer.ts | 2 +- .../suggestion-actions.component.html | 0 .../suggestion-actions.component.scss | 0 .../actions}/suggestion-actions.component.ts | 14 +++---- .../suggestion-approve-and-import.ts | 2 +- .../suggestion-evidences.component.html | 0 .../suggestion-evidences.component.scss | 0 .../suggestion-evidences.component.ts | 6 +-- .../suggestion-list-element.component.html | 0 .../suggestion-list-element.component.scss | 0 .../suggestion-list-element.component.spec.ts | 8 ++-- .../suggestion-list-element.component.ts | 10 ++--- .../suggestions-notification.component.html | 0 .../suggestions-notification.component.scss | 0 .../suggestions-notification.component.ts | 4 +- .../popup}/suggestions-popup.component.html | 0 .../popup}/suggestions-popup.component.scss | 0 .../suggestions-popup.component.spec.ts | 6 +-- .../popup}/suggestions-popup.component.ts | 8 ++-- .../suggestions.service.spec.ts | 24 ++++++------ .../{ => suggestions}/suggestions.service.ts | 38 +++++++++---------- .../publication-claim.component.html | 0 .../publication-claim.component.scss | 0 .../publication-claim.component.ts | 14 +++---- .../targets}/selectors.ts | 6 +-- .../targets}/suggestion-targets.actions.ts | 4 +- .../targets}/suggestion-targets.effects.ts | 8 ++-- .../targets}/suggestion-targets.reducer.ts | 2 +- .../suggestion-targets.state.service.ts | 4 +- .../profile-page.component.spec.ts | 2 +- .../profile-page/profile-page.component.ts | 2 +- ...-suggestion-targets-page.component.spec.ts | 2 +- ...tions-suggestion-targets-page.component.ts | 2 +- .../suggestions-page.component.spec.ts | 10 ++--- .../suggestions-page.component.ts | 10 ++--- .../app/home-page/home-page.component.ts | 2 +- .../my-dspace-page.component.ts | 2 +- .../profile-page/profile-page.component.ts | 2 +- 42 files changed, 101 insertions(+), 101 deletions(-) rename src/app/notifications/{suggestion-actions => suggestions/actions}/suggestion-actions.component.html (100%) rename src/app/notifications/{suggestion-actions => suggestions/actions}/suggestion-actions.component.scss (100%) rename src/app/notifications/{suggestion-actions => suggestions/actions}/suggestion-actions.component.ts (79%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-approve-and-import.ts (67%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-evidences/suggestion-evidences.component.html (100%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-evidences/suggestion-evidences.component.scss (100%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-evidences/suggestion-evidences.component.ts (69%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-list-element.component.html (100%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-list-element.component.scss (100%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-list-element.component.spec.ts (87%) rename src/app/notifications/{suggestion-list-element => suggestions/list-element}/suggestion-list-element.component.ts (83%) rename src/app/notifications/{suggestions-notification => suggestions/notification}/suggestions-notification.component.html (100%) rename src/app/notifications/{suggestions-notification => suggestions/notification}/suggestions-notification.component.scss (100%) rename src/app/notifications/{suggestions-notification => suggestions/notification}/suggestions-notification.component.ts (87%) rename src/app/notifications/{suggestions-popup => suggestions/popup}/suggestions-popup.component.html (100%) rename src/app/notifications/{suggestions-popup => suggestions/popup}/suggestions-popup.component.scss (100%) rename src/app/notifications/{suggestions-popup => suggestions/popup}/suggestions-popup.component.spec.ts (92%) rename src/app/notifications/{suggestions-popup => suggestions/popup}/suggestions-popup.component.ts (88%) rename src/app/notifications/{ => suggestions}/suggestions.service.spec.ts (85%) rename src/app/notifications/{ => suggestions}/suggestions.service.ts (86%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/publication-claim/publication-claim.component.html (100%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/publication-claim/publication-claim.component.scss (100%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/publication-claim/publication-claim.component.ts (87%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/selectors.ts (95%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/suggestion-targets.actions.ts (97%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/suggestion-targets.effects.ts (94%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/suggestion-targets.reducer.ts (97%) rename src/app/notifications/{suggestion-targets => suggestions/targets}/suggestion-targets.state.service.ts (96%) diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts index 33a8216a8a..4f05abc96c 100644 --- a/src/app/home-page/home-page.component.ts +++ b/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'; diff --git a/src/app/my-dspace-page/my-dspace-page.component.spec.ts b/src/app/my-dspace-page/my-dspace-page.component.spec.ts index 58f95e74c3..77636089a6 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.spec.ts +++ b/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', () => { diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts index 7acb900739..315b5562d2 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.ts +++ b/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'; diff --git a/src/app/notifications/notifications-effects.ts b/src/app/notifications/notifications-effects.ts index d06c9dae53..9bed1b4be3 100644 --- a/src/app/notifications/notifications-effects.ts +++ b/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, diff --git a/src/app/notifications/notifications.reducer.ts b/src/app/notifications/notifications.reducer.ts index 14ca6c0347..76c74f3f66 100644 --- a/src/app/notifications/notifications.reducer.ts +++ b/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 diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestions/actions/suggestion-actions.component.html similarity index 100% rename from src/app/notifications/suggestion-actions/suggestion-actions.component.html rename to src/app/notifications/suggestions/actions/suggestion-actions.component.html diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.scss b/src/app/notifications/suggestions/actions/suggestion-actions.component.scss similarity index 100% rename from src/app/notifications/suggestion-actions/suggestion-actions.component.scss rename to src/app/notifications/suggestions/actions/suggestion-actions.component.scss diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestions/actions/suggestion-actions.component.ts similarity index 79% rename from src/app/notifications/suggestion-actions/suggestion-actions.component.ts rename to src/app/notifications/suggestions/actions/suggestion-actions.component.ts index dc0e075667..f3b0e5387f 100644 --- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts +++ b/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 diff --git a/src/app/notifications/suggestion-list-element/suggestion-approve-and-import.ts b/src/app/notifications/suggestions/list-element/suggestion-approve-and-import.ts similarity index 67% rename from src/app/notifications/suggestion-list-element/suggestion-approve-and-import.ts rename to src/app/notifications/suggestions/list-element/suggestion-approve-and-import.ts index bda9532393..d0d20d6d80 100644 --- a/src/app/notifications/suggestion-list-element/suggestion-approve-and-import.ts +++ b/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 diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html b/src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.html similarity index 100% rename from src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html rename to src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.html diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.scss b/src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.scss similarity index 100% rename from src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.scss rename to src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.scss diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.ts similarity index 69% rename from src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts rename to src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.ts index d968826b70..8214a794c5 100644 --- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts +++ b/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) diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.html similarity index 100% rename from src/app/notifications/suggestion-list-element/suggestion-list-element.component.html rename to src/app/notifications/suggestions/list-element/suggestion-list-element.component.html diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.scss similarity index 100% rename from src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss rename to src/app/notifications/suggestions/list-element/suggestion-list-element.component.scss diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.spec.ts similarity index 87% rename from src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts rename to src/app/notifications/suggestions/list-element/suggestion-list-element.component.spec.ts index ceb33f8fac..c51ec3b37d 100644 --- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts +++ b/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'; diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts similarity index 83% rename from src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts rename to src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts index 9e55ba0825..07d68f4367 100644 --- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts +++ b/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'; diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.html b/src/app/notifications/suggestions/notification/suggestions-notification.component.html similarity index 100% rename from src/app/notifications/suggestions-notification/suggestions-notification.component.html rename to src/app/notifications/suggestions/notification/suggestions-notification.component.html diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.scss b/src/app/notifications/suggestions/notification/suggestions-notification.component.scss similarity index 100% rename from src/app/notifications/suggestions-notification/suggestions-notification.component.scss rename to src/app/notifications/suggestions/notification/suggestions-notification.component.scss diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts b/src/app/notifications/suggestions/notification/suggestions-notification.component.ts similarity index 87% rename from src/app/notifications/suggestions-notification/suggestions-notification.component.ts rename to src/app/notifications/suggestions/notification/suggestions-notification.component.ts index 208c1bfcbd..ca81d5d419 100644 --- a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts +++ b/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 diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.html b/src/app/notifications/suggestions/popup/suggestions-popup.component.html similarity index 100% rename from src/app/notifications/suggestions-popup/suggestions-popup.component.html rename to src/app/notifications/suggestions/popup/suggestions-popup.component.html diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.scss b/src/app/notifications/suggestions/popup/suggestions-popup.component.scss similarity index 100% rename from src/app/notifications/suggestions-popup/suggestions-popup.component.scss rename to src/app/notifications/suggestions/popup/suggestions-popup.component.scss diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts b/src/app/notifications/suggestions/popup/suggestions-popup.component.spec.ts similarity index 92% rename from src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts rename to src/app/notifications/suggestions/popup/suggestions-popup.component.spec.ts index 4ef3aa00a6..3710500552 100644 --- a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts +++ b/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', () => { diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts b/src/app/notifications/suggestions/popup/suggestions-popup.component.ts similarity index 88% rename from src/app/notifications/suggestions-popup/suggestions-popup.component.ts rename to src/app/notifications/suggestions/popup/suggestions-popup.component.ts index ab5a9bbab0..eeef8b4dde 100644 --- a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts +++ b/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 diff --git a/src/app/notifications/suggestions.service.spec.ts b/src/app/notifications/suggestions/suggestions.service.spec.ts similarity index 85% rename from src/app/notifications/suggestions.service.spec.ts rename to src/app/notifications/suggestions/suggestions.service.spec.ts index 7a552d3ce4..6e6ede9e05 100644 --- a/src/app/notifications/suggestions.service.spec.ts +++ b/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', () => { diff --git a/src/app/notifications/suggestions.service.ts b/src/app/notifications/suggestions/suggestions.service.ts similarity index 86% rename from src/app/notifications/suggestions.service.ts rename to src/app/notifications/suggestions/suggestions.service.ts index f1790f830f..b27789b67a 100644 --- a/src/app/notifications/suggestions.service.ts +++ b/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 diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html b/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.html similarity index 100% rename from src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html rename to src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.html diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.scss b/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.scss similarity index 100% rename from src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.scss rename to src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.scss diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.ts similarity index 87% rename from src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts rename to src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.ts index ccb56629c6..eea76b2a4d 100644 --- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts +++ b/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'; diff --git a/src/app/notifications/suggestion-targets/selectors.ts b/src/app/notifications/suggestions/targets/selectors.ts similarity index 95% rename from src/app/notifications/suggestion-targets/selectors.ts rename to src/app/notifications/suggestions/targets/selectors.ts index f80e36788b..67f1bed035 100644 --- a/src/app/notifications/suggestion-targets/selectors.ts +++ b/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, diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts b/src/app/notifications/suggestions/targets/suggestion-targets.actions.ts similarity index 97% rename from src/app/notifications/suggestion-targets/suggestion-targets.actions.ts rename to src/app/notifications/suggestions/targets/suggestion-targets.actions.ts index ee2009e144..8992944273 100644 --- a/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts +++ b/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 diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts b/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts similarity index 94% rename from src/app/notifications/suggestion-targets/suggestion-targets.effects.ts rename to src/app/notifications/suggestions/targets/suggestion-targets.effects.ts index 4a1b413872..d53dab1e51 100644 --- a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts +++ b/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, diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts b/src/app/notifications/suggestions/targets/suggestion-targets.reducer.ts similarity index 97% rename from src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts rename to src/app/notifications/suggestions/targets/suggestion-targets.reducer.ts index 74f8ec2f5c..c71f149675 100644 --- a/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts +++ b/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, diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts b/src/app/notifications/suggestions/targets/suggestion-targets.state.service.ts similarity index 96% rename from src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts rename to src/app/notifications/suggestions/targets/suggestion-targets.state.service.ts index 413a3b82ea..c70929078f 100644 --- a/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts +++ b/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, diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts index ebd3939432..ee2cec645d 100644 --- a/src/app/profile-page/profile-page.component.spec.ts +++ b/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'; diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts index 7799615bc6..7a198e34fa 100644 --- a/src/app/profile-page/profile-page.component.ts +++ b/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, diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts index 4fa9ad9917..1f2763ba2c 100644 --- a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts +++ b/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'; diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts index d545eb4e94..8af3c36cfd 100644 --- a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts +++ b/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', diff --git a/src/app/suggestions-page/suggestions-page.component.spec.ts b/src/app/suggestions-page/suggestions-page.component.spec.ts index 6c19405e94..a8c725f416 100644 --- a/src/app/suggestions-page/suggestions-page.component.spec.ts +++ b/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, diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts index dfddc164c2..32b1212b0c 100644 --- a/src/app/suggestions-page/suggestions-page.component.ts +++ b/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'; diff --git a/src/themes/custom/app/home-page/home-page.component.ts b/src/themes/custom/app/home-page/home-page.component.ts index 0be74993f0..72fe1deeec 100644 --- a/src/themes/custom/app/home-page/home-page.component.ts +++ b/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'; diff --git a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts index 64d93c41b4..8e177886b5 100644 --- a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts +++ b/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'; diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts index e5953f5ff2..9e3f5d3040 100644 --- a/src/themes/custom/app/profile-page/profile-page.component.ts +++ b/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';