fix: review

Author: Raubzeug

src/containers/Tenant/Diagnostics/AccessRights/components/ChangeOwnerDialog.tsx

@@ -21,11 +21,13 @@ interface GetChangeOwnerDialogProps {
 export async function getChangeOwnerDialog({
     path,
     database,
+    databaseFullPath,
 }: GetChangeOwnerDialogProps): Promise<boolean> {
     return await NiceModal.show(CHANGE_OWNER_DIALOG, {
         id: CHANGE_OWNER_DIALOG,
         path,
         database,
+        databaseFullPath,
     });
 }
 

src/containers/Tenant/Diagnostics/AccessRights/components/RightsTable/RevokeAllRightsDialog.tsx

@@ -26,12 +26,14 @@ export async function getRevokeAllRightsDialog({
     path,
     database,
     subject,
+    databaseFullPath,
 }: GetRevokeAllRightsDialogProps): Promise<boolean> {
     return await NiceModal.show(REVOKE_ALL_RIGHTS_DIALOG, {
         id: REVOKE_ALL_RIGHTS_DIALOG,
         path,
         database,
         subject,
+        databaseFullPath,
     });
 }
 

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TenantCpu.tsx

@@ -64,11 +64,7 @@ export function TenantCpu({
                 </>
             )}
             <StatsWrapper title={i18n('title_top-shards')} allEntitiesLink={topShardsLink}>
-                <TopShards
-                    database={database}
-                    path={databaseFullPath}
-                    databaseFullPath={databaseFullPath}
-                />
+                <TopShards database={database} databaseFullPath={databaseFullPath} />
             </StatsWrapper>
             <StatsWrapper
                 title={i18n('title_top-queries')}

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx

@@ -9,17 +9,16 @@ const columnsIds: TopShardsColumnId[] = ['TabletId', 'Path', 'CPUCores'];
 
 interface TopShardsProps {
     database: string;
-    path: string;
     databaseFullPath: string;
 }
 
-export const TopShards = ({database, path, databaseFullPath}: TopShardsProps) => {
+export const TopShards = ({database, databaseFullPath}: TopShardsProps) => {
     const ShardsTable = useComponent('ShardsTable');
 
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
     const {currentData, isFetching, error} = topShardsApi.useGetTopShardsQuery(
-        {database, path, databaseFullPath},
+        {database, databaseFullPath},
         {pollingInterval: autoRefreshInterval},
     );
 

src/store/reducers/tenantOverview/topShards/tenantOverviewTopShards.ts

@@ -19,17 +19,13 @@ export const topShardsApi = api.injectEndpoints({
     endpoints: (builder) => ({
         getTopShards: builder.query({
             queryFn: async (
-                {
-                    database,
-                    path,
-                    databaseFullPath,
-                }: {database: string; path: string; databaseFullPath: string},
+                {database, databaseFullPath}: {database: string; databaseFullPath: string},
                 {signal},
             ) => {
                 try {
                     const response = await window.api.viewer.sendQuery(
                         {
-                            query: createShardQuery(path, databaseFullPath),
+                            query: createShardQuery(databaseFullPath, databaseFullPath),
                             database,
                             action: queryAction,
                             internal_call: true,

src/store/reducers/viewSchema/viewSchema.ts

@@ -1,3 +1,4 @@
+import {transformPath} from '../../../containers/Tenant/ObjectSummary/transformPath';
 import {isQueryErrorResponse} from '../../../utils/query';
 import {api} from '../api';
 
@@ -20,7 +21,7 @@ export const viewSchemaApi = api.injectEndpoints({
                 timeout?: number;
             }) => {
                 try {
-                    const relativePath = path.replace(databaseFullPath, '');
+                    const relativePath = transformPath(path, databaseFullPath);
                     const response = await window.api.viewer.sendQuery(
                         {
                             query: createViewSchemaQuery(relativePath),

src/utils/shardsQueryBuilders.ts

@@ -95,5 +95,7 @@ function createPathWhereCondition(path: string): string {
     if (!path) {
         return '';
     }
-    return `Path='${path}' OR Path LIKE '${path}/%'`;
+    // Escape single quotes to prevent SQL injection
+    const escapedPath = path.replace(/'/g, "''");
+    return `Path='${escapedPath}' OR Path LIKE '${escapedPath}/%'`;
 }