fixes

Author: Raubzeug

src/containers/Node/Node.tsx

@@ -68,6 +68,8 @@ export function Node() {
 
     const isStorageNode = node?.Roles?.find((el) => el === STORAGE_ROLE);
 
+    const threadsQuantity = node?.Threads?.length;
+
     const {activeTab, nodeTabs} = React.useMemo(() => {
         let actualNodeTabs = isStorageNode
             ? NODE_TABS
@@ -76,15 +78,15 @@ export function Node() {
             actualNodeTabs = actualNodeTabs.filter((el) => el.id !== 'structure');
         }
         // Filter out threads tab if there's no thread data in the API response
-        if (!node?.Threads || node.Threads.length === 0) {
+        if (!threadsQuantity) {
             actualNodeTabs = actualNodeTabs.filter((el) => el.id !== 'threads');
         }
 
         const actualActiveTab =
             actualNodeTabs.find(({id}) => id === activeTabId) ?? actualNodeTabs[0];
 
         return {activeTab: actualActiveTab, nodeTabs: actualNodeTabs};
-    }, [isStorageNode, isDiskPagesAvailable, activeTabId, node?.Threads]);
+    }, [isStorageNode, isDiskPagesAvailable, activeTabId, threadsQuantity]);
 
     const tenantName = node?.Tenants?.[0] || tenantNameFromQuery?.toString();
 

src/store/reducers/node/types.ts

@@ -1,4 +1,3 @@
-import type {TThreadPoolInfo} from '../../../types/api/threads';
 import type {PreparedPDisk, PreparedVDisk} from '../../../utils/disks/types';
 import type {PreparedNodeSystemState} from '../../../utils/nodes';
 
@@ -19,6 +18,4 @@ export interface PreparedStructurePDisk extends PreparedPDisk {
 
 export type PreparedNodeStructure = Record<string, PreparedStructurePDisk>;
 
-export interface PreparedNode extends Partial<PreparedNodeSystemState> {
-    Threads?: TThreadPoolInfo[];
-}
+export interface PreparedNode extends Partial<PreparedNodeSystemState> {}

src/store/reducers/node/utils.ts

@@ -10,11 +10,5 @@ export const prepareNodeData = (data: TEvSystemStateResponse): PreparedNode => {
 
     const nodeData = data.SystemStateInfo[0];
 
-    const preparedSystemState = prepareNodeSystemState(nodeData);
-
-    // Include Threads from the top-level response for the tab filtering logic
-    return {
-        ...preparedSystemState,
-        Threads: data.Threads,
-    };
+    return prepareNodeSystemState(nodeData);
 };

tests/suites/nodes/NodePage.ts

@@ -1,6 +1,7 @@
 import type {Locator, Page} from '@playwright/test';
 
 import {PageModel} from '../../models/PageModel';
+import {VISIBILITY_TIMEOUT} from '../tenant/TenantPage';
 
 export class NodePage extends PageModel {
     readonly tabs: Locator;
@@ -20,8 +21,7 @@ export class NodePage extends PageModel {
     async waitForNodePageLoad() {
         // Wait for the page to load and tabs to be visible
         try {
-            await this.tabs.waitFor({state: 'visible', timeout: 10000});
-            console.log('Node page tabs loaded successfully');
+            await this.tabs.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
         } catch (error) {
             console.error('Failed to load node page tabs:', error);
             throw error;
@@ -31,24 +31,21 @@ export class NodePage extends PageModel {
     async isThreadsTabVisible() {
         const threadsTab = this.tabs.locator('.g-tab:has-text("Threads")');
         try {
-            await threadsTab.waitFor({state: 'visible', timeout: 2000});
-            console.log('Threads tab is visible');
+            await threadsTab.waitFor({state: 'visible'});
             return true;
         } catch {
-            console.log('Threads tab is not visible');
+            console.error('Threads tab is not visible');
             return false;
         }
     }
 
     async clickThreadsTab() {
         const threadsTab = this.tabs.locator('.g-tab:has-text("Threads")');
-        console.log('Clicking threads tab');
         await threadsTab.click();
     }
 
     async getAllTabNames() {
         const tabs = await this.tabs.locator('.g-tab').allTextContents();
-        console.log('Available tabs:', tabs);
         return tabs;
     }
 }

tests/suites/nodes/nodes.test.ts

@@ -196,12 +196,9 @@ test.describe('Test Nodes Paginated Table', async () => {
 });
 
 test.describe('Test Node Page Threads Tab', async () => {
-    test('Threads tab is hidden when node has no thread data', async ({page}) => {
+    test.only('Threads tab is hidden when node has no thread data', async ({page}) => {
         // Mock the node API to return no thread data
-        await page.route(`${backend}/viewer/json/sysinfo?*`, async (route) => {
-            const url = route.request().url();
-            console.log('Intercepted sysinfo request:', url);
-            
+        await page.route(`**/viewer/json/sysinfo?*`, async (route) => {
             await route.fulfill({
                 status: 200,
                 contentType: 'application/json',
@@ -210,7 +207,7 @@ test.describe('Test Node Page Threads Tab', async () => {
                         {
                             Host: 'localhost',
                             NodeId: 1,
-                            SystemState: 1, // Green
+                            SystemState: 'Green',
                             Version: 'test-version',
                         },
                     ],
@@ -236,10 +233,7 @@ test.describe('Test Node Page Threads Tab', async () => {
 
     test('Threads tab is visible when node has thread data', async ({page}) => {
         // Mock the node API to return thread data
-        await page.route(`${backend}/viewer/json/sysinfo?*`, async (route) => {
-            const url = route.request().url();
-            console.log('Intercepted sysinfo request:', url);
-            
+        await page.route(`**/viewer/json/sysinfo?*`, async (route) => {
             await route.fulfill({
                 status: 200,
                 contentType: 'application/json',
@@ -248,7 +242,7 @@ test.describe('Test Node Page Threads Tab', async () => {
                         {
                             Host: 'localhost',
                             NodeId: 1,
-                            SystemState: 1, // Green
+                            SystemState: 'Green',
                             Version: 'test-version',
                         },
                     ],
@@ -283,10 +277,7 @@ test.describe('Test Node Page Threads Tab', async () => {
 
     test('Threads tab is hidden when node has empty thread array', async ({page}) => {
         // Mock the node API to return empty thread data
-        await page.route(`${backend}/viewer/json/sysinfo?*`, async (route) => {
-            const url = route.request().url();
-            console.log('Intercepted sysinfo request:', url);
-            
+        await page.route(`**/viewer/json/sysinfo?*`, async (route) => {
             await route.fulfill({
                 status: 200,
                 contentType: 'application/json',
@@ -295,7 +286,7 @@ test.describe('Test Node Page Threads Tab', async () => {
                         {
                             Host: 'localhost',
                             NodeId: 1,
-                            SystemState: 1, // Green
+                            SystemState: 'Green',
                             Version: 'test-version',
                         },
                     ],