Skip to content

Commit bd0745b

Browse files
committed
fix: only show dev server commands when connected
1 parent 71048ff commit bd0745b

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

package.json

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,19 @@
335335
"command": "launchdarkly.enableCodeLens",
336336
"when": "false"
337337
},
338-
{
339-
"command": "launchdarkly.setMaintainer",
340-
"when": "false"
341-
}
342-
],
338+
{
339+
"command": "launchdarkly.setMaintainer",
340+
"when": "false"
341+
},
342+
{
343+
"command": "launchdarkly.setDevServerOverride",
344+
"when": "launchdarkly:devServerConnected"
345+
},
346+
{
347+
"command": "launchdarkly.removeDevServerOverride",
348+
"when": "launchdarkly:devServerConnected"
349+
}
350+
],
343351
"editor/context": [
344352
{
345353
"command": "launchdarkly.openInLaunchDarkly",
@@ -431,14 +439,14 @@
431439
"group": "inline"
432440
},
433441
{
434-
"command": "launchdarkly.setDevServerOverride",
435-
"when": "view == launchdarklyFeatureFlags && (viewItem == flagParentItem || viewItem == flagParentItemOverridden)",
436-
"group": "devserver@1"
442+
"command": "launchdarkly.setDevServerOverride",
443+
"when": "view == launchdarklyFeatureFlags && launchdarkly:devServerConnected && (viewItem == flagParentItem || viewItem == flagParentItemOverridden)",
444+
"group": "devserver@1"
437445
},
438446
{
439-
"command": "launchdarkly.removeDevServerOverride",
440-
"when": "view == launchdarklyFeatureFlags && viewItem == flagParentItemOverridden",
441-
"group": "devserver@2"
447+
"command": "launchdarkly.removeDevServerOverride",
448+
"when": "view == launchdarklyFeatureFlags && launchdarkly:devServerConnected && viewItem == flagParentItemOverridden",
449+
"group": "devserver@2"
442450
}
443451
]
444452
},

src/commands/connectDevServer.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ export function connectDevServerCommand(config: LDExtensionConfiguration): Dispo
9191
// Refresh the flags view to load dev-server values
9292
await commands.executeCommand(CMD_LD_REFRESH_ENTRY);
9393

94+
commands.executeCommand('setContext', 'launchdarkly:devServerConnected', true);
9495
analytics.track('dev-server-connected', { uri: finalUri });
9596
window.showInformationMessage(`Connected to LaunchDarkly dev-server at ${finalUri}`);
9697
} catch (err) {
@@ -131,6 +132,7 @@ export function disconnectDevServerCommand(config: LDExtensionConfiguration): Di
131132
// Refresh the flags view to show LaunchDarkly values
132133
await commands.executeCommand(CMD_LD_REFRESH_ENTRY);
133134

135+
commands.executeCommand('setContext', 'launchdarkly:devServerConnected', false);
134136
analytics.track('dev-server-disconnected');
135137
window.showInformationMessage('Disconnected from dev-server. Flag values now come from LaunchDarkly.');
136138
} catch (err) {

src/extension.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,9 @@ async function attemptDevServerReconnect(config: LDExtensionConfiguration): Prom
222222
}
223223
// Refresh dev-server data
224224
await devServerProvider?.refresh();
225-
// Update status bar
225+
// Update status bar and context
226226
updateDevServerStatusBar(config);
227+
commands.executeCommand('setContext', 'launchdarkly:devServerConnected', true);
227228
console.log(`Successfully reconnected to dev-server at ${devServerUri}`);
228229
} else {
229230
// Dev-server is not available
@@ -259,6 +260,7 @@ async function handleDevServerConnectionFailure(config: LDExtensionConfiguration
259260
await config.getFlagStore().reload();
260261
}
261262
updateDevServerStatusBar(config);
263+
commands.executeCommand('setContext', 'launchdarkly:devServerConnected', false);
262264
window.showInformationMessage('Disconnected from dev-server.');
263265
break;
264266
case 'Dismiss':
@@ -270,6 +272,7 @@ async function handleDevServerConnectionFailure(config: LDExtensionConfiguration
270272
await config.getFlagStore().reload();
271273
}
272274
updateDevServerStatusBar(config);
275+
commands.executeCommand('setContext', 'launchdarkly:devServerConnected', false);
273276
console.log('User dismissed dev-server reconnection prompt — dev-server disabled');
274277
break;
275278
}

0 commit comments

Comments
 (0)