fix list of urls in Open in Browser action (#1152)

* fix list of urls in Open in Browser action
* fix tslint issue for unused variables

Author: mohitsuman

src/odo.ts

@@ -179,9 +179,6 @@ export class Command {
     static watchComponent(project: string, app: string, component: string) {
         return `odo watch ${component} --app ${app} --project ${project}`;
     }
-    static getRouteHostName(namespace: string, component: string) {
-        return `oc get route --namespace ${namespace} -o jsonpath="{range .items[?(.metadata.labels.app\\.kubernetes\\.io/instance=='${component}')]}{.spec.host}{end}"`;
-    }
     @verbose
     static createLocalComponent(project: string, app: string, type: string, version: string, name: string, folder: string) {
         return `odo create ${type}:${version} ${name} --context ${folder} --app ${app} --project ${project}`;
@@ -211,7 +208,7 @@ export class Command {
     static createComponentCustomUrl(name: string, port: string) {
         return `odo url create ${name} --port ${port}`;
     }
-    static getComponentUrl(project: string, app: string, component: string) {
+    static getComponentUrl() {
         return `odo url list -o json`;
     }
     static deleteComponentUrl(project: string, app: string, component: string, name: string) {
@@ -746,8 +743,7 @@ export class OdoImpl implements Odo {
     }
 
     public async _getRoutes(component: OpenShiftObject): Promise<OpenShiftObject[]> {
-        const app = component.getParent();
-        const result: cliInstance.CliExitData = await this.execute(Command.getComponentUrl(app.getParent().getName(), app.getName(), component.getName()), component.contextPath ? component.contextPath.fsPath : Platform.getUserHomePath(), false);
+        const result: cliInstance.CliExitData = await this.execute(Command.getComponentUrl(), component.contextPath ? component.contextPath.fsPath : Platform.getUserHomePath(), false);
         return this.loadItems(result).map((value) => new OpenShiftObjectImpl(component, value.metadata.name, ContextType.COMPONENT_ROUTE, false, OdoImpl.instance, TreeItemCollapsibleState.None));
     }
 

src/openshift/component.ts

@@ -348,24 +348,17 @@ export class Component extends OpenShiftItem {
         );
         if (!component) return null;
         const app: OpenShiftObject = component.getParent();
-        const namespace: string = app.getParent().getName();
-        if (await Component.checkRouteCreated(namespace, component)) {
+        const urlItems = await Component.listUrl(component);
+        if (urlItems === null) {
             const value = await window.showInformationMessage(`No URL for Component '${component.getName()}' in Application '${app.getName()}'. Do you want to create a URL and open it?`, 'Create', 'Cancel');
             if (value === 'Create') {
                 await commands.executeCommand('openshift.url.create', component);
             }
         }
 
-        if (! await Component.checkRouteCreated(namespace, component)) {
-            const UrlDetails = await Component.odo.execute(Command.getComponentUrl(namespace, app.getName(), component.getName()), component.contextPath.fsPath);
-            let result: any[] = [];
+        if (urlItems !== null) {
             let selectRoute: QuickPickItem;
-            try {
-                result = JSON.parse(UrlDetails.stdout).items;
-            } catch (ignore) {
-                // should give empty list if no url configured
-                // see https://github.com/openshift/odo/issues/1515
-            }
+            const result = urlItems.filter(value => value.status.state === 'Pushed');
             const hostName: QuickPickItem[] = result.map((value) => ({ label: `${value.spec.protocol}://${value.spec.host}`, description: `Target Port is ${value.spec.port}`}));
             if (hostName.length >1) {
                 selectRoute = await window.showQuickPick(hostName, {placeHolder: "This Component has multiple URLs. Select the desired URL to open in browser."});
@@ -377,9 +370,9 @@ export class Component extends OpenShiftItem {
         }
     }
 
-    static async checkRouteCreated(namespace: string, component: OpenShiftObject): Promise<boolean> {
-        const routeCheck = await Component.odo.execute(Command.getRouteHostName(namespace, component.getName()));
-        return routeCheck.stdout.trim() === '';
+    static async listUrl(component: OpenShiftObject) {
+        const UrlDetails = await Component.odo.execute(Command.getComponentUrl(), component.contextPath.fsPath);
+        return JSON.parse(UrlDetails.stdout).items;
     }
 
     static async createFromLocal(context: OpenShiftObject): Promise<string> {

src/openshift/url.ts

@@ -68,9 +68,7 @@ export class Url extends OpenShiftItem{
 
     static async open(treeItem: OpenShiftObject): Promise<ChildProcess> {
         const component = treeItem.getParent();
-        const app = component.getParent();
-        const namespace = app.getParent();
-        const urlDetails = await Url.odo.execute(Command.getComponentUrl(namespace.getName(), app.getName(), component.getName()), component.contextPath.fsPath);
+        const urlDetails = await Url.odo.execute(Command.getComponentUrl(), component.contextPath.fsPath);
         let urlObject: any;
         let result: any[];
         try {