Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function useAdditionalTenantsProps({

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

const useMetaProxy = clusterInfo.settings?.use_meta_proxy || uiFactory.useMetaProxy;
const useMetaProxy = uiFactory.useMetaProxy && clusterInfo.settings?.use_meta_proxy !== false;

const additionalTenantsProps: AdditionalTenantsProps = {};
additionalTenantsProps.prepareTenantBackend = (nodeId) => {
Expand Down
2 changes: 1 addition & 1 deletion src/store/reducers/clusters/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const prepareClustersData = (data: MetaClusters): PreparedCluster[] => {
// Apply color map to every cluster in the list
return clusters.map((cluster) => {
// If no backend is provided, it will be automatically generated by API instance
const useMetaProxy = cluster.settings?.use_meta_proxy || uiFactory.useMetaProxy;
const useMetaProxy = uiFactory.useMetaProxy && cluster.settings?.use_meta_proxy !== false;
const preparedBackend =
cluster.balancer && !useMetaProxy
? prepareBackendFromBalancer(cluster.balancer)
Expand Down
2 changes: 1 addition & 1 deletion src/utils/hooks/useNodeDeveloperUIHref.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function useNodeDeveloperUIHref(node?: NodeAddress) {
const {balancer = backend, settings} = useClusterBaseInfo();
const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();

const useMetaProxy = settings?.use_meta_proxy || uiFactory.useMetaProxy;
const useMetaProxy = uiFactory.useMetaProxy && settings?.use_meta_proxy !== false;

if (!isUserAllowedToMakeChanges) {
return undefined;
Expand Down
16 changes: 10 additions & 6 deletions src/utils/prepareBackend.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {isNil} from 'lodash';

import {createDeveloperUILinkWithNodeId} from './developerUI/developerUI';
import {prepareBackendFromBalancer} from './parseBalancer';

import {valueIsDefined} from '.';

export const prepareHost = (host?: string) => {
// add "u-" prefix to cloud din nodes
return host?.startsWith('vm-') ? `u-${host}` : host;
Expand All @@ -14,11 +14,15 @@ export const getBackendFromBalancerAndNodeId = (
balancer?: string,
useMetaProxy?: boolean,
) => {
if (valueIsDefined(nodeId) && valueIsDefined(balancer)) {
// Use default value instead of balancer if meta proxy is enabled
const preparedBalancer = useMetaProxy ? undefined : prepareBackendFromBalancer(balancer);
if (isNil(nodeId)) {
return undefined;
}
if (useMetaProxy) {
return createDeveloperUILinkWithNodeId(nodeId);
}
if (!isNil(balancer)) {
const preparedBalancer = prepareBackendFromBalancer(balancer);
return createDeveloperUILinkWithNodeId(nodeId, preparedBalancer);
}

return undefined;
};
Loading