Skip to content

Commit 5d7fc61

Browse files
committed
Add check for OpenShift cluster when opening developer console
Signed-off-by: Jessica He <jhe@redhat.com>
1 parent 5b8c889 commit 5d7fc61

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@
14091409
},
14101410
{
14111411
"command": "openshift.resource.openInDeveloperConsole",
1412-
"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sObject || viewItem == openshift.k8sObject.helm"
1412+
"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sObject && isOpenshiftCluster || viewItem == openshift.k8sObject.helm && isOpenshiftCluster"
14131413
}
14141414
]
14151415
},

src/explorer.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,13 @@ export class OpenShiftExplorer implements TreeDataProvider<ExplorerItem>, Dispos
230230
}
231231
} else {
232232
result = [...await this.odo3.getDeploymentConfigs(), ...await this.odo3.getDeployments()];
233+
// don't show Open In Developer Dashboard if not openshift cluster
234+
const openshiftResources = await CliChannel.getInstance().executeTool(Command.isOpenshiftCluster());
235+
let isOpenshiftCluster = true;
236+
if (openshiftResources.stdout.length === 0){
237+
isOpenshiftCluster = false;
238+
}
239+
void commands.executeCommand('setContext', 'isOpenshiftCluster', isOpenshiftCluster);
233240
}
234241

235242
if (!element) {

src/odo/command.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,4 +315,9 @@ export class Command {
315315
static canCreatePod(): CommandText {
316316
return new CommandText('oc auth can-i create pod');
317317
}
318+
319+
static isOpenshiftCluster(): CommandText {
320+
return new CommandText('oc api-resources | grep openshift');
321+
}
322+
318323
}

0 commit comments

Comments
 (0)