fix: optional viewContext

Author: astandrik

src/containers/Storage/PaginatedStorage.tsx

@@ -25,15 +25,15 @@ export const PaginatedStorage = (props: PaginatedStorageProps) => {
     if (isNodes) {
         return (
             <PaginatedStorageNodes
-                initialEntitiesCount={getStorageNodesInitialEntitiesCount(props.viewContext ?? {})}
+                initialEntitiesCount={getStorageNodesInitialEntitiesCount(props.viewContext)}
                 {...props}
             />
         );
     }
 
     return (
         <PaginatedStorageGroups
-            initialEntitiesCount={getStorageGroupsInitialEntitiesCount(props.viewContext ?? {})}
+            initialEntitiesCount={getStorageGroupsInitialEntitiesCount(props.viewContext)}
             {...props}
         />
     );

src/containers/Storage/PaginatedStorageGroups.tsx

@@ -64,7 +64,7 @@ function StorageGroupsComponent({
 
     const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
         visibleEntities,
-        viewContext: viewContext ?? {},
+        viewContext,
     });
 
     const renderControls: RenderControls = ({totalEntities, foundEntities, inited}) => {
@@ -113,7 +113,7 @@ function GroupedStorageGroupsComponent({
 
     const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
         visibleEntities,
-        viewContext: viewContext ?? {},
+        viewContext,
     });
 
     const {currentData, isFetching, error} = storageApi.useGetStorageGroupsInfoQuery(

src/containers/Storage/PaginatedStorageNodes.tsx

@@ -71,7 +71,7 @@ function StorageNodesComponent({
 
     const {columnsToShow, columnsToSelect, setColumns} = useStorageNodesColumnsToSelect({
         database,
-        viewContext: viewContext ?? {},
+        viewContext,
     });
 
     const renderControls: RenderControls = ({totalEntities, foundEntities, inited}) => {
@@ -119,7 +119,7 @@ function GroupedStorageNodesComponent({
 
     const {columnsToShow, columnsToSelect, setColumns} = useStorageNodesColumnsToSelect({
         database,
-        viewContext: viewContext ?? {},
+        viewContext,
     });
 
     const {currentData, isFetching, error} = storageApi.useGetStorageNodesInfoQuery(
@@ -218,6 +218,6 @@ function useStorageNodesColumnsToSelect({
         additionalNodesProps,
         visibleEntities,
         database,
-        viewContext: viewContext ?? {},
+        viewContext,
     });
 }

src/containers/Storage/StorageGroups/columns/hooks.ts

@@ -14,7 +14,7 @@ import {
 } from './constants';
 import type {GetStorageGroupsColumnsParams} from './types';
 
-export function useGetStorageGroupsColumns(viewContext: StorageViewContext) {
+export function useGetStorageGroupsColumns(viewContext?: StorageViewContext) {
     return React.useMemo(() => {
         return getStorageGroupsColumns({viewContext});
     }, [viewContext]);

src/containers/Storage/StorageGroups/columns/types.ts

@@ -5,12 +5,12 @@ import type {StorageViewContext} from '../../types';
 export type StorageGroupsColumn = Column<PreparedStorageGroup>;
 
 export interface GetStorageColumnsData {
-    viewContext: StorageViewContext;
+    viewContext?: StorageViewContext;
 }
 
 export interface GetStorageGroupsColumnsParams {
     visibleEntities?: VisibleEntities;
-    viewContext: StorageViewContext;
+    viewContext?: StorageViewContext;
 }
 
 export type StorageColumnsGetter = (data?: GetStorageColumnsData) => StorageGroupsColumn[];

src/containers/Storage/StorageNodes/columns/types.ts

@@ -9,5 +9,5 @@ export interface GetStorageNodesColumnsParams {
     additionalNodesProps?: AdditionalNodesProps | undefined;
     visibleEntities?: VisibleEntities;
     database?: string;
-    viewContext: StorageViewContext;
+    viewContext?: StorageViewContext;
 }

src/containers/Storage/utils/index.ts

@@ -89,12 +89,14 @@ const DEFAULT_ENTITIES_COUNT = 10;
 // GroupPage - DEFAULT_ENTITIES_COUNT nodes
 // PDiskPage - 1 node
 // VDiskPage - 1 node
-export function getStorageNodesInitialEntitiesCount({
-    nodeId,
-    pDiskId,
-    vDiskSlotId,
-}: StorageViewContext): number | undefined {
-    if (valueIsDefined(nodeId) || valueIsDefined(pDiskId) || valueIsDefined(vDiskSlotId)) {
+export function getStorageNodesInitialEntitiesCount(
+    context?: StorageViewContext,
+): number | undefined {
+    if (
+        valueIsDefined(context?.nodeId) ||
+        valueIsDefined(context?.pDiskId) ||
+        valueIsDefined(context?.vDiskSlotId)
+    ) {
         return 1;
     }
 
@@ -105,14 +107,13 @@ export function getStorageNodesInitialEntitiesCount({
 // GroupPage - 1 group
 // PDiskPage - DEFAULT_ENTITIES_COUNT groups
 // VDiskPage - 1 group
-export function getStorageGroupsInitialEntitiesCount({
-    vDiskSlotId,
-    groupId,
-}: StorageViewContext): number | undefined {
-    if (valueIsDefined(groupId)) {
+export function getStorageGroupsInitialEntitiesCount(
+    context?: StorageViewContext,
+): number | undefined {
+    if (valueIsDefined(context?.groupId)) {
         return 1;
     }
-    if (valueIsDefined(vDiskSlotId)) {
+    if (valueIsDefined(context?.vDiskSlotId)) {
         return 1;
     }
 

tests/suites/paginatedTable/paginatedTable.test.ts

@@ -46,7 +46,7 @@ test.describe('PaginatedTable', () => {
         }
     });
 
-    test.only('loads data when scrolling to middle of table', async ({page}) => {
+    test('loads data when scrolling to middle of table', async ({page}) => {
         // Setup mocks with large dataset
         await setupLargeNodesMock(page);
         await setupSettingsMock(page);