contacts-pane 2.6.5 → 2.6.6

package/__tests__/unit/data-reformat-test.js

@@ -0,0 +1,166 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { getDataModelIssues } from '../../contactLogic';
+import fetchMock from "jest-fetch-mock";
+import pane from "../../contactsPane";
+import { parse } from "rdflib";
+import { context, doc, mockFetchFunction, mockUpdate, ns, store, prefixes, web } from "./setup";
+// This was at testingsolidos.solidcommunity.net
+const base = doc.dir().uri;
+const webid1 = store.sym(base + 'People/localPerson/index.ttl#this');
+const exampleData = prefixes + `
+
+:homeGroup1 a vcard:Group;
+    vcard:fn "Happy Home";
+    vcard:hasMember ${webid1} .
+
+:homeGroup2 a vcard:Group;
+    vcard:fn "Home";
+    vcard:hasMember :localPerson.
+
+:homeGroup3 a vcard:Group;
+    vcard:fn "Home";
+    vcard:hasMember :localPerson.
+
+`;
+const book = store.sym(base + 'book.ttl#this');
+const aliceLocal = store.sym(base + 'People/aaaaaaaaaa/index.ttl#this');
+const aliceWebId = store.sym('https://alice.example/card#me');
+web[aliceLocal.doc().uri] = `<#this> a vcard:Individual, schema:Person; vcard:fn "Alice".`;
+const bobLocal = store.sym(base + 'People/bbbbbbbbbb/index.ttl#this');
+const bobWebId = store.sym('https://bob.example.net/#me');
+web[bobLocal.doc().uri] = `<#this> a vcard:Individual, schema:Person;
+   vcard:hasURL [ vcard:type vcard:WebId; vcard:value ${bobWebId} ];
+   vcard:fn "Bob".`;
+web[base + 'book.ttl'] = `
+<#this> a vcard:AddressBook;
+    vcard:fn """Contacts: Test address book""";
+    vcard:nameEmailIndex <people.ttl>;
+    vcard:groupIndex <groups.ttl>.
+`;
+web[base + 'groups.ttl'] = `
+<Group/Test.ttl#this> a vcard:Group ;
+    vcard:fn "Test group".
+<Group/Home.ttl#this> a vcard:Group ;
+    vcard:fn "Home group".
+<Group/Work.ttl#this> a vcard:Group ;
+    vcard:fn "Work group".
+`;
+const testGroup = store.sym(base + 'Group/Test.ttl#this');
+web[testGroup.doc().uri] = `
+<#this> a vcard:Group;
+    vcard:fn "Test Group";
+    vcard:hasMember ${aliceLocal} .
+#                    <https://alice.example/card#me>,
+#                    <../People/aaaaaaaaaa/index.ttl#this>,
+#                    <../People/bbbbbbbbbbb/index.ttl#this> .
+
+    ${aliceLocal} = ${aliceWebId} .
+`;
+const homeGroup = store.sym(base + 'Group/Home.ttl#this');
+web[homeGroup.doc().uri] = `
+<#this> a vcard:Group;
+    vcard:fn "Home Group";
+    vcard:hasMember
+                    <../People/aaaaaaaaaa/index.ttl#this>,
+                    <../People/bbbbbbbbbb/index.ttl#this> .
+`;
+const workGroup = store.sym(base + 'Group/Work.ttl#this');
+web[workGroup.doc().uri] = `
+<#this> a vcard:Group;
+    vcard:fn "Work Group";
+    vcard:hasMember
+        <https://alice.example/card#me>,
+        <https://bob.example/card#me>,
+        <https://charlie.example/card#me> .`;
+web[base + 'People/aaaaaaaaaa/index.ttl'] = `
+    <#this> vcard:fn "Alice" .
+`;
+const groups = [testGroup, homeGroup, workGroup];
+for (const uri in web) {
+    console.log(`  parsing "${uri}"  (${web[uri].length})`);
+    parse(prefixes + web[uri], store, uri);
+}
+describe("contacts-pane", () => {
+    describe("returns right label", () => {
+        beforeAll(() => __awaiter(void 0, void 0, void 0, function* () {
+            store.removeDocument(doc);
+            // parse(exampleData, store, doc.uri);
+            // const label = pane.label(subject, context);
+        }));
+        /*
+        if (t[ns.vcard('Individual').uri]) return 'Contact'
+        if (t[ns.vcard('Organization').uri]) return 'contact'
+        if (t[ns.foaf('Person').uri]) return 'Person'
+        if (t[ns.schema('Person').uri]) return 'Person'
+        if (t[ns.vcard('Group').uri]) return 'Group'
+        if (t[ns.vcard('AddressBook').uri]) return 'Address book'
+        */
+        it("returns a good label contact if Organization", () => {
+            let thing = store.sym(base + 'thing1');
+            store.add(thing, ns.rdf('type'), ns.vcard('Organization'), doc);
+            expect(pane.label(thing, context)).toEqual('contact');
+        });
+        it("returns a good label Contact for Individual", () => {
+            let thing = store.sym(base + 'thing2');
+            store.add(thing, ns.rdf('type'), ns.vcard('Individual'), doc);
+            expect(pane.label(thing, context)).toEqual('Contact');
+        });
+        it("returns a good label Person if Person", () => {
+            let thing = store.sym(base + 'thing3');
+            store.add(thing, ns.rdf('type'), ns.schema('Person'), doc);
+            expect(pane.label(thing, context)).toEqual('Person');
+        });
+        it("returns a good label Person if foaf:Person", () => {
+            let thing = store.sym(base + 'thing4');
+            store.add(thing, ns.rdf('type'), ns.foaf('Person'), doc);
+            expect(pane.label(thing, context)).toEqual('Person');
+        });
+        it("returns a good label Group if Group", () => {
+            let thing = store.sym(base + 'thing5');
+            store.add(thing, ns.rdf('type'), ns.vcard('Group'), doc);
+            expect(pane.label(thing, context)).toEqual('Group');
+        });
+        it("returns a good label AddressBook if AddressBook", () => {
+            let thing = store.sym(base + 'thing6');
+            store.add(thing, ns.rdf('type'), ns.vcard('AddressBook'), doc);
+            expect(pane.label(thing, context)).toEqual('Address book');
+        });
+        it("returns a null label if not a person", () => {
+            let thing = store.sym(base + 'thing7');
+            expect(pane.label(store.sym('https://random.example.com/'), context)).toEqual(null);
+            // done()
+        });
+    }); // label tests
+    describe("render tests", () => {
+        it("renders an empty UI of an address book", () => {
+            const div = pane.render(book, context);
+            expect(div.outerHTML).toMatch("<div class=\"contactPane\"></div>");
+            expect(div.innerHTML).toMatch("");
+        });
+    }); // render tests
+    describe("data format tests", () => {
+        beforeAll(() => __awaiter(void 0, void 0, void 0, function* () {
+            store.removeDocument(doc);
+            parse(exampleData, store, doc.uri);
+            fetchMock.mockIf(/^https?.*$/, mockFetchFunction);
+        }));
+        it("converts a bad format into a good one", () => __awaiter(void 0, void 0, void 0, function* () {
+            expect(store.the(testGroup, ns.vcard('hasMember'), null, testGroup.doc())).toEqual(aliceLocal);
+            const { del, ins } = yield getDataModelIssues(groups);
+            expect(del.length).toEqual(1);
+            expect(ins.length).toEqual(1);
+            expect(del.toString()).toEqual('<https://janedoe.example/profile/Group/Test.ttl#this> <http://www.w3.org/2006/vcard/ns#hasMember> <https://janedoe.example/profile/People/aaaaaaaaaa/index.ttl#this> .');
+            expect(ins.toString()).toEqual('<https://janedoe.example/profile/Group/Test.ttl#this> <http://www.w3.org/2006/vcard/ns#hasMember> <https://alice.example/card#me> .');
+            mockUpdate(store, del, ins);
+            expect(store.the(testGroup, ns.vcard('hasMember'), null, testGroup.doc())).toEqual(aliceWebId);
+        }));
+    }); // data format tests
+}); // all tests

package/__tests__/unit/data-reformat-test.ts

@@ -0,0 +1,185 @@
+import { getDataModelIssues } from '../../contactLogic'
+import fetchMock from "jest-fetch-mock";
+
+import pane from "../../contactsPane";
+import { parse, NamedNode } from "rdflib";
+import { context, doc, subject, mockFetchFunction, mockUpdate, ns, store, prefixes, web } from "./setup";
+
+// This was at testingsolidos.solidcommunity.net
+
+const base = doc.dir().uri
+const webid1 = store.sym(base + 'People/localPerson/index.ttl#this')
+
+const exampleData = prefixes + `
+
+:homeGroup1 a vcard:Group;
+    vcard:fn "Happy Home";
+    vcard:hasMember ${webid1} .
+
+:homeGroup2 a vcard:Group;
+    vcard:fn "Home";
+    vcard:hasMember :localPerson.
+
+:homeGroup3 a vcard:Group;
+    vcard:fn "Home";
+    vcard:hasMember :localPerson.
+
+`
+
+const book = store.sym(base + 'book.ttl#this')
+
+const aliceLocal = store.sym(base + 'People/aaaaaaaaaa/index.ttl#this');
+const aliceWebId = store.sym('https://alice.example/card#me')
+
+web[aliceLocal.doc().uri] = `<#this> a vcard:Individual, schema:Person; vcard:fn "Alice".`;
+
+const bobLocal = store.sym(base + 'People/bbbbbbbbbb/index.ttl#this')
+const bobWebId = store.sym('https://bob.example.net/#me')
+web[bobLocal.doc().uri] = `<#this> a vcard:Individual, schema:Person;
+   vcard:hasURL [ vcard:type vcard:WebId; vcard:value ${bobWebId} ];
+   vcard:fn "Bob".`;
+
+
+
+web[base + 'book.ttl'] =  `
+<#this> a vcard:AddressBook;
+    vcard:fn """Contacts: Test address book""";
+    vcard:nameEmailIndex <people.ttl>;
+    vcard:groupIndex <groups.ttl>.
+`;
+
+web[base + 'groups.ttl'] = `
+<Group/Test.ttl#this> a vcard:Group ;
+    vcard:fn "Test group".
+<Group/Home.ttl#this> a vcard:Group ;
+    vcard:fn "Home group".
+<Group/Work.ttl#this> a vcard:Group ;
+    vcard:fn "Work group".
+`;
+
+const testGroup = store.sym(base + 'Group/Test.ttl#this')
+web[testGroup.doc().uri] = `
+<#this> a vcard:Group;
+    vcard:fn "Test Group";
+    vcard:hasMember ${aliceLocal} .
+#                    <https://alice.example/card#me>,
+#                    <../People/aaaaaaaaaa/index.ttl#this>,
+#                    <../People/bbbbbbbbbbb/index.ttl#this> .
+
+    ${aliceLocal} = ${aliceWebId} .
+`;
+const homeGroup = store.sym(base + 'Group/Home.ttl#this')
+web[homeGroup.doc().uri] = `
+<#this> a vcard:Group;
+    vcard:fn "Home Group";
+    vcard:hasMember
+                    <../People/aaaaaaaaaa/index.ttl#this>,
+                    <../People/bbbbbbbbbb/index.ttl#this> .
+`;
+
+const workGroup = store.sym(base + 'Group/Work.ttl#this')
+web[workGroup.doc().uri] = `
+<#this> a vcard:Group;
+    vcard:fn "Work Group";
+    vcard:hasMember
+        <https://alice.example/card#me>,
+        <https://bob.example/card#me>,
+        <https://charlie.example/card#me> .`;
+
+web[base + 'People/aaaaaaaaaa/index.ttl'] = `
+    <#this> vcard:fn "Alice" .
+`;
+
+const groups = [ testGroup, homeGroup, workGroup ];
+
+for (const uri in web) {
+  console.log(`  parsing "${uri}"  (${web[uri].length})`)
+  parse(prefixes + web[uri], store, uri);
+}
+
+describe("contacts-pane", () => {
+
+  describe("returns right label", () => {
+    beforeAll(async () => {
+      store.removeDocument(doc);
+      // parse(exampleData, store, doc.uri);
+      // const label = pane.label(subject, context);
+    });
+/*
+if (t[ns.vcard('Individual').uri]) return 'Contact'
+if (t[ns.vcard('Organization').uri]) return 'contact'
+if (t[ns.foaf('Person').uri]) return 'Person'
+if (t[ns.schema('Person').uri]) return 'Person'
+if (t[ns.vcard('Group').uri]) return 'Group'
+if (t[ns.vcard('AddressBook').uri]) return 'Address book'
+*/
+  it("returns a good label contact if Organization", () => {
+    let thing = store.sym(base + 'thing1')
+    store.add(thing, ns.rdf('type'),  ns.vcard('Organization'), doc)
+    expect(pane.label(thing, context)).toEqual('contact');
+  });
+
+  it("returns a good label Contact for Individual", () => {
+    let thing = store.sym(base + 'thing2')
+    store.add(thing, ns.rdf('type'),  ns.vcard('Individual'), doc)
+    expect(pane.label(thing, context)).toEqual('Contact');
+  });
+  it("returns a good label Person if Person", () => {
+    let thing = store.sym(base + 'thing3')
+    store.add(thing, ns.rdf('type'),  ns.schema('Person'), doc)
+    expect(pane.label(thing, context)).toEqual('Person');
+  });
+  it("returns a good label Person if foaf:Person", () => {
+    let thing = store.sym(base + 'thing4')
+    store.add(thing, ns.rdf('type'),  ns.foaf('Person'), doc)
+    expect(pane.label(thing, context)).toEqual('Person');
+  });
+  it("returns a good label Group if Group", () => {
+    let thing = store.sym(base + 'thing5')
+
+    store.add(thing, ns.rdf('type'),  ns.vcard('Group'), doc)
+    expect(pane.label(thing, context)).toEqual('Group');
+  });
+  it("returns a good label AddressBook if AddressBook", () => {
+    let thing = store.sym(base + 'thing6')
+    store.add(thing, ns.rdf('type'),  ns.vcard('AddressBook'), doc)
+    expect(pane.label(thing, context)).toEqual('Address book');
+  });
+    it("returns a null label if not a person", () => {
+      let thing = store.sym(base + 'thing7')
+      expect(pane.label(store.sym('https://random.example.com/'), context)).toEqual(null);
+      // done()
+    });
+
+  }); // label tests
+
+  describe("render tests", () => { // How to get the UI which comes over time?
+    it("renders an empty UI of an address book", () => {
+      const div = pane.render(book, context)
+      expect(div.outerHTML).toMatch("<div class=\"contactPane\"></div>");
+      expect(div.innerHTML).toMatch("");
+    });
+  }); // render tests
+
+  describe("data format tests", () => {
+    beforeAll(async () => {
+      store.removeDocument(doc);
+      parse(exampleData, store, doc.uri);
+      fetchMock.mockIf(/^https?.*$/, mockFetchFunction)
+    });
+
+    it("converts a bad format into a good one", async () => {
+      expect(store.the(testGroup, ns.vcard('hasMember'), null, testGroup.doc())).toEqual(aliceLocal)
+      const { del, ins } = await getDataModelIssues(groups)
+      expect(del.length).toEqual(1)
+      expect(ins.length).toEqual(1)
+      expect(del.toString()).toEqual('<https://janedoe.example/profile/Group/Test.ttl#this> <http://www.w3.org/2006/vcard/ns#hasMember> <https://janedoe.example/profile/People/aaaaaaaaaa/index.ttl#this> .')
+      expect(ins.toString()).toEqual('<https://janedoe.example/profile/Group/Test.ttl#this> <http://www.w3.org/2006/vcard/ns#hasMember> <https://alice.example/card#me> .')
+      mockUpdate(store, del, ins)
+      expect(store.the(testGroup, ns.vcard('hasMember'), null, testGroup.doc())).toEqual(aliceWebId)
+
+    });
+
+  }); // data format tests
+
+}); // all tests

package/__tests__/unit/setup.js

@@ -0,0 +1,74 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { ns, store } from "solid-ui";
+export { ns, store, rdf } from "solid-ui";
+// console.log('@@ store', store)
+// console.log('@@ store.sym', store.sym)
+export const subject = store.sym("https://janedoe.example/profile/card#me");
+export const doc = subject.doc();
+export const context = {
+    dom: document,
+    getOutliner: () => null,
+    session: {
+        paneRegistry: {
+            byName: (name) => {
+                return {
+                    render: () => {
+                        return document.createElement('div')
+                            .appendChild(document.createTextNode(`mock ${name} pane`));
+                    }
+                };
+            }
+        },
+        store,
+        logic: {},
+    },
+};
+const prefs = Object.keys(ns).filter(x => x !== 'default'); // default is bogus value
+export const prefixes = prefs.map(prefix => `@prefix ${prefix}: ${ns[prefix]('')}.\n`).join(''); // In turtle
+export let web = {};
+export let requests = [];
+export function mockFetchFunction(req) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (req.method !== 'GET') {
+            requests.push(req);
+            if (req.method === 'PUT') {
+                const contents = yield req.text();
+                web[req.url] = contents; // Update our dummy web
+                console.log(`Tetst: Updated ${req.url} on PUT to <<<${web[req.url]}>>>`);
+            }
+            return { status: 200 };
+        }
+        const contents = web[req.url];
+        if (contents !== undefined) { //
+            return {
+                body: prefixes + contents,
+                status: 200,
+                headers: {
+                    "Content-Type": "text/turtle",
+                    "WAC-Allow": 'user="write", public="read"',
+                    "Accept-Patch": "application/sparql-update"
+                }
+            };
+        } // if contents
+        return {
+            status: 404,
+            body: 'Not Found'
+        };
+    });
+}
+export function mockUpdate(store, del, ins) {
+    for (const st of del) {
+        store.remove(st);
+    }
+    for (const st of ins) {
+        store.addStatement(st);
+    }
+}

package/__tests__/unit/setup.ts

@@ -0,0 +1,77 @@
+import { DataBrowserContext, PaneRegistry } from "pane-registry";
+
+import  { Statement, LiveStore } from "rdflib";
+import { ns, store, rdf } from "solid-ui"
+export { ns, store, rdf } from "solid-ui"
+
+import { SolidLogic } from "solid-logic";
+
+// console.log('@@ store', store)
+// console.log('@@ store.sym', store.sym)
+
+export const subject = store.sym("https://janedoe.example/profile/card#me");
+export const doc = subject.doc();
+
+export const context = {
+    dom: document,
+    getOutliner: () => null,
+    session: {
+        paneRegistry: {
+            byName: (name: string) => {
+                return {
+                    render: () => {
+                        return document.createElement('div')
+                            .appendChild(
+                                document.createTextNode(`mock ${name} pane`)
+                            );
+                    }
+                }
+            }
+        } as PaneRegistry,
+        store,
+        logic: {} as SolidLogic,
+    },
+} as unknown as DataBrowserContext;
+
+const  prefs = Object.keys(ns).filter(x => x !== 'default') // default is bogus value
+export const prefixes = prefs.map(prefix => `@prefix ${prefix}: ${ns[prefix]('')}.\n`).join('') // In turtle
+
+export let web = {}
+export let requests = []
+
+export async function mockFetchFunction (req) {
+    if (req.method !== 'GET') {
+        requests.push(req)
+        if (req.method === 'PUT') {
+            const contents = await req.text()
+            web[req.url] = contents // Update our dummy web
+            console.log(`Tetst: Updated ${req.url} on PUT to <<<${web[req.url]}>>>`)
+        }
+        return { status: 200 }
+    }
+    const contents = web[req.url]
+    if (contents !== undefined) { //
+        return {
+            body: prefixes + contents, // Add namespaces to anything
+            status: 200,
+            headers: {
+                "Content-Type": "text/turtle",
+                "WAC-Allow": 'user="write", public="read"',
+                "Accept-Patch": "application/sparql-update"
+            }
+        }
+    } // if contents
+    return {
+        status: 404,
+        body: 'Not Found'
+    }
+}
+
+export function mockUpdate (store: LiveStore, del: Statement[], ins: Statement[]) {
+  for (const st of del) {
+    store.remove(st)
+  }
+  for (const st of ins) {
+    store.addStatement(st)
+  }
+}

package/babel.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    [
+      "@babel/preset-env",
+      {
+        targets: {
+          node: "current",
+        },
+      },
+    ],
+    "@babel/preset-typescript",
+  ],
+};

package/contactLogic.js

@@ -64,7 +64,7 @@ export async function saveNewContact (book, name, selectedGroups, klass) {
   try {
     await updater.updateMany([], agenda) // @@ in future, updater.updateMany
   } catch (e) {
-    console.log("Error: can't update " + person + ' as new contact:' + e)
+    console.error("Error: can't update " + person + ' as new contact:' + e)
     throw new Error('Updating new contact: ' + e)
   }
   return person
@@ -86,7 +86,7 @@ export async function saveNewGroup (book, name) {
   const gname = sanitizeToAlpha(name)
   const group = kb.sym(book.dir().uri + 'Group/' + gname + '.ttl#this')
   const doc = group.doc()
-  console.log(' New group will be: ' + group + '\n')
+  // console.log(' New group will be: ' + group + '\n')
   try {
     await kb.fetcher.load(gix)
   } catch (err) {
@@ -129,7 +129,7 @@ export async function addPersonToGroup (thing, group) {
 
   const types = kb.findTypeURIs(thing)
   for (const ty in types) {
-    console.log('    drop object type includes: ' + ty) // @@ Allow email addresses and phone numbers to be dropped?
+    // console.log('    drop object type includes: ' + ty) // @@ Allow email addresses and phone numbers to be dropped?
   }
   if (!(ns.vcard('Individual').uri in types ||
      ns.vcard('Organization').uri in types)) {
@@ -194,3 +194,39 @@ export function groupMembers (kb, group) {
   return b
 }
 
+export function isLocal(group, item) {
+  const tree = group.dir().dir().dir()
+  const local = item.uri && item.uri.startsWith(tree.uri)
+  // console.log(`   isLocal ${local} for ${item.uri} in group ${group} tree ${tree.uri}`)
+  return local
+}
+
+export function getSameAs(kb, item, doc) {
+  return kb.each(item, ns.owl('sameAs'), null, doc).concat(
+      kb.each(null, ns.owl('sameAs'), item, doc))
+}
+
+export async function getDataModelIssues(groups) {
+  let del = []
+  let ins = []
+  groups.forEach(group => {
+    const members = kb.each(group, ns.vcard('hasMember'), null, group.doc())
+    members.forEach((member) => {
+      const others = getSameAs(kb, member, group.doc())
+      if (others.length && isLocal(group, member)) { // Problem: local ID used instead of webID
+        for (const other of others) {
+          if (!isLocal(group, other)) { // Let's use this one as the immediate member for CSS ACLs'
+            // console.warn(`getDataModelIssues:  Need to swap ${member} to ${other}`)
+            del.push($rdf.st(group, ns.vcard('hasMember'), member, group.doc()))
+            ins.push($rdf.st(group, ns.vcard('hasMember'), other, group.doc()))
+            break
+          }
+          // console.log('getDataModelIssues: ??? expected id not to be local ' + other)
+        } // other
+      } // if
+    }) // member
+  }) // next group
+  return {del, ins }
+} // getDataModelIssues
+
+// Ends