Merge pull request #246 from soham4abc/license-browser

fix(licenses): header fixed and limit for responses removed Reviewed-by: mishra.gaurav@siemens.com Tested-by: shaheem.azmal@siemens.com
fossology · Aug 26, 2022 · 73076d3 · 73076d3
2 parents b3f22a0 + e6dba87
commit 73076d3
Showing 1 changed file with 34 additions and 11 deletions.
diff --git a/src/pages/BrowseUploads/LicenseBrowser/index.jsx b/src/pages/BrowseUploads/LicenseBrowser/index.jsx
@@ -69,7 +69,7 @@ const LicenseBrowser = () => {
           handleError(error, setMessage);
           setShowMessage(true);
         });
-      getUploadLicense(uploadId, ["ojo", "nomos", "monk"])
+      getUploadLicense(uploadId, ["ojo,nomos,monk"])
         .then((res) => {
           setFilesData(res);
           setShowMessage(false);
@@ -117,22 +117,45 @@ const LicenseBrowser = () => {
               <tbody>
                 {filesData &&
                   filesData.length > 0 &&
-                  filesData.map((data, index) => (
-                    <>
-                      {index < 10 ? (
+                  filesData.map((data) => {
+                    const filteredScanner = [...new Set(data.findings.scanner)];
+                    const filteredConclusion = [
+                      ...new Set(data.findings.conclusion),
+                    ];
+
+                    return (
+                      <>
                         <tr key={data.id}>
                           <td>{data.filePath}</td>
-                          <td>{data.findings.scanner}</td>
-                          <td>-</td>
+                          <td>
+                            {filteredScanner !== null
+                              ? filteredScanner.map((dataScanner, index) => {
+                                  return `${dataScanner}${
+                                    index + 1 === filteredScanner.length
+                                      ? ""
+                                      : ", "
+                                  }`;
+                                })
+                              : null}
+                          </td>
+                          <td>
+                            {filteredConclusion !== null
+                              ? filteredConclusion.map((dataScanner, index) => {
+                                  return `${dataScanner}${
+                                    index + 1 === filteredConclusion.length
+                                      ? ""
+                                      : ", "
+                                  }`;
+                                })
+                              : null}
+                          </td>
                           <td>-</td>
                           <td>-</td>
                           <td>-</td>
                         </tr>
-                      ) : (
-                        ""
-                      )}
-                    </>
-                  ))}
+                      </>
+                    );
+                  })}
               </tbody>
             </table>
           </div>