Skip to content

Commit 6fb97a9

Browse files
fix: remove excessive slash for requests via tenant node (#1537)
1 parent f24e5e4 commit 6fb97a9

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/components/BasicNodeViewer/BasicNodeViewer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ export const BasicNodeViewer = ({node, additionalNodesProps, className}: BasicNo
2424
let nodeHref: string | undefined;
2525

2626
if (additionalNodesProps?.getNodeRef) {
27-
nodeHref = additionalNodesProps.getNodeRef(node) + 'internal';
27+
nodeHref = additionalNodesProps.getNodeRef(node) + '/internal';
2828
} else if (node.NodeId) {
29-
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + 'internal';
29+
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + '/internal';
3030
}
3131

3232
return (

src/components/NodeHostWrapper/NodeHostWrapper.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ export const NodeHostWrapper = ({node, getNodeRef, database}: NodeHostWrapperPro
3030

3131
let nodeHref: string | undefined;
3232
if (getNodeRef) {
33-
nodeHref = getNodeRef(node) + 'internal';
33+
nodeHref = getNodeRef(node) + '/internal';
3434
} else if (node.NodeId) {
35-
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + 'internal';
35+
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + '/internal';
3636
}
3737

3838
const nodePath = isNodeAvailable

src/utils/__test__/prepareBackend.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('getBackendFromRawNodeData', () => {
4242
},
4343
],
4444
};
45-
const result = 'https://viewer.ydb.ru:443/ydb-dev02-000.search.net:8765/';
45+
const result = 'https://viewer.ydb.ru:443/ydb-dev02-000.search.net:8765';
4646

4747
expect(getBackendFromRawNodeData(node, balancer)).toBe(result);
4848
});

src/utils/developerUI/__test__/developerUI.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ import {
77
describe('Developer UI links generators', () => {
88
describe('createDeveloperUILinkWithNodeId', () => {
99
it('should create relative link with no host', () => {
10-
expect(createDeveloperUILinkWithNodeId(1)).toBe('/node/1/');
10+
expect(createDeveloperUILinkWithNodeId(1)).toBe('/node/1');
1111
});
1212
it('should create relative link with existing relative path with nodeId', () => {
13-
expect(createDeveloperUILinkWithNodeId(1, '/node/3/')).toBe('/node/1/');
13+
expect(createDeveloperUILinkWithNodeId(1, '/node/3/')).toBe('/node/1');
1414
});
1515
it('should create full link with host', () => {
1616
expect(
1717
createDeveloperUILinkWithNodeId(
1818
1,
1919
'http://ydb-vla-dev02-001.search.yandex.net:8765',
2020
),
21-
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1/');
21+
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1');
2222
});
2323
it('should create full link with host with existing node path with nodeId', () => {
2424
expect(
2525
createDeveloperUILinkWithNodeId(
2626
1,
2727
'http://ydb-vla-dev02-001.search.yandex.net:8765/node/3',
2828
),
29-
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1/');
29+
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1');
3030
});
3131
});
3232
describe('createPDiskDeveloperUILink', () => {

src/utils/developerUI/developerUI.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ export const createDeveloperUILinkWithNodeId = (nodeId: number | string, host =
88
// In case current backend is already relative node path ({host}/node/{nodeId})
99
// We replace existing nodeId path with new nodeId path
1010
if (nodePathRegexp.test(String(host))) {
11-
return String(host).replace(nodePathRegexp, `/node/${nodeId}/`);
11+
return String(host).replace(nodePathRegexp, `/node/${nodeId}`);
1212
}
1313

14-
return `${host ?? ''}/node/${nodeId}/`;
14+
return `${host ?? ''}/node/${nodeId}`;
1515
};
1616

1717
interface PDiskDeveloperUILinkParams {
@@ -21,7 +21,7 @@ interface PDiskDeveloperUILinkParams {
2121
}
2222

2323
export const createPDiskDeveloperUILink = ({nodeId, pDiskId, host}: PDiskDeveloperUILinkParams) => {
24-
const pdiskPath = 'actors/pdisks/pdisk' + pad9(pDiskId);
24+
const pdiskPath = '/actors/pdisks/pdisk' + pad9(pDiskId);
2525

2626
return createDeveloperUILinkWithNodeId(nodeId, host) + pdiskPath;
2727
};
@@ -36,7 +36,7 @@ export const createVDiskDeveloperUILink = ({
3636
vDiskSlotId,
3737
host,
3838
}: VDiskDeveloperUILinkParams) => {
39-
const vdiskPath = 'actors/vdisks/vdisk' + pad9(pDiskId) + '_' + pad9(vDiskSlotId);
39+
const vdiskPath = '/actors/vdisks/vdisk' + pad9(pDiskId) + '_' + pad9(vDiskSlotId);
4040

4141
return createDeveloperUILinkWithNodeId(nodeId, host) + vdiskPath;
4242
};

src/utils/prepareBackend.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const getBackendFromRawNodeData = (
2929

3030
if (useBalancerAsBackend && NodeId) {
3131
const preparedBalancer = removeViewerPathname(balancer);
32-
return `${preparedBalancer}/node/${NodeId}/`;
32+
return `${preparedBalancer}/node/${NodeId}`;
3333
}
3434

3535
if (Host && Endpoints) {
@@ -43,7 +43,7 @@ export const getBackendFromRawNodeData = (
4343

4444
// Currently this func is used to get link to developerUI for specific node
4545
// It's expected with / at the end (code in embedded version)
46-
return getBackendFromNodeHost(hostWithPort, balancer) + '/';
46+
return getBackendFromNodeHost(hostWithPort, balancer);
4747
}
4848

4949
return null;

0 commit comments

Comments
 (0)