hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 10:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved process data services

Browse Source
This commit is contained in:
lotte
2020-03-23 11:19:27 +01:00
committed by Art Lowel
parent 68e2a08af2
commit ee649debfb
5 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/core/core.module.ts
View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http'; import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core'; import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store'; import { StoreModule } from '@ngrx/store';
@@ -14,11 +13,7 @@ import { FormService } from '../shared/form/form.service';
import { HostWindowService } from '../shared/host-window.service'; import { HostWindowService } from '../shared/host-window.service';
import { MenuService } from '../shared/menu/menu.service'; import { MenuService } from '../shared/menu/menu.service';
import { EndpointMockingRestService } from '../shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service'; import { EndpointMockingRestService } from '../shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service';
import { import { MOCK_RESPONSE_MAP, MockResponseMap, mockResponseMap } from '../shared/mocks/dspace-rest-v2/mocks/mock-response-map';
MOCK_RESPONSE_MAP,
MockResponseMap,
mockResponseMap
} from '../shared/mocks/dspace-rest-v2/mocks/mock-response-map';
import { NotificationsService } from '../shared/notifications/notifications.service'; import { NotificationsService } from '../shared/notifications/notifications.service';
import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service'; import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
import { ObjectSelectService } from '../shared/object-select/object-select.service'; import { ObjectSelectService } from '../shared/object-select/object-select.service';
@@ -141,6 +136,8 @@ import { Version } from './shared/version.model';
import { VersionHistory } from './shared/version-history.model'; import { VersionHistory } from './shared/version-history.model';
import { Script } from '../process-page/scripts/script.model'; import { Script } from '../process-page/scripts/script.model';
import { Process } from '../process-page/processes/process.model'; import { Process } from '../process-page/processes/process.model';
import { ProcessDataService } from './data/processes/process-data.service';
import { ScriptDataService } from './data/processes/script-data.service';
/** /**
* When not in production, endpoint responses can be mocked for testing purposes * When not in production, endpoint responses can be mocked for testing purposes
@@ -261,6 +258,8 @@ const PROVIDERS = [
VersionHistoryDataService, VersionHistoryDataService,
LicenseDataService, LicenseDataService,
ItemTypeDataService, ItemTypeDataService,
ProcessDataService,
ScriptDataService,
// register AuthInterceptor as HttpInterceptor // register AuthInterceptor as HttpInterceptor
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,

18
src/app/process-page/processes/process-data.service.ts → src/app/core/data/processes/process-data.service.ts
View File

@@ -1,15 +1,15 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { DataService } from '../../core/data/data.service'; import { DataService } from '../data.service';
import { RequestService } from '../../core/data/request.service'; import { RequestService } from '../request.service';
import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { CoreState } from '../../core/core.reducers'; import { CoreState } from '../../core.reducers';
import { ObjectCacheService } from '../../core/cache/object-cache.service'; import { ObjectCacheService } from '../../cache/object-cache.service';
import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { HALEndpointService } from '../../shared/hal-endpoint.service';
import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { DefaultChangeAnalyzer } from '../../core/data/default-change-analyzer.service'; import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
import { Process } from './process.model'; import { Process } from '../../../process-page/processes/process.model';
@Injectable() @Injectable()
export class ProcessDataService extends DataService<Process> { export class ProcessDataService extends DataService<Process> {

18
src/app/process-page/scripts/script-data.service.ts → src/app/core/data/processes/script-data.service.ts
View File

@@ -1,15 +1,15 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { DataService } from '../../core/data/data.service'; import { DataService } from '../data.service';
import { RequestService } from '../../core/data/request.service'; import { RequestService } from '../request.service';
import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { CoreState } from '../../core/core.reducers'; import { CoreState } from '../../core.reducers';
import { ObjectCacheService } from '../../core/cache/object-cache.service'; import { ObjectCacheService } from '../../cache/object-cache.service';
import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { HALEndpointService } from '../../shared/hal-endpoint.service';
import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { DefaultChangeAnalyzer } from '../../core/data/default-change-analyzer.service'; import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
import { Script } from './script.model'; import { Script } from '../../../process-page/scripts/script.model';
@Injectable() @Injectable()
export class ScriptDataService extends DataService<Script> { export class ScriptDataService extends DataService<Script> {

2
src/app/process-page/new/scripts-select/scripts-select.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
import { ScriptDataService } from '../../scripts/script-data.service'; import { ScriptDataService } from '../../../core/data/processes/script-data.service';
import { Script } from '../../scripts/script.model'; import { Script } from '../../scripts/script.model';
import { Observable, Subscription } from 'rxjs'; import { Observable, Subscription } from 'rxjs';
import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators'; import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';

11
src/app/process-page/process-page.module.ts
View File

@@ -1,8 +1,8 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module'; import { SharedModule } from '../shared/shared.module';
import { ProcessPageRoutingModule } from './process-page-routing.module'; import { ProcessPageRoutingModule } from './process-page-routing.module';
import { ProcessDataService } from './processes/process-data.service'; import { ProcessDataService } from '../core/data/processes/process-data.service';
import { ScriptDataService } from './scripts/script-data.service'; import { ScriptDataService } from '../core/data/processes/script-data.service';
import { NewProcessComponent } from './new/new-process.component'; import { NewProcessComponent } from './new/new-process.component';
import { ScriptsSelectComponent } from './new/scripts-select/scripts-select.component'; import { ScriptsSelectComponent } from './new/scripts-select/scripts-select.component';
import { ScriptHelpComponent } from './new/script-help/script-help.component'; import { ScriptHelpComponent } from './new/script-help/script-help.component';
@@ -25,12 +25,7 @@ import { ParameterValueInputComponent } from './new/process-parameters/parameter
StringValueInputComponent, StringValueInputComponent,
ParameterValueInputComponent, ParameterValueInputComponent,
], ],
entryComponents: [ entryComponents: []
],
providers: [
ProcessDataService,
ScriptDataService
]
}) })
export class ProcessPageModule { export class ProcessPageModule {