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
4 changes: 3 additions & 1 deletion src/store/reducers/cluster/cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type {RootState} from '../../defaultStore';
import {api} from '../api';
import {selectNodesMap} from '../nodesList';

import {parseCoresUrl, parseLoggingUrls, parseTraceField} from './parseFields';
import {parseCoresUrl, parseLoggingUrls, parseSettingsField, parseTraceField} from './parseFields';
import type {ClusterGroupsStats, ClusterState} from './types';
import {
createSelectClusterGroupsQuery,
Expand Down Expand Up @@ -167,6 +167,8 @@ export function useClusterBaseInfo() {
traceView: parseTraceField(data.trace_view),
cores: parseCoresUrl(data.cores),
logging: parseLoggingUrls(data.logging),

settings: parseSettingsField(data.settings),
};
}

Expand Down
20 changes: 20 additions & 0 deletions src/store/reducers/cluster/parseFields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type {
MetaBaseClusterInfo,
MetaClusterCoresUrl,
MetaClusterLogsUrls,
MetaClusterSettings,
MetaClusterTraceView,
} from '../../../types/api/meta';

Expand Down Expand Up @@ -65,3 +66,22 @@ export function parseLoggingUrls(

return undefined;
}

const settingsSchema = z.object({
use_meta_proxy: z.boolean().optional(),
});

export function parseSettingsField(
settings: MetaBaseClusterInfo['settings'],
): MetaClusterSettings | undefined {
if (settings && typeof settings === 'object') {
return settings;
}
try {
return settings ? settingsSchema.parse(JSON.parse(settings)) : undefined;
} catch (e) {
console.error('Error parsing settings field:', e);
}

return undefined;
}
5 changes: 4 additions & 1 deletion src/store/reducers/clusters/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
getVersionsData,
prepareClusterVersions,
} from '../../../utils/versions/clusterVersionColors';
import {parseSettingsField} from '../cluster/parseFields';

import type {PreparedCluster} from './types';

Expand All @@ -24,8 +25,9 @@ export const prepareClustersData = (data: MetaClusters): PreparedCluster[] => {

// Apply color map to every cluster in the list
return clusters.map((cluster) => {
const parsedSettings = parseSettingsField(cluster.settings);
// If no backend is provided, it will be automatically generated by API instance
const useMetaProxy = uiFactory.useMetaProxy && cluster.settings?.use_meta_proxy !== false;
const useMetaProxy = uiFactory.useMetaProxy && parsedSettings?.use_meta_proxy !== false;
const preparedBackend =
cluster.balancer && !useMetaProxy
? prepareBackendFromBalancer(cluster.balancer)
Expand All @@ -35,6 +37,7 @@ export const prepareClustersData = (data: MetaClusters): PreparedCluster[] => {
...cluster,
preparedVersions: prepareClusterVersions(cluster.versions, versionsData),
preparedBackend,
settings: parsedSettings,
};
});
};
5 changes: 1 addition & 4 deletions src/types/api/meta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ export interface MetaBaseClusterInfo {
logging?: string | MetaClusterLogsUrls;
trace_view?: string | MetaClusterTraceView;
trace_check?: string | MetaClusterTraceCheck;

// Settings are returned only by meta versions, that decode values by itself
settings?: MetaClusterSettings;
settings?: string | MetaClusterSettings;
}

export interface MetaGeneralClusterInfo extends MetaBaseClusterInfo {
Expand Down Expand Up @@ -99,5 +97,4 @@ export interface MetaClusterTraceCheck {

export interface MetaClusterSettings {
use_meta_proxy?: boolean;
proxy?: unknown;
}
Loading