Update frontend display

SSWConsulting · Nov 29, 2023 · cc3ee6b · cc3ee6b
1 parent eb58fb6
commit cc3ee6b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ui/src/components/linkauditorcomponents/DetailsByDest.svelte b/ui/src/components/linkauditorcomponents/DetailsByDest.svelte
@@ -25,7 +25,7 @@
     destinationsKeys = Object.keys(destinations);
 
     ignoredChecks = builds.reduce((acc, val) => {
-      acc[val.dst] = isInIgnored(val.dst, $ignoredUrls$);
+      acc[val.dst] = isInIgnored(val, $ignoredUrls$);
       return acc;
     }, {});
   }

diff --git a/ui/src/components/linkauditorcomponents/DetailsByReason.svelte b/ui/src/components/linkauditorcomponents/DetailsByReason.svelte
@@ -25,7 +25,7 @@
     reasonsKeys = Object.keys(reasons);
 
     ignoredChecks = builds.reduce((acc, val) => {
-      acc[val.dst] = isInIgnored(val.dst, $ignoredUrls$);
+      acc[val.dst] = isInIgnored(val, $ignoredUrls$);
       return acc;
     }, {});
   }

diff --git a/ui/src/components/linkauditorcomponents/DetailsBySource.svelte b/ui/src/components/linkauditorcomponents/DetailsBySource.svelte
@@ -23,7 +23,7 @@
     sources = groupBy(props(["src"]))(builds);
     sourcesKeys = Object.keys(sources);
     ignoredChecks = builds.reduce((acc, val) => {
-      acc[val.dst] = isInIgnored(val.dst, $ignoredUrls$);
+      acc[val.dst] = isInIgnored(val, $ignoredUrls$);
       return acc;
     }, {});
   }

diff --git a/ui/src/utils/utils.js b/ui/src/utils/utils.js
@@ -134,7 +134,7 @@ export const getMatchingIgnoredRules = (url, list) => {
   const date = new Date();
   return list.filter((item) => {
     const pattern = item.urlToIgnore;
-    if (globMatchUrl(pattern, url)) {
+    if (globMatchUrl(pattern, url.src) || globMatchUrl(pattern, url.dst)) {
       const effectiveFrom = new Date(item.effectiveFrom);
       const timeElapsed = (date - effectiveFrom) / 86400000;
       return (item.ignoreDuration > 0 && timeElapsed < item.ignoreDuration) || item.ignoreDuration === -1;