Refactor

turbot · Dec 19, 2024 · 97aff70 · 97aff70
1 parent c70769b
commit 97aff70
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 36 deletions.
diff --git a/ui/dashboard/src/components/dashboards/grouping/Benchmark/index.tsx b/ui/dashboard/src/components/dashboards/grouping/Benchmark/index.tsx
@@ -370,15 +370,23 @@ const Inner = ({ withTitle }) => {
   }
 };
 
-type BenchmarkProps = PanelDefinition & {
+type BenchmarkProps = {
+  definition: PanelDefinition;
+  benchmarkChildren?: PanelDefinition[] | undefined;
   showControls: boolean;
   withTitle: boolean;
 };
 
 const BenchmarkWrapper = (props: BenchmarkProps) => {
   return (
-    <GroupingProvider definition={props}>
-      <PanelControlsProvider definition={props} enabled={props.showControls}>
+    <GroupingProvider
+      definition={props.definition}
+      benchmarkChildren={props.benchmarkChildren}
+    >
+      <PanelControlsProvider
+        definition={props.definition}
+        enabled={props.showControls}
+      >
         <Inner withTitle={props.withTitle} />
       </PanelControlsProvider>
     </GroupingProvider>

diff --git a/ui/dashboard/src/components/dashboards/grouping/DetectionBenchmark/index.tsx b/ui/dashboard/src/components/dashboards/grouping/DetectionBenchmark/index.tsx
@@ -397,15 +397,23 @@ const Inner = ({ showControls, withTitle }) => {
   }
 };
 
-type DetectionBenchmarkWrapperProps = PanelDefinition & {
+type DetectionBenchmarkWrapperProps = {
+  definition: PanelDefinition;
+  benchmarkChildren?: PanelDefinition[] | undefined;
   showControls: boolean;
   withTitle: boolean;
 };
 
 const DetectionBenchmarkWrapper = (props: DetectionBenchmarkWrapperProps) => {
   return (
-    <GroupingProvider definition={props}>
-      <PanelControlsProvider definition={props} enabled={props.showControls}>
+    <GroupingProvider
+      definition={props.definition}
+      benchmarkChildren={props.benchmarkChildren}
+    >
+      <PanelControlsProvider
+        definition={props.definition}
+        enabled={props.showControls}
+      >
         <Inner showControls={props.showControls} withTitle={props.withTitle} />
       </PanelControlsProvider>
     </GroupingProvider>

diff --git a/ui/dashboard/src/components/dashboards/layout/Child/index.tsx b/ui/dashboard/src/components/dashboards/layout/Child/index.tsx
@@ -29,15 +29,17 @@ const Child = ({
         const DetectionBenchmark = getComponent("detection_benchmark");
         return (
           <DetectionBenchmark
-            {...(layoutDefinition as PanelDefinition)}
+            definition={panelDefinition}
+            benchmarkChildren={layoutDefinition.children}
             showControls={showPanelControls}
           />
         );
       } else {
         const Benchmark = getComponent("benchmark");
         return (
           <Benchmark
-            {...(layoutDefinition as PanelDefinition)}
+            definition={panelDefinition}
+            benchmarkChildren={layoutDefinition.children}
             showControls={showPanelControls}
           />
         );
@@ -46,15 +48,15 @@ const Child = ({
       const Benchmark = getComponent("benchmark");
       return (
         <Benchmark
-          {...(layoutDefinition as PanelDefinition)}
+          definition={panelDefinition}
           showControls={showPanelControls}
         />
       );
     case "detection":
       const DetectionBenchmark = getComponent("detection_benchmark");
       return (
         <DetectionBenchmark
-          {...(layoutDefinition as PanelDefinition)}
+          definition={panelDefinition}
           showControls={showPanelControls}
         />
       );

diff --git a/ui/dashboard/src/hooks/useBenchmarkGrouping.tsx b/ui/dashboard/src/hooks/useBenchmarkGrouping.tsx
@@ -556,6 +556,7 @@ const reducer = (state: CheckGroupNodeStates, action) => {
 type CheckGroupingProviderProps = {
   children: null | JSX.Element | JSX.Element[];
   definition: PanelDefinition;
+  benchmarkChildren?: PanelDefinition[] | undefined;
 };
 
 function recordFilterValues(
@@ -749,6 +750,7 @@ const includeResult = (result: CheckResult, filterConfig: Filter): boolean => {
 
 const useGroupingInternal = (
   definition: PanelDefinition | null,
+  benchmarkChildren: PanelDefinition[] | undefined,
   panelsMap: PanelsMap | undefined,
   groupingConfig: CheckDisplayGroup[],
   skip = false,
@@ -772,24 +774,21 @@ const useGroupingInternal = (
     }
 
     // @ts-ignore
-    const nestedBenchmarks = definition.children?.filter(
+    const nestedBenchmarks = benchmarkChildren?.filter(
       (child) => child.panel_type === "benchmark",
     );
     const nestedControls =
       definition.panel_type === "control"
         ? [definition]
         : // @ts-ignore
-          definition.children?.filter(
-            (child) => child.panel_type === "control",
-          );
+          benchmarkChildren?.filter((child) => child.panel_type === "control");
 
-    const rootBenchmarkPanel = panelsMap[definition.name];
     const b = new BenchmarkType(
       "0",
-      rootBenchmarkPanel.name,
-      rootBenchmarkPanel.title,
-      rootBenchmarkPanel.description,
-      rootBenchmarkPanel.documentation,
+      definition.name,
+      definition.title,
+      definition.description,
+      definition.documentation,
       nestedBenchmarks,
       nestedControls,
       panelsMap,
@@ -836,7 +835,6 @@ const useGroupingInternal = (
 
     return [
       b,
-      { ...rootBenchmarkPanel, children: definition.children },
       results,
       firstChildSummaries,
       checkNodeStates,
@@ -848,6 +846,7 @@ const useGroupingInternal = (
 const GroupingProvider = ({
   children,
   definition,
+  benchmarkChildren,
 }: CheckGroupingProviderProps) => {
   const { panelsMap } = useDashboardState();
   const { setContext: setDashboardControlsContext } = useDashboardControls();
@@ -856,12 +855,16 @@ const GroupingProvider = ({
 
   const [
     benchmark,
-    panelDefinition,
     grouping,
     firstChildSummaries,
     tempNodeStates,
     filterValues,
-  ] = useGroupingInternal(definition, panelsMap, groupingConfig);
+  ] = useGroupingInternal(
+    definition,
+    benchmarkChildren,
+    panelsMap,
+    groupingConfig,
+  );
 
   const previousGroupings = usePrevious({ groupingConfig });
 
@@ -888,8 +891,7 @@ const GroupingProvider = ({
     <GroupingContext.Provider
       value={{
         benchmark,
-        // @ts-ignore
-        definition: panelDefinition,
+        definition,
         dispatch,
         firstChildSummaries,
         grouping,

diff --git a/ui/dashboard/src/hooks/useDetectionGrouping.tsx b/ui/dashboard/src/hooks/useDetectionGrouping.tsx
@@ -474,6 +474,7 @@ const reducer = (state: CheckGroupNodeStates, action) => {
 type DetectionGroupingProviderProps = {
   children: null | JSX.Element | JSX.Element[];
   definition: PanelDefinition;
+  benchmarkChildren: PanelDefinition[] | undefined;
 };
 
 function recordFilterValues(
@@ -647,6 +648,7 @@ const includeResult = (
 
 const useGroupingInternal = (
   definition: PanelDefinition | null,
+  benchmarkChildren: PanelDefinition[] | undefined,
   panelsMap: PanelsMap | undefined,
   groupingConfig: DetectionDisplayGroup[],
   skip = false,
@@ -667,24 +669,23 @@ const useGroupingInternal = (
     }
 
     // @ts-ignore
-    const nestedDetectionBenchmarks = definition.children?.filter(
+    const nestedDetectionBenchmarks = benchmarkChildren?.filter(
       (child) => child.panel_type === "benchmark",
     );
     const nestedDetections =
       definition.panel_type === "detection"
         ? [definition]
         : // @ts-ignore
-          definition.children?.filter(
+          benchmarkChildren?.filter(
             (child) => child.panel_type === "detection",
           );
 
-    const rootBenchmarkPanel = panelsMap[definition.name];
     const b = new DetectionBenchmarkType(
       "0",
-      rootBenchmarkPanel.name,
-      rootBenchmarkPanel.title,
-      rootBenchmarkPanel.description,
-      rootBenchmarkPanel.documentation,
+      definition.name,
+      definition.title,
+      definition.description,
+      definition.documentation,
       nestedDetectionBenchmarks,
       nestedDetections,
       panelsMap,
@@ -740,7 +741,6 @@ const useGroupingInternal = (
 
     return [
       b,
-      { ...rootBenchmarkPanel, children: definition.children },
       results,
       firstChildSummaries,
       hasSeverityResults,
@@ -753,6 +753,7 @@ const useGroupingInternal = (
 const GroupingProvider = ({
   children,
   definition,
+  benchmarkChildren,
 }: DetectionGroupingProviderProps) => {
   const { panelsMap } = useDashboardState();
   const { setContext: setDashboardControlsContext } = useDashboardControls();
@@ -761,13 +762,17 @@ const GroupingProvider = ({
 
   const [
     benchmark,
-    panelDefinition,
     grouping,
     firstChildSummaries,
     hasSeverityResults,
     tempNodeStates,
     filterValues,
-  ] = useGroupingInternal(definition, panelsMap, groupingConfig);
+  ] = useGroupingInternal(
+    definition,
+    benchmarkChildren,
+    panelsMap,
+    groupingConfig,
+  );
 
   const previousGroupings = usePrevious({ groupingConfig });
 
@@ -794,8 +799,7 @@ const GroupingProvider = ({
     <GroupingContext.Provider
       value={{
         benchmark,
-        // @ts-ignore
-        definition: panelDefinition,
+        definition,
         dispatch,
         firstChildSummaries,
         hasSeverityResults,