Skip to content

Commit 52dfee8

Browse files
authored
add 'run flux install ?' dialog (#498)
1 parent 7e6cdff commit 52dfee8

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

src/commands/enableDisableGitOps.ts

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { fluxTools } from 'cli/flux/fluxTools';
55
import { detectClusterProvider } from 'cli/kubernetes/clusterProvider';
66
import { kubeConfig } from 'cli/kubernetes/kubernetesConfig';
77
import { refreshAllTreeViewsCommand } from 'commands/refreshTreeViews';
8-
import { disableConfirmations, telemetry } from 'extension';
8+
import { skipConfirmations, telemetry } from 'extension';
99
import { ClusterProvider } from 'types/kubernetes/clusterProvider';
1010
import { TelemetryEvent } from 'types/telemetryEventNames';
1111
import { ClusterNode } from 'ui/treeviews/nodes/cluster/clusterNode';
@@ -34,12 +34,21 @@ async function enableDisableGitOps(clusterNode: ClusterNode | undefined, enableG
3434
return;
3535
}
3636

37-
if(!disableConfirmations && !enableGitOps ) {
38-
const confirm = await window.showWarningMessage(`Do you want to disable GitOps on the "${clusterName}" cluster?`, {
39-
modal: true,
40-
}, 'Disable');
41-
if (confirm !== 'Disable') {
42-
return;
37+
if(!skipConfirmations) {
38+
if(!enableGitOps) {
39+
const confirm = await window.showWarningMessage(`Do you want to disable GitOps (run \`flux uninstall\`) on the "${clusterName}" cluster?`, {
40+
modal: true,
41+
}, 'Disable');
42+
if (confirm !== 'Disable') {
43+
return;
44+
}
45+
} else {
46+
const confirm = await window.showInformationMessage(`Do you want to enable GitOps (run \`flux install\`) on the "${clusterName}" cluster?`, {
47+
modal: true,
48+
}, 'Enable');
49+
if (confirm !== 'Enable') {
50+
return;
51+
}
4352
}
4453
}
4554

src/extension.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { statusBar } from './ui/statusBar';
1717
import { clusterDataProvider, createTreeViews, sourceDataProvider, workloadDataProvider } from './ui/treeviews/treeViews';
1818

1919
/** Disable interactive modal dialogs, useful for testing */
20-
export let disableConfirmations = false;
20+
export let skipConfirmations = false;
2121
export let experimentalFlag = false;
2222

2323
/*
@@ -61,7 +61,7 @@ export async function activate(context: ExtensionContext) {
6161
// set vscode context: developing extension. test is also dev
6262
setVSCodeContext(ContextId.IsDev, context.extensionMode === ExtensionMode.Development || context.extensionMode === ExtensionMode.Test );
6363
if(context.extensionMode === ExtensionMode.Test) {
64-
disableConfirmations = true;
64+
skipConfirmations = true;
6565
}
6666

6767

0 commit comments

Comments
 (0)