Skip to content

Commit 2ab63d2

Browse files
committed
fix: strange if nesting
1 parent 19528ee commit 2ab63d2

File tree

1 file changed

+32
-34
lines changed

1 file changed

+32
-34
lines changed

src/utils/logs.ts

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,47 @@ export function getLogsLink({dbName, logging}: GetLogsLinkProps): string {
3030
try {
3131
const data = JSON.parse(logging) as ParsedLogging;
3232

33-
if (typeof data === 'object') {
34-
if ('url' in data) {
35-
const logUrl = data.url;
36-
if (!logUrl) {
37-
return '';
38-
}
39-
40-
if (data.monium_cluster) {
41-
const baseUrl = getBaseUrl(logUrl);
42-
const url = new URL(`${baseUrl}/projects/${DEFAULT_PROJECT}/logs`);
33+
if (typeof data === 'object' && 'url' in data) {
34+
const logUrl = data.url;
35+
if (!logUrl) {
36+
return '';
37+
}
4338

44-
const query = `{project = "${DEFAULT_PROJECT}", service = "${DEFAULT_SERVICE}", cluster = "${data.monium_cluster}", database = "${dbName}"}`;
39+
if (data.monium_cluster) {
40+
const baseUrl = getBaseUrl(logUrl);
41+
const url = new URL(`${baseUrl}/projects/${DEFAULT_PROJECT}/logs`);
4542

46-
url.searchParams.set('query', query);
47-
url.searchParams.set('from', DEFAULT_TIME_RANGE.from);
48-
url.searchParams.set('to', DEFAULT_TIME_RANGE.to);
49-
url.searchParams.set('columns', DEFAULT_COLUMNS);
50-
url.searchParams.set('groupByField', DEFAULT_GROUP_BY);
51-
url.searchParams.set('chartType', DEFAULT_CHART_TYPE);
52-
url.searchParams.set('linesMode', DEFAULT_LINES_MODE);
43+
const query = `{project = "${DEFAULT_PROJECT}", service = "${DEFAULT_SERVICE}", cluster = "${data.monium_cluster}", database = "${dbName}"}`;
5344

54-
// debug-only
55-
console.log('Monium_cluster branch');
56-
return url.toString();
57-
}
45+
url.searchParams.set('query', query);
46+
url.searchParams.set('from', DEFAULT_TIME_RANGE.from);
47+
url.searchParams.set('to', DEFAULT_TIME_RANGE.to);
48+
url.searchParams.set('columns', DEFAULT_COLUMNS);
49+
url.searchParams.set('groupByField', DEFAULT_GROUP_BY);
50+
url.searchParams.set('chartType', DEFAULT_CHART_TYPE);
51+
url.searchParams.set('linesMode', DEFAULT_LINES_MODE);
5852

59-
const url = new URL(logUrl);
53+
// debug-only
54+
console.log('Monium_cluster branch');
55+
return url.toString();
56+
}
6057

61-
const queryParam = url.searchParams.get('query');
62-
if (queryParam) {
63-
const decodedQuery = decodeURIComponent(queryParam);
58+
const url = new URL(logUrl);
6459

65-
const queryBetweenBraces = decodedQuery.slice(1, -1);
66-
const witComma = queryBetweenBraces.length > 0;
67-
const updatedQuery = `{${queryBetweenBraces}${witComma ? ', ' : ''}database = "${dbName}"}`;
60+
const queryParam = url.searchParams.get('query');
61+
if (queryParam) {
62+
const decodedQuery = decodeURIComponent(queryParam);
6863

69-
url.searchParams.set('query', updatedQuery);
70-
}
64+
const queryBetweenBraces = decodedQuery.slice(1, -1);
65+
const witComma = queryBetweenBraces.length > 0;
66+
const updatedQuery = `{${queryBetweenBraces}${witComma ? ', ' : ''}database = "${dbName}"}`;
7167

72-
// debug-only
73-
console.log('Url parsing branch');
74-
return url.toString();
68+
url.searchParams.set('query', updatedQuery);
7569
}
70+
71+
// debug-only
72+
console.log('Url parsing branch');
73+
return url.toString();
7674
}
7775
} catch {}
7876

0 commit comments

Comments
 (0)