use TypeIndexHelper

solid-contrib · Nov 27, 2023 · 70b5b84 · 70b5b84
1 parent 715b39e
commit 70b5b84
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/bookmarks/vanilla/src/modules/Bookmark.ts b/bookmarks/vanilla/src/modules/Bookmark.ts
@@ -26,6 +26,7 @@ import {
     RDFS
 } from "@inrupt/vocab-common-rdf";
 import { namedNode } from '@rdfjs/data-model';
+import { TypeIndexHelper } from "../utils/TypeIndexHelper";
 
 
 export type ICreateBookmark = {
@@ -56,11 +57,24 @@ export class Bookmark {
      * @returns string
      */
     public static async getIndexUrl(session: Session) {
+        const bookmarkRegisteries = await TypeIndexHelper.getFromTypeIndex(session)
+        if (bookmarkRegisteries) {
+            // inrupt getSolidDataset takes a full url to turtle file like https://example.com/bookmarks/index.ttl
+            const { instanceContainers, instances } = bookmarkRegisteries
+
+            if (!!instances) {
+                return instances[0]
+            }
+
+            // TODO: return all instances
+        } else {
+            // TODO: create registeries
+        }
         const pods = await getPodUrlAll(session.info.webId!, {
             fetch: session.fetch,
         });
         const bookmarksContainerUri = `${pods[0]}bookmarks/`;
-        return `${bookmarksContainerUri}index.ttl`;
+        return `${bookmarksContainerUri}index.ttl`; // defaultIndexUrl
     }
 
     /**
@@ -132,6 +146,7 @@ export class Bookmark {
      * @returns IBookmark
      */
     public static async create(payload: ICreateBookmark, session: Session) {
+        // TODO: check typeIndex
 
         const { title, link, creator, topic } = payload
 
@@ -166,6 +181,8 @@ export class Bookmark {
      * @returns IBookmark
      */
     public static async update(url: string, payload: IUpdateBookmark, session: Session) {
+        // TODO: check typeIndex
+
         const indexUrl = await this.getIndexUrl(session);
         const ds = await getSolidDataset(indexUrl, { fetch: session.fetch });
         let thing = getThing(ds, url)

diff --git a/bookmarks/vanilla/src/utils/TypeIndexHelper.ts b/bookmarks/vanilla/src/utils/TypeIndexHelper.ts
@@ -9,7 +9,6 @@ import {
     BOOKMARK
 } from "@inrupt/vocab-common-rdf";
 import { __FOR_CLASS, __PRIVATE_TYPEINDEX, __PUBLIC_TYPEINDEX, __SOLID_INSTANCE, __SOLID_INSTANCE_CONTAINER } from "../constants";
-// import { FOR_CLASS, SOLID } from "../constants";
 
 export class TypeIndexHelper {
     constructor() { }
@@ -43,6 +42,7 @@ export class TypeIndexHelper {
 
     public static async getFromTypeIndex(session: Session) {
         const typeIndex = await this.getTypeIndex({ session, isPrivate: true })
+
         if (!typeIndex) return // TODO validate
 
         const ds = await getSolidDataset(typeIndex?.value, { fetch: session.fetch })
@@ -69,7 +69,7 @@ export class TypeIndexHelper {
             instances,
             instanceContainers
         }
-        console.log("🚀 ~ file: TypeIndexHelper.ts:75 ~ TypeIndexHelper ~ getFromTypeIndex ~ bookmarkRegisteries:", bookmarkRegisteries)
+
         return bookmarkRegisteries
     }
 }