fix(Healthcheck): types (#2402)

Author: Raubzeug

src/containers/Tenant/Healthcheck/Healthcheck.tsx

@@ -36,7 +36,7 @@ interface HealthcheckDetailsProps {
 
 export function Healthcheck({
     tenantName,
-    countIssueTypes = uiFactory.countHealthcheckIssuesByType,
+    countIssueTypes = uiFactory.healthcheck.countHealthcheckIssuesByType,
 }: HealthcheckDetailsProps) {
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const fullscreen = useTypedSelector((state) => state.fullscreen);

src/containers/Tenant/Healthcheck/components/HealthcheckView.tsx

@@ -12,10 +12,10 @@ const HealthcheckViewValues: Record<string, CommonIssueType> = {
     compute: 'compute',
 };
 
-interface HealthcheckViewProps<T extends string = CommonIssueType> {
-    issuesCount: Record<T, number>;
-    viewTitles?: Record<T, string>;
-    sortOrder?: T[];
+interface HealthcheckViewProps {
+    issuesCount: ReturnType<typeof uiFactory.healthcheck.countHealthcheckIssuesByType>;
+    viewTitles?: ReturnType<typeof uiFactory.healthcheck.getHealthckechViewTitles>;
+    sortOrder?: ReturnType<typeof uiFactory.healthcheck.getHealthcheckViewsOrder>;
 }
 
 export function HealthcheckView({

src/uiFactory/types.ts

@@ -12,7 +12,7 @@ import type {ETenantType} from '../types/api/tenant';
 import type {GetLogsLink} from '../utils/logs';
 import type {GetMonitoringClusterLink, GetMonitoringLink} from '../utils/monitoring';
 
-export interface UIFactory {
+export interface UIFactory<H extends string = CommonIssueType> {
     onCreateDB?: HandleCreateDB;
     onEditDB?: HandleEditDB;
     onDeleteDB?: HandleDeleteDB;
@@ -29,12 +29,10 @@ export interface UIFactory {
     getClusterLinks?: GetClusterLinks;
 
     healthcheck: {
-        getHealthckechViewTitles: GetHealthcheckViewTitles<CommonIssueType>;
-        getHealthcheckViewsOrder: GetHealthcheckViewsOrder<CommonIssueType>;
+        getHealthckechViewTitles: GetHealthcheckViewTitles<H>;
+        getHealthcheckViewsOrder: GetHealthcheckViewsOrder<H>;
+        countHealthcheckIssuesByType: (issueTrees: IssuesTree[]) => Record<H, number>;
     };
-    countHealthcheckIssuesByType: (
-        issueTrees: IssuesTree[],
-    ) => Record<CommonIssueType, number> & Record<string, number>;
 }
 
 export type HandleCreateDB = (params: {clusterName: string}) => Promise<boolean>;

src/uiFactory/uiFactory.ts

@@ -16,8 +16,8 @@ const uiFactoryBase: UIFactory = {
     healthcheck: {
         getHealthckechViewTitles,
         getHealthcheckViewsOrder,
+        countHealthcheckIssuesByType,
     },
-    countHealthcheckIssuesByType: countHealthcheckIssuesByType,
 };
 
 export function configureUIFactory(overrides: Partial<UIFactory>) {