Merge pull request #13 from solid/feat/my-storages

fix: fixed baseIRI parser issue

Author: PreciousOritsedere

app/components/FileManager.tsx

@@ -216,15 +216,20 @@ export default function FileManager() {
     setShowPreviewModal(true);
   };
 
-  const storageFiles: FileItemData[] = filterProfileItems(storages).map((storage) => ({
+  console.log("storages:", storages);
+
+ 
+  // const storageFiles: FileItemData[] = filterProfileItems(storages).map((storage) => ({
+  const storageFiles: FileItemData[] = storages.map((storage) => ({
     id: storage.id,
     name: storage.name,
     type: "folder" as const,
     url: storage.url,
   }));
+  console.log("storageFiles:", storageFiles);
 
-  const filteredFiles = filterProfileItems(browsedFiles);
-  const displayFiles = selectedStorageId ? filteredFiles : storageFiles;
+  // const filteredFiles = filterProfileItems(browsedFiles);
+  const displayFiles = selectedStorageId ? browsedFiles : storageFiles;
 
   const selectedStorage = storages.find((s) => s.id === selectedStorageId);
   const breadcrumbItems = buildBreadcrumbItems(

app/components/NewFolderDialog.tsx

@@ -3,6 +3,7 @@
 import { useState, useEffect, useRef } from "react";
 import Modal from "./shared/Modal";
 import Button from "./shared/Button";
+import Input from "./shared/Input";
 import { getDefaultSession } from "@inrupt/solid-client-authn-browser";
 import { createContainerAt, getSolidDataset, UrlString } from "@inrupt/solid-client";
 import toast from "react-hot-toast";
@@ -129,14 +130,13 @@ export default function NewFolderDialog({
       }
     >
       <div className="py-2">
-        <input
+        <Input
           ref={inputRef}
           type="text"
           value={folderName}
-          onChange={(e) => setFolderName(e.target.value)}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => setFolderName(e.target.value)}
           onKeyDown={handleKeyDown}
           placeholder="Untitled folder"
-          className="w-full h-10 rounded-md border border-gray-300 bg-white px-3 text-sm text-black placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-[#7B42F6] focus:border-[#7B42F6] transition-colors disabled:bg-gray-50 disabled:text-gray-500"
           disabled={isCreating}
         />
       </div>

app/lib/helpers/index.ts

@@ -5,4 +5,5 @@ export * from "./fileFilters";
 export * from "./urlUtils";
 export * from "./breadcrumbUtils";
 export * from "./fileTypeUtils";
+export * from "./profileUtils";
 

app/lib/helpers/profileUtils.ts

@@ -0,0 +1,126 @@
+import { getDefaultSession } from "@inrupt/solid-client-authn-browser";
+import { Parser, Store, NamedNode } from "n3";
+
+// Cache for parsed profile documents
+const profileCache = new Map<string, { store: Store; baseUrl: string; mainSubject: NamedNode }>();
+
+/**
+ * Fetches and parses the WebID profile document, with caching to avoid duplicate fetches
+ * @param webId - The WebID to fetch
+ * @returns The parsed RDF store, base URL, and main subject
+ */
+export async function fetchAndParseProfile(
+  webId: string
+): Promise<{ store: Store; baseUrl: string; mainSubject: NamedNode }> {
+  // Check cache first
+  if (profileCache.has(webId)) {
+    return profileCache.get(webId)!;
+  }
+
+  const session = getDefaultSession();
+  const fetchFn = session.fetch || fetch;
+
+  // Try different Accept headers to get the profile
+  const acceptHeaders = [
+    'text/turtle, application/turtle, text/n3, application/n3',
+    'text/turtle',
+    'application/ld+json',
+  ];
+
+  let content: string | null = null;
+  let contentType: string = '';
+
+  for (const acceptHeader of acceptHeaders) {
+    try {
+      const response = await fetchFn(webId, {
+        method: 'GET',
+        headers: {
+          'Accept': acceptHeader,
+        },
+      });
+
+      if (response.ok) {
+        contentType = response.headers.get('content-type') || '';
+        content = await response.text();
+        break;
+      }
+    } catch (err) {
+      continue;
+    }
+  }
+
+  if (!content) {
+    throw new Error("Failed to fetch profile document with any Accept header");
+  }
+
+  // Parse the RDF content
+  const store = new Store();
+  const baseUrl = webId.split('#')[0];
+
+  if (contentType.includes('text/turtle') || contentType.includes('application/turtle') || 
+      contentType.includes('text/n3') || contentType.includes('application/n3')) {
+    const parser = new Parser({ baseIRI: baseUrl });
+    const quads = parser.parse(content);
+    store.addQuads(quads);
+  } else if (contentType.includes('application/ld+json')) {
+    // Try parsing as Turtle anyway (most servers return Turtle even if JSON-LD is requested)
+    try {
+      const parser = new Parser({ baseIRI: baseUrl });
+      const quads = parser.parse(content);
+      store.addQuads(quads);
+    } catch (e) {
+      // Silent error handling
+    }
+  }
+
+  // Find the main subject - try different variants
+  const FOAF_NAME = "http://xmlns.com/foaf/0.1/name";
+  const subjectVariants = [
+    new NamedNode(webId),
+    new NamedNode(baseUrl + '#me'),
+    new NamedNode('#me'),
+    new NamedNode(baseUrl + '#card'),
+  ];
+
+  let mainSubject: NamedNode | null = null;
+
+  for (const subject of subjectVariants) {
+    const nameQuads = store.getQuads(subject, new NamedNode(FOAF_NAME), null, null);
+    if (nameQuads.length > 0) {
+      mainSubject = subject;
+      break;
+    }
+  }
+
+  // If still not found, try to find Person type
+  if (!mainSubject) {
+    const personType = new NamedNode('http://xmlns.com/foaf/0.1/Person');
+    const personQuads = store.getQuads(null, new NamedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), personType, null);
+    if (personQuads.length > 0 && personQuads[0].subject.termType === 'NamedNode') {
+      mainSubject = personQuads[0].subject as NamedNode;
+    }
+  }
+
+  // Fallback to WebID itself
+  if (!mainSubject) {
+    mainSubject = new NamedNode(webId);
+  }
+
+  // Cache the result
+  const result = { store, baseUrl, mainSubject };
+  profileCache.set(webId, result);
+
+  return result;
+}
+
+/**
+ * Clears the profile cache (useful for testing or when profile might have changed)
+ */
+export function clearProfileCache(webId?: string): void {
+  if (webId) {
+    profileCache.delete(webId);
+  } else {
+    profileCache.clear();
+  }
+}
+