contacts-pane 2.6.0-71f11b5c → 2.6.0-e4525047

package/.github/workflows/ci.yml

@@ -3,10 +3,11 @@ name: CI
 on:
   push:
     branches:
-      - main
+      - "**"
   pull_request:
     branches:
-      - main
+      - "**"  
+  workflow_dispatch:
 
 jobs:
   test:
@@ -16,7 +17,7 @@ jobs:
         node-version:
           - 12.x
           - 14.x
-          - 15.x
+          - 16.x
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}

package/contactLogic.js

@@ -1,12 +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 kb = UI.store
+const kb = store
 const updater = kb.updater
 
 /** Perform updates on more than one document   @@ Move to rdflib!

package/contactsPane.js

@@ -14,11 +14,12 @@ to change its state according to an ontology, comment on it, etc.
 */
 /* global alert, confirm */
 
+import { authn } from 'solid-logic'
+import { addPersonToGroup, saveNewContact, saveNewGroup } from './contactLogic'
 import * as UI from 'solid-ui'
-import { toolsPane } from './toolsPane'
 import { mintNewAddressBook } from './mintNewAddressBook'
 import { renderIndividual } from './individual'
-import { saveNewContact, saveNewGroup, addPersonToGroup } from './contactLogic'
+import { toolsPane } from './toolsPane'
 
 // const $rdf = UI.rdf
 const ns = UI.ns
@@ -63,7 +64,7 @@ export default {
 
     //  Reproduction: Spawn a new instance of this app
     function newAddressBookButton (thisAddressBook) {
-      return UI.authn.newAppInstance(
+      return UI.login.newAppInstance(
         dom,
         { noun: 'address book', appPathSegment: 'contactorator.timbl.com' },
         function (ws, newBase) {
@@ -79,7 +80,7 @@ export default {
     const dom = dataBrowserContext.dom
     const kb = dataBrowserContext.session.store
     const div = dom.createElement('div')
-    const me = UI.authn.currentUser() // If already logged on
+    const me = authn.currentUser() // If already logged on
 
     UI.aclControl.preventBrowserDropEvents(dom) // protect drag and drop
 
@@ -96,7 +97,7 @@ export default {
 
       const t = kb.findTypeURIs(subject)
 
-      let me = UI.authn.currentUser()
+      let me = authn.currentUser()
 
       const context = {
         target: subject,
@@ -777,7 +778,7 @@ export default {
         const container = dom.createElement('div')
         newContactButton.setAttribute('type', 'button')
         if (!me) newContactButton.setAttribute('disabled', 'true')
-        UI.authn.checkUser().then(webId => {
+        authn.checkUser().then(webId => {
           if (webId) {
             me = webId
             newContactButton.removeAttribute('disabled')
@@ -793,7 +794,7 @@ export default {
         const container2 = dom.createElement('div')
         newOrganizationButton.setAttribute('type', 'button')
         if (!me) newOrganizationButton.setAttribute('disabled', 'true')
-        UI.authn.checkUser().then(webId => {
+        authn.checkUser().then(webId => {
           if (webId) {
             me = webId
             newOrganizationButton.removeAttribute('disabled')
@@ -860,7 +861,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.authn
+        UI.login
           .findAppInstances(context, ns.vcard('AddressBook'))
           .then(function (context) {
             const addressBooks = context.instances
@@ -888,12 +889,12 @@ export default {
         )
       }
 
-      me = UI.authn.currentUser()
+      me = authn.currentUser()
       if (!me) {
         console.log(
           '(You do not have your Web Id set. Sign in or sign up to make changes.)'
         )
-        UI.authn.logInLoadProfile(context).then(
+        UI.login.ensureLoadedProfile(context).then(
           context => {
             console.log('Logged in as ' + context.me)
             me = context.me

package/groupMembershipControl.js

@@ -7,7 +7,6 @@ const ns = UI.ns
 // const buttons = UI.buttonsn  no
 // const widgets = UI.widgets
 const utils = UI.utils
-// const kb = UI.store
 // const style = UI.style
 
 // Groups the person is a member of

package/individual.js

@@ -1,4 +1,5 @@
 import * as UI from 'solid-ui'
+import { authn, store } from 'solid-logic'
 import { renderMugshotGallery } from './mugshotGallery'
 import { renderWebIdControl, renderPublicIdControl } from './webidControl'
 import { renderGroupMemberships } from './groupMembershipControl.js'
@@ -7,7 +8,7 @@ import VCARD_ONTOLOGY_TEXT from './lib/vcard.js'
 
 const $rdf = UI.rdf
 const ns = UI.ns
-const kb = UI.store
+const kb = store
 const style = UI.style
 
 export function loadTurtleText (kb, thing, text) {
@@ -68,7 +69,7 @@ export async function renderIndividual (dom, div, subject, dataBrowserContext) {
 
   div.style = style.paneDivStyle || 'padding: 0.5em 1.5em 1em 1.5em;'
 
-  UI.authn.checkUser() // kick off async operation @@@ use async version
+  authn.checkUser() // kick off async operation @@@ use async version
 
   div.appendChild(renderMugshotGallery(dom, subject))
 

package/lib/autocompleteBar.js

@@ -38,16 +38,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 exports.renderAutocompleteControl = void 0;
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
-var UI = require("solid-ui");
 var autocompletePicker_1 = require("./autocompletePicker"); // dbpediaParameters
 var publicData_1 = require("./publicData");
 var WEBID_NOUN = 'Solid ID';
-var kb = solid_ui_1.store;
+var kb = solid_logic_1.store;
 var AUTOCOMPLETE_THRESHOLD = 4; // don't check until this many characters typed
 var AUTOCOMPLETE_ROWS = 12; // 20?
-var GREEN_PLUS = UI.icons.iconBase + 'noun_34653_green.svg';
-var SEARCH_ICON = UI.icons.iconBase + 'noun_Search_875351.svg';
+var GREEN_PLUS = solid_ui_1.icons.iconBase + 'noun_34653_green.svg';
+var SEARCH_ICON = solid_ui_1.icons.iconBase + 'noun_Search_875351.svg';
 function renderAutocompleteControl(dom, person, options, addOneIdAndRefresh) {
     return __awaiter(this, void 0, void 0, function () {
         function autoCompleteDone(object, _name) {
@@ -65,7 +65,7 @@ function renderAutocompleteControl(dom, person, options, addOneIdAndRefresh) {
                 var webid;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, solid_ui_1.widgets.askName(dom, solid_ui_1.store, creationArea, solid_ui_1.ns.vcard('url'), null, WEBID_NOUN)];
+                        case 0: return [4 /*yield*/, solid_ui_1.widgets.askName(dom, solid_logic_1.store, creationArea, solid_ui_1.ns.vcard('url'), null, WEBID_NOUN)];
                         case 1:
                             webid = _a.sent();
                             if (!webid) {

package/lib/autocompleteField.js

@@ -39,10 +39,10 @@ exports.__esModule = true;
 exports.autocompleteField = void 0;
 /* Form field for doing autocompleete
  */
+var rdflib_1 = require("rdflib");
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
 var autocompletePicker_1 = require("./autocompletePicker"); // dbpediaParameters
-var rdflib_1 = require("rdflib");
-var kb = solid_ui_1.store;
 var AUTOCOMPLETE_THRESHOLD = 4; // don't check until this many characters typed
 var AUTOCOMPLETE_ROWS = 12; // 20?
 /**
@@ -97,7 +97,7 @@ dom, container, already, subject, form, doc, callbackFunction) {
             });
         });
     }
-    var kb = solid_ui_1.store;
+    var kb = solid_logic_1.store;
     var formDoc = form.doc ? form.doc() : null; // @@ if blank no way to know
     var box = dom.createElement('tr');
     if (container)

package/lib/autocompletePicker.js

@@ -37,14 +37,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 exports.renderAutoComplete = void 0;
-/* Create and edit data using public data
-**
-** organization conveys many distinct types of thing.
-**
-*/
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
 var publicData_1 = require("./publicData");
-var kb = solid_ui_1.store;
 var AUTOCOMPLETE_THRESHOLD = 4; // don't check until this many characters typed
 var AUTOCOMPLETE_ROWS = 20; // 20?
 var AUTOCOMPLETE_ROWS_STRETCH = 40;
@@ -147,7 +142,7 @@ callback) {
             }
             if (hits == 1) { // Maybe require green confirmation button be clicked?
                 console.log("  auto complete elimination:  \"".concat(filter, "\" -> \"").concat(pickedName, "\""));
-                gotIt(kb.sym(pick), pickedName); // uri, name
+                gotIt(solid_logic_1.store.sym(pick), pickedName); // uri, name
             }
         }
         function clearList() {
@@ -236,7 +231,7 @@ callback) {
                                     return __generator(this, function (_a) {
                                         console.log('       click row textContent: ' + row.textContent);
                                         console.log('       click name: ' + name);
-                                        gotIt(kb.sym(uri), name);
+                                        gotIt(solid_logic_1.store.sym(uri), name);
                                         return [2 /*return*/];
                                     });
                                 }); });

package/lib/publicData.js

@@ -42,9 +42,9 @@ exports.getDbpediaDetails = exports.getWikidataLocation = exports.getWikidataDet
 * including filtering resut by natural language etc
 */
 var rdflib_1 = require("rdflib");
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
 var instituteDetailsQuery = require("../lib/instituteDetailsQuery.js");
-var kb = solid_ui_1.store;
 exports.AUTOCOMPLETE_LIMIT = 3000; // How many to get from server
 var subjectRegexp = /\$\(subject\)/g;
 // Schema.org seems to suggest NGOs are non-profit and Corporaions are for-profit
@@ -220,7 +220,7 @@ function queryESCODataByName(filter, theClass, queryTarget) {
                         headers: { 'Accept': 'application/json' }
                     } // CORS
                     ;
-                    return [4 /*yield*/, kb.fetcher.webOperation('GET', queryURI, options)
+                    return [4 /*yield*/, solid_logic_1.store.fetcher.webOperation('GET', queryURI, options)
                         //complain('Error querying db of organizations: ' + err)
                     ];
                 case 1:
@@ -276,7 +276,7 @@ function queryPublicDataSelect(sparql, queryTarget) {
                         headers: { 'Accept': 'application/json' }
                     } // CORS
                     ;
-                    return [4 /*yield*/, kb.fetcher.webOperation('GET', queryURI, options)
+                    return [4 /*yield*/, solid_logic_1.store.fetcher.webOperation('GET', queryURI, options)
                         //complain('Error querying db of organizations: ' + err)
                     ];
                 case 1:
@@ -308,7 +308,7 @@ function queryPublicDataConstruct(sparql, pubicId, queryTarget) {
                     options = { credentials: 'omit',
                         headers: { 'Accept': 'text/turtle' }
                     };
-                    return [4 /*yield*/, kb.fetcher.webOperation('GET', queryURI, options)];
+                    return [4 /*yield*/, solid_logic_1.store.fetcher.webOperation('GET', queryURI, options)];
                 case 1:
                     response = _a.sent();
                     text = response.responseText;
@@ -316,7 +316,7 @@ function queryPublicDataConstruct(sparql, pubicId, queryTarget) {
                     console.log('    queryPublicDataConstruct result text:' + report);
                     if (text.length === 0)
                         throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI);
-                    (0, rdflib_1.parse)(text, kb, pubicId.uri, 'text/turtle');
+                    (0, rdflib_1.parse)(text, solid_logic_1.store, pubicId.uri, 'text/turtle');
                     return [2 /*return*/];
             }
         });

package/mintNewAddressBook.js

@@ -1,4 +1,5 @@
-const UI = require('solid-ui')
+import * as UI from 'solid-ui'
+import { setACLUserPublic } from 'solid-logic'
 
 // const mime = require('mime-types')
 // const toolsPane0 = require('./toolsPane')
@@ -12,7 +13,7 @@ const $rdf = UI.rdf
 
 export function mintNewAddressBook (dataBrowserContext, context) {
   return new Promise(function (resolve, reject) {
-    UI.authn.logInLoadProfile(context).then(
+    UI.login.ensureLoadedProfile(context).then(
       context => {
         // 20180713
         console.log('Logged in as ' + context.me)
@@ -120,8 +121,7 @@ export function mintNewAddressBook (dataBrowserContext, context) {
               return reject(new Error('Error writing new file ' + task.to))
             }
 
-            UI.authn
-              .setACLUserPublic(dest, me, aclOptions)
+            setACLUserPublic(dest, me, aclOptions)
               .then(() => doNextTask())
               .catch(err => {
                 const message =

package/mugshotGallery.js

@@ -1,10 +1,11 @@
 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
+const kb = store
 
 /*  Mugshot Gallery
 *
@@ -116,7 +117,7 @@ export function renderMugshotGallery (dom, subject) {
   // When a set of URIs are dropped on
   async function handleURIsDroppedOnMugshot (uris) {
     for (const u of uris) {
-      var thing = $rdf.sym(u) // Attachment needs text label to disinguish I think not icon.
+      let thing = $rdf.sym(u) // Attachment needs text label to disinguish I think not icon.
       console.log('Dropped on mugshot thing ' + thing) // icon was: UI.icons.iconBase + 'noun_25830.svg'
       if (u.startsWith('http') && u.indexOf('#') < 0) {
         // Plain document
@@ -125,8 +126,9 @@ export function renderMugshotGallery (dom, subject) {
           thing = $rdf.sym('https:' + u.slice(5))
         }
         const options = { withCredentials: false, credentials: 'omit' }
+        let result
         try {
-          var result = await kb.fetcher.webOperation('GET', thing.uri, options)
+          result = await kb.fetcher.webOperation('GET', thing.uri, options)
         } catch (err) {
           complain(
             `Gallery: fetch error trying to read picture ${thing} data: ${err}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contacts-pane",
-  "version": "2.6.0-71f11b5c",
+  "version": "2.6.0-e4525047",
   "description": "Contacts Pane: Contacts manager for Address Book, Groups, and Individuals.",
   "main": "./contactsPane.js",
   "scripts": {
@@ -37,9 +37,10 @@
   },
   "homepage": "https://github.com/solid/contacts-pane",
   "dependencies": {
-    "pane-registry": "^2.4.6",
+    "pane-registry": "2.4.6-0a456338",
     "rdflib": "^2.2.17",
-    "solid-ui": "^2.4.15"
+    "solid-logic": "1.3.13-057429fe",
+    "solid-ui": "2.4.18-ca7338a8"
   },
   "devDependencies": {
     "eslint": "^7.32.0",

package/src/autocompleteBar.ts

@@ -1,13 +1,11 @@
 // The Control with decorations
 
-import { icons, ns, style, widgets, store } from 'solid-ui'
-
-import * as UI from 'solid-ui'
+import { NamedNode } from 'rdflib'
+import { store } from 'solid-logic'
+import { ns, widgets, icons } from 'solid-ui'
 import { renderAutoComplete } from './autocompletePicker' // dbpediaParameters
+import { wikidataParameters } from './publicData'
 
-import { NamedNode, Store, st } from 'rdflib'
-import { queryPublicDataByName, filterByLanguage, wikidataParameters,
-  AUTOCOMPLETE_LIMIT, QueryParameters, getPreferredLanguages } from './publicData'
 
 const WEBID_NOUN = 'Solid ID'
 
@@ -16,8 +14,8 @@ const kb = store
 const AUTOCOMPLETE_THRESHOLD = 4 // don't check until this many characters typed
 const AUTOCOMPLETE_ROWS = 12 // 20?
 
-const GREEN_PLUS = UI.icons.iconBase + 'noun_34653_green.svg'
-const SEARCH_ICON = UI.icons.iconBase + 'noun_Search_875351.svg'
+const GREEN_PLUS = icons.iconBase + 'noun_34653_green.svg'
+const SEARCH_ICON = icons.iconBase + 'noun_Search_875351.svg'
 
 export async function renderAutocompleteControl (dom:HTMLDocument,
    person:NamedNode, options, addOneIdAndRefresh): Promise<HTMLElement> {

package/src/autocompleteField.ts

@@ -1,16 +1,10 @@
 /* Form field for doing autocompleete
  */
-import { icons, ns, style, widgets, store } from 'solid-ui'
-
+import { BlankNode, NamedNode, st, Variable } from 'rdflib'
+import { store } from 'solid-logic'
+import { ns, style, widgets } from 'solid-ui'
 import { renderAutoComplete } from './autocompletePicker' // dbpediaParameters
 
-import { NamedNode, BlankNode, Variable, Store, st } from 'rdflib'
-import { queryPublicDataByName, filterByLanguage, wikidataParameters,
-  AUTOCOMPLETE_LIMIT, QueryParameters, getPreferredLanguages } from './publicData'
-
-
-const kb = store
-
 const AUTOCOMPLETE_THRESHOLD = 4 // don't check until this many characters typed
 const AUTOCOMPLETE_ROWS = 12 // 20?
 

package/src/autocompletePicker.ts

@@ -3,12 +3,12 @@
 ** organization conveys many distinct types of thing.
 **
 */
-import { icons, ns, style, widgets, store } from 'solid-ui'
-import { NamedNode, Store, st } from 'rdflib'
-import { queryPublicDataByName, filterByLanguage, wikidataParameters,
-  AUTOCOMPLETE_LIMIT, QueryParameters, getPreferredLanguages } from './publicData'
-
-const kb = store
+import { NamedNode } from 'rdflib'
+import { store } from 'solid-logic'
+import { style, widgets } from 'solid-ui'
+import {
+  AUTOCOMPLETE_LIMIT, filterByLanguage, getPreferredLanguages, QueryParameters, queryPublicDataByName
+} from './publicData'
 
 const AUTOCOMPLETE_THRESHOLD = 4 // don't check until this many characters typed
 const AUTOCOMPLETE_ROWS = 20 // 20?
@@ -120,7 +120,7 @@ export async function renderAutoComplete (dom: HTMLDocument, options:Autocomplet
     }
     if (hits == 1) { // Maybe require green confirmation button be clicked?
       console.log(`  auto complete elimination:  "${filter}" -> "${pickedName}"`)
-      gotIt(kb.sym(pick), pickedName) // uri, name
+      gotIt(store.sym(pick), pickedName) // uri, name
     }
   }
 
@@ -190,7 +190,7 @@ export async function renderAutoComplete (dom: HTMLDocument, options:Autocomplet
         row.addEventListener('click', async _event => {
           console.log('       click row textContent: ' + row.textContent)
           console.log('       click name: ' + name)
-          gotIt(kb.sym(uri), name)
+          gotIt(store.sym(uri), name)
         })
       })
     }

package/src/publicData.ts

@@ -2,13 +2,11 @@
 *
 * including filtering resut by natural language etc
 */
-import { NamedNode, Store, st, Literal, parse } from 'rdflib'
-
-import { icons, ns, style, widgets, store } from 'solid-ui'
+import { Literal, NamedNode, parse } from 'rdflib'
+import { store } from 'solid-logic'
+import { ns } from 'solid-ui'
 import * as instituteDetailsQuery from '../lib/instituteDetailsQuery.js'
 
-const kb = store
-
 export const AUTOCOMPLETE_LIMIT = 3000 // How many to get from server
 
 const subjectRegexp = /\$\(subject\)/g
@@ -228,7 +226,7 @@ export async function queryESCODataByName (filter: string, theClass:NamedNode, q
     headers: { 'Accept': 'application/json'}
   } // CORS
   var response
-  response = await kb.fetcher.webOperation('GET', queryURI, options)
+  response = await store.fetcher.webOperation('GET', queryURI, options)
   //complain('Error querying db of organizations: ' + err)
   const text = response.responseText
   console.log('    Query result  text' + text.slice(0,500) + '...')
@@ -268,7 +266,7 @@ export async function queryPublicDataSelect (sparql: string, queryTarget: QueryP
     headers: { 'Accept': 'application/json'}
   } // CORS
   var response
-  response = await kb.fetcher.webOperation('GET', queryURI, options)
+  response = await store.fetcher.webOperation('GET', queryURI, options)
   //complain('Error querying db of organizations: ' + err)
   const text = response.responseText
   // console.log('    Query result  text' + text.slice(0,100) + '...')
@@ -288,12 +286,12 @@ export async function queryPublicDataConstruct (sparql: string, pubicId: NamedNo
   const options = { credentials: 'omit', // CORS
     headers: { 'Accept': 'text/turtle'}
   }
-  const response = await kb.fetcher.webOperation('GET', queryURI, options)
+  const response = await store.fetcher.webOperation('GET', queryURI, options)
   const text = response.responseText
   const report = text.lenth > 500 ? text.slice(0,200) + ' ... ' + text.slice(-200) : text
   console.log('    queryPublicDataConstruct result text:' + report)
   if (text.length === 0) throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI)
-  parse(text, kb, pubicId.uri, 'text/turtle')
+  parse(text, store, pubicId.uri, 'text/turtle')
   return
 }
 

package/toolsPane.js

@@ -3,6 +3,7 @@
 /* global confirm, $rdf */
 
 import * as UI from 'solid-ui'
+import { store } from 'solid-logic'
 import { saveNewGroup, addPersonToGroup } from './contactLogic'
 export function toolsPane (
   selectAllGroups,
@@ -13,7 +14,7 @@ export function toolsPane (
   me
 ) {
   const dom = dataBrowserContext.dom
-  const kb = UI.store
+  const kb = store
   const ns = UI.ns
   const VCARD = ns.vcard
 
@@ -68,7 +69,7 @@ export function toolsPane (
 
     //
     try {
-      await UI.authn.registrationControl(context, book, ns.vcard('AddressBook'))
+      await UI.login.registrationControl(context, book, ns.vcard('AddressBook'))
     } catch (e) {
       UI.widgets.complain(context, 'registrationControl: ' + e)
     }
@@ -160,7 +161,7 @@ export function toolsPane (
       stats.nameEmailIndex = kb.any(book, ns.vcard('nameEmailIndex'))
       log('Loading name index...')
 
-      UI.store.fetcher.nowOrWhenFetched(
+      store.fetcher.nowOrWhenFetched(
         stats.nameEmailIndex,
         undefined,
         function (_ok, _message) {

package/webidControl.js

@@ -1,6 +1,7 @@
 // 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'
@@ -10,7 +11,7 @@ const $rdf = UI.rdf
 const ns = UI.ns
 const widgets = UI.widgets
 const utils = UI.utils
-const kb = UI.store
+const kb = store
 const style = UI.style
 
 const wikidataClasses = widgets.publicData.wikidataClasses // @@ move to solid-logic