Show cluster and registry nodes at top level in component types view (#2002)

dgolovin · web-flow · commit 3ac01b98d6cb · 2021-03-03T13:28:39.000-08:00
* Show cluster and registry nodes at top level in component types view This PR fixes #1999. Signed-off-by: Denis Golovin dgolovin@redhat.com
diff --git a/src/component.ts b/src/component.ts
@@ -26,24 +26,34 @@ import {
     ComponentTypesJson,
     DevfileComponentType,
     ImageStreamTag,
+    isCluster,
     isDevfileComponent,
     isImageStreamTag,
+    isRegistry,
     isS2iComponent,
+    Registry,
     S2iComponentType
 } from './odo/componentType';
 import {
     isStarterProject,
     StarterProject
 } from './odo/componentTypeDescription';
 import { vsCommand, VsCommandError } from './vscommand';
+import { Cluster } from '@kubernetes/client-node/dist/config_types';
+import { KubeConfig } from '@kubernetes/client-node';
 
-type ComponentType = S2iComponentType | DevfileComponentType | ImageStreamTag | StarterProject;
+type ComponentType = S2iComponentType | DevfileComponentType | ImageStreamTag | StarterProject | Cluster | Registry;
 
 export enum ContextType {
     S2I_COMPONENT_TYPE = 's2iComponentType',
     DEVFILE_COMPONENT_TYPE = 'devfileComponentType',
     S2I_IMAGE_STREAM_TAG = 's2iImageStreamTag',
     DEVFILE_STARTER_PROJECT = 'devfileStarterProject',
+    DEVFILE_REGISTRY = 'devfileRegistry',
+    OFFLINE_CLUSTER = 'clusterOffline',
+    ONLINE_LOGGEDOFF_CLUSER = 'clusterLoggedoffOnline',
+    ONLINE_LOOGEDIN_CLUSER = 'clusterLoggedinOnline',
+    OFFLINE_OR_LOGGEDOUT_CLUSTER = 'clusterOfflineOrLoggedout',
 }
 
 export class ComponentTypesView implements TreeDataProvider<ComponentType> {
@@ -59,6 +69,7 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
         .onDidChangeTreeDataEmitter.event;
 
     readonly odo: Odo = getInstance();
+    private registries: Registry[];
 
     createTreeView(id: string): TreeView<ComponentType> {
         if (!this.treeView) {
@@ -78,6 +89,19 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
 
     // eslint-disable-next-line class-methods-use-this
     getTreeItem(element: ComponentType): TreeItem | Thenable<TreeItem> {
+        if(isCluster(element)) {
+            return {
+                label: `${element.server}`,
+                collapsibleState: TreeItemCollapsibleState.Collapsed,
+            }
+        }
+        if (isRegistry(element)) {
+            return {
+                label: element.Name,
+                description: element.URL,
+                collapsibleState: TreeItemCollapsibleState.Collapsed,
+            }
+        }
         if(isS2iComponent(element)) {
             return {
                 label: `${element.metadata.name} (s2i)`,
@@ -91,7 +115,7 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
         }
         if(isImageStreamTag(element)) {
             return {
-                label: element.name,
+                label: element.annotations['openshift.io/display-name']? element.annotations['openshift.io/display-name'] : element.name,
                 contextValue: ContextType.S2I_IMAGE_STREAM_TAG,
                 tooltip: element.annotations.description,
                 description: element.annotations.description,
@@ -114,14 +138,14 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
             }
         }
         return {
-            label: `${element.Name} (devfile)`,
+            label: `${element.DisplayName} (devfile)`,
             contextValue: ContextType.DEVFILE_COMPONENT_TYPE,
             iconPath: {
                 dark: Uri.file(path.join(__dirname, '..','..','images', 'component', 'component-type-dark.png')),
                 light: Uri.file(path.join(__dirname, '..','..','images', 'component', 'component-type-light.png'))
             },
             tooltip: element.Description,
-            collapsibleState: TreeItemCollapsibleState.Collapsed,
+            collapsibleState: this.registries.length > 1? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed,
         };
     }
 
@@ -136,19 +160,39 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
         return data;
     }
 
+    private async getRegistries(): Promise<Registry[]> {
+        if(!this.registries) {
+            this.registries  =await this.odo.getRegistries();
+        }
+        return this.registries;
+    }
+
     // eslint-disable-next-line class-methods-use-this
     async getChildren(parent: ComponentType): Promise<ComponentType[]> {
         let children: ComponentType[];
+
         if (!parent) {
+            const config = new KubeConfig();
+            config.loadFromDefault();
+            const cluster = config.getCurrentCluster();
+            this.registries = await this.getRegistries();
+            children = [cluster,...this.registries];
+        } else if (isCluster(parent)) {
             const result: CliExitData = await this.odo.execute(Command.listCatalogComponentsJson());
-            children = this.loadItems<ComponentTypesJson, ComponentType>(result, (data) => {
+            const builders = this.loadItems<ComponentTypesJson, ComponentType>(result, (data) => {
                 if (data.s2iItems) { // filter hidden tags
                     data.s2iItems.forEach((s2iItem) => s2iItem.spec.imageStreamTags = s2iItem.spec.imageStreamTags.filter(tag => s2iItem.spec.nonHiddenTags.includes(tag.name)));
                 } else { // when not logged or disconnected form cluster s2i items are not available
                     data.s2iItems = [];
                 }
-                return [...data.s2iItems, ...data.devfileItems];
+                return data.s2iItems;
             });
+            children = [];
+            builders.forEach((builder: S2iComponentType) => children.splice(children.length,0, ...builder.spec.imageStreamTags));
+        } else if (isRegistry(parent) ) {
+            const result: CliExitData = await this.odo.execute(Command.listCatalogComponentsJson());
+            children = this.loadItems<ComponentTypesJson, DevfileComponentType>(result, (data) => data.devfileItems);
+            children = children.filter((element:DevfileComponentType) => element.Registry.Name === parent.Name);
 
         } else if (isS2iComponent(parent)) {
             children = parent.spec.imageStreamTags.map((tag:ImageStreamTag) => {
@@ -158,18 +202,12 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
         } else if (isDevfileComponent(parent)){
             const result: CliExitData = await this.odo.execute(Command.describeCatalogComponent(parent.Name));
             children = this.loadItems<ComponentTypeDescription, StarterProject>(result, (data) => data.Data.starterProjects);
+
             children = children.map((starter:StarterProject) => {
                 starter.typeName = parent.Name;;
                 return starter;
             });
         }
-        if (!parent) {
-            children = children.sort((a, b) => {
-                const aTi = this.getTreeItem(a) as TreeItem;
-                const bTi = this.getTreeItem(b) as TreeItem;
-                return aTi.label.localeCompare(bTi.label);
-            });
-        }
         return children;
     }
 
@@ -179,6 +217,7 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
     }
 
     refresh(): void {
+        this.registries = undefined;
         this.onDidChangeTreeDataEmitter.fire();
     }
 
diff --git a/src/odo.ts b/src/odo.ts
@@ -20,7 +20,7 @@ import { Platform } from './util/platform';
 import * as odo from './odo/config';
 import { GlyphChars } from './util/constants';
 import { Application } from './odo/application';
-import { ComponentType, ComponentTypesJson, ComponentKind, ComponentTypeAdapter } from './odo/componentType';
+import { ComponentType, ComponentTypesJson, ComponentKind, ComponentTypeAdapter, Registry, RegistryList } from './odo/componentType';
 import { Project } from './odo/project';
 import { ComponentsJson, DevfileComponentAdapter, S2iComponentAdapter } from './odo/component';
 import { Url } from './odo/url';
@@ -31,6 +31,7 @@ import { ImageStream } from './odo/imageStream';
 import { VsCommandError } from './vscommand';
 import { Storage } from './odo/storage';
 import bs = require('binary-search');
+import { CliExitData } from './cli';
 
 const {Collapsed} = TreeItemCollapsibleState;
 
@@ -368,6 +369,7 @@ export interface Odo {
     createComponentCustomUrl(component: OpenShiftObject, name: string, port: string, secure?: boolean): Promise<OpenShiftObject>;
     getOpenShiftObjectByContext(context: string): OpenShiftObject;
     loadItems<I>(result: cliInstance.CliExitData, fetch: (data) => I[]): I[];
+    getRegistries(): Promise<Registry[]>;
     readonly subject: Subject<OdoEvent>;
 }
 
@@ -472,6 +474,7 @@ class OdoModel {
 }
 
 export class OdoImpl implements Odo {
+
     public static data: OdoModel = new OdoModel();
 
     public static ROOT: OpenShiftObject = new OpenShiftRoot();
@@ -1065,6 +1068,23 @@ export class OdoImpl implements Odo {
         }
         return data;
     }
+
+    public loadItemsFrom<I,O>(result: CliExitData, fetch: (data:I) => O[] ): O[] {
+        let data: O[] = [];
+        try {
+            const items = fetch(JSON.parse(result.stdout));
+            if (items) data = items;
+        } catch (ignore) {
+            // ignore parse errors and return empty array
+        }
+        return data;
+    }
+
+    public async getRegistries(): Promise<Registry[]> {
+        const result = await this.execute(Command.listRegistries());
+        return this.loadItemsFrom<RegistryList, Registry>(result, (data) => data.registries);
+    }
+
 }
 
 export function getInstance(): Odo {
diff --git a/src/odo/command.ts b/src/odo/command.ts
@@ -51,6 +51,10 @@ export class Command {
         return `odo list --app ${app} --project ${project} -o json`;
     }
 
+    static listRegistries(): string {
+        return 'odo registry list -o json';
+    }
+
     static listCatalogComponents(): string {
         return 'odo catalog list components';
     }
diff --git a/src/odo/componentType.ts b/src/odo/componentType.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 
+import { Cluster } from '@kubernetes/client-node/dist/config_types';
 import { Url } from 'url';
 import { Ctx, Data } from './componentTypeDescription';
 import { ComponentMetadata } from './config';
@@ -12,6 +13,16 @@ export enum ComponentKind {
     DEVFILE = 'devfile'
 }
 
+export interface RegistryList {
+    registries: Registry[];
+}
+
+export interface Registry {
+    readonly Name: string;
+    readonly URL: string;
+    readonly Secure: boolean;
+}
+
 export interface ImageStreamTag {
     name: string,
     typeName?: string;
@@ -36,6 +47,14 @@ export function isImageStreamTag(tag: any): tag is ImageStreamTag {
     return tag.name && tag.annotations;
 }
 
+export function isCluster(cluster: any): cluster is Cluster {
+    return cluster.name && cluster.server && cluster.skipTLSVerify !== undefined;
+}
+
+export function isRegistry(registry: any): registry is Registry {
+    return registry.Name && registry.URL && registry.Secure !== undefined;
+}
+
 export interface S2iComponentType {
     kind: 'ComponentType';
     apiVersion: string;
@@ -55,6 +74,7 @@ export interface RegistryRef {
 
 export interface DevfileComponentType {
     Name: string;
+    DisplayName: string;
     Description: string;
     Link: string;
     Registry: RegistryRef;

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,10 @@ export class Command {`
`51`	`51`	return `odo list --app ${app} --project ${project} -o json`;
`52`	`52`	`}`
`53`	`53`
	`54`	`+ static listRegistries(): string {`
	`55`	`+ return 'odo registry list -o json';`
	`56`	`+ }`
	`57`	`+`
`54`	`58`	`static listCatalogComponents(): string {`
`55`	`59`	`return 'odo catalog list components';`
`56`	`60`	`}`