update reporting spec

deepfence · Nov 11, 2024 · 16efd86 · 16efd86
1 parent 157c1cf
commit 16efd86
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/deepfence_frontend/apps/dashboard/api-spec.json b/deepfence_frontend/apps/dashboard/api-spec.json
@@ -16663,17 +16663,20 @@
           "include_dead_nodes": { "type": "boolean" },
           "most_exploitable_report": { "type": "boolean" },
           "node_type": {
-            "enum": [
-              "host",
-              "container",
-              "container_image",
-              "linux",
-              "cluster",
-              "aws",
-              "gcp",
-              "azure"
-            ],
-            "type": "string"
+            "type": "array",
+            "items": {
+              "enum": [
+                "host",
+                "container",
+                "container_image",
+                "linux",
+                "cluster",
+                "aws",
+                "gcp",
+                "azure"
+              ]
+            },
+            "nullable": true
           },
           "scan_id": { "type": "string" },
           "scan_type": {

diff --git a/deepfence_frontend/apps/dashboard/src/api/generated/models/UtilsReportFilters.ts b/deepfence_frontend/apps/dashboard/src/api/generated/models/UtilsReportFilters.ts
@@ -46,10 +46,10 @@ export interface UtilsReportFilters {
     most_exploitable_report?: boolean;
     /**
      * 
-     * @type {string}
+     * @type {Array<string>}
      * @memberof UtilsReportFilters
      */
-    node_type: UtilsReportFiltersNodeTypeEnum;
+    node_type: Array<UtilsReportFiltersNodeTypeEnum>;
     /**
      * 
      * @type {string}

diff --git a/deepfence_frontend/apps/dashboard/src/features/common/data-component/downloadSBOMAction.tsx b/deepfence_frontend/apps/dashboard/src/features/common/data-component/downloadSBOMAction.tsx
@@ -35,7 +35,7 @@ export const action = async ({ request }: ActionFunctionArgs): Promise<null> =>
   const getReportIdApiResponse = await getReportIdApi({
     modelGenerateReportReq: {
       filters: {
-        node_type: nodeType,
+        node_type: [nodeType],
         scan_type: scanType,
         scan_id: scanId,
       },

diff --git a/deepfence_frontend/apps/dashboard/src/features/common/data-component/downloadScanAction.tsx b/deepfence_frontend/apps/dashboard/src/features/common/data-component/downloadScanAction.tsx
@@ -34,7 +34,7 @@ export const action = async ({ request }: ActionFunctionArgs): Promise<null> =>
   const getReportIdApiResponse = await getReportIdApi({
     modelGenerateReportReq: {
       filters: {
-        node_type: nodeType,
+        node_type: [nodeType],
         scan_type: scanType,
         scan_id: scanId,
       },

diff --git a/deepfence_frontend/apps/dashboard/src/features/integrations/components/ReportsTable.tsx b/deepfence_frontend/apps/dashboard/src/features/integrations/components/ReportsTable.tsx
@@ -154,7 +154,10 @@ export const ReportTable = ({
       }
       if (
         nodeTypeFilter?.length &&
-        (!nodeTypeFilter.includes(filters?.node_type) || isNil(filters?.node_type))
+        (!nodeTypeFilter.some((filter) =>
+          filters?.node_type?.includes(filter as UtilsReportFiltersNodeTypeEnum),
+        ) ||
+          isNil(filters?.node_type))
       ) {
         return false;
       }

diff --git a/deepfence_frontend/apps/dashboard/src/features/integrations/pages/CreateReport.tsx b/deepfence_frontend/apps/dashboard/src/features/integrations/pages/CreateReport.tsx
@@ -147,7 +147,7 @@ const action = async ({ request }: ActionFunctionArgs): Promise<ActionData> => {
       filters: {
         advanced_report_filters: advanced_report_filters,
         include_dead_nodes: body.deadNodes === 'on',
-        node_type: _nodeType,
+        node_type: [_nodeType],
         scan_type: _resource,
         severity_or_check_type:
           severitiesOrCheckTypes as UtilsReportFiltersSeverityOrCheckTypeEnum,