Skip to content

Commit 4eaf037

Browse files
authored
feat: release feature flag for proxy support COMPASS-8167 (#6157)
1 parent 63c3e19 commit 4eaf037

File tree

5 files changed

+6
-17
lines changed

5 files changed

+6
-17
lines changed

packages/compass-connections/src/hooks/use-connection-form-preferences.tsx

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export function useConnectionFormPreferences() {
1313
const protectConnectionStringsForNewConnections = usePreference(
1414
'protectConnectionStringsForNewConnections'
1515
);
16-
const showProxySettings = usePreference('enableProxySupport');
1716

1817
return useMemo(
1918
() => ({
@@ -24,7 +23,6 @@ export function useConnectionFormPreferences() {
2423
enableOidc,
2524
enableDebugUseCsfleSchemaMap,
2625
protectConnectionStringsForNewConnections,
27-
showProxySettings,
2826
}),
2927
[
3028
protectConnectionStrings,
@@ -34,7 +32,6 @@ export function useConnectionFormPreferences() {
3432
enableOidc,
3533
enableDebugUseCsfleSchemaMap,
3634
protectConnectionStringsForNewConnections,
37-
showProxySettings,
3835
]
3936
);
4037
}

packages/compass-e2e-tests/tests/oidc.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ describe('OIDC integration', function () {
495495

496496
beforeEach(async function () {
497497
await browser.setFeature('proxy', '');
498-
await browser.setFeature('enableProxySupport', true);
499498
httpServer = createHTTPServer();
500499
({ connectRequests, httpForwardRequests, connections } =
501500
setupProxyServer(httpServer));

packages/compass-e2e-tests/tests/proxy.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ describe('Proxy support', function () {
9595
browser = compass.browser;
9696

9797
await browser.setFeature('proxy', '');
98-
await browser.setFeature('enableProxySupport', true);
9998
httpProxyServer1.removeAllListeners('request');
10099
({ connectRequests, connections } = setupProxyServer(httpProxyServer1));
101100
});

packages/compass-preferences-model/src/feature-flags.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export const featureFlags: Required<{
7878
* Feature flag for explicit proxy configuration support.
7979
*/
8080
enableProxySupport: {
81-
stage: 'development',
81+
stage: 'released',
8282
description: {
8383
short: 'Enables support for explicit proxy configuration.',
8484
long: 'Allows users to specify proxy configuration for the entire Compass application.',

packages/compass-settings/src/components/modal.tsx

+5-11
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ type SettingsModalProps = {
3434
isAIFeatureEnabled: boolean;
3535
isOpen: boolean;
3636
isOIDCEnabled: boolean;
37-
isProxySupportEnabled: boolean;
3837
selectedTab: SettingsTabId | undefined;
3938
onMount?: () => void;
4039
onClose: () => void;
@@ -65,7 +64,6 @@ const settingsStyles = css(
6564

6665
export const SettingsModal: React.FunctionComponent<SettingsModalProps> = ({
6766
isAIFeatureEnabled,
68-
isProxySupportEnabled,
6967
isOpen,
7068
selectedTab,
7169
onMount,
@@ -86,6 +84,11 @@ export const SettingsModal: React.FunctionComponent<SettingsModalProps> = ({
8684
{ tabId: 'general', name: 'General', component: GeneralSettings },
8785
{ tabId: 'theme', name: 'Theme', component: ThemeSettings },
8886
{ tabId: 'privacy', name: 'Privacy', component: PrivacySettings },
87+
{
88+
tabId: 'proxy',
89+
name: 'Proxy Configuration',
90+
component: ProxySettings,
91+
},
8992
];
9093

9194
if (
@@ -108,14 +111,6 @@ export const SettingsModal: React.FunctionComponent<SettingsModalProps> = ({
108111
});
109112
}
110113

111-
if (isProxySupportEnabled) {
112-
settings.push({
113-
tabId: 'proxy',
114-
name: 'Proxy Configuration',
115-
component: ProxySettings,
116-
});
117-
}
118-
119114
if (useShouldShowFeaturePreviewSettings()) {
120115
settings.push({
121116
tabId: 'preview',
@@ -170,7 +165,6 @@ export default connect(
170165
state.settings.isModalOpen && state.settings.loadingState === 'ready',
171166
isAIFeatureEnabled: !!state.settings.settings.enableGenAIFeatures,
172167
isOIDCEnabled: !!state.settings.settings.enableOidc,
173-
isProxySupportEnabled: !!state.settings.settings.enableProxySupport,
174168
hasChangedSettings: state.settings.updatedFields.length > 0,
175169
selectedTab: state.settings.tab,
176170
};

0 commit comments

Comments
 (0)