From fd8710b897a67518d3a61c319e54b6a65ba443ef Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Apr 2019 15:26:33 +0200 Subject: Add logs endpoint --- client/src/app/+admin/jobs/shared/index.ts | 1 - client/src/app/+admin/jobs/shared/job.service.ts | 46 ------------------------ 2 files changed, 47 deletions(-) delete mode 100644 client/src/app/+admin/jobs/shared/index.ts delete mode 100644 client/src/app/+admin/jobs/shared/job.service.ts (limited to 'client/src/app/+admin/jobs/shared') diff --git a/client/src/app/+admin/jobs/shared/index.ts b/client/src/app/+admin/jobs/shared/index.ts deleted file mode 100644 index 609439e5c..000000000 --- a/client/src/app/+admin/jobs/shared/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './job.service' diff --git a/client/src/app/+admin/jobs/shared/job.service.ts b/client/src/app/+admin/jobs/shared/job.service.ts deleted file mode 100644 index b96dc3359..000000000 --- a/client/src/app/+admin/jobs/shared/job.service.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { catchError, map } from 'rxjs/operators' -import { HttpClient, HttpParams } from '@angular/common/http' -import { Injectable } from '@angular/core' -import { SortMeta } from 'primeng/primeng' -import { Observable } from 'rxjs' -import { ResultList } from '../../../../../../shared' -import { JobState } from '../../../../../../shared/models' -import { Job } from '../../../../../../shared/models/server/job.model' -import { environment } from '../../../../environments/environment' -import { RestExtractor, RestPagination, RestService } from '../../../shared' - -@Injectable() -export class JobService { - private static BASE_JOB_URL = environment.apiUrl + '/api/v1/jobs' - - constructor ( - private authHttp: HttpClient, - private restService: RestService, - private restExtractor: RestExtractor - ) {} - - getJobs (state: JobState, pagination: RestPagination, sort: SortMeta): Observable> { - let params = new HttpParams() - params = this.restService.addRestGetParams(params, pagination, sort) - - return this.authHttp.get>(JobService.BASE_JOB_URL + '/' + state, { params }) - .pipe( - map(res => { - return this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'processedOn', 'finishedOn' ]) - }), - map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData)), - map(res => this.restExtractor.applyToResultListData(res, this.buildUniqId)), - catchError(err => this.restExtractor.handleError(err)) - ) - } - - private prettyPrintData (obj: Job) { - const data = JSON.stringify(obj.data, null, 2) - - return Object.assign(obj, { data }) - } - - private buildUniqId (obj: Job) { - return Object.assign(obj, { uniqId: `${obj.id}-${obj.type}` }) - } -} -- cgit v1.2.3