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

atarix83 · atarix83 · commit cf4942ac8f10 · 2025-08-07T19:04:52.000+02:00
diff --git a/src/app/core/end-user-agreement/end-user-agreement.guard.ts b/src/app/core/end-user-agreement/end-user-agreement.guard.ts
@@ -11,8 +11,9 @@ import {
   Observable,
   of,
 } from 'rxjs';
+import { map } from 'rxjs/operators';
 
-import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators';
+import { getEndUserAgreementPath } from '../../info/info-routing-paths';
 
 export declare type HasAcceptedGuardParamFn = () => Observable<boolean>;
 /**
@@ -32,3 +33,18 @@ export const endUserAgreementGuard = (
     );
   };
 };
+
+/**
+ * Operator that returns a UrlTree to the unauthorized page when the boolean received is false
+ * @param router    Router
+ * @param redirect  Redirect URL to add to the UrlTree. This is used to redirect back to the original route after the
+ *                  user accepts the agreement.
+ */
+export const returnEndUserAgreementUrlTreeOnFalse = (router: Router, redirect: string) =>
+  (source: Observable<boolean>): Observable<boolean | UrlTree> =>
+    source.pipe(
+      map((hasAgreed: boolean) => {
+        const queryParams = { redirect: encodeURIComponent(redirect) };
+        return hasAgreed ? hasAgreed : router.createUrlTree([getEndUserAgreementPath()], { queryParams });
+      }),
+    );
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
@@ -45,9 +45,9 @@ import {
   take,
 } from 'rxjs/operators';
 
-import { QualityAssuranceEventData } from '../../../../notifications/qa/project-entry-import-modal/project-entry-import-modal.component';
 import { NotificationsService } from '../../../notification-system/notifications.service';
 import { QualityAssuranceEventObject } from '../models/quality-assurance-event.model';
+import { QualityAssuranceEventData } from '../models/quality-assurance-event-data.model';
 
 /**
  * The service handling all Quality Assurance topic REST requests.
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event-data.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event-data.model.ts
@@ -0,0 +1,59 @@
+import { Item } from '../../../shared/item.model';
+import { QualityAssuranceEventObject } from './quality-assurance-event.model';
+
+/**
+ * The possible types of import for the external entry
+ */
+export enum ImportType {
+  None = 'None',
+  LocalEntity = 'LocalEntity',
+  LocalAuthority = 'LocalAuthority',
+  NewEntity = 'NewEntity',
+  NewAuthority = 'NewAuthority'
+}
+
+/**
+ * The data type passed from the parent page
+ */
+export interface QualityAssuranceEventData {
+  /**
+   * The Quality Assurance event
+   */
+  event: QualityAssuranceEventObject;
+  /**
+   * The Quality Assurance event Id (uuid)
+   */
+  id: string;
+  /**
+   * The publication title
+   */
+  title: string;
+  /**
+   * Contains the boolean that indicates if a project is present
+   */
+  hasProject: boolean;
+  /**
+   * The project title, if present
+   */
+  projectTitle: string;
+  /**
+   * The project id (uuid), if present
+   */
+  projectId: string;
+  /**
+   * The project handle, if present
+   */
+  handle: string;
+  /**
+   * The reject/discard reason
+   */
+  reason: string;
+  /**
+   * Contains the boolean that indicates if there is a running operation (REST call)
+   */
+  isRunning: boolean;
+  /**
+   * The related publication DSpace item
+   */
+  target?: Item;
+}
diff --git a/src/app/core/shared/authorized.operators.ts b/src/app/core/shared/authorized.operators.ts
@@ -13,7 +13,6 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import { getEndUserAgreementPath } from '../../info/info-routing-paths';
 import { AuthService } from '../auth/auth.service';
 import { RemoteData } from '../data/remote-data';
 import {
@@ -90,16 +89,3 @@ export const returnForbiddenUrlTreeOrLoginOnAllFalse = (router: Router, authServ
           }
         }
       }));
-/**
- * Operator that returns a UrlTree to the unauthorized page when the boolean received is false
- * @param router    Router
- * @param redirect  Redirect URL to add to the UrlTree. This is used to redirect back to the original route after the
- *                  user accepts the agreement.
- */
-export const returnEndUserAgreementUrlTreeOnFalse = (router: Router, redirect: string) =>
-  (source: Observable<boolean>): Observable<boolean | UrlTree> =>
-    source.pipe(
-      map((hasAgreed: boolean) => {
-        const queryParams = { redirect: encodeURIComponent(redirect) };
-        return hasAgreed ? hasAgreed : router.createUrlTree([getEndUserAgreementPath()], { queryParams });
-      }));
diff --git a/src/app/core/submission/models/submission-error.model.ts b/src/app/core/submission/models/submission-error.model.ts
@@ -1,4 +1,4 @@
-import { SubmissionSectionError } from '../../../submission/objects/submission-section-error.model';
+import { SubmissionSectionError } from './submission-section-error.model';
 
 /**
  * An interface to represent section error
diff --git a/src/app/core/submission/models/submission-section-error.model.ts b/src/app/core/submission/models/submission-section-error.model.ts
diff --git a/src/app/core/submission/models/submission-section-object.model.ts b/src/app/core/submission/models/submission-section-object.model.ts
@@ -1,11 +1,10 @@
+import { SectionsType } from '../sections-type';
 import {
   SectionScope,
   SectionVisibility,
-} from '@dspace/core/submission/models/section-visibility.model';
-import { WorkspaceitemSectionDataType } from '@dspace/core/submission/models/workspaceitem-sections.model';
-import { SectionsType } from '@dspace/core/submission/sections-type';
-
+} from './section-visibility.model';
 import { SubmissionSectionError } from './submission-section-error.model';
+import { WorkspaceitemSectionDataType } from './workspaceitem-sections.model';
 
 /**
  * An interface to represent section object state
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -21,6 +21,7 @@ import { buildPaginatedList } from '@dspace/core/data/paginated-list.model';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
 import { QualityAssuranceEventDataService } from '@dspace/core/notifications/qa/events/quality-assurance-event-data.service';
 import { QualityAssuranceEventObject } from '@dspace/core/notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceEventData } from '@dspace/core/notifications/qa/models/quality-assurance-event-data.model';
 import { PaginationService } from '@dspace/core/pagination/pagination.service';
 import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
 import { followLink } from '@dspace/core/shared/follow-link-config.model';
@@ -56,7 +57,6 @@ import {
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { QualityAssuranceEventData } from '../project-entry-import-modal/project-entry-import-modal.component';
 import { QualityAssuranceEventsComponent } from './quality-assurance-events.component';
 
 describe('QualityAssuranceEventsComponent test suite', () => {
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -24,6 +24,7 @@ import {
   QualityAssuranceEventObject,
   SourceQualityAssuranceEventMessageObject,
 } from '@dspace/core/notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceEventData } from '@dspace/core/notifications/qa/models/quality-assurance-event-data.model';
 import { PaginationService } from '@dspace/core/pagination/pagination.service';
 import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
 import { getItemPageRoute } from '@dspace/core/router/utils/dso-route.utils';
@@ -69,10 +70,7 @@ import { AlertComponent } from '../../../shared/alert/alert.component';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import {
-  ProjectEntryImportModalComponent,
-  QualityAssuranceEventData,
-} from '../project-entry-import-modal/project-entry-import-modal.component';
+import { ProjectEntryImportModalComponent } from '../project-entry-import-modal/project-entry-import-modal.component';
 import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
 
 /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -11,6 +11,7 @@ import {
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { buildPaginatedList } from '@dspace/core/data/paginated-list.model';
+import { ImportType } from '@dspace/core/notifications/qa/models/quality-assurance-event-data.model';
 import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
 import { Item } from '@dspace/core/shared/item.model';
 import { PageInfo } from '@dspace/core/shared/page-info.model';
@@ -33,10 +34,7 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
 import { SearchService } from '../../../shared/search/search.service';
 import { ThemedSearchResultsComponent } from '../../../shared/search/search-results/themed-search-results.component';
-import {
-  ImportType,
-  ProjectEntryImportModalComponent,
-} from './project-entry-import-modal.component';
+import { ProjectEntryImportModalComponent } from './project-entry-import-modal.component';
 
 const eventData = {
   event: qualityAssuranceEventObjectMissingProjectFound,
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -10,14 +10,14 @@ import { FormsModule } from '@angular/forms';
 import { RouterLink } from '@angular/router';
 import { PaginatedList } from '@dspace/core/data/paginated-list.model';
 import { RemoteData } from '@dspace/core/data/remote-data';
+import { SourceQualityAssuranceEventMessageObject } from '@dspace/core/notifications/qa/models/quality-assurance-event.model';
 import {
-  QualityAssuranceEventObject,
-  SourceQualityAssuranceEventMessageObject,
-} from '@dspace/core/notifications/qa/models/quality-assurance-event.model';
+  ImportType,
+  QualityAssuranceEventData,
+} from '@dspace/core/notifications/qa/models/quality-assurance-event-data.model';
 import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
 import { Context } from '@dspace/core/shared/context.model';
 import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
-import { Item } from '@dspace/core/shared/item.model';
 import { ListableObject } from '@dspace/core/shared/object-collection/listable-object.model';
 import { PaginatedSearchOptions } from '@dspace/core/shared/search/models/paginated-search-options.model';
 import { SearchResult } from '@dspace/core/shared/search/models/search-result.model';
@@ -41,63 +41,6 @@ import { SelectableListService } from '../../../shared/object-list/selectable-li
 import { SearchService } from '../../../shared/search/search.service';
 import { ThemedSearchResultsComponent } from '../../../shared/search/search-results/themed-search-results.component';
 
-/**
- * The possible types of import for the external entry
- */
-export enum ImportType {
-  None = 'None',
-  LocalEntity = 'LocalEntity',
-  LocalAuthority = 'LocalAuthority',
-  NewEntity = 'NewEntity',
-  NewAuthority = 'NewAuthority'
-}
-
-/**
- * The data type passed from the parent page
- */
-export interface QualityAssuranceEventData {
-  /**
-   * The Quality Assurance event
-   */
-  event: QualityAssuranceEventObject;
-  /**
-   * The Quality Assurance event Id (uuid)
-   */
-  id: string;
-  /**
-   * The publication title
-   */
-  title: string;
-  /**
-   * Contains the boolean that indicates if a project is present
-   */
-  hasProject: boolean;
-  /**
-   * The project title, if present
-   */
-  projectTitle: string;
-  /**
-   * The project id (uuid), if present
-   */
-  projectId: string;
-  /**
-   * The project handle, if present
-   */
-  handle: string;
-  /**
-   * The reject/discard reason
-   */
-  reason: string;
-  /**
-   * Contains the boolean that indicates if there is a running operation (REST call)
-   */
-  isRunning: boolean;
-  /**
-   * The related publication DSpace item
-   */
-  target?: Item;
-}
-
 @Component({
   selector: 'ds-project-entry-import-modal',
   styleUrls: ['./project-entry-import-modal.component.scss'],
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
@@ -8,6 +8,7 @@ import {
 } from '@dspace/core/submission/models/section-visibility.model';
 import { SubmissionError } from '@dspace/core/submission/models/submission-error.model';
 import { SubmissionObject } from '@dspace/core/submission/models/submission-object.model';
+import { SubmissionSectionError } from '@dspace/core/submission/models/submission-section-error.model';
 import { WorkspaceitemSectionUploadFileObject } from '@dspace/core/submission/models/workspaceitem-section-upload-file.model';
 import {
   WorkspaceitemSectionDataType,
@@ -16,8 +17,6 @@ import {
 import { SectionsType } from '@dspace/core/submission/sections-type';
 import { Action } from '@ngrx/store';
 
-import { SubmissionSectionError } from './submission-section-error.model';
-
 /**
  * For each action type in an action group, make a simple
  * enum object for all of this group's action types.
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
@@ -5,6 +5,8 @@ import { followLink } from '@dspace/core/shared/follow-link-config.model';
 import { Item } from '@dspace/core/shared/item.model';
 import { getFirstSucceededRemoteDataPayload } from '@dspace/core/shared/operators';
 import { SubmissionObject } from '@dspace/core/submission/models/submission-object.model';
+import { SubmissionSectionError } from '@dspace/core/submission/models/submission-section-error.model';
+import { SubmissionSectionObject } from '@dspace/core/submission/models/submission-section-object.model';
 import { WorkflowItem } from '@dspace/core/submission/models/workflowitem.model';
 import { WorkspaceItem } from '@dspace/core/submission/models/workspaceitem.model';
 import { WorkspaceitemSectionDuplicatesObject } from '@dspace/core/submission/models/workspaceitem-section-duplicates.model';
@@ -78,8 +80,6 @@ import {
   UpdateSectionDataSuccessAction,
 } from './submission-objects.actions';
 import { SubmissionObjectEntry } from './submission-objects.reducer';
-import { SubmissionSectionError } from './submission-section-error.model';
-import { SubmissionSectionObject } from './submission-section-object.model';
 
 @Injectable()
 export class SubmissionObjectEffects {
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
@@ -1,3 +1,4 @@
+import { SubmissionSectionObject } from '@dspace/core/submission/models/submission-section-object.model';
 import { WorkspaceitemSectionUploadObject } from '@dspace/core/submission/models/workspaceitem-section-upload.model';
 import {
   hasValue,
@@ -48,7 +49,6 @@ import {
   SubmissionObjectActionTypes,
   UpdateSectionDataAction,
 } from './submission-objects.actions';
-import { SubmissionSectionObject } from './submission-section-object.model';
 
 /**
  * An interface to represent SubmissionSectionObject entry
diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -22,6 +22,7 @@ import { JsonPatchOperationPathCombiner } from '@dspace/core/json-patch/builder/
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
 import { FormFieldModel } from '@dspace/core/shared/form/models/form-field.model';
 import { FormFieldMetadataValueObject } from '@dspace/core/shared/form/models/form-field-metadata-value.model';
+import { SubmissionSectionError } from '@dspace/core/submission/models/submission-section-error.model';
 import { WorkflowItem } from '@dspace/core/submission/models/workflowitem.model';
 import { WorkspaceItem } from '@dspace/core/submission/models/workspaceitem.model';
 import { SectionsType } from '@dspace/core/submission/sections-type';
@@ -52,7 +53,6 @@ import { getMockFormOperationsService } from '../../../shared/form/testing/form-
 import { getMockFormService } from '../../../shared/form/testing/form-service.mock';
 import { getMockThemeService } from '../../../shared/theme-support/test/theme-service.mock';
 import { ThemeService } from '../../../shared/theme-support/theme.service';
-import { SubmissionSectionError } from '../../objects/submission-section-error.model';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionObjectService } from '../../submission-object.service';
 import {
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
@@ -21,6 +21,8 @@ import {
   getRemoteDataPayload,
 } from '@dspace/core/shared/operators';
 import { SubmissionObject } from '@dspace/core/submission/models/submission-object.model';
+import { SubmissionSectionError } from '@dspace/core/submission/models/submission-section-error.model';
+import { SubmissionSectionObject } from '@dspace/core/submission/models/submission-section-object.model';
 import { WorkflowItem } from '@dspace/core/submission/models/workflowitem.model';
 import { WorkspaceItem } from '@dspace/core/submission/models/workspaceitem.model';
 import { WorkspaceitemSectionFormObject } from '@dspace/core/submission/models/workspaceitem-section-form.model';
@@ -59,8 +61,6 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
-import { SubmissionSectionError } from '../../objects/submission-section-error.model';
-import { SubmissionSectionObject } from '../../objects/submission-section-object.model';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionObjectService } from '../../submission-object.service';
 import { SectionModelComponent } from '../models/section.model';
diff --git a/src/app/submission/sections/models/section-data.model.ts b/src/app/submission/sections/models/section-data.model.ts
@@ -1,8 +1,7 @@
+import { SubmissionSectionError } from '@dspace/core/submission/models/submission-section-error.model';
 import { WorkspaceitemSectionDataType } from '@dspace/core/submission/models/workspaceitem-sections.model';
 import { SectionsType } from '@dspace/core/submission/sections-type';
 
-import { SubmissionSectionError } from '../../objects/submission-section-error.model';
-
 /**
  * An interface to represent section model
  */
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
@@ -21,6 +21,7 @@ import {
   getPaginatedListPayload,
   getRemoteDataPayload,
 } from '@dspace/core/shared/operators';
+import { SubmissionSectionError } from '@dspace/core/submission/models/submission-section-error.model';
 import {
   hasValue,
   isEmpty,
@@ -43,7 +44,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { SubmissionSectionError } from '../../objects/submission-section-error.model';
 import { SectionModelComponent } from '../models/section.model';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsService } from '../sections.service';
diff --git a/src/app/submission/sections/sections.directive.ts b/src/app/submission/sections/sections.directive.ts
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
diff --git a/src/app/submission/selectors.ts b/src/app/submission/selectors.ts
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { SubmissionSectionError } from '../../../submission/objects/submission-section-error.model';`
	`1`	`+import { SubmissionSectionError } from './submission-section-error.model';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* An interface to represent section error`