fix url matching

tijlleenders · Oct 16, 2023 · 159ab7b · 159ab7b
1 parent 868cd7e
commit 159ab7b
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/src/components/GoalsComponents/MyGoal.tsx b/src/components/GoalsComponents/MyGoal.tsx
@@ -207,22 +207,27 @@ const MyGoal: React.FC<MyGoalProps> = ({ goal, showActions, setShowActions }) =>
         <div aria-hidden className="goal-tile" onClick={handleGoalClick}>
           <div className="goal-title">
             {replacedString.split(" ").map((ele, index) => {
-              if (ele.includes("zURL-")) {
-                const urlIndex = Number(ele.split("-")[1]);
-                const originalUrl = urlsWithIndexes[urlIndex];
-                const summarizedUrl = summarizeUrl(originalUrl);
-                console.log(originalUrl);
-
+              const replacedUrls = Array.from(ele.matchAll(/zURL-(\d+)/g));
+              if (replacedUrls.length) {
                 return (
-                  <span
-                    key={`${goal.id}-${ele}`}
-                    style={{ cursor: "pointer", textDecoration: "underline" }}
-                    onClickCapture={() => {
-                      window.open(originalUrl, "_blank");
-                    }}
-                  >
-                    {index === 0 ? summarizedUrl : ` ${summarizedUrl}`}
-                  </span>
+                  <React.Fragment key={`${goal.id}-${ele}-replacedUrlsFragment`}>
+                    {replacedUrls.map(([url, digitStr]) => {
+                      const urlIndex = Number.parseInt(digitStr, 10);
+                      const originalUrl = urlsWithIndexes[urlIndex];
+                      const summarizedUrl = summarizeUrl(originalUrl);
+                      return (
+                        <span
+                          key={`${goal.id}-${ele}-${url}`}
+                          style={{ cursor: "pointer", textDecoration: "underline" }}
+                          onClickCapture={() => {
+                            window.open(originalUrl, "_blank");
+                          }}
+                        >
+                          {index === 0 ? summarizedUrl : ` ${summarizedUrl}`}
+                        </span>
+                      );
+                    })}
+                  </React.Fragment>
                 );
               }
               return <span key={`${goal.id}-${ele}`}>{index === 0 ? ele : ` ${ele}`}</span>;