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
10 changes: 3 additions & 7 deletions src/containers/AppWithClusters/AppWithClusters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ import React from 'react';
import type {Store} from '@reduxjs/toolkit';
import type {History} from 'history';

import {getLogsLink as getLogsLinkDefault} from '../../utils/logs';
import type {
GetLogsLink,
GetMonitoringClusterLink,
GetMonitoringLink,
} from '../../utils/monitoring';
import type {GetLogsLink} from '../../utils/logs';
import type {GetMonitoringClusterLink, GetMonitoringLink} from '../../utils/monitoring';
import {
getMonitoringClusterLink as getMonitoringClusterLinkDefault,
getMonitoringLink as getMonitoringLinkDefault,
Expand All @@ -32,7 +28,7 @@ export interface AppWithClustersProps {
export function AppWithClusters({
store,
history,
getLogsLink = getLogsLinkDefault,
getLogsLink,
getMonitoringLink = getMonitoringLinkDefault,
getMonitoringClusterLink = getMonitoringClusterLinkDefault,
userSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import {cn} from '../../../utils/cn';
import {USE_CLUSTER_BALANCER_AS_BACKEND_KEY} from '../../../utils/constants';
import {useSetting} from '../../../utils/hooks';
import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesProps';
import type {
GetLogsLink,
GetMonitoringClusterLink,
GetMonitoringLink,
} from '../../../utils/monitoring';
import type {GetLogsLink} from '../../../utils/logs';
import type {GetMonitoringClusterLink, GetMonitoringLink} from '../../../utils/monitoring';
import {getCleanBalancerValue, prepareBackendFromBalancer} from '../../../utils/parseBalancer';
import {getBackendFromBalancerAndNodeId} from '../../../utils/prepareBackend';
import type {Cluster} from '../../Cluster/Cluster';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {useClusterBaseInfo} from '../../../store/reducers/cluster/cluster';
import type {ETenantType} from '../../../types/api/tenant';
import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesProps';
import type {GetLogsLink, GetMonitoringLink} from '../../../utils/monitoring';
import type {GetLogsLink} from '../../../utils/logs';
import type {GetMonitoringLink} from '../../../utils/monitoring';
import type {Tenant} from '../../Tenant/Tenant';

export interface ExtendedTenantProps {
Expand Down
51 changes: 0 additions & 51 deletions src/utils/__test__/logs.test.ts

This file was deleted.

32 changes: 1 addition & 31 deletions src/utils/logs.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,6 @@
interface GetLogsLinkProps {
export interface GetLogsLinkProps {
dbName: string;
logging: string;
}

export type GetLogsLink = (props: GetLogsLinkProps) => string;

export function getLogsLink({dbName, logging}: GetLogsLinkProps): string {
try {
const data = JSON.parse(logging);

if (typeof data === 'object' && 'url' in data) {
const logUrl = data.url;
if (!logUrl) {
return '';
}

const url = new URL(logUrl);

const queryParam = url.searchParams.get('query');
if (queryParam) {
const decodedQuery = decodeURIComponent(queryParam);

const queryBetweenBraces = decodedQuery.slice(1, -1);
const witComma = queryBetweenBraces.length > 0;
const updatedQuery = `{${queryBetweenBraces}${witComma ? ', ' : ''}database = "${dbName}"}`;

url.searchParams.set('query', updatedQuery);
}

return url.toString();
}
} catch {}

return '';
}
7 changes: 0 additions & 7 deletions src/utils/monitoring.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,3 @@ export function parseMonitoringData(monitoring: string): ParsedMonitoringData |

return undefined;
}

interface GetLogsLinkProps {
dbName: string;
logging: string;
}

export type GetLogsLink = (props: GetLogsLinkProps) => string;
Loading