From d89e639e7693f4728cc2097721cf68f08bfc92dd Mon Sep 17 00:00:00 2001 From: lotte Date: Mon, 8 Apr 2019 17:17:12 +0200 Subject: [PATCH] 61561: clean up --- src/app/core/cache/models/normalized-object-factory.ts | 3 --- src/app/core/data/request.effects.ts | 1 - src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts | 1 - src/app/core/shared/resource-type.ts | 1 - src/app/shared/mocks/mock-remote-data-build.service.ts | 4 +++- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app/core/cache/models/normalized-object-factory.ts b/src/app/core/cache/models/normalized-object-factory.ts index 15dfe08e86..2a0db803df 100644 --- a/src/app/core/cache/models/normalized-object-factory.ts +++ b/src/app/core/cache/models/normalized-object-factory.ts @@ -53,9 +53,6 @@ export class NormalizedObjectFactory { case ResourceType.Group: { return NormalizedGroup } - case ResourceType.Status: { - return NormalizedAuthStatus - } case ResourceType.MetadataSchema: { return NormalizedMetadataSchema } diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts index 506cfd5f8d..5e7bec698b 100644 --- a/src/app/core/data/request.effects.ts +++ b/src/app/core/data/request.effects.ts @@ -48,7 +48,6 @@ export class RequestEffects { const serializer = new DSpaceRESTv2Serializer(NormalizedObjectFactory.getConstructor(request.body.type)); body = serializer.serialize(request.body); } - console.log(JSON.stringify(request)); return this.restApi.request(request.method, request.href, body, request.options).pipe( map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)), addToResponseCacheAndCompleteAction(request, this.EnvConfig), diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts index 6e700f68d7..a2a9f2530c 100644 --- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts +++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts @@ -71,7 +71,6 @@ export class DSpaceRESTv2Service { if (options && options.responseType) { requestOptions.responseType = options.responseType; } - console.log('url', url); return this.http.request(method, url, requestOptions).pipe( map((res) => ({ payload: res.body, headers: res.headers, statusCode: res.status, statusText: res.statusText })), catchError((err) => { diff --git a/src/app/core/shared/resource-type.ts b/src/app/core/shared/resource-type.ts index 451e4c3324..484f1ea6e2 100644 --- a/src/app/core/shared/resource-type.ts +++ b/src/app/core/shared/resource-type.ts @@ -20,5 +20,4 @@ export enum ResourceType { SubmissionForms = 'submissionforms', SubmissionSections = 'submissionsections', SubmissionSection = 'submissionsection', - Status = 'status', } diff --git a/src/app/shared/mocks/mock-remote-data-build.service.ts b/src/app/shared/mocks/mock-remote-data-build.service.ts index 675e539d90..3cab439581 100644 --- a/src/app/shared/mocks/mock-remote-data-build.service.ts +++ b/src/app/shared/mocks/mock-remote-data-build.service.ts @@ -4,6 +4,7 @@ import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-bu import { RemoteData } from '../../core/data/remote-data'; import { RequestEntry } from '../../core/data/request.reducer'; import { hasValue } from '../empty.util'; +import { NormalizedObject } from '../../core/cache/models/normalized-object.model'; export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observable>): RemoteDataBuildService { return { @@ -17,7 +18,8 @@ export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observab } as RemoteData))) } }, - buildSingle: (href$: string | Observable) => observableOf(new RemoteData(false, false, true, undefined, {})) + buildSingle: (href$: string | Observable) => observableOf(new RemoteData(false, false, true, undefined, {})), + build: (normalized: NormalizedObject) => Object.create({}) } as RemoteDataBuildService; }