Merge pull request #36 from amagovpt/fix-api-endpoint

Fix url in form
amagovpt · Sep 3, 2024 · 43dcb86 · 43dcb86
2 parents 105d25a + 5fbe11c
commit 43dcb86
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/src/pages/Details/index.js b/src/pages/Details/index.js
@@ -56,10 +56,6 @@ export default function Details({ allData, setAllData }) {
     },
   ];
 
-  const removeProtocol = (url) => {
-    return url.replace(/^(https?:\/\/)?(www\.)?/, "");
-  };
-
   function getDetailsData(data, tt) {
     const response = getTestResults(details, data, tt);
     setDataTable(response);
@@ -79,7 +75,8 @@ export default function Details({ allData, setAllData }) {
         const storedUrl = localStorage.getItem("evaluationUrl");
         const test = location.pathname.split("/")
         let url = test[test.length-2]
-        const currentUrl = removeProtocol(url.split("%2F")[2]) +"/"
+
+        const currentUrl = decodeURIComponent(url)
 
         if (storedData && storedUrl === currentUrl) {
           const parsedStoredData = JSON.parse(storedData);

diff --git a/src/pages/PageCode/index.js b/src/pages/PageCode/index.js
@@ -38,10 +38,6 @@ export default function Resume() {
     navigate(`${pathURL}results/${test[test.length-2]}`);
   };
 
-  const removeProtocol = (url) => {
-    return url.replace(/^(https?:\/\/)?(www\.)?/, "");
-  };
-
   useEffect(() => {
     const fetchData = async () => {
       setLoadingProgress(true);
@@ -58,7 +54,7 @@ export default function Resume() {
         const storedUrl = localStorage.getItem("evaluationUrl");
         const test = location.pathname.split("/")
         let url = test[test.length-2]
-        const currentUrl = removeProtocol(url.split("%2F")[2]) +"/"
+        const currentUrl = decodeURIComponent(url)
         if (storedData && storedUrl === currentUrl) {
           const parsedStoredData = JSON.parse(storedData);
           setOriginalData(parsedStoredData);

diff --git a/src/pages/Resume/index.js b/src/pages/Resume/index.js
@@ -33,12 +33,6 @@ export default function Resume({ setAllData, setEle }) {
   const { theme } = useContext(ThemeContext);
   const themeClass = theme === "light" ? "" : "dark_mode-resume";
 
-  const removeProtocol = (url) => {
-    return url.replace(/^(https?:\/\/)?(www\.)?/, "");
-  };
-
-  const decodedUrl = removeProtocol(content);
-
   useEffect(() => {
     const fetchData = async () => {
       setLoadingProgress(true);
@@ -47,7 +41,7 @@ export default function Resume({ setAllData, setEle }) {
         const storedData = localStorage.getItem("evaluation");
         const storedUrl = localStorage.getItem("evaluationUrl");
 
-        const currentUrl = content === "html" ? contentHtml : decodedUrl;
+        const currentUrl = content === "html" ? contentHtml : content;
 
         if (storedData && storedUrl === currentUrl) {
           const parsedStoredData = JSON.parse(storedData);
@@ -60,7 +54,7 @@ export default function Resume({ setAllData, setEle }) {
 
           return;
         }
-
+        
         const response = await getEvalData(content, currentUrl);
 
 
@@ -83,7 +77,7 @@ export default function Resume({ setAllData, setEle }) {
     };
 
     fetchData();
-  }, [content, contentHtml, decodedUrl]);
+  }, [content, contentHtml]);
 
   const reRequest = () => {
     if (content === "html") {