Update pending todo

deepfence_frontend/apps/dashboard/src/components/ReactEcharts.tsx

@@ -48,7 +48,6 @@ export interface ReactEChartsProps {
   style?: CSSProperties;
   settings?: SetOptionOpts;
   loading?: boolean;
-  theme?: Mode; // TODO: Remove theme prop
   onChartClick?: (data: {
     name: string;
     value: string | number | Date;

deepfence_frontend/apps/dashboard/src/components/scan-configure-forms/ComplianceScanConfigureForm.tsx

@@ -269,16 +269,14 @@ const ToggleControl = ({
   nodeId,
   nodeType,
   checkType,
-  fetcher,
 }: {
   checked: boolean;
   controlId: string[];
   nodeId: string;
   nodeType: string;
   checkType: string;
-  fetcher: FetcherWithComponents<ControlActionDta>;
 }) => {
-  // TODO: should show loader indicator here
+  const fetcher = useFetcher();
   if (fetcher.state !== 'idle') {
     return <CircleSpinner size="sm" />;
   }
@@ -340,14 +338,14 @@ const ControlTable = ({
         cell: (info) => {
           return (
             <ToggleControl
+              key={info.row.original?.control_id}
               nodeId={nodeIds[0]}
               nodeType={_nodeType}
               checkType={selectedTab.toLowerCase()}
               checked={!!info.row.original.enabled}
               controlId={
                 info.row.original?.control_id ? [info.row.original.control_id] : ['']
               }
-              fetcher={fetcher}
             />
           );
         },

deepfence_frontend/apps/dashboard/src/constants/charts.ts

@@ -24,7 +24,6 @@ export const getSeverityChartInnerColorMap = (theme: Mode) => {
   };
 };
 
-// TODO: take theme into account
 export function getColorForCVSSScore(theme: Mode, score: number | undefined): string {
   const color = colors[theme === 'light' ? 'variables' : 'darkVariables'].DEFAULT;
   if (!score) return color['df-gray']['600'];

deepfence_frontend/apps/dashboard/src/features/dashboard/components/TopRisks.tsx

@@ -100,7 +100,6 @@ const TopRisksContent = ({
     <div className="flex-1 flex flex-col items-center py-1.5">
       <div className="max-w-[162px] max-h-[162px] h-[162px] w-[162px]">
         <ReactECharts
-          theme="dark"
           option={chartOptions}
           onChartClick={({ name }: { name: string; value: string | number | Date }) => {
             navigate(`${to}?severity=${name.toLowerCase()}`);

deepfence_frontend/apps/dashboard/src/features/dashboard/components/TopRisksRuntimeDummy.tsx

@@ -105,5 +105,5 @@ const DummyDonutChart = () => {
       },
     ],
   };
-  return <ReactECharts theme={mode} option={option} />;
+  return <ReactECharts option={option} />;
 };

deepfence_frontend/apps/dashboard/src/features/integrations/pages/IntegrationAdd.tsx

@@ -285,6 +285,9 @@ const action = async ({ request, params }: ActionFunctionArgs): Promise<ActionDa
       _filters.fields_filters.contains_filter.filter_in = newFilter;
     }
 
+    /**
+     * this filter may not be needed anymore
+     */
     if (intervalFilter) {
       // TODO Add filters
     }

deepfence_frontend/apps/dashboard/src/features/malwares/components/landing/TopNMalwareCard.tsx

@@ -213,7 +213,6 @@ const TopNCardContent = ({ type }: { type: 'host' | 'container' | 'image' }) =>
     <div className="pb-2 h-[300px] flex items-center justify-center">
       {data.length ? (
         <ReactECharts
-          theme="dark"
           option={chartOptions}
           onChartClick={({ id }: { id?: string }) => {
             if (!id) {

deepfence_frontend/apps/dashboard/src/features/malwares/components/scan-results/MalwareScanResultsPieChart.tsx

@@ -119,5 +119,5 @@ export const MalwareScanResultsPieChart = ({
     return null;
   }
   const options = getChartOptions({ data, theme: mode });
-  return <ReactECharts theme="dark" option={options} onChartClick={onChartClick} />;
+  return <ReactECharts option={options} onChartClick={onChartClick} />;
 };

deepfence_frontend/apps/dashboard/src/features/malwares/pages/landing/MalwareCountsCard.tsx

@@ -198,7 +198,6 @@ const CardContent = ({ data, to }: { data: MalwaresCountsCardData; to: string })
     <div className="flex-1 flex flex-col items-center min-h-[180px]">
       <div className="h-[180px] w-[180px]">
         <ReactECharts
-          theme={mode}
           option={chartOptions}
           onChartClick={({ name }: { name: string; value: string | number | Date }) => {
             navigate(`${to}?severity=${name.toLowerCase()}`);

deepfence_frontend/apps/dashboard/src/features/postures/components/scan-result/PostureScanResultsPieChart.tsx

@@ -82,5 +82,5 @@ export const PostureScanResultsPieChart = ({
     return null;
   }
   const options = getChartOptions({ data, theme: mode });
-  return <ReactECharts theme="dark" option={options} onChartClick={onChartClick} />;
+  return <ReactECharts option={options} onChartClick={onChartClick} />;
 };

deepfence_frontend/apps/dashboard/src/features/secrets/components/landing/SecretsCountsCard.tsx

@@ -196,7 +196,6 @@ const CardContent = ({ data, to }: { data: SecretsCountsCardData; to: string })
     <div className="flex-1 flex flex-col items-center min-h-[180px]">
       <div className="h-[180px] w-[180px]">
         <ReactECharts
-          theme={mode}
           option={chartOptions}
           onChartClick={({ name }: { name: string; value: string | number | Date }) => {
             navigate(`${to}?severity=${name.toLowerCase()}`);

deepfence_frontend/apps/dashboard/src/features/secrets/components/landing/TopNSecretCard.tsx

@@ -213,7 +213,6 @@ const TopNCardContent = ({ type }: { type: 'host' | 'container' | 'image' }) =>
     <div className="pb-2 h-[300px] flex items-center justify-center">
       {data.length ? (
         <ReactECharts
-          theme="dark"
           option={chartOptions}
           onChartClick={({ id }: { id?: string }) => {
             if (!id) {

deepfence_frontend/apps/dashboard/src/features/secrets/components/scan-results/SecretScanResultsPieChart.tsx

@@ -119,5 +119,5 @@ export const SecretScanResultsPieChart = ({
     return null;
   }
   const options = getChartOptions({ data, theme: mode });
-  return <ReactECharts theme="dark" option={options} onChartClick={onChartClick} />;
+  return <ReactECharts option={options} onChartClick={onChartClick} />;
 };

deepfence_frontend/apps/dashboard/src/features/topology/components/scan-results/AvailabilityCharts.tsx

@@ -120,10 +120,7 @@ export const AvailabilityCharts = ({
         <div className="flex flex-col justify-center">
           <div className="h-[220px]">
             {cpuMax ? (
-              <ReactECharts
-                theme="dark"
-                option={getChartOption(mode, cpuUsage, cpuMax, 'cpu')}
-              />
+              <ReactECharts option={getChartOption(mode, cpuUsage, cpuMax, 'cpu')} />
             ) : (
               <div className="flex items-center justify-center h-full w-full gap-2">
                 <div className="h-6 w-6 shrink-0 text-text-icon">
@@ -139,7 +136,6 @@ export const AvailabilityCharts = ({
           <div className="h-[220px]">
             {memoryMax ? (
               <ReactECharts
-                theme="dark"
                 option={getChartOption(mode, memoryUsage, memoryMax, 'memory')}
               />
             ) : (

deepfence_frontend/apps/dashboard/src/features/vulnerabilities/components/ScanResults/VulnerabilityScanResultsPieChart.tsx

@@ -119,5 +119,5 @@ export const VulnerabilityScanResultsPieChart = ({
     return null;
   }
   const options = getChartOptions({ data, theme: mode });
-  return <ReactECharts theme="dark" option={options} onChartClick={onChartClick} />;
+  return <ReactECharts option={options} onChartClick={onChartClick} />;
 };

deepfence_frontend/apps/dashboard/src/features/vulnerabilities/components/landing/TopNVulnerableCard.tsx

@@ -223,7 +223,6 @@ const TopNCardContent = ({ type }: { type: 'host' | 'container' | 'image' }) =>
     <div className="px-2 h-[300px] flex items-center justify-center">
       {data.length ? (
         <ReactECharts
-          theme="dark"
           option={chartOptions}
           onChartClick={({ id }: { id?: string }) => {
             if (!id) {

deepfence_frontend/apps/dashboard/src/features/vulnerabilities/components/landing/VulnerabilitiesCountsCard.tsx

@@ -203,7 +203,6 @@ const CardContent = ({
     <div className="flex-1 flex flex-col items-center min-h-[180px] ">
       <div className="h-[180px] w-[180px]">
         <ReactECharts
-          theme={mode}
           option={chartOptions}
           onChartClick={({ name }: { name: string; value: string | number | Date }) => {
             navigate(`${to}?severity=${name.toLowerCase()}`);

deepfence_frontend/apps/dashboard/src/queries/common.ts

@@ -130,13 +130,8 @@ export const commonQueries = createQueryKeys('common', {
           throw response.error;
         }
 
-        if (response.value === null) {
-          // TODO: handle this case with 404 status maybe
-          throw new Error('Error getting host filters');
-        }
-
         return {
-          data: response.value.possible_values?.slice(0, size) || [],
+          data: response.value?.possible_values?.slice(0, size) || [],
         };
       },
     };
@@ -167,13 +162,8 @@ export const commonQueries = createQueryKeys('common', {
           throw response.error;
         }
 
-        if (response.value === null) {
-          // TODO: handle this case with 404 status maybe
-          throw new Error('Error getting completion pods info');
-        }
-
         return {
-          data: response.value.possible_values?.slice(0, size) || [],
+          data: response.value?.possible_values?.slice(0, size) || [],
         };
       },
     };
@@ -208,13 +198,8 @@ export const commonQueries = createQueryKeys('common', {
           throw response.error;
         }
 
-        if (response.value === null) {
-          // TODO: handle this case with 404 status maybe
-          throw new Error('Error getting completion containers info');
-        }
-
         return {
-          data: response.value.possible_values?.slice(0, size) || [],
+          data: response.value?.possible_values?.slice(0, size) || [],
         };
       },
     };
@@ -251,13 +236,8 @@ export const commonQueries = createQueryKeys('common', {
           throw response.error;
         }
 
-        if (response.value === null) {
-          // TODO: handle this case with 404 status maybe
-          throw new Error('Error getting test number filters');
-        }
-
         return {
-          data: response.value.possible_values?.slice(0, size) || [],
+          data: response.value?.possible_values?.slice(0, size) || [],
         };
       },
     };
@@ -294,13 +274,8 @@ export const commonQueries = createQueryKeys('common', {
           throw response.error;
         }
 
-        if (response.value === null) {
-          // TODO: handle this case with 404 status maybe
-          throw new Error('Error getting control filters');
-        }
-
         return {
-          data: response.value.possible_values?.slice(0, size) || [],
+          data: response.value?.possible_values?.slice(0, size) || [],
         };
       },
     };

deepfence_frontend/apps/dashboard/src/queries/malware.tsx

@@ -470,12 +470,8 @@ export const malwareQueries = createQueryKeys('malware', {
           throw resultMalwareScanResponse.error;
         }
 
-        if (resultMalwareScanResponse.value === null) {
-          // TODO: handle this case with 404 status maybe
-          throw new Error('Error getting scan results');
-        }
         const totalSeverity = Object.values(
-          resultMalwareScanResponse.value.severity_counts ?? {},
+          resultMalwareScanResponse.value?.severity_counts ?? {},
         ).reduce((acc, value) => {
           acc = acc + value;
           return acc;
@@ -491,14 +487,14 @@ export const malwareQueries = createQueryKeys('malware', {
             totalSeverity,
             severityCounts: {
               critical:
-                resultMalwareScanResponse.value.severity_counts?.['critical'] ?? 0,
-              high: resultMalwareScanResponse.value.severity_counts?.['high'] ?? 0,
-              medium: resultMalwareScanResponse.value.severity_counts?.['medium'] ?? 0,
-              low: resultMalwareScanResponse.value.severity_counts?.['low'] ?? 0,
-              unknown: resultMalwareScanResponse.value.severity_counts?.['unknown'] ?? 0,
+                resultMalwareScanResponse.value?.severity_counts?.['critical'] ?? 0,
+              high: resultMalwareScanResponse.value?.severity_counts?.['high'] ?? 0,
+              medium: resultMalwareScanResponse.value?.severity_counts?.['medium'] ?? 0,
+              low: resultMalwareScanResponse.value?.severity_counts?.['low'] ?? 0,
+              unknown: resultMalwareScanResponse.value?.severity_counts?.['unknown'] ?? 0,
             },
-            tableData: resultMalwareScanResponse.value.malwares ?? [],
-            dockerImageName: resultMalwareScanResponse.value.docker_image_name,
+            tableData: resultMalwareScanResponse.value?.malwares ?? [],
+            dockerImageName: resultMalwareScanResponse.value?.docker_image_name ?? '',
             pagination: {
               currentPage: page,
               totalRows: page * pageSize + resultCounts.value.count,
@@ -576,13 +572,8 @@ export const malwareQueries = createQueryKeys('malware', {
           throw resultMalwareScanResponse.error;
         }
 
-        if (resultMalwareScanResponse.value === null) {
-          // TODO: handle this case with 404 status maybe
-          throw new Error('Error getting scan results');
-        }
-
         return {
-          data: resultMalwareScanResponse.value.malwares,
+          data: resultMalwareScanResponse.value?.malwares ?? [],
         };
       },
     };
@@ -770,8 +761,7 @@ export const malwareQueries = createQueryKeys('malware', {
         });
 
         if (!uniqueMalwareCounts.ok) {
-          // TODO handle error
-          return defaultResults;
+          throw new Error('Error getting unique malware counts');
         }
 
         return {
@@ -835,8 +825,7 @@ export const malwareQueries = createQueryKeys('malware', {
           },
         });
         if (!mostExploitableMalwareCounts.ok) {
-          // TODO handle error
-          return defaultResults;
+          throw new Error('Error getting most exploitable count');
         }
 
         return {

deepfence_frontend/apps/dashboard/src/queries/secret.tsx

@@ -464,7 +464,6 @@ export const secretQueries = createQueryKeys('secret', {
         }
 
         if (resultSecretScanResponse.value === null) {
-          // TODO: handle this case with 404 status maybe
           throw new Error('Error getting scan results');
         }
         const totalSeverity = Object.values(
@@ -563,7 +562,6 @@ export const secretQueries = createQueryKeys('secret', {
         }
 
         if (resultSecretScanResponse.value === null) {
-          // TODO: handle this case with 404 status maybe
           throw new Error('Error getting scan results');
         }
 
@@ -755,8 +753,7 @@ export const secretQueries = createQueryKeys('secret', {
         });
 
         if (!uniqueSecretsCounts.ok) {
-          // TODO handle error
-          return defaultResults;
+          throw new Error('Error getting unique secret count');
         }
 
         return {
@@ -820,8 +817,7 @@ export const secretQueries = createQueryKeys('secret', {
           },
         });
         if (!mostExploitableSecretCounts.ok) {
-          // TODO handle error
-          return defaultResults;
+          throw new Error('Error getting most exploitable count');
         }
 
         return {

deepfence_frontend/apps/dashboard/src/queries/vulnerability.tsx

@@ -520,7 +520,6 @@ export const vulnerabilityQueries = createQueryKeys('vulnerability', {
         }
 
         if (resultVulnerabilityScanResponse.value === null) {
-          // TODO: handle this case with 404 status maybe
           throw new Error('Error getting scan results');
         }
         const totalSeverity = Object.values(
@@ -644,7 +643,6 @@ export const vulnerabilityQueries = createQueryKeys('vulnerability', {
         }
 
         if (resultVulnerabilityScanResponse.value === null) {
-          // TODO: handle this case with 404 status maybe
           throw new Error('Error getting scan results');
         }
 
@@ -1209,8 +1207,7 @@ export const vulnerabilityQueries = createQueryKeys('vulnerability', {
           },
         });
         if (!mostExploitableVulenrabilityCounts.ok) {
-          // TODO handle error
-          return defaultResults;
+          throw new Error('Error getting most exploitable count');
         }
 
         return {
@@ -1268,8 +1265,7 @@ export const vulnerabilityQueries = createQueryKeys('vulnerability', {
         });
 
         if (!uniqueVulenrabilityCounts.ok) {
-          // TODO handle error
-          return defaultResults;
+          throw new Error('Error getting unique vulnerability count');
         }
 
         return {
@@ -1494,7 +1490,6 @@ export const vulnerabilityQueries = createQueryKeys('vulnerability', {
         }
 
         if (response.value === null) {
-          // TODO: handle this case with 404 status maybe
           throw new Error('Error getting scan results filters');
         }