Merge pull request #781 from SSWConsulting:fix-compare-scan

Fixed comparing scan directing to 404 page
SSWConsulting · Nov 23, 2023 · 08aca9e · 08aca9e
2 parents 1e0f63b + e9b4c27
commit 08aca9e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ui/src/containers/ScanCompare.svelte b/ui/src/containers/ScanCompare.svelte
@@ -6,6 +6,7 @@
   import LoadingFlat from "../components/misccomponents/LoadingFlat.svelte";
   import { navigateTo } from "svelte-router-spa";
   import Breadcrumbs from "../components/misccomponents/Breadcrumbs.svelte";
+  import { revertSpecialCharUrl } from "../utils/utils";
 
   export let currentRoute;
   let allScans = [];
@@ -16,7 +17,7 @@
   onMount(async () => {
     allScans = await getAllScanSummaryFromUrl(
       currentRoute.namedParams.api,
-      currentRoute.namedParams.url
+      revertSpecialCharUrl(currentRoute.namedParams.url)
     );
 
     if (allScans.length > 0) {

diff --git a/ui/src/utils/utils.js b/ui/src/utils/utils.js
@@ -351,6 +351,15 @@ export const convertSpecialCharUrl = (url) => {
   return url.replace(/[:/]/g, m => specialChars[m]);
 };
 
+export const revertSpecialCharUrl = (url) => {
+  // Replace special characters in URL string
+  const specialChars = {
+    '%3A' : ':',
+    '%2F' : '/'
+  };
+ return url.replace(/%3A|%2F/gi, (matched) => specialChars[matched]);
+};
+
 export const RuleType = {
   Warning: "Warning",
   Error: "Error",