Skip to content

Commit f86889f

Browse files
committed
feat: use_meta_proxy true by default
1 parent c34f669 commit f86889f

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

src/containers/AppWithClusters/utils/useAdditionalTenantsProps.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function useAdditionalTenantsProps({
2727

2828
const {balancer, monitoring, logging, name: clusterName} = clusterInfo;
2929

30-
const useMetaProxy = clusterInfo.settings?.use_meta_proxy || uiFactory.useMetaProxy;
30+
const useMetaProxy = uiFactory.useMetaProxy && clusterInfo.settings?.use_meta_proxy !== false;
3131

3232
const additionalTenantsProps: AdditionalTenantsProps = {};
3333
additionalTenantsProps.prepareTenantBackend = (nodeId) => {

src/store/reducers/clusters/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const prepareClustersData = (data: MetaClusters): PreparedCluster[] => {
2525
// Apply color map to every cluster in the list
2626
return clusters.map((cluster) => {
2727
// If no backend is provided, it will be automatically generated by API instance
28-
const useMetaProxy = cluster.settings?.use_meta_proxy || uiFactory.useMetaProxy;
28+
const useMetaProxy = uiFactory.useMetaProxy && cluster.settings?.use_meta_proxy !== false;
2929
const preparedBackend =
3030
cluster.balancer && !useMetaProxy
3131
? prepareBackendFromBalancer(cluster.balancer)

src/utils/hooks/useNodeDeveloperUIHref.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function useNodeDeveloperUIHref(node?: NodeAddress) {
1717
const {balancer = backend, settings} = useClusterBaseInfo();
1818
const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
1919

20-
const useMetaProxy = settings?.use_meta_proxy || uiFactory.useMetaProxy;
20+
const useMetaProxy = uiFactory.useMetaProxy && settings?.use_meta_proxy !== false;
2121

2222
if (!isUserAllowedToMakeChanges) {
2323
return undefined;

src/utils/prepareBackend.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import {isNil} from 'lodash';
2+
13
import {createDeveloperUILinkWithNodeId} from './developerUI/developerUI';
24
import {prepareBackendFromBalancer} from './parseBalancer';
35

4-
import {valueIsDefined} from '.';
5-
66
export const prepareHost = (host?: string) => {
77
// add "u-" prefix to cloud din nodes
88
return host?.startsWith('vm-') ? `u-${host}` : host;
@@ -14,11 +14,15 @@ export const getBackendFromBalancerAndNodeId = (
1414
balancer?: string,
1515
useMetaProxy?: boolean,
1616
) => {
17-
if (valueIsDefined(nodeId) && valueIsDefined(balancer)) {
18-
// Use default value instead of balancer if meta proxy is enabled
19-
const preparedBalancer = useMetaProxy ? undefined : prepareBackendFromBalancer(balancer);
17+
if (isNil(nodeId)) {
18+
return undefined;
19+
}
20+
if (useMetaProxy) {
21+
return createDeveloperUILinkWithNodeId(nodeId);
22+
}
23+
if (!isNil(balancer)) {
24+
const preparedBalancer = prepareBackendFromBalancer(balancer);
2025
return createDeveloperUILinkWithNodeId(nodeId, preparedBalancer);
2126
}
22-
2327
return undefined;
2428
};

0 commit comments

Comments
 (0)