Rename kind property to avoid conflict with proposed API (#2315)

Signed-off-by: Denis Golovin [email protected]
redhat-developer · Dec 10, 2021 · b787b09 · b787b09
1 parent 1b90a6f
commit b787b09
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/odo/componentType.ts b/src/odo/componentType.ts
@@ -34,8 +34,8 @@ export interface ImageStreamTag {
 }
 
 export function ascDevfileFirst(c1: ComponentType, c2: ComponentType): number {
-    if(c1.kind !== c2.kind) {
-        return c1.kind === ComponentKind.DEVFILE? -1: 1;
+    if(c1.type !== c2.type) {
+        return c1.type === ComponentKind.DEVFILE? -1: 1;
     }
     return c1.label.localeCompare(c2.label)
 }
@@ -76,7 +76,7 @@ export interface ComponentType {
     label: string;
     description: string;
     name: string;
-    kind: ComponentKind;
+    type: ComponentKind;
     version: string;
 }
 
@@ -87,7 +87,7 @@ export interface ComponentTypeDescription {
 
 export class ComponentTypeAdapter implements ComponentType {
     constructor(
-        public readonly kind: ComponentKind,
+        public readonly type: ComponentKind,
         public readonly name: string,
         public readonly version: string,
         public readonly description: string,

diff --git a/src/openshift/component.ts b/src/openshift/component.ts
@@ -653,7 +653,7 @@ export class Component extends OpenShiftItem {
             progressIndicator.show();
             const componentTypes = await Component.odo.getComponentTypes();
             if (componentTypeName) {
-                componentTypeCandidates = componentTypes.filter(type => type.name === componentTypeName && type.kind === componentKind && (!version || type.version === version));
+                componentTypeCandidates = componentTypes.filter(type => type.name === componentTypeName && type.type === componentKind && (!version || type.version === version));
                 if (componentTypeCandidates?.length === 0) {
                     componentType = await window.showQuickPick(componentTypes.sort(ascDevfileFirst), { placeHolder: `Cannot find Component type '${componentTypeName}', select one below to use instead`, ignoreFocusOut: true });
                 } else if (componentTypeCandidates?.length > 1) {
@@ -668,7 +668,7 @@ export class Component extends OpenShiftItem {
 
             if (!componentType) return createCancelledResult('componentType');
 
-            if (componentType.kind === ComponentKind.DEVFILE) {
+            if (componentType.type === ComponentKind.DEVFILE) {
                 progressIndicator.placeholder = 'Checking if provided context folder is empty'
                 progressIndicator.show();
                 const globbyPath = `${folder.fsPath.replace('\\', '/')}/`;
@@ -778,13 +778,13 @@ export class Component extends OpenShiftItem {
             return result;
         }
         const components = await Component.odo.getComponentTypes();
-        const componentBuilder: ComponentTypeAdapter = components.find((comonentType) => comonentType.kind === component.kind? comonentType.name === component.builderImage.name : false);
+        const componentBuilder: ComponentTypeAdapter = components.find((comonentType) => comonentType.type === component.kind? comonentType.name === component.builderImage.name : false);
         let isJava: boolean;
         let isNode: boolean;
         let isPython: boolean;
 
         // TODO: https://github.com/redhat-developer/vscode-openshift-tools/issues/38
-        if (componentBuilder && componentBuilder.tags && componentBuilder.kind === ComponentKind.S2I) { // s2i component has been selected for debug
+        if (componentBuilder && componentBuilder.tags && componentBuilder.type === ComponentKind.S2I) { // s2i component has been selected for debug
             isJava = componentBuilder.tags.includes('java');
             isNode = componentBuilder.tags.includes('nodejs');
             isPython = componentBuilder.tags.includes('python');

diff --git a/test/integration/command.test.ts b/test/integration/command.test.ts
@@ -154,7 +154,7 @@ suite('odo commands integration', () => {
 
     test('describeCatalogComponent()', async function () {
         const types = await ODO.getComponentTypes();
-        const devfileCompType = types.find((compType) => compType.kind === ComponentKind.DEVFILE);
+        const devfileCompType = types.find((compType) => compType.type === ComponentKind.DEVFILE);
         if (!devfileCompType) {
             this.skip();
         } else {