Merge pull request #265 from krishna9304/ui/reportImport

feat(ui): Added logical components to the report import page and Integrated the API

Reviewed-by: [email protected]
Tested-by: [email protected]

src/Routes.jsx

@@ -188,7 +188,7 @@ const Routes = () => {
           />
           <PrivateLayout
             exact
-            path={routes.upload.report}
+            path={routes.upload.importReport}
             component={ImportReport}
           />
           <PublicLayout

src/api/jobs.js

@@ -137,4 +137,17 @@ export const downloadReportApi = (reportId) => {
   });
 };
 
+export const importReportApi = (uploadId, reqBody) => {
+  const url = endpoints.jobs.importReport(uploadId);
+  return sendRequest({
+    url,
+    method: "POST",
+    headers: {
+      Authorization: getToken(),
+    },
+    isMultipart: true,
+    body: reqBody,
+  });
+};
+
 export default getJobApi;

src/components/Header/index.jsx

@@ -129,7 +129,7 @@ const Header = () => {
                   <NavDropdown.Item as={Link} to={routes.upload.vcs}>
                     From VCS
                   </NavDropdown.Item>
-                  <NavDropdown.Item as={Link} to={routes.upload.report}>
+                  <NavDropdown.Item as={Link} to={routes.upload.importReport}>
                     Import Report
                   </NavDropdown.Item>
                   <NavDropdown.Item as={Link} to={routes.upload.instructions}>

src/constants/constants.js

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2022 Soham Banerjee([email protected])
+ Copyright (C) 2022 Soham Banerjee([email protected]), Krishna Mahato ([email protected])
 
  SPDX-License-Identifier: GPL-2.0
 
@@ -80,6 +80,11 @@ export const actionsOptions = [
     name: "Export Unified Report",
     reportFormat: "unifiedreport",
   },
+  {
+    id: 6,
+    name: "Import Report",
+    reportFormat: "importReport",
+  },
 ];
 export const initialMessage = {
   type: "success",
@@ -139,16 +144,16 @@ export const initialFolderListFile = [
 ];
 // constants for upload/ImportReport
 export const initialStateImportReport = {
-  folder: "",
-  editUpload: "",
-  reportUpload: "",
-  newLicense: "licenseCanditate",
-  licenseInfoInFile: true,
-  licenseConcluded: false,
-  licenseDecision: true,
-  existingDecisions: true,
-  importDiscussed: true,
-  copyright: false,
+  folder: 1,
+  upload: "",
+  report: null,
+  addNewLicensesAs: "candidate",
+  addConcludedAsDecisions: true,
+  addLicenseInfoFromInfoInFile: true,
+  addLicenseInfoFromConcluded: false,
+  addConcludedAsDecisionsOverwrite: true,
+  addConcludedAsDecisionsTBD: true,
+  addCopyrights: false,
 };
 
 // constants for upload/UploadFromServer

src/constants/endpoints.js

@@ -29,6 +29,7 @@ const endpoints = {
     allJobs: () => `${apiUrl}/jobs/all`,
     scheduleReport: () => `${apiUrl}/report`,
     downloadReport: (reportId) => `${apiUrl}/report/${reportId}`,
+    importReport: (uploadId) => `${apiUrl}/report/import?upload=${uploadId}`,
   },
   auth: {
     tokens: () => `${apiUrl}/tokens`,

src/constants/routes.js

@@ -1,5 +1,6 @@
 /*
  Copyright (C) 2021 Aman Dwivedi ([email protected]), Shruti Agarwal ([email protected])
+ Copyright (C) 2022 Krishna Mahato <[email protected]>
 
  SPDX-License-Identifier: GPL-2.0
 
@@ -27,7 +28,7 @@ const routes = {
     server: "/upload/server",
     url: "/upload/url",
     vcs: "/upload/vcs",
-    report: "/upload/report",
+    importReport: "/upload/reportImport",
     instructions: "/upload/instructions",
     oneShotAnalysis: "/upload/oneShotAnalysis",
     oneShotCopyright: "/upload/oneShotCopyright",

src/pages/Browse/index.jsx

@@ -1,6 +1,6 @@
 /*
  Copyright (C) 2021 Shruti Agarwal ([email protected]), Aman Dwivedi ([email protected]),
- Copyright (C) 2022 Soham Banerjee ([email protected])
+ Copyright (C) 2022 Soham Banerjee ([email protected]), Krishna Mahato ([email protected])
 
  SPDX-License-Identifier: GPL-2.0
 
@@ -19,7 +19,7 @@
 
 import React, { useState, useEffect } from "react";
 import routes from "constants/routes";
-import { Link } from "react-router-dom";
+import { Link, useHistory } from "react-router-dom";
 import arrayToTree from "array-to-tree";
 import messages from "constants/messages";
 
@@ -79,6 +79,8 @@ const Browse = () => {
   const [query, setQuery] = useState("");
   const [pages, setPages] = useState();
 
+  const history = useHistory();
+
   useEffect(() => {
     setMessage({
       type: "success",
@@ -146,6 +148,12 @@ const Browse = () => {
   };
 
   const handleActionChange = (e, uploadId) => {
+    if (e.target.value === "importReport") {
+      history.push(
+        `/upload/reportImport?folder=${browseData.folderId}&upload=${uploadId}`
+      );
+      return;
+    }
     scheduleReport(uploadId, e.target.value)
       .then((res) => {
         return res?.message;