Merge branch 'main' into astandrik.1821

Author: astandrik

.github/workflows/release.yml

@@ -2,7 +2,7 @@ on:
   push:
     branches:
       - main
-      - hotfix/v[0-9]+.[0-9]+.[0-9]+ # match branches in format hotfix/v6.20.10
+      - hotfix/v[0-9]+.[0-9]+.[0-9]+* # match branches in format hotfix/v6.20.10 and hotfix/v6.20.10-hotfix.1
 
 name: Release
 

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "9.6.3"
+  ".": "9.7.0"
 }

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [9.7.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v9.6.3...v9.7.0) (2025-06-20)
+
+
+### Features
+
+* add backups page with custom render ([#2442](https://github.com/ydb-platform/ydb-embedded-ui/issues/2442)) ([b66e8d5](https://github.com/ydb-platform/ydb-embedded-ui/commit/b66e8d50bdf23044f103850310bdec55a400ee54))
+* manage schema object permissions ([#2398](https://github.com/ydb-platform/ydb-embedded-ui/issues/2398)) ([0c89baa](https://github.com/ydb-platform/ydb-embedded-ui/commit/0c89baa3d9f33ae8cc9b67a101815bdcbf5a890d))
+
+
+### Bug Fixes
+
+* **HealthcheckPreview:** use only one query ([#2427](https://github.com/ydb-platform/ydb-embedded-ui/issues/2427)) ([74ca103](https://github.com/ydb-platform/ydb-embedded-ui/commit/74ca10362e45a062fccdd8b4a7691abb7bcc8a4d))
+* **healthcheck:** show groups ids in separate rows ([#2423](https://github.com/ydb-platform/ydb-embedded-ui/issues/2423)) ([eaa789b](https://github.com/ydb-platform/ydb-embedded-ui/commit/eaa789bcdb320ebec137aace2c1e055ef999bd2c))
+* **Network:** require ConnectStatus for host column ([#2429](https://github.com/ydb-platform/ydb-embedded-ui/issues/2429)) ([eccba69](https://github.com/ydb-platform/ydb-embedded-ui/commit/eccba6912daecf540d435b3df2eb3e186ab815ff))
+* **Nodes:** request tablets only if required ([#2433](https://github.com/ydb-platform/ydb-embedded-ui/issues/2433)) ([e1499e9](https://github.com/ydb-platform/ydb-embedded-ui/commit/e1499e9912692e3714708e574f87c77c3d507940))
+* support name param for database ([#2426](https://github.com/ydb-platform/ydb-embedded-ui/issues/2426)) ([ce1fb66](https://github.com/ydb-platform/ydb-embedded-ui/commit/ce1fb6639030e608bab6628f4c45cfd10e9512a5))
+* tests ([#2439](https://github.com/ydb-platform/ydb-embedded-ui/issues/2439)) ([6001e22](https://github.com/ydb-platform/ydb-embedded-ui/commit/6001e22d0b24abf1ff07b8548f9208c494b0afe7))
+* unskip tests ([#2436](https://github.com/ydb-platform/ydb-embedded-ui/issues/2436)) ([76b37bb](https://github.com/ydb-platform/ydb-embedded-ui/commit/76b37bbe8ec36bb91481fbf636bd6d038c5eb726))
+
 ## [9.6.3](https://github.com/ydb-platform/ydb-embedded-ui/compare/v9.6.2...v9.6.3) (2025-06-17)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "9.6.3",
+  "version": "9.7.0",
   "files": [
     "dist"
   ],

package.json

@@ -88,6 +88,7 @@ function getTitleColumn({isEditClusterAvailable, isDeleteClusterAvailable}: Clus
                     <DropdownMenu
                         items={menuItems}
                         defaultSwitcherProps={{view: 'flat-secondary'}}
+                        size="s"
                         menuProps={{size: 'l'}}
                     />
                 );
@@ -199,7 +200,10 @@ const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
         sortable: false,
         render: ({row}) => {
             const dc = (row.cluster && row.cluster.DataCenters) || [];
-            return <div className={b('cluster-dc')}>{dc.join(', ') || EMPTY_CELL}</div>;
+            return (
+                // For some reason DC list could contain empty strings
+                <div className={b('cluster-dc')}>{dc.filter(Boolean).join(', ') || EMPTY_CELL}</div>
+            );
         },
     },
     {

src/containers/Clusters/columns.tsx

@@ -13,6 +13,7 @@ import {
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../store/reducers/tenant/constants';
 import {setDiagnosticsTab} from '../../../store/reducers/tenant/tenant';
 import type {AdditionalNodesProps, AdditionalTenantsProps} from '../../../types/additionalProps';
+import {uiFactory} from '../../../uiFactory/uiFactory';
 import {cn} from '../../../utils/cn';
 import {useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
 import {Heatmap} from '../../Heatmap';
@@ -49,7 +50,6 @@ const b = cn('kv-tenant-diagnostics');
 function Diagnostics(props: DiagnosticsProps) {
     const {path, database, type, subType} = useCurrentSchema();
     const containerRef = React.useRef<HTMLDivElement>(null);
-
     const dispatch = useTypedDispatch();
     const {diagnosticsTab = TENANT_DIAGNOSTICS_TABS_IDS.overview} = useTypedSelector(
         (state) => state.tenant,
@@ -65,6 +65,7 @@ function Diagnostics(props: DiagnosticsProps) {
         hasFeatureFlags,
         hasTopicData,
         isTopLevel: path === database,
+        hasBackups: typeof uiFactory.renderBackups === 'function',
     });
     let activeTab = pages.find((el) => el.id === diagnosticsTab);
     if (!activeTab) {
@@ -77,6 +78,7 @@ function Diagnostics(props: DiagnosticsProps) {
         }
     }, [activeTab, diagnosticsTab, dispatch]);
 
+    // eslint-disable-next-line complexity
     const renderTabContent = () => {
         switch (activeTab?.id) {
             case TENANT_DIAGNOSTICS_TABS_IDS.overview: {
@@ -161,6 +163,12 @@ function Diagnostics(props: DiagnosticsProps) {
             case TENANT_DIAGNOSTICS_TABS_IDS.operations: {
                 return <Operations database={tenantName} scrollContainerRef={containerRef} />;
             }
+            case TENANT_DIAGNOSTICS_TABS_IDS.backups: {
+                return uiFactory.renderBackups?.({
+                    database: tenantName,
+                    scrollContainerRef: containerRef,
+                });
+            }
             default: {
                 return <div>No data...</div>;
             }

src/containers/Tenant/Diagnostics/Diagnostics.tsx

@@ -37,6 +37,10 @@ const access = {
     id: TENANT_DIAGNOSTICS_TABS_IDS.access,
     title: 'Access',
 };
+const backups = {
+    id: TENANT_DIAGNOSTICS_TABS_IDS.backups,
+    title: 'Backups',
+};
 
 const nodes = {
     id: TENANT_DIAGNOSTICS_TABS_IDS.nodes,
@@ -111,6 +115,7 @@ const DATABASE_PAGES = [
     configs,
     access,
     operations,
+    backups,
 ];
 
 const TABLE_PAGES = [overview, schema, topShards, nodes, graph, tablets, hotKeys, describe, access];
@@ -166,7 +171,12 @@ const pathSubTypeToPages: Record<EPathSubType, Page[] | undefined> = {
 export const getPagesByType = (
     type?: EPathType,
     subType?: EPathSubType,
-    options?: {hasFeatureFlags?: boolean; hasTopicData?: boolean; isTopLevel?: boolean},
+    options?: {
+        hasFeatureFlags?: boolean;
+        hasTopicData?: boolean;
+        isTopLevel?: boolean;
+        hasBackups?: boolean;
+    },
 ) => {
     const subTypePages = subType ? pathSubTypeToPages[subType] : undefined;
     const typePages = type ? pathTypeToPages[type] : undefined;
@@ -181,6 +191,9 @@ export const getPagesByType = (
             return pages.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.configs);
         }
     }
+    if (!options?.hasBackups) {
+        return pages.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.backups);
+    }
     return pages;
 };
 

src/containers/Tenant/Diagnostics/DiagnosticsPages.ts

@@ -39,6 +39,7 @@ import {
     useTypedSelector,
 } from '../../../../utils/hooks';
 import {useChangedQuerySettings} from '../../../../utils/hooks/useChangedQuerySettings';
+import {useDisableOidcStreaming} from '../../../../utils/hooks/useDisableOidcStreaming';
 import {useLastQueryExecutionSettings} from '../../../../utils/hooks/useLastQueryExecutionSettings';
 import {DEFAULT_QUERY_SETTINGS, QUERY_ACTIONS, QUERY_MODES} from '../../../../utils/query';
 import {useCurrentSchema} from '../../TenantContext';
@@ -94,10 +95,14 @@ export default function QueryEditor(props: QueryEditorProps) {
     const [lastExecutedQueryText, setLastExecutedQueryText] = React.useState<string>('');
     const [isQueryStreamingEnabled] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
 
+    // Temporary check: disable streaming if backend parameter contains "oidc"
+    const isOidcBackend = useDisableOidcStreaming();
+
     const isStreamingEnabled =
         useStreamingAvailable() &&
         isQueryStreamingEnabled &&
-        querySettings.queryMode === QUERY_MODES.query;
+        querySettings.queryMode === QUERY_MODES.query &&
+        !isOidcBackend;
 
     const [sendQuery] = queryApi.useUseSendQueryMutation();
     const [streamQuery] = queryApi.useUseStreamQueryMutation();

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

@@ -3,6 +3,7 @@ import {HelpMark, Switch} from '@gravity-ui/uikit';
 import {cn} from '../../../../utils/cn';
 import {ENABLE_QUERY_STREAMING} from '../../../../utils/constants';
 import {useSetting} from '../../../../utils/hooks';
+import {useDisableOidcStreaming} from '../../../../utils/hooks/useDisableOidcStreaming';
 
 import {QUERY_SETTINGS_FIELD_SETTINGS} from './constants';
 import i18n from './i18n';
@@ -20,7 +21,12 @@ interface TimeoutLabelProps {
 export function TimeoutLabel({isDisabled, isChecked, onToggle}: TimeoutLabelProps) {
     const [isQueryStreamingEnabled] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
 
-    if (isQueryStreamingEnabled) {
+    // Temporary check: disable streaming UI if backend parameter contains "oidc"
+    const isOidcBackend = useDisableOidcStreaming();
+
+    const shouldShowStreamingUI = isQueryStreamingEnabled && !isOidcBackend;
+
+    if (shouldShowStreamingUI) {
         return (
             <div className={b('switch-title')}>
                 <Switch