[DURACOM-327] move remaining data services, resource types and models inside core, fix paths with /src/app/core

Author: FrancescoMolinaro

cypress/support/commands.ts

@@ -6,11 +6,11 @@
 import {
   AuthTokenInfo,
   TOKENITEM,
-} from 'src/app/core/auth/models/auth-token-info.model';
+} from '@core/auth/models/auth-token-info.model';
 import {
   DSPACE_XSRF_COOKIE,
   XSRF_REQUEST_HEADER,
-} from 'src/app/core/xsrf/xsrf.constants';
+} from '@core/xsrf/xsrf.constants';
 import { v4 as uuidv4 } from 'uuid';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs

cypress/support/e2e.ts

@@ -19,7 +19,7 @@ import './commands';
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
 
-import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
+import { DSPACE_XSRF_COOKIE } from '@core/xsrf/xsrf.constants';
 
 // Runs once before all tests
 before(() => {

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

@@ -4,6 +4,8 @@ import {
   TestBed,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { AdminNotifyMessage } from '@core/data/admin-notify-message.model';
+import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model';
 import { buildPaginatedList } from '@core/data/paginated-list.model';
 import { SearchService } from '@core/shared/search/search.service';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
@@ -15,8 +17,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
-import { AdminNotifyMessage } from './models/admin-notify-message.model';
-import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
 
 describe('AdminNotifyDashboardComponent', () => {
   let component: AdminNotifyDashboardComponent;

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

@@ -5,6 +5,7 @@ import {
   Input,
   Output,
 } from '@angular/core';
+import { AdminNotifyMessage } from '@core/data/admin-notify-message.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateModule,
@@ -13,7 +14,6 @@ import {
 
 import { fadeIn } from '../../../shared/animations/fade';
 import { MissingTranslationHelper } from '../../../shared/translate/missing-translation.helper';
-import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 
 @Component({
   selector: 'ds-admin-notify-detail-modal',

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

@@ -5,6 +5,8 @@ import {
   TestBed,
 } from '@angular/core/testing';
 import { RouterModule } from '@angular/router';
+import { AdminNotifyMessage } from '@core/data/admin-notify-message.model';
+import { AdminNotifyMessagesDataService } from '@core/data/admin-notify-messages-data.service';
 import { SearchConfigurationService } from '@core/shared/search/search-configuration.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -14,8 +16,6 @@ import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configu
 import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component';
 import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { AdminNotifyMessage } from '../models/admin-notify-message.model';
-import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
 import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component';
 
 export const mockAdminNotifyMessages = [
@@ -78,7 +78,7 @@ describe('AdminNotifySearchResultComponent', () => {
   let component: AdminNotifySearchResultComponent;
   let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
 
-  let adminNotifyMessageService: AdminNotifyMessagesService;
+  let adminNotifyMessageService: AdminNotifyMessagesDataService;
   let searchConfigService: SearchConfigurationService;
   let modalService: NgbModal;
 
@@ -99,7 +99,7 @@ describe('AdminNotifySearchResultComponent', () => {
         TranslateModule.forRoot(),
       ],
       providers: [
-        { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService },
+        { provide: AdminNotifyMessagesDataService, useValue: adminNotifyMessageService },
         DatePipe,
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],

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

@@ -9,6 +9,9 @@ import {
   OnInit,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
+import { AdminNotifyMessage } from '@core/data/admin-notify-message.model';
+import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model';
+import { AdminNotifyMessagesDataService } from '@core/data/admin-notify-messages-data.service';
 import { PaginatedList } from '@core/data/paginated-list.model';
 import { SearchConfigurationService } from '@core/shared/search/search-configuration.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -23,9 +26,6 @@ import { TabulatableResultListElementsComponent } from '../../../shared/object-l
 import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component';
 import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { AdminNotifyMessage } from '../models/admin-notify-message.model';
-import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
-import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
 
 @Component({
   selector: 'ds-admin-notify-search-result',
@@ -103,7 +103,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
   private dateFormat = 'YYYY/MM/d hh:mm:ss';
 
   constructor(private modalService: NgbModal,
-                private adminNotifyMessagesService: AdminNotifyMessagesService,
+                private adminNotifyMessagesService: AdminNotifyMessagesDataService,
                 private datePipe: DatePipe,
                 @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
     super();

src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts

@@ -10,6 +10,8 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
+import { DspaceRestService } from '@core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model';
 import {
   NgbAccordion,
   NgbAccordionModule,
@@ -19,8 +21,6 @@ import {
   TranslateModule,
 } from '@ngx-translate/core';
 import { of } from 'rxjs';
-import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
-import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
 import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
 
 import { FilteredCollectionsComponent } from './filtered-collections.component';

src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts

@@ -8,15 +8,15 @@ import {
   FormBuilder,
   FormGroup,
 } from '@angular/forms';
+import { RestRequestMethod } from '@core/data/rest-request-method';
+import { DspaceRestService } from '@core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model';
 import {
   NgbAccordion,
   NgbAccordionModule,
 } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { RestRequestMethod } from 'src/app/core/data/rest-request-method';
-import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
-import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
 import { environment } from 'src/environments/environment';
 
 import { FiltersComponent } from '../filters-section/filters-section.component';

src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts

@@ -11,13 +11,13 @@ import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service';
 import { ScriptDataService } from '@core/data/processes/script-data.service';
+import { Script } from '@core/shared/scripts/script.model';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
 import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
 import { Process } from '../../../../process-page/processes/process.model';
-import { Script } from '../../../../process-page/scripts/script.model';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,

src/app/admin/admin-reports/filtered-items/filtered-items-model.ts

@@ -1,5 +1,5 @@
 import { Collection } from '@core/shared/collection.model';
-import { Item } from 'src/app/core/shared/item.model';
+import { Item } from '@core/shared/item.model';
 
 export class FilteredItems {