decodeURIComponent

Author: sinanatra

src/components/Markdown.svelte

@@ -19,10 +19,10 @@
 				return `<a class="external" target="_blank" href="${href}" title="${text}">${text}</a>`;
 			} else {
 				// let uniqueId = newUniqueId();
-				let uniqueId = href; //.split('/')[1];
-				return `<a class="node-highlite" unique-id="${uniqueId}" id="${href}"
-				data-id="${href}" title="${text}">${text}
-				<span class="symbol node" unique-id="${uniqueId}" data-id="item_${href}"
+				let uniqueId = decodeURIComponent(href); //.split('/')[1];
+				return `<a class="node-highlite" unique-id="${uniqueId}" id="${decodeURIComponent(href)}"
+				data-id="${decodeURIComponent(href)}" title="${text}">${text}
+				<span class="symbol node" unique-id="${uniqueId}" data-id="item_${decodeURIComponent(href)}"
 				data-class="${items
 					.filter((d) => d.label == text)
 					.map((d) => {

src/utils.js

@@ -11,7 +11,7 @@ export async function extractLinks(markdown, mdData) {
             continue;
         } else {
             const label = match[3];
-            const url = match[2];
+            const url = decodeURIComponent(match[2]);
             // const id = url.split("/")[1] || url.split("/")[0];
             // console.log(label, id, url)
 
@@ -27,14 +27,13 @@ export async function extractLinks(markdown, mdData) {
 
     const allUrls = links.filter(link => link.url).map(link => link.id);
 
-
     let parseItems = [
         ...getItemsFromDbById(allUrls, mdData, 'items'),
     ];
 
 
-
     for (let i = 0; i < links.length; i++) {
+
         const link = links.find(d => parseItems[i]?.["@id"].includes(d.id));
         const json = parseItems[i];
         if (link) {
@@ -49,11 +48,13 @@ export async function extractLinks(markdown, mdData) {
 function getItemsFromDbById(ids, mdData, type) {
     const baseApiUrl = config.api;
 
+
     return mdData.filter(item => {
-        const id = item["@id"];
+        const id = (item["@id"]);
         // const idWithoutBaseUrl = id?.split('/').pop();
+        return ids.find((d) => d == id)
 
-        return ids.includes(id);
+        // return ids.includes(id);
     }).map(item => {
         // only for omeka
         item["@id"] = item["@id"]?.replace(/\/items\//, '/resources/')?.replace(/\/media\//, '/resources/')?.replace(/\/item_sets\//, '/resources/');