Merge branch 'main' into astandrik.1607

Author: astandrik

src/containers/Operations/Operations.tsx

@@ -25,7 +25,7 @@ export function Operations({database}: OperationsProps) {
     const {kind, searchValue, pageSize, pageToken, handleKindChange, handleSearchChange} =
         useOperationsQueryParams();
 
-    const {data, isFetching, error, refetch} = operationsApi.useGetOperationListQuery(
+    const {data, isLoading, error, refetch} = operationsApi.useGetOperationListQuery(
         {database, kind, page_size: pageSize, page_token: pageToken},
         {
             pollingInterval: autoRefreshInterval,
@@ -53,13 +53,13 @@ export function Operations({database}: OperationsProps) {
                     searchValue={searchValue}
                     entitiesCountCurrent={filteredOperations.length}
                     entitiesCountTotal={data?.operations?.length}
-                    entitiesLoading={isFetching}
+                    entitiesLoading={isLoading}
                     handleKindChange={handleKindChange}
                     handleSearchChange={handleSearchChange}
                 />
             </TableWithControlsLayout.Controls>
             {error ? <ResponseError error={error} /> : null}
-            <TableWithControlsLayout.Table loading={isFetching} className={b('table')}>
+            <TableWithControlsLayout.Table loading={isLoading} className={b('table')}>
                 {data ? (
                     <ResizeableDataTable
                         columns={getColumns({database, refreshTable: refetch})}

src/containers/Tenant/Diagnostics/Configs/Configs.tsx

@@ -91,7 +91,7 @@ export const Configs = ({database}: ConfigsProps) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const {
         currentData = [],
-        isFetching,
+        isLoading,
         error,
     } = tenantApi.useGetClusterConfigQuery({database}, {pollingInterval: autoRefreshInterval});
 
@@ -113,7 +113,7 @@ export const Configs = ({database}: ConfigsProps) => {
                     placeholder={i18n('search-placeholder')}
                 />
             </TableWithControlsLayout.Controls>
-            <TableWithControlsLayout.Table loading={isFetching}>
+            <TableWithControlsLayout.Table loading={isLoading}>
                 {error ? (
                     <ResponseError error={error} />
                 ) : (

src/containers/Tenant/utils/schemaQueryTemplates.ts

@@ -128,7 +128,7 @@ export const createExternalTableTemplate = (params?: SchemaQueryParams) => {
 };
 
 export const createTopicTemplate = (params?: SchemaQueryParams) => {
-    const path = params?.relativePath ? `\`${params?.relativePath}\`/my_topic` : '${1:my_topic}';
+    const path = params?.relativePath ? `\`${params?.relativePath}/my_topic\`` : '${1:my_topic}';
     return `-- docs: https://ydb.tech/docs/en/yql/reference/syntax/create-topic
 CREATE TOPIC ${path} (
     CONSUMER consumer1,