[DURACOM-191] fix wrong imports

cypress/e2e/admin-sidebar.cy.ts

@@ -1,5 +1,5 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
 
 describe('Admin Sidebar', () => {
   beforeEach(() => {
@@ -22,7 +22,7 @@ describe('Admin Sidebar', () => {
             // Currently all expandable sections have nested interactive elements
             // See https://github.com/DSpace/dspace-angular/issues/2178
             'nested-interactive': { enabled: false },
-            }
+          },
         } as Options);
   });
 });

cypress/e2e/homepage-statistics.cy.ts

@@ -1,6 +1,7 @@
+import '../support/commands';
+
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
-import '../support/commands';
 
 describe('Site Statistics Page', () => {
   it('should load if you click on "Statistics" from homepage', () => {

cypress/e2e/item-edit.cy.ts

@@ -1,5 +1,5 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
 
 const ITEM_EDIT_PAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('/edit');
 
@@ -54,8 +54,8 @@ describe('Edit Item > Bitstreams tab', () => {
                 // Currently Bitstreams page loads a pagination component per Bundle
                 // and they all use the same 'id="p-dad"'.
                 'duplicate-id': { enabled: false },
-                }
+              },
-            } as Options
+            } as Options,
     );
   });
 });

cypress/e2e/login-modal.cy.ts

@@ -31,7 +31,7 @@ const page = {
     // Wait until above POST command responds before continuing
     // (This ensures next action waits until logout completes)
     cy.wait('@logout');
-    }
+  },
 };
 
 describe('Login Modal', () => {

cypress/e2e/search-navbar.cy.ts

@@ -10,7 +10,7 @@ const page = {
   },
   submitQueryByPressingIcon() {
     cy.get('ds-themed-header [data-test="header-search-icon"]').click();
-    }
+  },
 };
 
 describe('Search from Navigation Bar', () => {

cypress/e2e/search-page.cy.ts

@@ -1,5 +1,5 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
 
 describe('Search Page', () => {
   // NOTE: these tests currently assume this query will return results!
@@ -49,9 +49,9 @@ describe('Search Page', () => {
             {
               rules: {
                 // Card titles fail this test currently
-                    'heading-order': { enabled: false }
+                'heading-order': { enabled: false },
-                }
+              },
-            } as Options
+            } as Options,
     );
   });
 });

cypress/e2e/submission.cy.ts

@@ -41,9 +41,9 @@ describe('New Submission page', () => {
                 // All select boxes fail to have a name / aria-label.
                 // This is a bug in ng-dynamic-forms and may require https://github.com/DSpace/dspace-angular/issues/2216
                 'select-name': { enabled: false },
-                }
+              },
 
-            } as Options
+            } as Options,
     );
 
     // Discard button should work
@@ -138,7 +138,7 @@ describe('New Submission page', () => {
     // Upload our DSpace logo via drag & drop onto submission form
     // cy.get('div#section_upload')
     cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.png', {
-            action: 'drag-drop'
+      action: 'drag-drop',
     });
 
     // Wait for upload to complete before proceeding
@@ -196,9 +196,9 @@ describe('New Submission page', () => {
                 // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                 'aria-required-children': { enabled: false },
                 'nested-interactive': { enabled: false },
-                }
+              },
 
-            } as Options
+            } as Options,
     );
 
     // Click the lookup button next to "Publication" field
@@ -212,7 +212,7 @@ describe('New Submission page', () => {
     testA11y({
       include: ['ds-dynamic-lookup-relation-modal'],
       exclude: [
-                ['ul.nav-tabs'] // Tabs at top of model have several issues which seem to be caused by ng-bootstrap
+        ['ul.nav-tabs'], // Tabs at top of model have several issues which seem to be caused by ng-bootstrap
       ],
     });
 

cypress/plugins/index.ts

@@ -54,6 +54,6 @@ module.exports = (on, config) => {
     // Retrieve currently saved value of REST Domain
     getRestBaseDomain() {
       return REST_DOMAIN ;
-        }
+    },
   });
 };

cypress/support/commands.ts

@@ -3,8 +3,14 @@
 // See docs at https://docs.cypress.io/api/cypress-api/custom-commands
 // ***********************************************
 
-import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
+import {
-import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER } from 'src/app/core/xsrf/xsrf.constants';
+  AuthTokenInfo,
+  TOKENITEM,
+} from 'src/app/core/auth/models/auth-token-info.model';
+import {
+  DSPACE_XSRF_COOKIE,
+  XSRF_REQUEST_HEADER,
+} from 'src/app/core/xsrf/xsrf.constants';
 import { v4 as uuidv4 } from 'uuid';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs
@@ -67,7 +73,7 @@ function login(email: string, password: string): void {
         url: baseRestUrl + '/api/authn/login',
         headers: { [XSRF_REQUEST_HEADER]: csrfToken },
         form: true, // indicates the body should be form urlencoded
-                body: { user: email, password: password }
+        body: { user: email, password: password },
       }).then((resp) => {
         // We expect a successful login
         expect(resp.status).to.eq(200);

cypress/support/e2e.ts

@@ -15,10 +15,10 @@
 
 // Import all custom Commands (from commands.ts) for all tests
 import './commands';
-
 // Import Cypress Axe tools for all tests
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
+
 import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
 
 // Runs once before all tests

cypress/support/utils.ts

@@ -7,7 +7,7 @@ import { Options } from 'cypress-axe';
 function terminalLog(violations: Result[]) {
   cy.task(
     'log',
-        `${violations.length} accessibility violation${violations.length === 1 ? '' : 's'} ${violations.length === 1 ? 'was' : 'were'} detected`
+    `${violations.length} accessibility violation${violations.length === 1 ? '' : 's'} ${violations.length === 1 ? 'was' : 'were'} detected`,
   );
   // pluck specific keys to keep the table readable
   const violationData = violations.map(
@@ -17,8 +17,8 @@ function terminalLog(violations: Result[]) {
       description,
       helpUrl,
       nodes: nodes.length,
-            html: nodes.map(node => node.html)
+      html: nodes.map(node => node.html),
-        })
+    }),
   );
 
   // Print violations as an array, since 'node.html' above often breaks table alignment
@@ -38,7 +38,7 @@ export const testA11y = (context?: any, options?: Options) => {
       // Disable color contrast checks as they are inaccurate / result in a lot of false positives
       // See also open issues in axe-core: https://github.com/dequelabs/axe-core/labels/color%20contrast
       { id: 'color-contrast', enabled: false },
-        ]
+    ],
   });
   cy.checkA11y(context, options, terminalLog);
 };

src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts

@@ -13,7 +13,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { SearchService } from '../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts

@@ -11,7 +11,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { RouteService } from '../../../../core/services/route.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
 import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
 import { routeServiceStub } from '../../../../shared/testing/route-service.stub';

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts

@@ -4,7 +4,7 @@ import {
 } from '@angular/core';
 
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 
 @Component({
   selector: 'ds-admin-notify-incoming',

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts

@@ -16,7 +16,7 @@ import { map } from 'rxjs/operators';
 import { Context } from '../../../../core/shared/context.model';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 
 @Component({
   selector: 'ds-admin-notify-logs-result',

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts

@@ -11,7 +11,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { RouteService } from '../../../../core/services/route.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
 import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
 import { routeServiceStub } from '../../../../shared/testing/route-service.stub';

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts

@@ -4,7 +4,7 @@ import {
 } from '@angular/core';
 
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 
 @Component({
   selector: 'ds-admin-notify-outgoing',

src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts

@@ -20,7 +20,7 @@ import { RouteService } from '../../../core/services/route.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';

src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts

@@ -15,7 +15,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Context } from '../../../core/shared/context.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../../core/shared/view-mode.model';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { tabulatableObjectsComponent } from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
 import { TabulatableResultListElementsComponent } from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';

src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts

@@ -35,7 +35,7 @@ import { Collection } from '../../core/shared/collection.model';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
 import { ErrorComponent } from '../../shared/error/error.component';
 import { HostWindowService } from '../../shared/host-window.service';
 import { LoadingComponent } from '../../shared/loading/loading.component';

src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts

@@ -53,7 +53,7 @@ import {
 } from '../../core/shared/operators';
 import { SearchService } from '../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
 import {
   fadeIn,
   fadeInOut,

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

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-configuration.service';
 import { ThemedSearchComponent } from '../shared/search/themed-search.component';
 
 @Component({

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts

@@ -49,6 +49,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import {
   hasValue,
   isNotEmpty,
@@ -68,7 +69,6 @@ import {
 } from './relationship.actions';
 import { ThemedDynamicLookupRelationSearchTabComponent } from './search-tab/themed-dynamic-lookup-relation-search-tab.component';
 import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dynamic-lookup-relation-selection-tab.component';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts

@@ -39,7 +39,7 @@ import { Item } from '../../../../../../core/shared/item.model';
 import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model';
 import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service';
 import {
   fadeIn,
   fadeInOut,

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts

@@ -39,7 +39,7 @@ import {
 } from '../../../../../../core/shared/operators';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service';
 import { hasValue } from '../../../../../empty.util';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts

@@ -21,7 +21,7 @@ import { PaginationService } from '../../../../../../core/pagination/pagination.
 import { Context } from '../../../../../../core/shared/context.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';

src/app/shared/search/advanced-search/advanced-search.component.spec.ts

@@ -20,9 +20,9 @@ import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormBuilderService } from '../../form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { getMockFormBuilderService } from '../../mocks/form-builder-service.mock';
 import { BrowserOnlyMockPipe } from '../../testing/browser-only-mock.pipe';
 import { RouterStub } from '../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';

src/app/shared/search/advanced-search/advanced-search.component.ts

@@ -25,7 +25,7 @@ import {
 
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { slide } from '../../animations/slide';
 import { BrowserOnlyPipe } from '../../utils/browser-only.pipe';
 

src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts

@@ -27,7 +27,7 @@ import {
   SCOPE,
   SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RouterStub } from '../../../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';

src/app/shared/search/search-filters/search-filter/search-filter.component.ts

@@ -28,7 +28,7 @@ import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
 import { SequenceService } from '../../../../core/shared/sequence.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 import { slide } from '../../../animations/slide';
 import {
   hasValue,

src/app/shared/search/search-labels/search-labels.component.ts

@@ -15,7 +15,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
 import { SearchLabelComponent } from './search-label/search-label.component';
 

src/app/shared/search/search-settings/search-settings.component.spec.ts

@@ -5,6 +5,7 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
@@ -14,10 +15,14 @@ import {
   SortOptions,
 } from '../../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { SidebarService } from '../../sidebar/sidebar.service';
+import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { SearchServiceStub } from '../../testing/search-service.stub';
 import { SidebarServiceStub } from '../../testing/sidebar-service.stub';
 import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { VarDirective } from '../../utils/var.directive';
@@ -59,8 +64,8 @@ describe('SearchSettingsComponent', () => {
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), SearchSettingsComponent, EnumKeysPipe, VarDirective],
       providers: [
-        { provide: SearchService, useValue: searchServiceStub },
+        { provide: SearchService, useValue: new SearchServiceStub() },
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
         {
           provide: SidebarService,
           useValue: SidebarServiceStub,

src/app/shared/search/search.component.ts

@@ -54,7 +54,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
 import { pushInOut } from '../animations/push';
 import {
   hasValue,

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

@@ -7,12 +7,12 @@ import {
   Component,
 } from '@angular/core';
 
-import { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
-import { MyDSpaceNewSubmissionComponent } from '../../../../app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component';
 import {
-  MyDSpacePageComponent as BaseComponent,
+  MyDSpaceConfigurationService,
   SEARCH_CONFIG_SERVICE,
-} from '../../../../app/my-dspace-page/my-dspace-page.component';
+} from '../../../../app/my-dspace-page/my-dspace-configuration.service';
+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 { pushInOut } from '../../../../app/shared/animations/push';

src/themes/custom/app/search-page/configuration-search-page.component.ts

@@ -10,7 +10,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 
 import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
 import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/search-page/configuration-search-page.component';
 import { pushInOut } from '../../../../app/shared/animations/push';
 import { SearchLabelsComponent } from '../../../../app/shared/search/search-labels/search-labels.component';

src/themes/custom/app/shared/search/search-filters/search-filters.component.ts

@@ -15,7 +15,7 @@ import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
 import { AdvancedSearchComponent } from '../../../../../../app/shared/search/advanced-search/advanced-search.component';
 import { SearchFilterComponent } from '../../../../../../app/shared/search/search-filters/search-filter/search-filter.component';
 import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component';

src/themes/custom/app/shared/search/search-settings/search-settings.component.ts

@@ -14,7 +14,7 @@ import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
 import { PageSizeSelectorComponent } from '../../../../../../app/shared/page-size-selector/page-size-selector.component';
 import { SearchSettingsComponent as BaseComponent } from '../../../../../../app/shared/search/search-settings/search-settings.component';
 import { SidebarDropdownComponent } from '../../../../../../app/shared/sidebar/sidebar-dropdown.component';