solid-panes 3.5.16 → 3.5.18-18e626a8

package/src/outline/manager.js

@@ -4,6 +4,7 @@
 */
 
 import * as UI from 'solid-ui'
+import { authn, authSession, store } from 'solid-logic'
 import * as panes from 'pane-registry'
 import * as $rdf from 'rdflib'
 import YAHOO from './dragDrop'
@@ -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')
@@ -361,7 +362,7 @@ export default function (context) {
       const pane = panes.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()])
@@ -416,23 +417,23 @@ export default function (context) {
       .concat(pods)
 
     async function getPods () {
-      async function addPodRoot (pod) { // namedNode
-        await checkForContainerRepresentation(pod)
+      async function addPodStorage (pod) { // namedNode
+        await loadContainerRepresentation(pod)
         if (kb.holds(pod, ns.rdf('type'), ns.space('Storage'), pod.doc())) {
           pods.push(pod)
           return true
         }
         return false
       }
-      async function addPodRootFromUrl (url) {
+      async function addPodStorageFromUrl (url) {
         const podStorage = new URL(url)
-        // check that origin is not included in pods array
-        if (!pods.some(pod => pod.uri.includes(podStorage.origin))) {
-          // check in order, location.origin/<podName> then location.origin containing space:Storage
-          if (podStorage.pathname === '/' || !(await addPodRoot(kb.sym(`${podStorage.origin}/${podStorage.pathname.split('/')[1]}/`)))) {
-            await addPodRoot(kb.sym(`${podStorage.origin}/`))
-          }
+        // check for predicate pim:Storage in containers up the path tree
+        let pathStorage = podStorage.pathname
+        while (pathStorage.length) {
+          pathStorage = pathStorage.substring(0, pathStorage.lastIndexOf('/'))
+          if (await addPodStorage(kb.sym(`${podStorage.origin}${pathStorage}/`))) return
         }
+        // TODO should url.origin be added to pods list when there are no pim:Storage ???
       }
 
       try {
@@ -442,16 +443,30 @@ export default function (context) {
         console.error('Unable to load profile', err)
         return []
       }
-      const pods = kb.each(me, ns.space('storage'), null, me.doc())
+      // load pod's storages from profile
+      let pods = kb.each(me, ns.space('storage'), null, me.doc())
+      pods.map(async (pod) => {
+        // TODO use addPodStorageFromUrl(pod.uri) to check for pim:Storage ???
+        await loadContainerRepresentation(pod)
+      })
 
       try {
         // if uri then SolidOS is a browse.html web app
         const uri = (new URL(window.location.href)).searchParams.get('uri')
         const podUrl = uri || window.location.href
-        await addPodRootFromUrl(podUrl.substring(0, podUrl.lastIndexOf('/') + 1))
+        await addPodStorageFromUrl(podUrl)
       } catch (err) {
         console.error('cannot load container', err)
       }
+      // remove namedNodes duplicates
+      function uniques (nodes) {
+        const uniqueNodes = []
+        nodes.forEach(node => {
+          if (!uniqueNodes.find(uniqueNode => uniqueNode.equals(node))) uniqueNodes.push(node)
+        })
+        return uniqueNodes
+      }
+      pods = uniques(pods)
       if (!pods.length) return []
       return pods.map((pod, index) => {
         function split (item) { return item.uri.split('//')[1].slice(0, -1) }
@@ -468,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')
         )
@@ -520,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'
@@ -566,7 +581,7 @@ export default function (context) {
     )
   }
 
-  async function checkForContainerRepresentation (subject) {
+  async function loadContainerRepresentation (subject) {
     // force reload for index.html with RDFa
     if (!kb.any(subject, ns.ldp('contains'), undefined, subject.doc())) {
       const response = await kb.fetcher.webOperation('GET', subject.uri, kb.fetcher.initFetchOptions(subject.uri, { headers: { accept: 'text/turtle' } }))
@@ -577,7 +592,7 @@ export default function (context) {
 
   async function getRelevantPanes (subject, context) {
     // make sure container representation is loaded (when server returns index.html)
-    if (subject.uri.endsWith('/')) { await checkForContainerRepresentation(subject) }
+    if (subject.uri.endsWith('/')) { await loadContainerRepresentation(subject) }
     const panes = context.session.paneRegistry
     const relevantPanes = panes.list.filter(
       pane => pane.label(subject, context) && !pane.global
@@ -586,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]]
@@ -1353,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);
     }
   }
@@ -1424,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
@@ -1595,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)
@@ -1646,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)
@@ -1888,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);

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)