fix: review fixes

Author: astandrik

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/useTenantCpuQueryParams.ts

@@ -1,9 +1,9 @@
 import {StringParam, useQueryParams} from 'use-query-params';
 
 import {
-    TENANT_CPU_NODES_MODE_IDS,
-    TENANT_CPU_TABS_IDS,
-} from '../../../../../store/reducers/tenant/constants';
+    tenantCpuTabSchema,
+    tenantNodesModeSchema,
+} from '../../../../../store/reducers/tenant/types';
 import type {TenantCpuTab, TenantNodesMode} from '../../../../../store/reducers/tenant/types';
 
 export function useTenantCpuQueryParams() {
@@ -12,27 +12,8 @@ export function useTenantCpuQueryParams() {
         nodesMode: StringParam,
     });
 
-    // Parse and validate cpuTab with fallback to nodes
-    const cpuTab: TenantCpuTab = (() => {
-        if (!queryParams.cpuTab) {
-            return TENANT_CPU_TABS_IDS.nodes;
-        }
-        const validTabs = Object.values(TENANT_CPU_TABS_IDS) as string[];
-        return validTabs.includes(queryParams.cpuTab)
-            ? (queryParams.cpuTab as TenantCpuTab)
-            : TENANT_CPU_TABS_IDS.nodes;
-    })();
-
-    // Parse and validate nodesMode with fallback to load
-    const nodesMode: TenantNodesMode = (() => {
-        if (!queryParams.nodesMode) {
-            return TENANT_CPU_NODES_MODE_IDS.load;
-        }
-        const validModes = Object.values(TENANT_CPU_NODES_MODE_IDS) as string[];
-        return validModes.includes(queryParams.nodesMode)
-            ? (queryParams.nodesMode as TenantNodesMode)
-            : TENANT_CPU_NODES_MODE_IDS.load;
-    })();
+    const cpuTab: TenantCpuTab = tenantCpuTabSchema.parse(queryParams.cpuTab);
+    const nodesMode: TenantNodesMode = tenantNodesModeSchema.parse(queryParams.nodesMode);
 
     const handleCpuTabChange = (value: TenantCpuTab) => {
         setQueryParams({cpuTab: value}, 'replaceIn');

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/ProgressWrapper.tsx

@@ -42,10 +42,7 @@ export function ProgressWrapper({
     const clampedFillWidth = Math.min(fillWidth, MAX_PERCENTAGE);
 
     const [valueText, capacityText] = React.useMemo(() => {
-        if (formatValues) {
-            return formatValues(Number(value), Number(capacity));
-        }
-        return [value, capacity];
+        return formatValues(Number(value), Number(capacity));
     }, [formatValues, value, capacity]);
 
     const displayText = React.useMemo(() => {

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/useTenantStorageQueryParams.ts

@@ -1,23 +1,14 @@
 import {StringParam, useQueryParams} from 'use-query-params';
 
-import {TENANT_STORAGE_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
+import {tenantStorageTabSchema} from '../../../../../store/reducers/tenant/types';
 import type {TenantStorageTab} from '../../../../../store/reducers/tenant/types';
 
 export function useTenantStorageQueryParams() {
     const [queryParams, setQueryParams] = useQueryParams({
         storageTab: StringParam,
     });
 
-    // Parse and validate storageTab with fallback to tables
-    const storageTab: TenantStorageTab = (() => {
-        if (!queryParams.storageTab) {
-            return TENANT_STORAGE_TABS_IDS.tables;
-        }
-        const validTabs = Object.values(TENANT_STORAGE_TABS_IDS) as string[];
-        return validTabs.includes(queryParams.storageTab)
-            ? (queryParams.storageTab as TenantStorageTab)
-            : TENANT_STORAGE_TABS_IDS.tables;
-    })();
+    const storageTab: TenantStorageTab = tenantStorageTabSchema.parse(queryParams.storageTab);
 
     const handleStorageTabChange = (value: TenantStorageTab) => {
         setQueryParams({storageTab: value}, 'replaceIn');

src/store/reducers/tenant/types.ts

@@ -2,20 +2,34 @@ import {z} from 'zod';
 
 import type {ValueOf} from '../../../types/common';
 
-import {TENANT_PAGES_IDS} from './constants';
-import type {
+import {
     TENANT_CPU_NODES_MODE_IDS,
     TENANT_CPU_TABS_IDS,
+    TENANT_PAGES_IDS,
+    TENANT_STORAGE_TABS_IDS,
+} from './constants';
+import type {
     TENANT_DIAGNOSTICS_TABS_IDS,
     TENANT_METRICS_TABS_IDS,
     TENANT_QUERY_TABS_ID,
-    TENANT_STORAGE_TABS_IDS,
     TENANT_SUMMARY_TABS_IDS,
 } from './constants';
 
 export const tenantPageSchema = z.nativeEnum(TENANT_PAGES_IDS);
 export type TenantPage = z.infer<typeof tenantPageSchema>;
 
+export const tenantStorageTabSchema = z
+    .nativeEnum(TENANT_STORAGE_TABS_IDS)
+    .catch(TENANT_STORAGE_TABS_IDS.tables);
+
+export const tenantCpuTabSchema = z
+    .nativeEnum(TENANT_CPU_TABS_IDS)
+    .catch(TENANT_CPU_TABS_IDS.nodes);
+
+export const tenantNodesModeSchema = z
+    .nativeEnum(TENANT_CPU_NODES_MODE_IDS)
+    .catch(TENANT_CPU_NODES_MODE_IDS.load);
+
 export type TenantQueryTab = ValueOf<typeof TENANT_QUERY_TABS_ID>;
 export type TenantDiagnosticsTab = ValueOf<typeof TENANT_DIAGNOSTICS_TABS_IDS>;
 export type TenantSummaryTab = ValueOf<typeof TENANT_SUMMARY_TABS_IDS>;