contacts-pane 2.5.7 → 2.5.8-b63e0080

package/contactLogic.js

@@ -1,13 +1,13 @@
 // Logic for solid contacts
 
 import * as UI from 'solid-ui'
-import { store } from 'solid-logic'
 import { getPersonas } from './webidControl'
 
 const ns = UI.ns
 const $rdf = UI.rdf
 const utils = UI.utils
-const updater = store.updater
+const kb = UI.store
+const updater = kb.updater
 
 /** Perform updates on more than one document   @@ Move to rdflib!
 */
@@ -18,7 +18,7 @@ export async function updateMany (deletions, insertions = []) {
     if (!uniqueDocs.find(uniqueDoc => uniqueDoc.equals(doc))) uniqueDocs.push(doc)
   })
   const updates = uniqueDocs.map(doc =>
-    store.updater.update(deletions.filter(st => st.why.sameTerm(doc)),
+    kb.updater.update(deletions.filter(st => st.why.sameTerm(doc)),
       insertions.filter(st => st.why.sameTerm(doc))))
   return Promise.all(updates)
 }
@@ -29,11 +29,11 @@ export async function updateMany (deletions, insertions = []) {
 * @returns {NamedNode} the person
 */
 export async function saveNewContact (book, name, selectedGroups, klass) {
-  await store.fetcher.load(book.doc())
-  const nameEmailIndex = store.any(book, ns.vcard('nameEmailIndex'))
+  await kb.fetcher.load(book.doc())
+  const nameEmailIndex = kb.any(book, ns.vcard('nameEmailIndex'))
 
   const uuid = utils.genUuid()
-  const person = store.sym(
+  const person = kb.sym(
     book.dir().uri + 'Person/' + uuid + '/index.ttl#this'
   )
   const doc = person.doc()
@@ -52,7 +52,7 @@ export async function saveNewContact (book, name, selectedGroups, klass) {
   ]
 
   for (const gu in selectedGroups) {
-    const g = store.sym(gu)
+    const g = kb.sym(gu)
     const gd = g.doc()
     agenda.push(
       $rdf.st(g, ns.vcard('hasMember'), person, gd),
@@ -79,19 +79,19 @@ export function sanitizeToAlpha (name) { // https://mathiasbynens.be/notes/es6-u
  * @returns group
 */
 export async function saveNewGroup (book, name) {
-  await store.fetcher.load(book.doc())
-  const gix = store.any(book, ns.vcard('groupIndex'))
+  await kb.fetcher.load(book.doc())
+  const gix = kb.any(book, ns.vcard('groupIndex'))
 
   const gname = sanitizeToAlpha(name)
-  const group = store.sym(book.dir().uri + 'Group/' + gname + '.ttl#this')
+  const group = kb.sym(book.dir().uri + 'Group/' + gname + '.ttl#this')
   const doc = group.doc()
   console.log(' New group will be: ' + group + '\n')
   try {
-    await store.fetcher.load(gix)
+    await kb.fetcher.load(gix)
   } catch (err) {
     throw new Error('Error loading group index!' + gix.uri + ': ' + err)
   }
-  if (store.holds(book, ns.vcard('includesGroup'), group, gix)) {
+  if (kb.holds(book, ns.vcard('includesGroup'), group, gix)) {
     return group // Already exists
   }
   const insertTriples = [
@@ -121,12 +121,12 @@ export async function saveNewGroup (book, name) {
 export async function addPersonToGroup (thing, group) {
   const toBeFetched = [thing.doc(), group.doc()]
   try {
-    await store.fetcher.load(toBeFetched)
+    await kb.fetcher.load(toBeFetched)
   } catch (e) {
     throw new Error('addPersonToGroup: ' + e)
   }
 
-  const types = store.findTypeURIs(thing)
+  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?
   }
@@ -134,10 +134,10 @@ export async function addPersonToGroup (thing, group) {
      ns.vcard('Organization').uri in types)) {
     return alert(`Can't add ${thing} to a group: it has to be an individual or another group.`)
   }
-  const pname = store.any(thing, ns.vcard('fn'))
-  const gname = store.any(group, ns.vcard('fn'))
+  const pname = kb.any(thing, ns.vcard('fn'))
+  const gname = kb.any(group, ns.vcard('fn'))
   if (!pname) { return alert('No vcard name known for ' + thing) }
-  const already = store.holds(group, ns.vcard('hasMember'), thing, group.doc())
+  const already = kb.holds(group, ns.vcard('hasMember'), thing, group.doc())
   if (already) {
     return alert(
       'ALREADY added ' + pname + ' to group ' + gname
@@ -150,15 +150,15 @@ export async function addPersonToGroup (thing, group) {
     $rdf.st(thing, ns.vcard('fn'), pname, group.doc())
   ]
   // find person webIDs
-  const webIDs = getPersonas(store, thing).map(webid => webid.value)
+  const webIDs = getPersonas(kb, thing).map(webid => webid.value)
   webIDs.forEach(webid => {
-    ins.push($rdf.st(thing, ns.owl('sameAs'), store.sym(webid), group.doc()))
+    ins.push($rdf.st(thing, ns.owl('sameAs'), kb.sym(webid), group.doc()))
   })
   try {
     await updater.update([], ins)
     // to allow refresh of card groupList
-    store.fetcher.unload(group.doc())
-    await store.fetcher.load(group.doc())
+    kb.fetcher.unload(group.doc())
+    await kb.fetcher.load(group.doc())
   } catch (e) {
     throw new Error(`Error adding ${pname} to group ${gname}:` + e)
   }

package/contactsPane.js

@@ -15,7 +15,6 @@ to change its state according to an ontology, comment on it, etc.
 /* global alert, confirm */
 
 import * as UI from 'solid-ui'
-import { authn, solidLogicSingleton } from 'solid-logic'
 import { toolsPane } from './toolsPane'
 import { mintNewAddressBook } from './mintNewAddressBook'
 import { renderIndividual } from './individual'
@@ -64,7 +63,7 @@ export default {
 
     //  Reproduction: Spawn a new instance of this app
     function newAddressBookButton (thisAddressBook) {
-      return UI.login.newAppInstance(
+      return UI.authn.newAppInstance(
         dom,
         { noun: 'address book', appPathSegment: 'contactorator.timbl.com' },
         function (ws, newBase) {
@@ -80,7 +79,7 @@ export default {
     const dom = dataBrowserContext.dom
     const kb = dataBrowserContext.session.store
     const div = dom.createElement('div')
-    const me = authn.currentUser() // If already logged on
+    const me = UI.authn.currentUser() // If already logged on
 
     UI.aclControl.preventBrowserDropEvents(dom) // protect drag and drop
 
@@ -97,7 +96,7 @@ export default {
 
       const t = kb.findTypeURIs(subject)
 
-      let me = authn.currentUser()
+      let me = UI.authn.currentUser()
 
       const context = {
         target: subject,
@@ -778,7 +777,7 @@ export default {
         const container = dom.createElement('div')
         newContactButton.setAttribute('type', 'button')
         if (!me) newContactButton.setAttribute('disabled', 'true')
-        authn.checkUser().then(webId => {
+        UI.authn.checkUser().then(webId => {
           if (webId) {
             me = webId
             newContactButton.removeAttribute('disabled')
@@ -794,7 +793,7 @@ export default {
         const container2 = dom.createElement('div')
         newOrganizationButton.setAttribute('type', 'button')
         if (!me) newOrganizationButton.setAttribute('disabled', 'true')
-        authn.checkUser().then(webId => {
+        UI.authn.checkUser().then(webId => {
           if (webId) {
             me = webId
             newOrganizationButton.removeAttribute('disabled')
@@ -861,7 +860,7 @@ export default {
         //          Render a Group instance
       } else if (t[ns.vcard('Group').uri]) {
         // If we have a main address book, then render this group as a guest group within it
-        UI.login
+        UI.authn
           .findAppInstances(context, ns.vcard('AddressBook'))
           .then(function (context) {
             const addressBooks = context.instances
@@ -889,23 +888,12 @@ export default {
         )
       }
 
-      me = authn.currentUser()
+      me = UI.authn.currentUser()
       if (!me) {
         console.log(
           '(You do not have your Web Id set. Sign in or sign up to make changes.)'
         )
-        try {
-          const renderContext = await UI.login.loggedInContext(context)
-          // load profile
-          me = renderContext.me
-          console.log('Logged in as ' + me)
-          renderContext.publicProfile = await solidLogicSingleton.loadProfile(me)
-          // load preferences
-          renderContext.preferencesFile = await solidLogicSingleton.loadPreferences(me)
-        } catch (err) {
-          div.appendChild(UI.widgets.errorMessageBlock(err))
-        }
-        /* UI.authn.logInLoadProfile(context).then(
+        UI.authn.logInLoadProfile(context).then(
           context => {
             console.log('Logged in as ' + context.me)
             me = context.me
@@ -913,7 +901,7 @@ export default {
           err => {
             div.appendChild(UI.widgets.errorMessageBlock(err))
           }
-        ) */
+        )
       } else {
         // console.log("(Your webid is "+ me +")")
       }

package/individual.js

@@ -1,5 +1,4 @@
 import * as UI from 'solid-ui'
-import { store, authn } from 'solid-logic'
 import { renderMugshotGallery } from './mugshotGallery'
 import { renderWebIdControl, renderPublicIdControl } from './webidControl'
 import { renderGroupMemberships } from './groupMembershipControl.js'
@@ -8,6 +7,7 @@ import VCARD_ONTOLOGY_TEXT from './lib/vcard.js'
 
 const $rdf = UI.rdf
 const ns = UI.ns
+const kb = UI.store
 const style = UI.style
 
 export function loadTurtleText (kb, thing, text) {
@@ -40,35 +40,35 @@ export async function renderIndividual (dom, div, subject, dataBrowserContext) {
   }
 
   /// ///////////////////////////
-  const t = store.findTypeURIs(subject)
+  const t = kb.findTypeURIs(subject)
   const isOrganization = !!(t[ns.vcard('Organization').uri] || t[ns.schema('Organization').uri])
-  const editable = store.updater.editable(subject.doc().uri, store)
+  const editable = kb.updater.editable(subject.doc().uri, kb)
 
-  const individualForm = store.sym(
+  const individualForm = kb.sym(
     'https://solid.github.io/solid-panes/contact/individualForm.ttl#form1'
   )
-  loadTurtleText(store, individualForm, textOfForms)
+  loadTurtleText(kb, individualForm, textOfForms)
 
-  const orgDetailsForm = store.sym( // orgDetailsForm organizationForm
+  const orgDetailsForm = kb.sym( // orgDetailsForm organizationForm
     'https://solid.github.io/solid-panes/contact/individualForm.ttl#orgDetailsForm'
   )
 
   // Ontology metadata for this pane we bundle with the JS
   const vcardOnt = UI.ns.vcard('Type').doc()
-  if (!store.holds(undefined, undefined, undefined, vcardOnt)) {
+  if (!kb.holds(undefined, undefined, undefined, vcardOnt)) {
     // If not loaded already
-    $rdf.parse(VCARD_ONTOLOGY_TEXT, store, vcardOnt.uri, 'text/turtle') // Load ontology directly
+    $rdf.parse(VCARD_ONTOLOGY_TEXT, kb, vcardOnt.uri, 'text/turtle') // Load ontology directly
   }
 
   try {
-    await store.fetcher.load(subject.doc())
+    await kb.fetcher.load(subject.doc())
   } catch (err) {
     complain('Error: Failed to load contact card: ' + err)
   } // end of try catch on load
 
   div.style = style.paneDivStyle || 'padding: 0.5em 1.5em 1em 1.5em;'
 
-  authn.checkUser() // kick off async operation @@@ use async version
+  UI.authn.checkUser() // kick off async operation @@@ use async version
 
   div.appendChild(renderMugshotGallery(dom, subject))
 

package/lib/autocompletePicker.js

@@ -146,7 +146,7 @@ callback) {
                 }
             }
             if (hits == 1) { // Maybe require green confirmation button be clicked?
-                console.log("  auto complete elimination:  \"" + filter + "\" -> \"" + pickedName + "\"");
+                console.log("  auto complete elimination:  \"".concat(filter, "\" -> \"").concat(pickedName, "\""));
                 gotIt(kb.sym(pick), pickedName); // uri, name
             }
         }
@@ -174,7 +174,7 @@ callback) {
                     switch (_a.label) {
                         case 0:
                             if (inputEventHandlerLock) {
-                                console.log("Ignoring \"" + searchInput.value + "\" because of lock ");
+                                console.log("Ignoring \"".concat(searchInput.value, "\" because of lock "));
                                 return [2 /*return*/];
                             }
                             inputEventHandlerLock = true;
@@ -222,7 +222,7 @@ callback) {
                                 numberOfRows = slimmed.length; // stretch if it means we get all items
                             }
                             allDisplayed = loadedEnough && slimmed.length <= numberOfRows;
-                            console.log(" Filter:\"" + filter + "\" bindings: " + bindings.length + ", slimmed to " + slimmed.length + "; rows: " + numberOfRows + ", Enough? " + loadedEnough + ", All displayed? " + allDisplayed);
+                            console.log(" Filter:\"".concat(filter, "\" bindings: ").concat(bindings.length, ", slimmed to ").concat(slimmed.length, "; rows: ").concat(numberOfRows, ", Enough? ").concat(loadedEnough, ", All displayed? ").concat(allDisplayed));
                             slimmed.slice(0, numberOfRows).forEach(function (binding) {
                                 var row = table.appendChild(dom.createElement('tr'));
                                 solid_ui_1.style.setStyle(row, 'autocompleteRowStyle');
@@ -256,7 +256,7 @@ callback) {
         */
         function sparqlForSearch(name, theType) {
             var clean = name.replace(/\W/g, ''); // Remove non alphanum so as to protect regexp
-            var sparql = "select distinct ?subject, ?name where {\n      ?subject a <" + theType.uri + ">; rdfs:label ?name\n      FILTER regex(?name, \"" + clean + "\", \"i\")\n    } LIMIT " + publicData_1.AUTOCOMPLETE_LIMIT;
+            var sparql = "select distinct ?subject, ?name where {\n      ?subject a <".concat(theType.uri, ">; rdfs:label ?name\n      FILTER regex(?name, \"").concat(clean, "\", \"i\")\n    } LIMIT ").concat(publicData_1.AUTOCOMPLETE_LIMIT);
             return sparql;
         }
         var queryParams, OrgClass, candidatesLoaded, runningTimeout, inputEventHandlerLock, allDisplayed, lastFilter, numberOfRows, div, foundName, foundObject, table, head, cell, searchInput, searchInputStyle;

package/lib/publicData.js

@@ -121,7 +121,7 @@ function filterByLanguage(bindings, languagePrefs) {
         sortMe.reverse(); // best at the top
         slimmed.push(sortMe[0][1]);
     } // map u
-    console.log(" Filter by language: " + bindings.length + " -> " + slimmed.length);
+    console.log(" Filter by language: ".concat(bindings.length, " -> ").concat(slimmed.length));
     return slimmed;
 }
 exports.filterByLanguage = filterByLanguage;
@@ -144,8 +144,8 @@ exports.predMap = {
 };
 function loadFromBindings(kb, solidSubject, bindings, doc) {
     var results = {};
-    console.log("loadFromBindings:  subject: " + solidSubject);
-    console.log("                       doc: " + doc);
+    console.log("loadFromBindings:  subject: ".concat(solidSubject));
+    console.log("                       doc: ".concat(doc));
     bindings.forEach(function (binding) {
         for (var key in binding) {
             var result = binding[key];
@@ -156,7 +156,7 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
     });
     var _loop_1 = function (key) {
         var values = results[key];
-        console.log("    results " + key + " -> " + values);
+        console.log("    results ".concat(key, " -> ").concat(values));
         values.forEach(function (combined) {
             var result = JSON.parse(combined);
             var type = result.type, value = result.value;
@@ -168,7 +168,7 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
                 obj = new rdflib_1.Literal(value, result.language, result.datatype);
             }
             else {
-                throw new Error("loadFromBindings:  unexpected type: " + type);
+                throw new Error("loadFromBindings:  unexpected type: ".concat(type));
             }
             if (key == 'type') {
                 if (exports.wikidataClassMap[value]) {
@@ -192,7 +192,7 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
             else if (exports.predMap[key]) {
                 var pred = exports.predMap[key] || solid_ui_1.ns.schema(key); // fallback to just using schema.org
                 kb.add(solidSubject, pred, obj, doc); // @@ deal with non-string and objects
-                console.log("  public data " + pred + " " + obj + ".");
+                console.log("  public data ".concat(pred, " ").concat(obj, "."));
             }
         });
     };
@@ -334,7 +334,7 @@ function loadPublicDataThing(kb, subject, publicDataID) {
                 case 1:
                     if (!publicDataID.uri.match(/^https?:\/\/www\.wikidata\.org\/entity\/.*/)) return [3 /*break*/, 3];
                     QId = publicDataID.uri.split('/')[4];
-                    dataURI = "http://www.wikidata.org/wiki/Special:EntityData/" + QId + ".ttl";
+                    dataURI = "http://www.wikidata.org/wiki/Special:EntityData/".concat(QId, ".ttl");
                     // In fact loading the data URI gives much to much irrelevant data, from wikidata.
                     return [4 /*yield*/, getWikidataDetails(kb, subject, publicDataID)
                         // await getWikidataLocation(kb, subject, publicDataID)  -- should get that in the details query now
@@ -416,7 +416,7 @@ function getDbpediaDetails(kb, solidSubject, publicDataID) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    sparql = "select distinct ?city, ?state, ?country, ?homepage, ?logo, ?lat, ?long,  WHERE {\n    OPTIONAL { <" + publicDataID + "> <http://dbpedia.org/ontology/city> ?city }\n    OPTIONAL { " + publicDataID + " <http://dbpedia.org/ontology/state> ?state }\n    OPTIONAL { " + publicDataID + " <http://dbpedia.org/ontology/country> ?country }\n    OPTIONAL { " + publicDataID + " foaf:homepage ?homepage }\n    OPTIONAL { " + publicDataID + " foaf:lat ?lat; foaf:long ?long }\n    OPTIONAL { " + publicDataID + " <http://dbpedia.org/ontology/country> ?country }\n   }";
+                    sparql = "select distinct ?city, ?state, ?country, ?homepage, ?logo, ?lat, ?long,  WHERE {\n    OPTIONAL { <".concat(publicDataID, "> <http://dbpedia.org/ontology/city> ?city }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/state> ?state }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/country> ?country }\n    OPTIONAL { ").concat(publicDataID, " foaf:homepage ?homepage }\n    OPTIONAL { ").concat(publicDataID, " foaf:lat ?lat; foaf:long ?long }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/country> ?country }\n   }");
                     predMap = {
                         city: solid_ui_1.ns.vcard('locality'),
                         state: solid_ui_1.ns.vcard('region'),

package/mintNewAddressBook.js

@@ -1,5 +1,4 @@
-import * as UI from 'solid-ui'
-import { solidLogicSingleton, aclLogic } from 'solid-logic'
+const UI = require('solid-ui')
 
 // const mime = require('mime-types')
 // const toolsPane0 = require('./toolsPane')
@@ -13,23 +12,7 @@ const $rdf = UI.rdf
 
 export function mintNewAddressBook (dataBrowserContext, context) {
   return new Promise(function (resolve, reject) {
-    async function loadPreference (context) {
-      let loggedInContext
-      try {
-        loggedInContext = await UI.login.loggedInContext(context)
-        // load profile
-        loggedInContext.publicProfile = await solidLogicSingleton.loadProfile(loggedInContext.me)
-        // load preferences
-        loggedInContext.preferencesFile = await solidLogicSingleton.loadPreferences(loggedInContext.me)
-      } catch (err) {
-        const error = `Could not login and load profile and preferences: ${err}`
-        console.log(error)
-        context.div.appendChild(UI.widgets.errorMessageBlock(error))
-      }
-      return loggedInContext
-    }
-
-    loadPreference(context).then(
+    UI.authn.logInLoadProfile(context).then(
       context => {
         // 20180713
         console.log('Logged in as ' + context.me)
@@ -137,7 +120,7 @@ export function mintNewAddressBook (dataBrowserContext, context) {
               return reject(new Error('Error writing new file ' + task.to))
             }
 
-            aclLogic
+            UI.authn
               .setACLUserPublic(dest, me, aclOptions)
               .then(() => doNextTask())
               .catch(err => {

package/mugshotGallery.js

@@ -1,10 +1,10 @@
 import * as UI from 'solid-ui'
-import { store } from 'solid-logic'
 import * as mime from 'mime-types'
 
 const $rdf = UI.rdf
 const ns = UI.ns
 const utils = UI.utils
+const kb = UI.store
 
 /*  Mugshot Gallery
 *
@@ -23,9 +23,9 @@ export function renderMugshotGallery (dom, subject) {
     ]
     try {
       if (remove) {
-        await store.updater.update(link, [])
+        await kb.updater.update(link, [])
       } else {
-        await store.updater.update([], link)
+        await kb.updater.update([], link)
       }
     } catch (err) {
       const msg = ' Write back image link FAIL ' + pic + ', Error: ' + err
@@ -35,16 +35,16 @@ export function renderMugshotGallery (dom, subject) {
   }
 
   function handleDroppedThing (thing) {
-    store.fetcher.nowOrWhenFetched(thing.doc(), function (ok, mess) {
+    kb.fetcher.nowOrWhenFetched(thing.doc(), function (ok, mess) {
       if (!ok) {
         console.log('Error looking up dropped thing ' + thing + ': ' + mess)
       } else {
-        const types = store.findTypeURIs(thing)
+        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('Default: assume web page  ' + thing) // icon was: UI.icons.iconBase + 'noun_25830.svg'
-        store.add(subject, ns.wf('attachment'), thing, subject.doc())
+        kb.add(subject, ns.wf('attachment'), thing, subject.doc())
         // @@ refresh UI
       }
     })
@@ -70,8 +70,8 @@ export function renderMugshotGallery (dom, subject) {
     let n, pic
     for (n = 0; ; n++) {
       // Check filename is not used or invent new one
-      pic = store.sym(subject.dir().uri + filename)
-      if (!store.holds(subject, ns.vcard('hasPhoto'), pic)) {
+      pic = kb.sym(subject.dir().uri + filename)
+      if (!kb.holds(subject, ns.vcard('hasPhoto'), pic)) {
         break
       }
       filename = prefix + n + '.' + extension
@@ -84,7 +84,7 @@ export function renderMugshotGallery (dom, subject) {
         ' to ' +
         pic
     )
-    store.fetcher
+    kb.fetcher
       .webOperation('PUT', pic.uri, {
         data: data,
         contentType: contentType
@@ -95,8 +95,8 @@ export function renderMugshotGallery (dom, subject) {
           return
         }
         console.log(' Upload: put OK: ' + pic)
-        store.add(subject, predicate, pic, subject.doc())
-        store.fetcher
+        kb.add(subject, predicate, pic, subject.doc())
+        kb.fetcher
           .putBack(subject.doc(), { contentType: 'text/turtle' })
           .then(
             function (_response) {
@@ -126,7 +126,7 @@ export function renderMugshotGallery (dom, subject) {
         }
         const options = { withCredentials: false, credentials: 'omit' }
         try {
-          var result = await store.fetcher.webOperation('GET', thing.uri, options)
+          var result = await kb.fetcher.webOperation('GET', thing.uri, options)
         } catch (err) {
           complain(
             `Gallery: fetch error trying to read picture ${thing} data: ${err}`
@@ -205,7 +205,7 @@ export function renderMugshotGallery (dom, subject) {
   }
 
   function syncMugshots () {
-    let images = store.each(subject, ns.vcard('hasPhoto')) // Priviledge vcard ones
+    let images = kb.each(subject, ns.vcard('hasPhoto')) // Priviledge vcard ones
     images.sort() // arbitrary consistency
     images = images.slice(0, 5) // max number for the space
     if (images.length === 0) {
@@ -220,7 +220,7 @@ export function renderMugshotGallery (dom, subject) {
 
   // Good URI for a Camera picture
   function getImageDoc () {
-    const imageDoc = store.sym(
+    const imageDoc = kb.sym(
       subject.dir().uri + 'Image_' + Date.now() + '.png'
     )
     return imageDoc
@@ -240,7 +240,7 @@ export function renderMugshotGallery (dom, subject) {
       'Drag here to delete'
     )
     async function droppedURIHandler (uris) {
-      const images = store
+      const images = kb
         .each(subject, ns.vcard('hasPhoto'))
         .map(x => x.uri)
       for (const uri of uris) {
@@ -250,10 +250,10 @@ export function renderMugshotGallery (dom, subject) {
         }
         if (confirm(`Permanently DELETE image ${uri} completely?`)) {
           console.log('Unlinking image file ' + uri)
-          await linkToPicture(subject, store.sym(uri), true)
+          await linkToPicture(subject, kb.sym(uri), true)
           try {
             console.log('Deleting image file ' + uri)
-            await store.fetcher.webOperation('DELETE', uri)
+            await kb.fetcher.webOperation('DELETE', uri)
           } catch (err) {
             alert('Unable to delete picture! ' + err)
           }
@@ -273,7 +273,7 @@ export function renderMugshotGallery (dom, subject) {
     const right = row.appendChild(dom.createElement('td'))
 
     left.appendChild(
-      UI.media.cameraButton(dom, store, getImageDoc, tookPicture)
+      UI.media.cameraButton(dom, kb, getImageDoc, tookPicture)
     ) // 20190812
     try {
       middle.appendChild(
@@ -288,7 +288,7 @@ export function renderMugshotGallery (dom, subject) {
 
   // Body of renderMugshotGallery
 
-  const editable = store.updater.editable(subject.doc().uri, store)
+  const editable = kb.updater.editable(subject.doc().uri, kb)
   const galleryDiv = dom.createElement('div')
   const mugshotDiv = galleryDiv.appendChild(dom.createElement('div'))
   const placeholder = elementForImage()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contacts-pane",
-  "version": "2.5.7",
+  "version": "2.5.8-b63e0080",
   "description": "Contacts Pane: Contacts manager for Address Book, Groups, and Individuals.",
   "main": "./contactsPane.js",
   "scripts": {

package/toolsPane.js

@@ -3,7 +3,6 @@
 /* global confirm, $rdf */
 
 import * as UI from 'solid-ui'
-import { store } from 'solid-logic'
 import { saveNewGroup, addPersonToGroup } from './contactLogic'
 export function toolsPane (
   selectAllGroups,
@@ -14,6 +13,7 @@ export function toolsPane (
   me
 ) {
   const dom = dataBrowserContext.dom
+  const kb = UI.store
   const ns = UI.ns
   const VCARD = ns.vcard
 
@@ -59,7 +59,7 @@ export function toolsPane (
         book.dir(),
         dataBrowserContext,
         'book',
-        store,
+        kb,
         function (ok, body) {
           if (!ok) box.innerHTML = 'ACL control box Failed: ' + body
         }
@@ -68,7 +68,7 @@ export function toolsPane (
 
     //
     try {
-      await UI.login.registrationControl(context, book, ns.vcard('AddressBook'))
+      await UI.authn.registrationControl(context, book, ns.vcard('AddressBook'))
     } catch (e) {
       UI.widgets.complain(context, 'registrationControl: ' + e)
     }
@@ -82,9 +82,9 @@ export function toolsPane (
     }
 
     function stats () {
-      const totalCards = store.each(undefined, VCARD('inAddressBook'), book).length
+      const totalCards = kb.each(undefined, VCARD('inAddressBook'), book).length
       log('' + totalCards + ' cards loaded. ')
-      const groups = store.each(book, VCARD('includesGroup'))
+      const groups = kb.each(book, VCARD('includesGroup'))
       log('' + groups.length + ' total groups. ')
       const gg = []
       for (const g in selectedGroups) {
@@ -95,9 +95,9 @@ export function toolsPane (
 
     async function loadIndexHandler (_event) {
       loadIndexButton.setAttribute('style', 'background-color: #ffc;')
-      const nameEmailIndex = store.any(book, ns.vcard('nameEmailIndex'))
+      const nameEmailIndex = kb.any(book, ns.vcard('nameEmailIndex'))
       try {
-        await store.fetcher.load(nameEmailIndex)
+        await kb.fetcher.load(nameEmailIndex)
       } catch (e) {
         loadIndexButton.setAttribute('style', 'background-color: #fcc;')
         log('Error: People index has NOT been loaded' + e + '\n')
@@ -135,8 +135,8 @@ export function toolsPane (
       }
 
       for (let i = 0; i < gg.length; i++) {
-        const g = store.sym(gg[i])
-        const a = store.each(g, ns.vcard('hasMember'))
+        const g = kb.sym(gg[i])
+        const a = kb.each(g, ns.vcard('hasMember'))
         log(UI.utils.label(g) + ': ' + a.length + ' members')
         for (let j = 0; j < a.length; j++) {
           const card = a[j]
@@ -157,10 +157,10 @@ export function toolsPane (
       const stats = {} // global god context
 
       stats.book = book
-      stats.nameEmailIndex = store.any(book, ns.vcard('nameEmailIndex'))
+      stats.nameEmailIndex = kb.any(book, ns.vcard('nameEmailIndex'))
       log('Loading name index...')
 
-      store.fetcher.nowOrWhenFetched(
+      UI.store.fetcher.nowOrWhenFetched(
         stats.nameEmailIndex,
         undefined,
         function (_ok, _message) {
@@ -235,8 +235,8 @@ export function toolsPane (
           } // erase one
   */
           //   Check actual records to see which are exact matches - slow
-          stats.nameDupLog = store.sym(book.dir().uri + 'dedup-nameDupLog.ttl')
-          stats.exactDupLog = store.sym(book.dir().uri + 'dedup-exactDupLog.ttl')
+          stats.nameDupLog = kb.sym(book.dir().uri + 'dedup-nameDupLog.ttl')
+          stats.exactDupLog = kb.sym(book.dir().uri + 'dedup-exactDupLog.ttl')
           /*
           function checkOne (card) {
             return new Promise(function (resolve, reject) {
@@ -322,7 +322,7 @@ export function toolsPane (
 
           function checkOneNameless (card) {
             return new Promise(function (resolve) {
-              store.fetcher
+              kb.fetcher
                 .load(card)
                 .then(function (_xhr) {
                   log(' Nameless check ' + card)
@@ -331,7 +331,7 @@ export function toolsPane (
                   exclude[ns.dc('created').uri] = true
                   exclude[ns.dc('modified').uri] = true
                   function filtered (x) {
-                    return store
+                    return kb
                       .statementsMatching(null, null, null, x.doc())
                       .filter(function (st) {
                         return !exclude[st.predicate.uri]
@@ -350,14 +350,14 @@ export function toolsPane (
                   // Cheat: serialize and compare
                   // var cardText = $rdf.serialize(card.doc(), kb, card.doc().uri, 'text/turtle')
                   // var otherText = $rdf.serialize(other.doc(), kb, other.doc().uri, 'text/turtle')
-                  const cardText = new $rdf.Serializer(store)
+                  const cardText = new $rdf.Serializer(kb)
                     .setBase(card.doc().uri)
                     .statementsToN3(desc)
                   const other = stats.nameLessIndex[cardText]
                   if (other) {
                     log('  Matches with ' + other)
-                    const cardGroups = store.each(null, ns.vcard('hasMember'), card)
-                    const otherGroups = store.each(null, ns.vcard('hasMember'), other)
+                    const cardGroups = kb.each(null, ns.vcard('hasMember'), card)
+                    const otherGroups = kb.each(null, ns.vcard('hasMember'), other)
                     for (let j = 0; j < cardGroups.length; j++) {
                       let found = false
                       for (let k = 0; k < otherGroups.length; k++) {
@@ -431,7 +431,7 @@ export function toolsPane (
               for (let i = 0; i < stats.uniques.length; i++) {
                 stats.uniquesSet[stats.uniques[i].uri] = true
               }
-              stats.groupMembers = store
+              stats.groupMembers = kb
                 .statementsMatching(null, ns.vcard('hasMember'))
                 .map(st => st.object)
               log('  Naive group members ' + stats.groupMembers.length)
@@ -472,13 +472,13 @@ export function toolsPane (
 
           function scanForDuplicates () {
             return new Promise(function (resolve) {
-              stats.cards = store.each(undefined, VCARD('inAddressBook'), stats.book)
+              stats.cards = kb.each(undefined, VCARD('inAddressBook'), stats.book)
               log('' + stats.cards.length + ' total cards')
 
               let c, card, name
               for (c = 0; c < stats.cards.length; c++) {
                 card = stats.cards[c]
-                name = store.anyValue(card, ns.vcard('fn'))
+                name = kb.anyValue(card, ns.vcard('fn'))
                 if (!name) {
                   stats.nameless.push(card)
                   continue
@@ -532,18 +532,18 @@ export function toolsPane (
 
             return Promise.resolve()
               .then(() => {
-                cleanPeople = store.sym(stats.book.dir().uri + 'clean-people.ttl')
+                cleanPeople = kb.sym(stats.book.dir().uri + 'clean-people.ttl')
                 let sts = []
                 for (let i = 0; i < stats.uniques.length; i++) {
                   sts = sts.concat(
-                    store.connectedStatements(stats.uniques[i], stats.nameEmailIndex)
+                    kb.connectedStatements(stats.uniques[i], stats.nameEmailIndex)
                   )
                 }
-                const sz = new $rdf.Serializer(store).setBase(stats.nameEmailIndex.uri)
+                const sz = new $rdf.Serializer(kb).setBase(stats.nameEmailIndex.uri)
                 log('Serializing index of uniques...')
                 const data = sz.statementsToN3(sts)
 
-                return store.fetcher.webOperation('PUT', cleanPeople, {
+                return kb.fetcher.webOperation('PUT', cleanPeople, {
                   data: data,
                   contentType: 'text/turtle'
                 })
@@ -563,18 +563,18 @@ export function toolsPane (
             return Promise.resolve()
               .then(() => {
                 const s = g.uri.replace('/Group/', '/NewGroup/')
-                cleanGroup = store.sym(s)
+                cleanGroup = kb.sym(s)
                 let sts = []
                 for (let i = 0; i < stats.uniques.length; i++) {
                   sts = sts.concat(
-                    store.connectedStatements(stats.uniques[i], g.doc())
+                    kb.connectedStatements(stats.uniques[i], g.doc())
                   )
                 }
-                const sz = new $rdf.Serializer(store).setBase(g.uri)
+                const sz = new $rdf.Serializer(kb).setBase(g.uri)
                 log('   Regenerating group of uniques...' + cleanGroup)
                 const data = sz.statementsToN3(sts)
 
-                return store.fetcher.webOperation('PUT', cleanGroup, { data })
+                return kb.fetcher.webOperation('PUT', cleanGroup, { data })
               })
               .then(() => {
                 log('     Done uniques group ' + cleanGroup)
@@ -595,9 +595,9 @@ export function toolsPane (
             if (stats.book) {
               const books = [stats.book]
               books.forEach(function (book) {
-                const gs = book ? store.each(book, ns.vcard('includesGroup')) : []
+                const gs = book ? kb.each(book, ns.vcard('includesGroup')) : []
                 const gs2 = gs.map(function (g) {
-                  return [book, store.any(g, ns.vcard('fn')), g]
+                  return [book, kb.any(g, ns.vcard('fn')), g]
                 })
                 groups = groups.concat(gs2)
               })
@@ -609,7 +609,7 @@ export function toolsPane (
 
           stats.groupObjects = groups.map(gstr => gstr[2])
           log('Loading ' + stats.groupObjects.length + ' groups... ')
-          store.fetcher
+          kb.fetcher
             .load(stats.groupObjects)
             .then(scanForDuplicates)
             .then(checkGroupMembers)
@@ -647,34 +647,34 @@ export function toolsPane (
     }
 
     async function getGroupless (book) {
-      const groupIndex = store.any(book, ns.vcard('groupIndex'))
-      const nameEmailIndex = store.any(book, ns.vcard('nameEmailIndex'))
+      const groupIndex = kb.any(book, ns.vcard('groupIndex'))
+      const nameEmailIndex = kb.any(book, ns.vcard('nameEmailIndex'))
       try {
-        await store.fetcher.load([nameEmailIndex, groupIndex])
-        const groups = store.each(book, ns.vcard('includesGroup'))
-        await store.fetcher.load(groups)
+        await kb.fetcher.load([nameEmailIndex, groupIndex])
+        const groups = kb.each(book, ns.vcard('includesGroup'))
+        await kb.fetcher.load(groups)
       } catch (e) {
         complain('Error loading stuff:' + e)
       }
 
       const reverseIndex = {}
       const groupless = []
-      const groups = store.each(book, VCARD('includesGroup'))
+      const groups = kb.each(book, VCARD('includesGroup'))
 
       log('' + groups.length + ' total groups. ')
 
       for (let i = 0; i < groups.length; i++) {
         const g = groups[i]
-        const a = store.each(g, ns.vcard('hasMember'))
+        const a = kb.each(g, ns.vcard('hasMember'))
         log(UI.utils.label(g) + ': ' + a.length + ' members')
         for (let j = 0; j < a.length; j++) {
-          store.allAliases(a[j]).forEach(function (y) {
+          kb.allAliases(a[j]).forEach(function (y) {
             reverseIndex[y.uri] = g
           })
         }
       }
 
-      const cards = store.each(undefined, VCARD('inAddressBook'), book)
+      const cards = kb.each(undefined, VCARD('inAddressBook'), book)
       log('' + cards.length + ' total cards')
       for (let c = 0; c < cards.length; c++) {
         if (!reverseIndex[cards[c].uri]) {
@@ -697,9 +697,9 @@ export function toolsPane (
           return
         }
 
-        const nameEmailIndex = store.any(book, ns.vcard('nameEmailIndex'))
+        const nameEmailIndex = kb.any(book, ns.vcard('nameEmailIndex'))
         try {
-          await store.fetcher.load(nameEmailIndex)
+          await kb.fetcher.load(nameEmailIndex)
         } catch (e) {
           complain(e)
         }

package/webidControl.js

@@ -1,7 +1,6 @@
 // Render a control to record the webids we have for this agent
 /* eslint-disable multiline-ternary */
 import * as UI from 'solid-ui'
-import { store } from 'solid-logic'
 import { updateMany } from './contactLogic'
 // import { renderAutoComplete } from './lib/autocompletePicker' // dbpediaParameters
 import { renderAutocompleteControl } from './lib/autocompleteBar'
@@ -11,6 +10,7 @@ const $rdf = UI.rdf
 const ns = UI.ns
 const widgets = UI.widgets
 const utils = UI.utils
+const kb = UI.store
 const style = UI.style
 
 const wikidataClasses = widgets.publicData.wikidataClasses // @@ move to solid-logic
@@ -134,8 +134,8 @@ export function vcardWebIDs (kb, person, urlType) {
 
 export function isOrganization (agent) {
   const doc = agent.doc()
-  return store.holds(agent, ns.rdf('type'), ns.vcard('Organization'), doc) ||
-    store.holds(agent, ns.rdf('type'), ns.schema('Organization'), doc)
+  return kb.holds(agent, ns.rdf('type'), ns.vcard('Organization'), doc) ||
+    kb.holds(agent, ns.rdf('type'), ns.schema('Organization'), doc)
 }
 /// ////////////////////////////////////////////////////////////// UI
 
@@ -163,11 +163,11 @@ export async function renderWebIdControl (person, dataBrowserContext) {
 }
 
 export async function renderPublicIdControl (person, dataBrowserContext) {
-  let orgClass = store.sym('http://www.wikidata.org/wiki/Q43229')
+  let orgClass = kb.sym('http://www.wikidata.org/wiki/Q43229')
   let orgClassId = 'Organization'
   for (const classId in wikidataClasses) {
-    if (store.holds(person, ns.rdf('type'), ns.schema(classId), person.doc())) {
-      orgClass = store.sym(wikidataClasses[classId])
+    if (kb.holds(person, ns.rdf('type'), ns.schema(classId), person.doc())) {
+      orgClass = kb.sym(wikidataClasses[classId])
       orgClassId = classId
       console.log(`  renderPublicIdControl bingo: ${classId} -> ${orgClass}`)
     }
@@ -266,14 +266,14 @@ export async function renderIdControl (person, dataBrowserContext, options) {
   } // renderPersona
 
   async function refreshWebIDTable () {
-    const personas = getPersonas(store, person)
+    const personas = getPersonas(kb, person)
     console.log('WebId personas: ' + person + ' -> ' + personas.map(p => p.uri).join(',\n  '))
     prompt.style.display = personas.length ? 'none' : ''
-    utils.syncTableToArrayReOrdered(profileArea, personas, persona => renderPersona(dom, persona, store))
+    utils.syncTableToArrayReOrdered(profileArea, personas, persona => renderPersona(dom, persona, kb))
   }
   async function addOneIdAndRefresh (person, webid) {
     try {
-      await addWebIDToContacts(person, webid, options.urlType, store)
+      await addWebIDToContacts(person, webid, options.urlType, kb)
     } catch (err) {
       div.appendChild(widgets.errorMessageBlock(dom, `Error adding Id ${webid} to ${person}: ${err}`))
     }
@@ -282,11 +282,11 @@ export async function renderIdControl (person, dataBrowserContext, options) {
 
   const { dom } = dataBrowserContext
   options = options || {}
-  options.editable = store.updater.editable(person.doc().uri, store)
+  options.editable = kb.updater.editable(person.doc().uri, kb)
   const div = dom.createElement('div')
   div.style = 'border-radius:0.3em; border: 0.1em solid #888;' // padding: 0.8em;
 
-  if (getPersonas(store, person).length === 0 && !options.editable) {
+  if (getPersonas(kb, person).length === 0 && !options.editable) {
     div.style.display = 'none'
     return div // No point listing an empty list you can't change
   }