From b787b099d3914ef0a38c13546c810e1d5a1485e7 Mon Sep 17 00:00:00 2001 From: Denis Golovin Date: Thu, 9 Dec 2021 19:07:16 -0800 Subject: [PATCH] Rename kind property to avoid conflict with proposed API (#2315) Signed-off-by: Denis Golovin dgolovin@redhat.com --- package-lock.json | 21 +++++++++++++-------- src/odo/componentType.ts | 8 ++++---- src/openshift/component.ts | 8 ++++---- test/integration/command.test.ts | 2 +- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 70137363d..375f1d582 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "@types/targz": "^1.0.1", "@types/tmp": "0.2.2", "@types/validator": "^13.7.0", - "@types/vscode": "1.62.0", + "@types/vscode": "^1.62.0", "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "babel-loader": "^8.2.3", @@ -2059,6 +2059,8 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -2074,7 +2076,9 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/ajv-keywords": { "version": "3.5.2", @@ -16215,15 +16219,14 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, - "requires": { - "ajv": "^8.0.0" - }, + "requires": {}, "dependencies": { "ajv": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "version": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", "dev": true, + "optional": true, + "peer": true, "requires": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -16235,7 +16238,9 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "optional": true, + "peer": true } } }, diff --git a/src/odo/componentType.ts b/src/odo/componentType.ts index 75b1ec96f..7cfe5fde6 100644 --- 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 index e0e436f42..a55403169 100644 --- 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 index c89b006cc..29d39a06c 100644 --- 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 {