Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1923,7 +1923,7 @@
},
{
"command": "openshift.resource.watchLogs",
"when": "view == openshiftProjectExplorer && viewItem =~ /^openshift\\.k8sObject\\.(?!helm)/"
"when": "view == openshiftProjectExplorer && viewItem =~ /^openshift\\.k8sObject\\.!(helm&&pod)/"
Comment thread
datho7561 marked this conversation as resolved.
Outdated
},
{
"command": "openshift.deployment.shell",
Expand All @@ -1939,7 +1939,7 @@
},
{
"command": "openshift.resource.openInDeveloperConsole",
"when": "view == openshiftProjectExplorer && viewItem =~ /^openshift\\.k8sObject/ && isOpenshiftCluster"
"when": "view == openshiftProjectExplorer && viewItem =~ /^openshift\\.k8sObject\\.!(helm&&pod)/ && isOpenshiftCluster"
Comment thread
datho7561 marked this conversation as resolved.
Outdated
},
{
"command": "openshift.resource.openInBrowser",
Expand Down
6 changes: 4 additions & 2 deletions src/explorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export class OpenShiftExplorer implements TreeDataProvider<ExplorerItem>, Dispos
} else if (element.kind === 'Pod') {
const contextElement: DeploymentPodObject = element;
return {
contextValue: 'openshift.k8sobject.Deployment.pod',
contextValue: 'openshift.k8sObject.pod',
label: contextElement.metadata.name,
description: `${contextElement.kind.substring(0, 1).toLocaleUpperCase()}${contextElement.kind.substring(1)}`,
collapsibleState: TreeItemCollapsibleState.None,
Expand Down Expand Up @@ -565,7 +565,9 @@ export class OpenShiftExplorer implements TreeDataProvider<ExplorerItem>, Dispos

@vsCommand('openshift.resource.delete')
public static async deleteResource(component: KubernetesObject) {
await Oc.Instance.deleteKubernetesObject(component.kind, component.metadata.name);
await Progress.execFunctionWithProgress(`Deleting '${component.kind}/${component.metadata.name}'`, async (_) => {
await Oc.Instance.deleteKubernetesObject(component.kind, component.metadata.name);
});
void window.showInformationMessage(`Deleted the '${component.kind}' named '${component.metadata.name}'`);
OpenShiftExplorer.instance.refresh();
}
Expand Down