From 806fbaa49cda91c2883d508fe8c28c149decb71f Mon Sep 17 00:00:00 2001
From: Meina Zhou <meinaz@vmware.com>
Date: Wed, 5 Sep 2018 09:28:08 +0800
Subject: [PATCH] fix build fail for angular 6

Signed-off-by: Meina Zhou <meinaz@vmware.com>
---
 src/ui_ng/angular-cli.json                    | 70 -------------------
 src/ui_ng/lib/src/channel/channel.service.ts  |  2 +-
 .../lib/src/operation/operation.service.ts    |  4 +-
 src/ui_ng/src/tsconfig.json                   | 25 -------
 src/ui_ng/tsconfig-aot.json                   | 25 -------
 5 files changed, 3 insertions(+), 123 deletions(-)
 delete mode 100644 src/ui_ng/angular-cli.json
 delete mode 100644 src/ui_ng/src/tsconfig.json
 delete mode 100644 src/ui_ng/tsconfig-aot.json

diff --git a/src/ui_ng/angular-cli.json b/src/ui_ng/angular-cli.json
deleted file mode 100644
index 64a1f0ea6..000000000
--- a/src/ui_ng/angular-cli.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "project": {
-        "version": "1.0.0-beta.20-4",
-        "name": "clarity-seed"
-    },
-    "apps": [{
-        "root": "src",
-        "outDir": "dist",
-        "assets": [
-            "images",
-            "favicon.ico",
-            "setting.json"
-        ],
-        "index": "index.html",
-        "main": "main.ts",
-        "test": "test.ts",
-        "tsconfig": "tsconfig.json",
-        "prefix": "app",
-        "mobile": false,
-        "styles": [
-            "../node_modules/clarity-icons/clarity-icons.min.css",
-            "../node_modules/clarity-ui/clarity-ui.min.css",
-            "../node_modules/prismjs/themes/prism-solarizedlight.css",
-            "styles.css"
-        ],
-        "scripts": [
-            "../node_modules/core-js/client/shim.min.js",
-            "../node_modules/mutationobserver-shim/dist/mutationobserver.min.js",
-            "../node_modules/@webcomponents/custom-elements/custom-elements.min.js",
-            "../node_modules/clarity-icons/clarity-icons.min.js",
-            "../node_modules/web-animations-js/web-animations.min.js",
-            "../node_modules/marked/lib/marked.js",
-            "../node_modules/prismjs/prism.js",
-            "../node_modules/prismjs/components/prism-yaml.min.js"
-        ],
-        "environmentSource": "environments/environment.ts",
-        "environments": {
-            "dev": "environments/environment.ts",
-            "prod": "environments/environment.prod.ts"
-        }
-    }],
-    "addons": [],
-    "packages": [],
-    "e2e": {
-        "protractor": {
-            "config": "./protractor.config.js"
-        }
-    },
-    "test": {
-        "karma": {
-            "config": "./karma.conf.js"
-        }
-    },
-    "defaults": {
-        "styleExt": "scss",
-        "prefixInterfaces": false,
-        "inline": {
-            "style": false,
-            "template": false
-        },
-        "spec": {
-            "class": false,
-            "component": true,
-            "directive": true,
-            "module": false,
-            "pipe": true,
-            "service": true
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ui_ng/lib/src/channel/channel.service.ts b/src/ui_ng/lib/src/channel/channel.service.ts
index 06a2ad994..3a34456b4 100644
--- a/src/ui_ng/lib/src/channel/channel.service.ts
+++ b/src/ui_ng/lib/src/channel/channel.service.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { Injectable } from '@angular/core';
-import { Subject} from "rxjs";
+import { Observable, Subject} from "rxjs";
 
 @Injectable()
 export class ChannelService {
diff --git a/src/ui_ng/lib/src/operation/operation.service.ts b/src/ui_ng/lib/src/operation/operation.service.ts
index cd305daae..d7bcd5d09 100644
--- a/src/ui_ng/lib/src/operation/operation.service.ts
+++ b/src/ui_ng/lib/src/operation/operation.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Subject} from "rxjs";
-import {OperateInfo} from "./operate";
+import { Observable, Subject} from "rxjs";
+import { OperateInfo } from "./operate";
 
 @Injectable()
 export class OperationService {
diff --git a/src/ui_ng/src/tsconfig.json b/src/ui_ng/src/tsconfig.json
deleted file mode 100644
index e67ce7c76..000000000
--- a/src/ui_ng/src/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "baseUrl": "",
-        "declaration": false,
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "mapRoot": "./",
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "outDir": "../dist/out-tsc",
-        "sourceMap": true,
-        "target": "es5",
-        "typeRoots": [
-            "../node_modules/@types"
-        ]
-    },
-    "exclude": [
-        "node_modules",
-        "dist"
-    ]
-}
diff --git a/src/ui_ng/tsconfig-aot.json b/src/ui_ng/tsconfig-aot.json
deleted file mode 100644
index b705b5650..000000000
--- a/src/ui_ng/tsconfig-aot.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": ["es2015", "dom"],
-    "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "allowSyntheticDefaultImports": true,
-    "typeRoots": [
-      "./node_modules/@types/"
-    ]
-  },
-  "files": [
-    "src/app/app.module.ts",
-    "src/main-aot.ts"
-  ],
-  "angularCompilerOptions": {
-    "genDir": "aot",
-    "skipMetadataEmit" : true
-  }
-}
\ No newline at end of file