[DURACOM-327] Reorganize code to remove dependency between core and app classes

atarix83 · atarix83 · commit 5f7ff2441cfa · 2025-08-07T14:50:36.000+02:00
diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts
@@ -1,11 +1,5 @@
 export const COAR_NOTIFY_SUPPORT = 'coar-notify-support';
 
-export const HOME_PAGE_PATH = 'home';
-
-export function getHomePageRoute() {
-  return `/${HOME_PAGE_PATH}`;
-}
-
 export const ADMIN_MODULE_PATH = 'admin';
 
 export function getAdminModuleRoute() {
diff --git a/src/app/core/reload/reload.guard.ts b/src/app/core/reload/reload.guard.ts
@@ -12,7 +12,7 @@ import {
 } from '@dspace/config/app-config.interface';
 import { isNotEmpty } from '@dspace/shared/utils/empty.util';
 
-import { HOME_PAGE_PATH } from '../../app-routing-paths';
+import { HOME_PAGE_PATH } from '../router/core-routing-paths';
 
 /**
  * A guard redirecting the user to the URL provided in the route's query params
diff --git a/src/app/core/router/core-routing-paths.ts b/src/app/core/router/core-routing-paths.ts
@@ -48,3 +48,9 @@ export const LEGACY_BITSTREAM_MODULE_PATH = 'bitstream';
 export function getBitstreamModuleRoute() {
   return `/${BITSTREAM_MODULE_PATH}`;
 }
+
+export const HOME_PAGE_PATH = 'home';
+
+export function getHomePageRoute() {
+  return `/${HOME_PAGE_PATH}`;
+}
diff --git a/src/app/core/shared/health-component.model.ts b/src/app/core/shared/health-component.model.ts
diff --git a/src/app/core/shared/listable-notification-object.model.ts b/src/app/core/shared/listable-notification-object.model.ts
@@ -1,8 +1,8 @@
-import { LISTABLE_NOTIFICATION_OBJECT } from '../../shared/object-list/listable-notification-object/listable-notification-object.resource-type';
 import { typedObject } from '../cache/builders/build-decorators';
 import { TypedObject } from '../cache/typed-object.model';
 import { NotificationType } from '../notification-system/models/notification-type';
 import { GenericConstructor } from './generic-constructor';
+import { LISTABLE_NOTIFICATION_OBJECT } from './object-collection/listable-notification-object.resource-type';
 import { ListableObject } from './object-collection/listable-object.model';
 import { ResourceType } from './resource-type';
 
diff --git a/src/app/core/shared/object-collection/listable-notification-object.resource-type.ts b/src/app/core/shared/object-collection/listable-notification-object.resource-type.ts
@@ -1,4 +1,4 @@
-import { ResourceType } from '@dspace/core/shared/resource-type';
+import { ResourceType } from '../resource-type';
 
 /**
  * The resource type for {@link ListableNotificationObject}
diff --git a/src/app/core/testing/health-endpoint.mocks.ts b/src/app/core/testing/health-endpoint.mocks.ts
@@ -4,7 +4,7 @@ import {
   HealthInfoResponse,
   HealthResponse,
   HealthStatus,
-} from '../../health-page/models/health-component.model';
+} from '../shared/health-component.model';
 
 export const HealthResponseObj: HealthResponse = {
   'status': HealthStatus.UP_WITH_ISSUES,
diff --git a/src/app/core/testing/search-service.mock.ts b/src/app/core/testing/search-service.mock.ts
@@ -1,8 +1,6 @@
 import { of } from 'rxjs';
 
-import { SearchService } from '../../shared/search/search.service';
-
-export function getMockSearchService(): SearchService {
+export function getMockSearchService() {
   return jasmine.createSpyObj('searchService', {
     search: '',
     getEndpoint: of('discover/search/objects'),
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
@@ -3,11 +3,11 @@ import {
   Component,
   Input,
 } from '@angular/core';
+import { HealthInfoComponent } from '@dspace/core/shared/health-component.model';
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
 import { HealthComponentComponent } from '../../health-panel/health-component/health-component.component';
-import { HealthInfoComponent } from '../../models/health-component.model';
 
 /**
  * Shows a health info object
diff --git a/src/app/health-page/health-info/health-info.component.ts b/src/app/health-page/health-info/health-info.component.ts
@@ -4,12 +4,12 @@ import {
   Input,
   OnInit,
 } from '@angular/core';
+import { HealthInfoResponse } from '@dspace/core/shared/health-component.model';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 
 import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
 import { HealthStatusComponent } from '../health-panel/health-status/health-status.component';
-import { HealthInfoResponse } from '../models/health-component.model';
 import { HealthInfoComponentComponent } from './health-info-component/health-info-component.component';
 
 /**
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
@@ -3,6 +3,10 @@ import {
   Component,
   OnInit,
 } from '@angular/core';
+import {
+  HealthInfoResponse,
+  HealthResponse,
+} from '@dspace/core/shared/health-component.model';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
@@ -13,10 +17,6 @@ import { AlertType } from '../shared/alert/alert-type';
 import { HealthService } from './health.service';
 import { HealthInfoComponent } from './health-info/health-info.component';
 import { HealthPanelComponent } from './health-panel/health-panel.component';
-import {
-  HealthInfoResponse,
-  HealthResponse,
-} from './models/health-component.model';
 
 @Component({
   selector: 'ds-health-page',
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.ts b/src/app/health-page/health-panel/health-component/health-component.component.ts
@@ -3,13 +3,13 @@ import {
   Component,
   Input,
 } from '@angular/core';
+import { HealthComponent } from '@dspace/core/shared/health-component.model';
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
 import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
-import { HealthComponent } from '../../models/health-component.model';
 
 /**
  * A component to render a "health component" object.
diff --git a/src/app/health-page/health-panel/health-panel.component.ts b/src/app/health-page/health-panel/health-panel.component.ts
@@ -4,14 +4,14 @@ import {
   Input,
   OnInit,
 } from '@angular/core';
+import { HealthResponse } from '@dspace/core/shared/health-component.model';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
 
 import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
-import { HealthResponse } from '../models/health-component.model';
 import { HealthComponentComponent } from './health-component/health-component.component';
 import { HealthStatusComponent } from './health-status/health-status.component';
 
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.spec.ts b/src/app/health-page/health-panel/health-status/health-status.component.spec.ts
@@ -3,14 +3,14 @@ import {
   TestBed,
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { HealthStatus } from '@dspace/core/shared/health-component.model';
 import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateLoader,
   TranslateModule,
 } from '@ngx-translate/core';
 
-import { HealthStatus } from '../../models/health-component.model';
 import { HealthStatusComponent } from './health-status.component';
 
 describe('HealthStatusComponent', () => {
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.ts b/src/app/health-page/health-panel/health-status/health-status.component.ts
@@ -3,11 +3,10 @@ import {
   Component,
   Input,
 } from '@angular/core';
+import { HealthStatus } from '@dspace/core/shared/health-component.model';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { HealthStatus } from '../../models/health-component.model';
-
 /**
  * Show a health status object
  */
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -16,6 +16,7 @@ import { RemoteData } from '@dspace/core/data/remote-data';
 import { EPerson } from '@dspace/core/eperson/models/eperson.model';
 import { FeedbackDataService } from '@dspace/core/feedback/feedback-data.service';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
+import { getHomePageRoute } from '@dspace/core/router/core-routing-paths';
 import { RouteService } from '@dspace/core/services/route.service';
 import {
   NativeWindowRef,
@@ -30,7 +31,6 @@ import {
 } from '@ngx-translate/core';
 import { take } from 'rxjs/operators';
 
-import { getHomePageRoute } from '../../../app-routing-paths';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ErrorComponent } from '../../../shared/error/error.component';
 
diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts
@@ -10,6 +10,7 @@ import { CommunityDataService } from '@dspace/core/data/community-data.service';
 import { RemoteData } from '@dspace/core/data/remote-data';
 import { RequestService } from '@dspace/core/data/request.service';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
+import { getHomePageRoute } from '@dspace/core/router/core-routing-paths';
 import { RouteService } from '@dspace/core/services/route.service';
 import { Collection } from '@dspace/core/shared/collection.model';
 import { Community } from '@dspace/core/shared/community.model';
@@ -33,8 +34,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { getHomePageRoute } from '../../../../app-routing-paths';
-
 /**
  * Component representing the create page for communities and collections
  */
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -31,6 +31,7 @@ import { Context } from '@dspace/core/shared/context.model';
 import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
 import { DSpaceObjectType } from '@dspace/core/shared/dspace-object-type.model';
 import { ListableNotificationObject } from '@dspace/core/shared/listable-notification-object.model';
+import { LISTABLE_NOTIFICATION_OBJECT } from '@dspace/core/shared/object-collection/listable-notification-object.resource-type';
 import { ListableObject } from '@dspace/core/shared/object-collection/listable-object.model';
 import {
   getFirstCompletedRemoteData,
@@ -69,7 +70,6 @@ import { HoverClassDirective } from '../../hover-class.directive';
 import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
 import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { ListableObjectComponentLoaderComponent } from '../../object-collection/shared/listable-object/listable-object-component-loader.component';
-import { LISTABLE_NOTIFICATION_OBJECT } from '../../object-list/listable-notification-object/listable-notification-object.resource-type';
 import { SearchService } from '../../search/search.service';
 
 @Component({
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 import { ListableNotificationObject } from '@dspace/core/shared/listable-notification-object.model';
+import { LISTABLE_NOTIFICATION_OBJECT } from '@dspace/core/shared/object-collection/listable-notification-object.resource-type';
 import { ViewMode } from '@dspace/core/shared/view-mode.model';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
 
 /**
  * The component for displaying a notifications inside an object list
diff --git a/src/app/shared/test-module.ts b/src/app/shared/test-module.ts
@@ -3,12 +3,12 @@ import {
   CUSTOM_ELEMENTS_SCHEMA,
   NgModule,
 } from '@angular/core';
+import { BrowserOnlyMockPipe } from '@dspace/core/testing/browser-only-mock.pipe';
+import { NgComponentOutletDirectiveStub } from '@dspace/core/testing/ng-component-outlet-directive.stub';
+import { QueryParamsDirectiveStub } from '@dspace/core/testing/query-params-directive.stub';
+import { RouterLinkDirectiveStub } from '@dspace/core/testing/router-link-directive.stub';
 
-import { MySimpleItemActionComponent } from '../../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec';
-import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
-import { NgComponentOutletDirectiveStub } from './ng-component-outlet-directive.stub';
-import { QueryParamsDirectiveStub } from './query-params-directive.stub';
-import { RouterLinkDirectiveStub } from './router-link-directive.stub';
+import { MySimpleItemActionComponent } from '../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec';
 
 /**
  * This module isn't used. It serves to prevent the AoT compiler

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ResourceType } from '@dspace/core/shared/resource-type';`
	`1`	`+import { ResourceType } from '../resource-type';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* The resource type for {@link ListableNotificationObject}`