fix: code-review

ydb-platform · Mar 14, 2024 · fd479cd · fd479cd
1 parent 7615856
commit fd479cd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx b/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx
@@ -1,4 +1,3 @@
-import {useRef} from 'react';
 import {useLocation} from 'react-router';
 import cn from 'bem-cn-lite';
 
@@ -15,12 +14,12 @@ import {Query} from '../Query/Query';
 import Diagnostics from '../Diagnostics/Diagnostics';
 
 import './ObjectGeneral.scss';
-import {registerYQLCompletionItemProvider} from '../../../utils/monaco';
 
 const b = cn('object-general');
 
 interface ObjectGeneralProps {
     type: EPathType;
+    tenantName: string;
     additionalTenantProps?: AdditionalTenantsProps;
     additionalNodesProps?: AdditionalNodesProps;
 }
@@ -29,23 +28,16 @@ function ObjectGeneral(props: ObjectGeneralProps) {
     const location = useLocation();
     const theme = useThemeValue();
 
-    const previousTenant = useRef<string>();
-
     const [initialPage] = useSetting<string>(TENANT_INITIAL_PAGE_KEY);
 
     const queryParams = parseQuery(location);
-    const {name: tenantName, tenantPage = initialPage} = queryParams;
-
-    if (tenantName && typeof tenantName === 'string' && previousTenant.current !== tenantName) {
-        registerYQLCompletionItemProvider(tenantName);
-        previousTenant.current = tenantName;
-    }
+    const {tenantPage = initialPage} = queryParams;
 
     const renderTabContent = () => {
-        const {type, additionalTenantProps, additionalNodesProps} = props;
+        const {type, additionalTenantProps, additionalNodesProps, tenantName} = props;
         switch (tenantPage) {
             case TENANT_PAGES_IDS.query: {
-                return <Query path={tenantName as string} theme={theme} type={type} />;
+                return <Query path={tenantName} theme={theme} type={type} />;
             }
             default: {
                 return (
@@ -60,6 +52,7 @@ function ObjectGeneral(props: ObjectGeneralProps) {
     };
 
     const renderContent = () => {
+        const {tenantName} = props;
         if (!tenantName) {
             return null;
         }

diff --git a/src/containers/Tenant/Tenant.tsx b/src/containers/Tenant/Tenant.tsx
@@ -1,4 +1,4 @@
-import {useEffect, useReducer} from 'react';
+import {useEffect, useReducer, useRef} from 'react';
 import cn from 'bem-cn-lite';
 import {useLocation} from 'react-router';
 import qs from 'qs';
@@ -11,6 +11,7 @@ import {DEFAULT_IS_TENANT_SUMMARY_COLLAPSED, DEFAULT_SIZE_TENANT_KEY} from '../.
 import {useTypedSelector, useTypedDispatch} from '../../utils/hooks';
 import {setHeaderBreadcrumbs} from '../../store/reducers/header/header';
 import {disableAutorefresh, getSchema} from '../../store/reducers/schema/schema';
+import {registerYQLCompletionItemProvider} from '../../utils/monaco';
 
 import SplitPane from '../../components/SplitPane';
 import {AccessDenied} from '../../components/Errors/403';
@@ -49,6 +50,7 @@ function Tenant(props: TenantProps) {
         undefined,
         getTenantSummaryState,
     );
+    const previousTenant = useRef<string>();
 
     const {currentSchemaPath, currentSchema: currentItem = {}} = useTypedSelector(
         (state) => state.schema,
@@ -77,6 +79,11 @@ function Tenant(props: TenantProps) {
     const {name} = queryParams;
     const tenantName = name as string;
 
+    if (tenantName && typeof tenantName === 'string' && previousTenant.current !== tenantName) {
+        registerYQLCompletionItemProvider(tenantName);
+        previousTenant.current = tenantName;
+    }
+
     useEffect(() => {
         dispatch(getSchema({path: tenantName}));
     }, [tenantName, dispatch]);
@@ -140,6 +147,7 @@ function Tenant(props: TenantProps) {
                         type={preloadedPathType || currentPathType}
                         additionalTenantProps={props.additionalTenantProps}
                         additionalNodesProps={props.additionalNodesProps}
+                        tenantName={tenantName}
                     />
                 </SplitPane>
             )}

diff --git a/src/utils/yqlSuggestions/generateSuggestions.ts b/src/utils/yqlSuggestions/generateSuggestions.ts
@@ -128,8 +128,12 @@ export async function generateColumnsSuggestion(
     suggestColumns: YqlAutocompleteResult['suggestColumns'] | undefined,
     database: string,
 ): Promise<monaco.languages.CompletionItem[]> {
+    if (!suggestColumns?.tables) {
+        return [];
+    }
     const suggestions: monaco.languages.CompletionItem[] = [];
-    for (const entity of suggestColumns?.tables ?? []) {
+    const multi = suggestColumns.tables.length > 1;
+    for (const entity of suggestColumns.tables ?? []) {
         let normalizedEntityName = removeBackticks(entity.name);
         // if it's relative entity path
         if (!normalizedEntityName.startsWith('/')) {
@@ -141,6 +145,9 @@ export async function generateColumnsSuggestion(
             let columnNameSuggestion = normalizedName;
             if (entity.alias) {
                 columnNameSuggestion = `${entity.alias}.${normalizedName}`;
+            } else if (multi) {
+                // no need to wrap entity.name to backticks, because it's already with them if needed
+                columnNameSuggestion = `${entity.name}.${normalizedName}`;
             }
             suggestions.push({
                 label: columnNameSuggestion,