[DURACOM-327] move core dependencies (imported files) into core folder, move config (app) into core, move core states files into core folder, replace import of some constants for route paths with strings to avoid import/dependency from other part of the app

Author: FrancescoMolinaro

scripts/base-href.ts

@@ -1,8 +1,8 @@
 import { existsSync, writeFileSync } from 'fs';
 import { join } from 'path';
 
-import { AppConfig } from '../src/config/app-config.interface';
-import { buildAppConfig } from '../src/config/config.server';
+import { AppConfig } from '../src/app/core/config/app-config.interface';
+import { buildAppConfig } from '../src/app/core/config/config.server';
 
 /**
  * Script to set baseHref as `ui.nameSpace` for development mode. Adds `baseHref` to angular.json build options.

scripts/serve.ts

@@ -1,7 +1,7 @@
 import { spawn } from 'child_process';
 
-import { AppConfig } from '../src/config/app-config.interface';
-import { buildAppConfig } from '../src/config/config.server';
+import { AppConfig } from '../src/app/core/config/app-config.interface';
+import { buildAppConfig } from '../src/app/core/config/config.server';
 
 const appConfig: AppConfig = buildAppConfig();
 

scripts/test-rest.ts

@@ -1,8 +1,8 @@
 import { request } from 'http';
 import { request as https_request } from 'https';
 
-import { AppConfig } from '../src/config/app-config.interface';
-import { buildAppConfig } from '../src/config/config.server';
+import { AppConfig } from '../src/app/core/config/app-config.interface';
+import { buildAppConfig } from '../src/app/core/config/config.server';
 
 const appConfig: AppConfig = buildAppConfig();
 

server.ts

@@ -42,22 +42,22 @@ import { enableProdMode } from '@angular/core';
 import { environment } from './src/environments/environment';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { hasValue } from './modules/shared/utils/src/lib/utils/empty.util';
-import { UIServerConfig } from './src/config/ui-server-config.interface';
+import { UIServerConfig } from './src/app/core/config/ui-server-config.interface';
 import bootstrap from './src/main.server';
-import { buildAppConfig } from './src/config/config.server';
+import { buildAppConfig } from './src/app/core/config/config.server';
 import {
   APP_CONFIG,
   AppConfig,
-} from './src/config/app-config.interface';
-import { extendEnvironmentWithAppConfig } from './src/config/config.util';
+} from './src/app/core/config/app-config.interface';
+import { extendEnvironmentWithAppConfig } from './src/app/core/config/config.util';
 import { logStartupMessage } from './startup-message';
 import { TOKENITEM } from './src/app/core/auth/models/auth-token-info.model';
 import { CommonEngine } from '@angular/ssr';
 import { APP_BASE_HREF } from '@angular/common';
 import {
   REQUEST,
   RESPONSE,
-} from './src/express.tokens';
+} from './src/app/core/tokens/express.tokens';
 
 /*
  * Set path for the browser application's dist folder

src/app/access-control/access-control-routes.ts

@@ -8,14 +8,14 @@ import {
 import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { groupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
 import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { EPersonResolver } from '../core/eperson/eperson-resolver.service';
 import {
   EPERSON_PATH,
   GROUP_PATH,
 } from './access-control-routing-paths';
 import { BulkAccessComponent } from './bulk-access/bulk-access.component';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
-import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
 import { groupPageGuard } from './group-registry/group-page.guard';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';

src/app/access-control/bulk-access/bulk-access.component.spec.ts

@@ -7,14 +7,14 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../core/utilities/remote-data.utils';
 import { getMockThemeService } from '../../core/mocks/theme-service.mock';
+import { NotificationsService } from '../../core/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../core/utilities/remote-data.utils';
+import { NotificationsServiceStub } from '../../core/utilities/testing/notifications-service.stub';
 import { Process } from '../../process-page/processes/process.model';
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 import { BulkAccessComponent } from './bulk-access.component';
 import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.component';

src/app/access-control/epeople-registry/epeople-registry.component.spec.ts

@@ -30,7 +30,6 @@ import {
   of as observableOf,
 } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../core/utilities/remote-data.utils';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FindListOptions } from '../../core/data/find-list-options.model';
 import {
@@ -43,19 +42,20 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { getMockFormBuilderService } from '../../core/mocks/form-builder-service.mock';
 import { RouterMock } from '../../core/mocks/router.mock';
+import { NotificationsService } from '../../core/notifications/notifications.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { createSuccessfulRemoteDataObject$ } from '../../core/utilities/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../core/utilities/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../core/utilities/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../core/utilities/testing/pagination-service.stub';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
-import {
-  EPersonMock,
-  EPersonMock2,
-} from '../../shared/testing/eperson.mock';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { EPeopleRegistryComponent } from './epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form/eperson-form.component';
 

src/app/access-control/epeople-registry/epeople-registry.component.ts

@@ -45,6 +45,7 @@ import { RequestService } from '../../core/data/request.service';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
+import { NotificationsService } from '../../core/notifications/notifications.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { NoContent } from '../../core/shared/NoContent.model';
 import {
@@ -55,7 +56,6 @@ import { PageInfo } from '../../core/shared/page-info.model';
 import { PaginationComponentOptions } from '../../core/shared/pagination-component-options.model';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import {
   getEPersonEditRoute,

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts

@@ -28,7 +28,6 @@ import {
   of as observableOf,
 } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../../core/utilities/remote-data.utils';
 import { AuthService } from '../../../core/auth/auth.service';
 import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
@@ -44,24 +43,25 @@ import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { getMockFormBuilderService } from '../../../core/mocks/form-builder-service.mock';
+import { NotificationsService } from '../../../core/notifications/notifications.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../core/utilities/remote-data.utils';
+import { ActivatedRouteStub } from '../../../core/utilities/testing/active-router.stub';
+import { AuthServiceStub } from '../../../core/utilities/testing/auth-service.stub';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../core/utilities/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../../core/utilities/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../core/utilities/testing/pagination-service.stub';
+import { RouterStub } from '../../../core/utilities/testing/router.stub';
+import { createPaginatedList } from '../../../core/utilities/testing/utils.test';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
-import {
-  EPersonMock,
-  EPersonMock2,
-} from '../../../shared/testing/eperson.mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { EPeopleRegistryComponent } from '../epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form.component';

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

@@ -55,6 +55,7 @@ import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { Group } from '../../../core/eperson/models/group.model';
+import { NotificationsService } from '../../../core/notifications/notifications.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import {
@@ -71,7 +72,6 @@ import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/c
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { getEPersonsRoute } from '../../access-control-routing-paths';