UI: add an option to download zipped reports

deepfence · Nov 7, 2024 · 624dbc6 · 624dbc6
1 parent e3c3972
commit 624dbc6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/deepfence_frontend/apps/dashboard/api-spec.json b/deepfence_frontend/apps/dashboard/api-spec.json
@@ -14650,7 +14650,8 @@
           "from_timestamp": { "type": "integer" },
           "options": { "$ref": "#/components/schemas/UtilsReportOptions" },
           "report_type": { "enum": ["pdf", "xlsx", "sbom"], "type": "string" },
-          "to_timestamp": { "type": "integer" }
+          "to_timestamp": { "type": "integer" },
+          "zipped_report": { "type": "boolean" }
         }
       },
       "ModelGenerateReportResp": {

diff --git a/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelGenerateReportReq.ts b/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelGenerateReportReq.ts
@@ -62,6 +62,12 @@ export interface ModelGenerateReportReq {
      * @memberof ModelGenerateReportReq
      */
     to_timestamp?: number;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ModelGenerateReportReq
+     */
+    zipped_report?: boolean;
 }
 
 
@@ -101,6 +107,7 @@ export function ModelGenerateReportReqFromJSONTyped(json: any, ignoreDiscriminat
         'options': !exists(json, 'options') ? undefined : UtilsReportOptionsFromJSON(json['options']),
         'report_type': json['report_type'],
         'to_timestamp': !exists(json, 'to_timestamp') ? undefined : json['to_timestamp'],
+        'zipped_report': !exists(json, 'zipped_report') ? undefined : json['zipped_report'],
     };
 }
 
@@ -118,6 +125,7 @@ export function ModelGenerateReportReqToJSON(value?: ModelGenerateReportReq | nu
         'options': UtilsReportOptionsToJSON(value.options),
         'report_type': value.report_type,
         'to_timestamp': value.to_timestamp,
+        'zipped_report': value.zipped_report,
     };
 }
 
diff --git a/deepfence_frontend/apps/dashboard/src/features/integrations/pages/CreateReport.tsx b/deepfence_frontend/apps/dashboard/src/features/integrations/pages/CreateReport.tsx
@@ -152,7 +152,7 @@ const action = async ({ request }: ActionFunctionArgs): Promise<ActionData> => {
         severity_or_check_type:
           severitiesOrCheckTypes as UtilsReportFiltersSeverityOrCheckTypeEnum,
       },
-
+      zipped_report: body.downloadZip === 'on',
       report_type: _reportType,
     },
   });
@@ -191,6 +191,7 @@ const ReportForm = () => {
   const [provider, setProvider] = useState('');
   const [downloadType, setDownloadType] = useState('');
   const [deadNodes, setIncludeDeadNodes] = useState(false);
+  const [downloadZip, setDownloadZip] = useState(false);
 
   const { navigate } = usePageNavigation();
 
@@ -308,7 +309,7 @@ const ReportForm = () => {
               })}
             </Listbox>
 
-            <div className="col-span-2 my-5">
+            <div className="col-span-2">
               <Checkbox
                 label="Include Dead Nodes"
                 key="deadNodes"
@@ -319,6 +320,17 @@ const ReportForm = () => {
                 }}
               />
             </div>
+
+            <div className="col-span-2">
+              <Checkbox
+                label="Download a zipped archive of reports with a separate file per node/account?"
+                name="downloadZip"
+                checked={downloadZip}
+                onCheckedChange={(checked: boolean) => {
+                  setDownloadZip(checked);
+                }}
+              />
+            </div>
           </div>
 
           <AdvancedFilter