Merge branch 'main' into astandrik.1821

Author: astandrik

src/components/nodesColumns/constants.ts

@@ -178,7 +178,7 @@ export function getNodesGroupByFieldTitle(groupByField: NodesGroupByField) {
 // Also for some columns we may use more than one field
 export const NODES_COLUMNS_TO_DATA_FIELDS: Record<NodesColumnId, NodesRequiredField[]> = {
     NodeId: ['NodeId'],
-    Host: ['Host', 'Rack', 'Database', 'SystemState'],
+    Host: ['Host', 'Rack', 'Database', 'SystemState', 'ConnectStatus'],
     Database: ['Database'],
     NodeName: ['NodeName'],
     DC: ['DC'],

src/containers/Nodes/getNodes.ts

@@ -13,18 +13,9 @@ import {getRequiredDataFields} from '../../utils/tableUtils/getRequiredDataField
 export const getNodes: FetchData<
     NodesPreparedEntity,
     NodesFilters,
-    Pick<NodesRequestParams, 'type' | 'storage' | 'tablets'>
+    Pick<NodesRequestParams, 'type' | 'storage'>
 > = async (params) => {
-    const {
-        type = 'any',
-        storage = false,
-        tablets = true,
-        limit,
-        offset,
-        sortParams,
-        filters,
-        columnsIds,
-    } = params;
+    const {type = 'any', storage = false, limit, offset, sortParams, filters, columnsIds} = params;
 
     const {sortOrder, columnId} = sortParams ?? {};
     const {
@@ -46,7 +37,6 @@ export const getNodes: FetchData<
     const response = await window.api.viewer.getNodes({
         type,
         storage,
-        tablets,
         limit,
         offset,
         sort,

src/services/api/viewer.ts

@@ -102,7 +102,7 @@ export class ViewerAPI extends BaseYdbAPI {
     getNodes(
         {
             type = 'any',
-            tablets = false,
+            tablets,
             database,
             tenant,
             fieldsRequired,
@@ -119,7 +119,8 @@ export class ViewerAPI extends BaseYdbAPI {
             this.getPath('/viewer/json/nodes?enums=true'),
             {
                 type,
-                tablets,
+                // Use tablets for backward compatibility even if fieldsRequired is passed
+                tablets: tablets ?? fieldsRequired?.includes('Tablets'),
                 // Do not send empty string
                 filter: filter || undefined,
                 // TODO: remove after remove tenant param

tests/suites/tenant/diagnostics/tabs/access.test.ts

@@ -22,7 +22,8 @@ test.describe('Diagnostics Access tab', async () => {
         await expect(diagnostics.isOwnerCardVisible()).resolves.toBe(true);
     });
 
-    test('Can change owner on access tab', async ({page}) => {
+    // TODO: https://github.com/ydb-platform/ydb-embedded-ui/issues/2437
+    test.skip('Can change owner on access tab', async ({page}) => {
         const pageQueryParams = {
             schema: '/local/.sys_health',
             database: '/local',
@@ -47,7 +48,8 @@ test.describe('Diagnostics Access tab', async () => {
         expect(updatedOwnerName).not.toBe(initialOwnerName);
     });
 
-    test('Owner card is visible after navigating to access tab', async ({page}) => {
+    // TODO: https://github.com/ydb-platform/ydb-embedded-ui/issues/2437
+    test.skip('Owner card is visible after navigating to access tab', async ({page}) => {
         const pageQueryParams = {
             schema: '/dev02/home/xenoxeno/db1/my_row_table',
             database: '/dev02/home/xenoxeno/db1',
@@ -84,7 +86,7 @@ test.describe('Diagnostics Access tab', async () => {
         await expect(diagnostics.isGrantAccessDrawerVisible()).resolves.toBe(true);
     });
 
-    test.only('Can grant full access to a new subject', async ({page}) => {
+    test('Can grant full access to a new subject', async ({page}) => {
         const pageQueryParams = {
             schema: '/local/.sys_health',
             database: '/local',