From a52d50e788792a63e97a9176ab319d53db7a2853 Mon Sep 17 00:00:00 2001 From: vempo Date: Tue, 24 Jul 2018 17:34:04 +0300 Subject: Replaced old implementation at root Old project files and directories has been moved under 'deprecated-workflow-designer'. The old project is not built by the CI anymore, but can be still built manually. New modules/directories have been moved up and integrated with the CI system. Change-Id: I1528c792bcbcce9e50bfc294a1328a20e72c91cf Issue-ID: SDC-1559 Signed-off-by: vempo --- .../src/app/util/http.service.ts | 67 ---------------------- .../src/app/util/rxjs-operators.ts | 19 ------ .../src/app/util/workflow-util.ts | 43 -------------- 3 files changed, 129 deletions(-) delete mode 100644 sdc-workflow-designer-ui/src/app/util/http.service.ts delete mode 100644 sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts delete mode 100644 sdc-workflow-designer-ui/src/app/util/workflow-util.ts (limited to 'sdc-workflow-designer-ui/src/app/util') diff --git a/sdc-workflow-designer-ui/src/app/util/http.service.ts b/sdc-workflow-designer-ui/src/app/util/http.service.ts deleted file mode 100644 index f754d38e..00000000 --- a/sdc-workflow-designer-ui/src/app/util/http.service.ts +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Copyright (c) 2017 ZTE Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * ZTE - initial API and implementation and/or initial documentation - */ -import { Injectable } from '@angular/core'; -import { Http, RequestOptionsArgs } from '@angular/http'; -import { Observable } from 'rxjs/Rx'; -import './rxjs-operators'; - -@Injectable() -export class HttpService { - constructor(private http: Http) { } - - public get(uri: string, options?: RequestOptionsArgs): Observable { - return this.getHttp('get', uri, options); - } - - public post(uri: string, data: any, options?: RequestOptionsArgs): Observable { - return this.getHttp('post', uri, data); - } - - public put(uri: string, data: any, options?: RequestOptionsArgs): Observable { - return this.getHttp('put', uri, data, options); - } - - public delete(uri: string): Observable { - return this.getHttp('delete', uri); - } - - public getHttp(type: string, uri: string, data?: any, options?: RequestOptionsArgs): Observable { - if (data) { - return this.http[type](uri, data, options) - .map(response => { - if (response.text() === '') { - return {}; - } - - return response.json(); - }) - .catch(this.handleError); - } else { - return this.http[type](uri, options) - .map(response => response.json()) - .catch(this.handleError); - } - } - - private handleError(error: any) { - let errMsg = ''; - try { - errMsg = error.json().message; - if (!errMsg) { - errMsg = error.json().msg; - } - } catch (e) { - errMsg = error.status ? `${error.status}-${error.statusText}` : 'Server error'; - } - return Observable.throw(errMsg); - } -} diff --git a/sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts b/sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts deleted file mode 100644 index 1a8f11c0..00000000 --- a/sdc-workflow-designer-ui/src/app/util/rxjs-operators.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) 2017 ZTE Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * ZTE - initial API and implementation and/or initial documentation - */ -import 'rxjs/add/observable/forkJoin'; -import 'rxjs/add/observable/throw'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/debounceTime'; -import 'rxjs/add/operator/distinctUntilChanged'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/switchMap'; -import 'rxjs/add/operator/toPromise'; diff --git a/sdc-workflow-designer-ui/src/app/util/workflow-util.ts b/sdc-workflow-designer-ui/src/app/util/workflow-util.ts deleted file mode 100644 index 802cba9f..00000000 --- a/sdc-workflow-designer-ui/src/app/util/workflow-util.ts +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) 2017-2018 ZTE Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html - * and http://www.apache.org/licenses/LICENSE-2.0 - * - * Contributors: - * ZTE - initial API and implementation and/or initial documentation - */ -export class WorkflowUtil { - public static deepClone(source: any) { - if (source === null || typeof source !== 'object') { - return source; - } else { - if (source instanceof Array) { - const target = []; - source.forEach(item => target.push(WorkflowUtil.deepClone(item))); - return target; - } else { - const target = {}; - for (const key in source) { - target[key] = WorkflowUtil.deepClone(source[key]); - } - return target; - } - } - } - - public static GetIconFullPath(iconName: string): string { - if (iconName && '' != iconName) { - if (-1 == iconName.indexOf('.')) { - return 'assets/images/' + iconName + '.svg'; - } else { - return 'assets/images/' + iconName; - } - } else { - return 'assets/images/default.svg'; - } - } - -} -- cgit 1.2.3-korg