From 07333166d76b22bf8f5193a967240cec79d7904e Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 30 Apr 2025 19:33:51 +0300
Subject: [PATCH 1/4] fix: fix slashes everywhere

---
 src/containers/Header/breadcrumbs.tsx              |  6 +-----
 src/containers/Tenant/ObjectSummary/ObjectTree.tsx | 12 ++++++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/containers/Header/breadcrumbs.tsx b/src/containers/Header/breadcrumbs.tsx
index 3163f71edd..54cde24ef6 100644
--- a/src/containers/Header/breadcrumbs.tsx
+++ b/src/containers/Header/breadcrumbs.tsx
@@ -30,10 +30,6 @@ import {TenantTabsGroups, getTenantPath} from '../Tenant/TenantPages';
 
 import {headerKeyset} from './i18n';
 
-const prepareTenantName = (tenantName: string) => {
-    return tenantName.startsWith('/') ? tenantName.slice(1) : tenantName;
-};
-
 export interface RawBreadcrumbItem {
     text: string;
     link?: string;
@@ -66,7 +62,7 @@ const getTenantBreadcrumbs: GetBreadcrumbs<TenantBreadcrumbsOptions> = (options,
 
     const breadcrumbs = getClusterBreadcrumbs(options, query);
 
-    const text = tenantName ? prepareTenantName(tenantName) : headerKeyset('breadcrumbs.tenant');
+    const text = tenantName ? tenantName : headerKeyset('breadcrumbs.tenant');
     const link = tenantName ? getTenantPath({...query, database: tenantName}) : undefined;
 
     const lastItem = {text, link, icon: <DatabaseIcon />};
diff --git a/src/containers/Tenant/ObjectSummary/ObjectTree.tsx b/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
index a0c149f1f4..76a3aab01a 100644
--- a/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
+++ b/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
@@ -12,6 +12,14 @@ interface ObjectTreeProps {
     path?: string;
 }
 
+function prepareSchemaRootName(name: string | undefined, fallback: string): string {
+    if (name) {
+        return name.startsWith('/') ? name : `/${name}`;
+    }
+
+    return fallback.startsWith('/') ? fallback : `/${fallback}`;
+}
+
 export function ObjectTree({tenantName, path}: ObjectTreeProps) {
     const {data: tenantData = {}, isLoading} = useGetSchemaQuery({
         path: tenantName,
@@ -38,8 +46,8 @@ export function ObjectTree({tenantName, path}: ObjectTreeProps) {
                     <SchemaTree
                         rootPath={tenantName}
                         // for the root pathData.Name contains the same string as tenantName,
-                        // but without the leading slash
-                        rootName={pathData.Name || tenantName}
+                        // but without the leading slash - ensure it has one
+                        rootName={prepareSchemaRootName(pathData.Name, tenantName)}
                         rootType={pathData.PathType}
                         currentPath={path}
                         onActivePathUpdate={setCurrentPath}

From cb54689c0a6fc00253be36c3b3887033dbed3db6 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 30 Apr 2025 19:35:04 +0300
Subject: [PATCH 2/4] fix: better code

---
 src/containers/Header/breadcrumbs.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/Header/breadcrumbs.tsx b/src/containers/Header/breadcrumbs.tsx
index 54cde24ef6..1b9c144ffc 100644
--- a/src/containers/Header/breadcrumbs.tsx
+++ b/src/containers/Header/breadcrumbs.tsx
@@ -62,7 +62,7 @@ const getTenantBreadcrumbs: GetBreadcrumbs<TenantBreadcrumbsOptions> = (options,
 
     const breadcrumbs = getClusterBreadcrumbs(options, query);
 
-    const text = tenantName ? tenantName : headerKeyset('breadcrumbs.tenant');
+    const text = tenantName || headerKeyset('breadcrumbs.tenant');
     const link = tenantName ? getTenantPath({...query, database: tenantName}) : undefined;
 
     const lastItem = {text, link, icon: <DatabaseIcon />};

From fbde1cc61d7491c919d18bb06ecb85e2c731aa92 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 30 Apr 2025 19:36:07 +0300
Subject: [PATCH 3/4] fix: comment

---
 src/containers/Tenant/ObjectSummary/ObjectTree.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/Tenant/ObjectSummary/ObjectTree.tsx b/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
index 76a3aab01a..0d9d1df466 100644
--- a/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
+++ b/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
@@ -46,7 +46,7 @@ export function ObjectTree({tenantName, path}: ObjectTreeProps) {
                     <SchemaTree
                         rootPath={tenantName}
                         // for the root pathData.Name contains the same string as tenantName,
-                        // but without the leading slash - ensure it has one
+                        // ensure it has slash in the beginning
                         rootName={prepareSchemaRootName(pathData.Name, tenantName)}
                         rootType={pathData.PathType}
                         currentPath={path}

From 7955b68e54eb9b6c5df6c10f6ffe918cc781965c Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 30 Apr 2025 19:37:13 +0300
Subject: [PATCH 4/4] fix: better comment

---
 src/containers/Tenant/ObjectSummary/ObjectTree.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/Tenant/ObjectSummary/ObjectTree.tsx b/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
index 0d9d1df466..1090f945d4 100644
--- a/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
+++ b/src/containers/Tenant/ObjectSummary/ObjectTree.tsx
@@ -46,7 +46,7 @@ export function ObjectTree({tenantName, path}: ObjectTreeProps) {
                     <SchemaTree
                         rootPath={tenantName}
                         // for the root pathData.Name contains the same string as tenantName,
-                        // ensure it has slash in the beginning
+                        // ensure it has the leading slash
                         rootName={prepareSchemaRootName(pathData.Name, tenantName)}
                         rootType={pathData.PathType}
                         currentPath={path}