solid-panes 3.5.19 → 3.5.21

package/src/mainPage/header.ts

@@ -1,4 +1,5 @@
-import { icons, authn, initHeader } from 'solid-ui'
+import { authSession, authn } from 'solid-logic'
+import { icons, initHeader } from 'solid-ui'
 /**
  * menu icons
 */
@@ -41,7 +42,7 @@ async function setUserMenu (outliner: any) {
   const logOut = {
     label: LOG_OUT_MENU_ITEM,
     onclick: () => {
-      authn.authSession.logout()
+      authSession.logout()
     }
   }
 

package/src/microblogPane/microblogPane.js

@@ -3,13 +3,14 @@
  Charles McKenzie <charles2@mit.edu>
 */
 /* global alert */
-const UI = require('solid-ui')
+import { authn, store } from 'solid-logic'
+import * as UI from 'solid-ui'
 
 module.exports = {
   icon: UI.icons.originalIconBase + 'microblog/microblog.png',
   name: 'microblogPane',
   label: function (subject) {
-    if (UI.store.whether(subject, UI.ns.rdf('type'), UI.ns.foaf('Person'))) {
+    if (store.whether(subject, UI.ns.rdf('type'), UI.ns.foaf('Person'))) {
       return 'Microblog'
     } else {
       return null
@@ -25,9 +26,9 @@ module.exports = {
     const terms = UI.rdf.Namespace('http://purl.org/dc/terms/')
     const RDF = UI.ns.rdf
 
-    const kb = UI.store
+    const kb = store
     const charCount = 140
-    const sf = UI.store.fetcher
+    const sf = store.fetcher
     //* **********************************************
     // BACK END
     //* **********************************************
@@ -134,7 +135,7 @@ module.exports = {
       // attempt to fetch user account from local preferences if just
       // in case the user's foaf was not writable. add it to the store
       // this will probably need to change.
-      const theUser = UI.authn.currentUser()
+      const theUser = authn.currentUser()
 
       if (theUser) {
         let theAccount = UI.preferences.get('acct')
@@ -304,7 +305,7 @@ module.exports = {
       })
     }
     Microblog.prototype.getMyURI = function () {
-      const me = UI.authn.currentUser()
+      const me = authn.currentUser()
       console.log(me)
       const myMicroblog = kb.any(kb.sym(me), FOAF('holdsAccount'))
       console.log('\n\n' + myMicroblog)
@@ -533,7 +534,7 @@ module.exports = {
       } else if (resourceType.uri === SIOC('User').uri) {
         this.thisIsMe = s.uri === mb.getMyURI()
       } else if (resourceType.uri === FOAF('Person').uri) {
-        const me = UI.authn.currentUser()
+        const me = authn.currentUser()
         const meUri = me && me.uri
         this.thisIsMe = s.uri === meUri
       } else {
@@ -900,7 +901,7 @@ module.exports = {
         ) {
           creator = creators[c]
           // var mb = kb.sym(creator.uri.split("#")[0]);
-          // UI.store.fetcher.refresh(mb);
+          // store.fetcher.refresh(mb);
           break
           // TODO add support for more than one microblog in same foaf
         }

package/src/outline/dragDrop.js

@@ -20,9 +20,10 @@ if (!tabulator_gBrowser) {
 */
 
 /* 2007: adapted from dragAndDrop UI Library */
+import { store } from 'solid-logic'
+import * as UI from 'solid-ui'
+import * as $rdf from 'rdflib'
 
-const UI = require('solid-ui')
-const $rdf = require('rdflib')
 const dragAndDrop = (module.exports = {})
 
 dragAndDrop.util = {}
@@ -270,7 +271,7 @@ const TabulatorOutlinerObserver = {
         const templateDoc = $rdf.sym(
           'chrome://tabulator/content/internalKnowledge.n3#defaultNew'
         )
-        UI.store.copyTo(templateDoc, $rdf.sym(url))
+        store.copyTo(templateDoc, $rdf.sym(url))
         /*
       function WriteToFileRepresentedBy (subject){
           var outputFormulaTerm=kb.any(subject,OWL('unionOf'))
@@ -333,7 +334,7 @@ const TabulatorOutlinerObserver = {
     const thisOutline = table.outline
     thisOutline.UserInput.insertTermTo(
       targetTd,
-      UI.utils.getAbout(UI.store, this.dragTarget)
+      UI.utils.getAbout(store, this.dragTarget)
     )
   },
   onDragStart: function (x, y, td) {

package/src/outline/licenseOptions.js

@@ -3,6 +3,8 @@
 
 // tabulator.options becaome UI.licenseOptions
 // Possible future alternative directoons: Store licence preferences in a solid preferences file
+import * as UI from 'solid-ui'
+import { store } from 'solid-logic'
 
 const licenseURI = [
   'http://creativecommons.org/licenses/by-nc-nd/3.0/',
@@ -15,9 +17,6 @@ const licenseURI = [
 
 const names = ['BY-NC-ND', 'BY-NC-SA', 'BY-NC', 'BY-ND', 'BY-SA', 'BY']
 
-const UI = require('solid-ui')
-const kb = UI.store
-
 module.exports = function licenseOptions () {
   this.options = {}
   this.references = []
@@ -83,9 +82,9 @@ module.exports = function licenseOptions () {
   }
 
   this.checkLicence = function checkLicense (statement) {
-    const licenses = kb.each(
+    const licenses = store.each(
       statement.why,
-      kb.sym('http://creativecommons.org/ns#license')
+      store.sym('http://creativecommons.org/ns#license')
     )
     UI.log.info('licenses:' + statement.why + ': ' + licenses)
     for (let i = 0; i < licenses.length; i++) {

package/src/outline/manager.js

@@ -4,7 +4,8 @@
 */
 
 import * as UI from 'solid-ui'
-import * as panes from 'pane-registry'
+import { authn, authSession, store } from 'solid-logic'
+import * as paneRegistry from 'pane-registry'
 import * as $rdf from 'rdflib'
 import YAHOO from './dragDrop'
 import outlineIcons from './outlineIcons'
@@ -30,9 +31,9 @@ export default function (context) {
   this.selection = selection
   this.ancestor = UI.utils.ancestor // make available as outline.ancestor in callbacks
   this.sparql = UI.rdf.UpdateManager
-  this.kb = UI.store
-  const kb = UI.store
-  const sf = UI.store.fetcher
+  this.kb = store
+  const kb = store
+  const sf = store.fetcher
   dom.outline = this
   this.qs = new queryByExample.QuerySource() // Track queries in queryByExample
 
@@ -344,7 +345,7 @@ export default function (context) {
   async function globalAppTabs (options = {}) {
     console.log('globalAppTabs @@')
     const div = dom.createElement('div')
-    const me = UI.authn.currentUser()
+    const me = authn.currentUser()
     if (!me) {
       alert('Must be logged in for this')
       throw new Error('Not logged in')
@@ -358,10 +359,10 @@ export default function (context) {
 
     function renderMain (containerDiv, item) {
       // Items are pane names
-      const pane = panes.byName(item.paneName) // 20190701
+      const pane = paneRegistry.byName(item.paneName) // 20190701
       containerDiv.innerHTML = ''
       const table = containerDiv.appendChild(dom.createElement('table'))
-      const me = UI.authn.currentUser()
+      const me = authn.currentUser()
       thisOutline.GotoSubject(
         item.subject || me,
         true,
@@ -391,7 +392,7 @@ export default function (context) {
   this.getDashboard = globalAppTabs
 
   async function getDashboardItems () {
-    const me = UI.authn.currentUser()
+    const me = authn.currentUser()
     if (!me) return []
     const div = dom.createElement('div')
     const [books, pods] = await Promise.all([getAddressBooks(), getPods()])
@@ -482,7 +483,7 @@ export default function (context) {
 
     async function getAddressBooks () {
       try {
-        const context = await UI.authn.findAppInstances(
+        const context = await UI.login.findAppInstances(
           { me, div, dom },
           ns.vcard('AddressBook')
         )
@@ -534,7 +535,7 @@ export default function (context) {
     })
 
     // close the dashboard if user log out
-    UI.authn.authSession.onLogout(closeDashboard)
+    authSession.onLogout(closeDashboard)
 
     // finally - switch to showing dashboard
     outlineContainer.style.display = 'none'
@@ -600,7 +601,7 @@ export default function (context) {
       // there are no relevant panes, simply return default pane (which ironically is internalPane)
       return [panes.byName('internal')]
     }
-    const filteredPanes = await UI.authn.filterAvailablePanes(relevantPanes)
+    const filteredPanes = await UI.login.filterAvailablePanes(relevantPanes)
     if (filteredPanes.length === 0) {
       // if no relevant panes are available panes because of user role, we still allow for the most relevant pane to be viewed
       return [relevantPanes[0]]
@@ -1367,7 +1368,7 @@ export default function (context) {
     if (target.label) {
       window.content.location = target.label
       // The following alternative does not work in the extension.
-      // var s = UI.store.sym(target.label);
+      // var s = store.sym(target.label);
       // outline.GotoSubject(s, true);
     }
   }
@@ -1438,7 +1439,7 @@ export default function (context) {
         // don't do these for headers or base nodes
         const source = st.why
         // var target = st.why
-        const editable = UI.store.updater.editable(source.uri, kb)
+        const editable = store.updater.editable(source.uri, kb)
         if (!editable) {
           // let target = node.parentNode.AJAR_inverse ? st.object : st.subject
         } // left hand side
@@ -1609,7 +1610,7 @@ export default function (context) {
           // I don't know why 'HTML'
           const object = UI.utils.getAbout(kb, selectedTd)
           target = selectedTd.parentNode.AJAR_statement.why
-          editable = UI.store.updater.editable(target.uri, kb)
+          editable = store.updater.editable(target.uri, kb)
           if (object) {
             // <Feature about='enterToExpand'>
             outline.GotoSubject(object, true)
@@ -1660,7 +1661,7 @@ export default function (context) {
       case 46: // delete
       case 8: // backspace
         target = selectedTd.parentNode.AJAR_statement.why
-        editable = UI.store.updater.editable(target.uri, kb)
+        editable = store.updater.editable(target.uri, kb)
         if (editable) {
           e.preventDefault() // prevent from going back
           this.UserInput.Delete(selectedTd)
@@ -1688,7 +1689,7 @@ export default function (context) {
             sf.addCallback('done', setSelectedAfterward)
             sf.addCallback('fail', setSelectedAfterward)
             outlineExpand(selectedTd, obj, {
-              pane: panes.byName('defaultPane')
+              pane: paneRegistry.byName('defaultPane')
             })
           }
           setSelectedAfterward()
@@ -1791,7 +1792,7 @@ export default function (context) {
     const target = thisOutline.targetOf(e)
     const p = target.parentNode
     const subject = UI.utils.getAbout(kb, target)
-    const pane = e.altKey ? panes.byName('internal') : undefined // set later: was panes.defaultPane
+    const pane = e.altKey ? paneRegistry.byName('internal') : undefined // set later: was panes.defaultPane
 
     if (e.shiftKey) {
       // Shift forces a refocus - bring this to the top
@@ -1800,7 +1801,7 @@ export default function (context) {
       if (e.altKey) {
         // To investigate screw ups, dont wait show internals
         outlineExpand(p, subject, {
-          pane: panes.byName('internal'),
+          pane: paneRegistry.byName('internal'),
           immediate: true
         })
       } else {
@@ -1813,7 +1814,7 @@ export default function (context) {
     // for icon UI.icons.originalIconBase + 'tbl-collapse.png'
     const target = thisOutline.targetOf(e)
     const subject = UI.utils.getAbout(kb, target)
-    const pane = e.altKey ? panes.byName('internal') : undefined
+    const pane = e.altKey ? paneRegistry.byName('internal') : undefined
     const p = target.parentNode.parentNode
     outlineCollapse(p, subject, pane)
   }
@@ -1902,7 +1903,7 @@ export default function (context) {
       const st = node.parentNode.AJAR_statement
       if (!st) return // For example in the title TD of an expanded pane
       const target = st.why
-      const editable = UI.store.updater.editable(target.uri, kb)
+      const editable = store.updater.editable(target.uri, kb)
       if (sel && editable) thisOutline.UserInput.Click(e, selection[0]) // was next 2 lines
       // var text='TabulatorMouseDown@Outline()';
       // HCIoptions['able to edit in Discovery Mode by mouse'].setupHere([sel,e,thisOutline,selection[0]],text);
@@ -2414,7 +2415,7 @@ export default function (context) {
         row.appendChild(thisOutline.outlineObjectTD(elt))
       }
     } else if (obj.termType === 'Graph') {
-      rep = panes
+      rep = paneRegistry
         .byName('dataContentPane')
         .statementsAsTables(obj.statements, context)
       rep.setAttribute('class', 'nestedFormula')

package/src/outline/queryByExample.js

@@ -6,7 +6,8 @@
 // to find all other places which had the same pattern.
 // Fields could be optional by pressing th ewhite optoional button
 
-const UI = require('solid-ui')
+import { store } from 'solid-logic'
+import * as UI from 'solid-ui'
 
 module.exports = {
   makeQueryRow,
@@ -31,7 +32,6 @@ function predParentOf (node) {
 }
 
 function makeQueryRow (q, tr, constraint) {
-  const kb = UI.store
   // predtr = predParentOf(tr)
   // var nodes = tr.childNodes
   // var n = tr.childNodes.length
@@ -87,7 +87,7 @@ function makeQueryRow (q, tr, constraint) {
     }
   }
   if (opt) {
-    const optForm = kb.formula()
+    const optForm = store.formula()
     optionalSubqueriesIndex.push(optForm)
     predtr.setAttribute(
       'optionalSubqueriesIndex',
@@ -115,7 +115,7 @@ function makeQueryRow (q, tr, constraint) {
   // UI.log.debug('Initial variable: '+tr.AJAR_variable)
   const v = tr.AJAR_variable
     ? tr.AJAR_variable
-    : kb.variable(UI.utils.newVariableName())
+    : store.variable(UI.utils.newVariableName())
   q.vars.push(v)
   v.label = hasParent ? parentVar.label : UI.utils.label(parentVar)
   v.label += ' ' + UI.utils.predicateLabelForXML(st.predicate, inverse)