issue-pane 2.4.9-5fd734ff → 2.4.9-e1b104be

package/board.js

@@ -11,7 +11,7 @@
 */
 
 import * as UI from 'solid-ui'
-import { store } from 'solid-logic'
+const kb = UI.store
 const ns = UI.ns
 const $rdf = UI.rdf
 
@@ -38,7 +38,7 @@ export function board (dom, columnValues, renderItem, options) {
     function droppedURIHandler (uris) {
       uris.forEach(function (u) {
         console.log('Dropped on column: ' + u)
-        const item = store.sym(u)
+        const item = kb.sym(u)
         options.columnDropHandler(item, x)
       })
     }
@@ -54,19 +54,19 @@ export function board (dom, columnValues, renderItem, options) {
   function defaultRenderItem (item, category) {
     const card = dom.createElement('div')
     const table = card.appendChild(dom.createElement('table'))
-    const classes = store.each(item, ns.rdf('type'))
-    const catColors = classes.map(cat => store.any(cat, ns.ui('backgroundColor'))).filter(c => c)
+    const classes = kb.each(item, ns.rdf('type'))
+    const catColors = classes.map(cat => kb.any(cat, ns.ui('backgroundColor'))).filter(c => c)
 
     table.appendChild(UI.widgets.personTR(dom, null, item))
     table.subject = item
     table.style = 'margin: 1em;' // @@ use style.js
-    const backgroundColor = catColors[0] || store.any(category, ns.ui('backgroundColor'))
+    const backgroundColor = catColors[0] || kb.any(category, ns.ui('backgroundColor'))
     card.style.backgroundColor = backgroundColor ? backgroundColor.value : '#fff'
     return card
   }
 
   function sortedBy (values, predicate, defaultSortValue, reverse) {
-    const toBeSorted = values.map(x => [store.any(x, predicate) || defaultSortValue, x])
+    const toBeSorted = values.map(x => [kb.any(x, predicate) || defaultSortValue, x])
     toBeSorted.sort()
     if (reverse) toBeSorted.reverse() // @@ check
     return toBeSorted.map(pair => pair[1])
@@ -82,7 +82,7 @@ export function board (dom, columnValues, renderItem, options) {
     }
     for (let col = mainRow.firstChild; col; col = col.nextSibling) {
       const category = col.subject
-      let items = store.each(null, ns.rdf('type'), category)
+      let items = kb.each(null, ns.rdf('type'), category)
       const sortBy = options.sortBy || ns.dct('created')
       if (options.filter) {
         items = items.filter(options.filter)

package/issue.js

@@ -1,24 +1,36 @@
 // All the UI for a single issue, without store load or listening for changes
 //
-import { icons, messageArea, ns, rdf, style, utils, widgets } from 'solid-ui'
-import { authn, store } from 'solid-logic'
+import { authn, icons, messageArea, ns, rdf, store, style, utils, widgets } from 'solid-ui'
 import { newIssueForm } from './newIssue'
 
 const $rdf = rdf
+const kb = store
 
 const SET_MODIFIED_DATES = false
 
+export const TASK_ICON = icons.iconBase + 'noun_17020_gray-tick.svg'
+export const OPEN_TASK_ICON = icons.iconBase + 'noun_17020_sans-tick.svg'
+export const CLOSED_TASK_ICON = icons.iconBase + 'noun_17020.svg'
+
 function complain (message, context) {
   console.warn(message)
   context.paneDiv.appendChild(widgets.errorMessageBlock(context.dom, message))
 }
 
+export function isOpen (issue) {
+  const types = kb.findTypeURIs(issue)
+  return !!types[ns.wf('Open').uri]
+}
+
+export function iconForIssue (issue) {
+  return isOpen(issue) ? TASK_ICON : CLOSED_TASK_ICON
+}
 export function getState (issue, classification) {
-  const tracker = store.the(issue, ns.wf('tracker'), null, issue.doc())
-  const states = store.any(tracker, ns.wf('issueClass'))
+  const tracker = kb.the(issue, ns.wf('tracker'), null, issue.doc())
+  const states = kb.any(tracker, ns.wf('issueClass'))
   classification = classification || states
-  const types = store.each(issue, ns.rdf('type'))
-    .filter(ty => store.holds(ty, ns.rdfs('subClassOf'), classification))
+  const types = kb.each(issue, ns.rdf('type'))
+    .filter(ty => kb.holds(ty, ns.rdfs('subClassOf'), classification))
   if (types.length !== 1) {
     // const initialState = kb.any(tracker, ns.wf('initialState')) No do NOT default
     // if (initialState) return initialState
@@ -29,8 +41,8 @@ export function getState (issue, classification) {
 
 export function renderIssueCard (issue, context) {
   function getBackgroundColor () {
-    const classes = store.each(issue, ns.rdf('type')) // @@ pick cats in order then state
-    const catColors = classes.map(cat => store.any(cat, ns.ui('backgroundColor'))).filter(c => !!c)
+    const classes = kb.each(issue, ns.rdf('type')) // @@ pick cats in order then state
+    const catColors = classes.map(cat => kb.any(cat, ns.ui('backgroundColor'))).filter(c => !!c)
 
     if (catColors.length) return catColors[0].value // pick first one
     return null
@@ -46,7 +58,7 @@ export function renderIssueCard (issue, context) {
   const card = dom.createElement('div')
   const table = card.appendChild(dom.createElement('table'))
   table.style.width = '100%'
-  const options = { draggable: false } // Let the baord make th ewhole card draggable
+  const options = { draggable: false } // Let the baord make the whole card draggable
   table.appendChild(widgets.personTR(dom, null, issue, options))
   table.subject = issue
   card.style = 'border-radius: 0.4em; border: 0.05em solid grey; margin: 0.3em;'
@@ -66,7 +78,7 @@ export function renderIssueCard (issue, context) {
   if (uncategorized) {
     const deleteButton = widgets.deleteButtonWithCheck(dom, buttonsCell, 'issue', async function () { // noun?
       try {
-        await store.updater.update(store.connectedStatements(issue))
+        await kb.updater.update(kb.connectedStatements(issue))
       } catch (err) {
         complain(`Unable to delete issue: ${err}`, context)
       }
@@ -102,16 +114,15 @@ export function exposeOverlay (subject, context) {
 
 export function renderIssue (issue, context) {
   // Don't bother changing the last modified dates of things: save time
-  function setModifiedDate (subj, store, doc) {
+  function setModifiedDate (subj, kb, doc) {
     if (SET_MODIFIED_DATES) {
       if (!getOption(tracker, 'trackLastModified')) return
-      let deletions = store.statementsMatching(issue, ns.dct('modified'))
-      deletions = deletions.concat(
-        store.statementsMatching(issue, ns.wf('modifiedBy'))
-      )
+      const deletions = kb.statementsMatching(issue, ns.dct('modified'))
+        .concat(kb.statementsMatching(issue, ns.wf('modifiedBy'))
+        )
       const insertions = [$rdf.st(issue, ns.dct('modified'), new Date(), doc)]
       if (me) insertions.push($rdf.st(issue, ns.wf('modifiedBy'), me, doc))
-      store.updater.update(deletions, insertions, function (_uri, _ok, _body) {})
+      kb.updater.update(deletions, insertions, function (_uri, _ok, _body) {})
     }
   }
 
@@ -144,32 +155,32 @@ export function renderIssue (issue, context) {
   }
   function getOption (tracker, option) {
     // eg 'allowSubIssues'
-    const opt = store.any(tracker, ns.ui(option))
+    const opt = kb.any(tracker, ns.ui(option))
     return !!(opt && opt.value)
   }
 
   function setPaneStyle () {
-    const types = store.findTypeURIs(issue)
-    let mystyle = 'padding: 0.5em 1.5em 1em 1.5em; '
+    const types = kb.findTypeURIs(issue)
+    const mystyle0 = 'padding: 0.5em 1.5em 1em 1.5em; '
     let backgroundColor = null
     for (const uri in types) {
-      backgroundColor = store.any(
-        store.sym(uri),
-        store.sym('http://www.w3.org/ns/ui#backgroundColor')
+      backgroundColor = kb.any(
+        kb.sym(uri),
+        kb.sym('http://www.w3.org/ns/ui#backgroundColor')
       )
       if (backgroundColor) break
     }
     backgroundColor = backgroundColor ? backgroundColor.value : '#eee' // default grey
-    mystyle += 'background-color: ' + backgroundColor + '; '
+    const mystyle = mystyle0 + 'background-color: ' + backgroundColor + '; '
     issueDiv.setAttribute('style', mystyle)
   }
 
+  /// ////////////// Body of renderIssue
+
   const dom = context.dom
-  // eslint-disable-next-line no-use-before-define
-  const tracker = store.the(issue, ns.wf('tracker'), null, issue.doc())
+  const tracker = kb.the(issue, ns.wf('tracker'), null, issue.doc())
   if (!tracker) throw new Error('No tracker')
-  // eslint-disable-next-line no-use-before-define
-  const stateStore = store.any(tracker, ns.wf('stateStore'))
+  const stateStore = kb.any(tracker, ns.wf('stateStore'))
   const store = issue.doc()
 
   const issueDiv = dom.createElement('div')
@@ -179,17 +190,20 @@ export function renderIssue (issue, context) {
 
   authn.checkUser() // kick off async operation
 
-  const states = store.any(tracker, ns.wf('issueClass'))
+  const iconButton = issueDiv.appendChild(widgets.button(dom, iconForIssue(issue)))
+  widgets.makeDraggable(iconButton, issue) // Drag me wherever you need to do stuff with this issue
+
+  const states = kb.any(tracker, ns.wf('issueClass'))
   if (!states) { throw new Error('This tracker ' + tracker + ' has no issueClass') }
   const select = widgets.makeSelectForCategory(
     dom,
-    store,
+    kb,
     issue,
     states,
     stateStore,
     function (ok, body) {
       if (ok) {
-        setModifiedDate(store, store, store)
+        setModifiedDate(store, kb, store)
         widgets.refreshTree(issueDiv)
       } else {
         console.log('Failed to change state:\n' + body)
@@ -198,18 +212,18 @@ export function renderIssue (issue, context) {
   )
   issueDiv.appendChild(select)
 
-  const cats = store.each(tracker, ns.wf('issueCategory')) // zero or more
-  for (let i = 0; i < cats.length; i++) {
+  const cats = kb.each(tracker, ns.wf('issueCategory')) // zero or more
+  for (const cat of cats) {
     issueDiv.appendChild(
       widgets.makeSelectForCategory(
         dom,
-        store,
+        kb,
         issue,
-        cats[i],
+        cat,
         stateStore,
         function (ok, body) {
           if (ok) {
-            setModifiedDate(store, store, store)
+            setModifiedDate(store, kb, store)
             widgets.refreshTree(issueDiv)
           } else {
             console.log('Failed to change category:\n' + body)
@@ -253,7 +267,7 @@ export function renderIssue (issue, context) {
     wf:Task     :creationForm core:coreIsueForm .
 `
   const CORE_ISSUE_FORM = ns.wf('coreIsueForm')
-  $rdf.parse(coreIssueFormText, store, CORE_ISSUE_FORM.doc().uri, 'text/turtle')
+  $rdf.parse(coreIssueFormText, kb, CORE_ISSUE_FORM.doc().uri, 'text/turtle')
   widgets.appendForm(
     dom,
     issueDiv,
@@ -282,11 +296,11 @@ export function renderIssue (issue, context) {
 
   // Assigned to whom?
 
-  const assignments = store.statementsMatching(issue, ns.wf('assignee'))
+  const assignments = kb.statementsMatching(issue, ns.wf('assignee'))
   if (assignments.length > 1) {
     say('Weird, was assigned to more than one person. Fixing ..')
     const deletions = assignments.slice(1)
-    store.updater.update(deletions, [], function (uri, ok, body) {
+    kb.updater.update(deletions, [], function (uri, ok, body) {
       if (ok) {
         say('Now fixed.')
       } else {
@@ -299,20 +313,16 @@ export function renderIssue (issue, context) {
   // Anyone assigned to any issue we know about
 
   async function getPossibleAssignees () {
-    let devs = []
-    const devGroups = store.each(issue, ns.wf('assigneeGroup'))
-    for (let i = 0; i < devGroups.length; i++) {
-      const group = devGroups[i]
-      await store.fetcher.load()
-      devs = devs.concat(store.each(group, ns.vcard('member')))
-    }
+    const devGroups = kb.each(issue, ns.wf('assigneeGroup'))
+    await kb.fetcher.load(devGroups) // Load them all
+    const groupDevs = devGroups.map(group => kb.each(group, ns.vcard('member'), null, group.doc())).flat()
     // Anyone who is a developer of any project which uses this tracker
-    const proj = store.any(null, ns.doap('bug-database'), tracker) // What project?
+    const proj = kb.any(null, ns.doap('bug-database'), tracker) // What project?
     if (proj) {
-      await store.fetcher.load(proj)
-      devs = devs.concat(store.each(proj, ns.doap('developer')))
+      await kb.fetcher.load(proj)
     }
-    return devs
+    const projectDevs = proj ? kb.each(proj, ns.doap('developer')) : []
+    return groupDevs.concat(projectDevs)
   }
 
   // Super issues first - like parent directories .. maybe use breadcrums from?? @@
@@ -324,7 +334,7 @@ export function renderIssue (issue, context) {
   getPossibleAssignees().then(devs => {
     if (devs.length) {
       devs.forEach(function (person) {
-        store.fetcher.lookUpThing(person)
+        kb.fetcher.lookUpThing(person)
       }) // best effort async for names etc
       const opts = {
         // 'mint': '** Add new person **',
@@ -339,14 +349,14 @@ export function renderIssue (issue, context) {
       issueDiv.appendChild(
         widgets.makeSelectForOptions(
           dom,
-          store,
+          kb,
           issue,
           ns.wf('assignee'),
           devs,
           opts,
           store,
           function (ok, body) {
-            if (ok) setModifiedDate(store, store, store)
+            if (ok) setModifiedDate(store, kb, store)
             else console.log('Failed to change assignee:\n' + body)
           }
         )
@@ -366,7 +376,7 @@ export function renderIssue (issue, context) {
     subIssuePanel.appendChild(dom.createElement('h4')).textContent = 'Super Issues'
     const listOfSupers = subIssuePanel.appendChild(dom.createElement('div'))
     listOfSupers.refresh = function () {
-      utils.syncTableToArrayReOrdered(listOfSupers, store.each(null, ns.wf('dependent'), issue), renderSubIssue)
+      utils.syncTableToArrayReOrdered(listOfSupers, kb.each(null, ns.wf('dependent'), issue), renderSubIssue)
     }
     listOfSupers.refresh()
 
@@ -374,7 +384,7 @@ export function renderIssue (issue, context) {
     subIssuePanel.appendChild(dom.createElement('h4')).textContent = 'Sub Issues'
     const listOfSubs = subIssuePanel.appendChild(dom.createElement('div'))
     listOfSubs.refresh = function () {
-      utils.syncTableToArrayReOrdered(listOfSubs, store.each(issue, ns.wf('dependent')), renderSubIssue)
+      utils.syncTableToArrayReOrdered(listOfSubs, kb.each(issue, ns.wf('dependent')), renderSubIssue)
     }
     listOfSubs.refresh()
 
@@ -387,7 +397,7 @@ export function renderIssue (issue, context) {
     b.addEventListener(
       'click',
       function (_event) {
-        subIssuePanel.insertBefore(newIssueForm(dom, store, tracker, issue, listOfSubs.refresh), b.nextSibling) // Pop form just after button
+        subIssuePanel.insertBefore(newIssueForm(dom, kb, tracker, issue, listOfSubs.refresh), b.nextSibling) // Pop form just after button
       },
       false
     )
@@ -396,7 +406,7 @@ export function renderIssue (issue, context) {
   issueDiv.appendChild(dom.createElement('br'))
 
   // Extras are stored centrally to the tracker
-  const extrasForm = store.any(tracker, ns.wf('extrasEntryForm'))
+  const extrasForm = kb.any(tracker, ns.wf('extrasEntryForm'))
   if (extrasForm) {
     widgets.appendForm(
       dom,
@@ -414,7 +424,7 @@ export function renderIssue (issue, context) {
   const spacer = issueDiv.appendChild(dom.createElement('tr'))
   spacer.setAttribute('style', 'height: 1em') // spacer and placeHolder
 
-  const template = store.anyValue(tracker, ns.wf('issueURITemplate'))
+  const template = kb.anyValue(tracker, ns.wf('issueURITemplate'))
   /*
   var chatDocURITemplate = kb.anyValue(tracker, ns.wf('chatDocURITemplate')) // relaive to issue
   var chat
@@ -427,18 +437,18 @@ export function renderIssue (issue, context) {
   if (template) {
     messageStore = issue.doc() // for now. Could go deeper
   } else {
-    messageStore = store.any(tracker, ns.wf('messageStore'))
-    if (!messageStore) messageStore = store.any(tracker, ns.wf('stateStore'))
-    store.sym(messageStore.uri + '#' + 'Chat' + timestring()) // var chat =
+    messageStore = kb.any(tracker, ns.wf('messageStore'))
+    if (!messageStore) messageStore = kb.any(tracker, ns.wf('stateStore'))
+    kb.sym(messageStore.uri + '#' + 'Chat' + timestring()) // var chat =
   }
 
-  store.fetcher.nowOrWhenFetched(messageStore, function (ok, body, _xhr) {
+  kb.fetcher.nowOrWhenFetched(messageStore, function (ok, body, _xhr) {
     if (!ok) {
       const er = dom.createElement('p')
       er.textContent = body // @@ use nice error message
       issueDiv.insertBefore(er, spacer)
     } else {
-      const discussion = messageArea(dom, store, issue, messageStore)
+      const discussion = messageArea(dom, kb, issue, messageStore)
       issueDiv.insertBefore(discussion, spacer)
     }
   })
@@ -448,23 +458,22 @@ export function renderIssue (issue, context) {
   attachmentHint.innerHTML = `<h4>Attachments</h4>
     <p>Drag files, emails,
     web pages onto the paper clip, or click the file upload button.</p>`
-  let uploadFolderURI
-  if (issue.uri.endsWith('/index.ttl#this')) { // This has a whole folder to itself
-    uploadFolderURI = issue.uri.slice(0, 14) + 'Files/' // back to slash
-  } else { // like state.ttl#Iss1587852322438
-    uploadFolderURI = issue.dir().uri + 'Files/' + issue.uri.split('#')[1] + '/' // New folder for issue in file with others
-  }
+  const uploadFolderURI =
+     issue.uri.endsWith('/index.ttl#this') // This has a whole folder to itself
+       ? issue.uri.slice(0, 14) + 'Files/' // back to slash
+       : issue.dir().uri + 'Files/' + issue.uri.split('#')[1] + '/' // New folder for issue in file with others
+
   widgets.attachmentList(dom, issue, issueDiv, {
     doc: stateStore,
     promptIcon: icons.iconBase + 'noun_25830.svg',
-    uploadFolder: store.sym(uploadFolderURI), // Allow local files to be uploaded
+    uploadFolder: kb.sym(uploadFolderURI), // Allow local files to be uploaded
     predicate: ns.wf('attachment')
   })
 
   // Delete button to delete the issue
   const deleteButton = widgets.deleteButtonWithCheck(dom, issueDiv, 'issue', async function () {
     try {
-      await store.updater.update(store.connectedStatements(issue))
+      await kb.updater.update(kb.connectedStatements(issue))
     } catch (err) {
       complain(`Unable to delete issue: ${err}`, context)
     }
@@ -482,7 +491,7 @@ export function renderIssue (issue, context) {
     'click',
     async function (_event) {
       try {
-        await store.fetcher.load(messageStore, { force: true, clearPreviousData: true })
+        await kb.fetcher.load(messageStore, { force: true, clearPreviousData: true })
       } catch (err) {
         alert(err)
         return

package/issuePane.js

@@ -6,7 +6,6 @@
  */
 
 import * as UI from 'solid-ui'
-import { store, authn } from 'solid-logic'
 import { board } from './board' // @@ will later be in solid-UI
 import { renderIssue, renderIssueCard, getState, exposeOverlay } from './issue'
 import { newTrackerButton } from './newTracker'
@@ -16,6 +15,7 @@ import { trackerSettingsFormText } from './trackerSettingsForm.js'
 
 const $rdf = UI.rdf
 const ns = UI.ns
+const kb = UI.store
 const widgets = UI.widgets
 
 // const MY_TRACKERS_ICON = UI.icons.iconBase + 'noun_Document_998605.svg'
@@ -36,10 +36,10 @@ export default {
 
   // Does the subject deserve an issue pane?
   label: function (subject, _context) {
-    const t = store.findTypeURIs(subject)
+    const t = kb.findTypeURIs(subject)
     if (
       t['http://www.w3.org/2005/01/wf/flow#Task'] ||
-      store.holds(subject, UI.ns.wf('tracker'))
+      kb.holds(subject, UI.ns.wf('tracker'))
     ) { return 'issue' } // in case ontology not available
     if (t['http://www.w3.org/2005/01/wf/flow#Tracker']) return 'tracker'
     // Later: Person. For a list of things assigned to them,
@@ -61,7 +61,7 @@ export default {
       return Promise.all(updates)
     }
 
-    var kb = context.session.store
+    const kb = context.session.store
     const ns = UI.ns
     let stateStore
     if (options.newInstance) {
@@ -73,7 +73,7 @@ export default {
     const tracker = options.newInstance
     const appDoc = tracker.doc()
 
-    const me = authn.currentUser()
+    const me = UI.authn.currentUser()
     if (me) {
       kb.add(tracker, ns.dc('author'), me, appDoc)
     }
@@ -148,65 +148,73 @@ export default {
         const needed = new Set(collection.elements.map(x => x.uri))
         const existing = new Set(kb.each(null, ns.rdfs('subClassOf'), klass, doc)
           .map(x => x.uri))
+        const superfluous = existing.filter(sub => !needed.has(sub))
+        const deleteActions = superfluous.map(sub => { return { action: 'delete', st: $rdf.st(kb.sym(sub), ns.rdfs('subClassOf'), klass, doc) } })
+        /*
         for (const sub of existing) {
           if (!needed.has(sub)) {
             deletables.push($rdf.st(kb.sym(sub), ns.rdfs('subClassOf'), klass, doc))
           }
         }
+        */
+        const missing = needed.filter(sub => !existing.has(sub))
+        const insertActions = missing.ma(sub => { return { action: 'insert', st: $rdf.st(kb.sym(sub), ns.rdfs('subClassOf'), klass, doc) } })
+        /*
         for (const sub of needed) {
           if (!existing.has(sub)) {
             insertables.push($rdf.st(kb.sym(sub), ns.rdfs('subClassOf'), klass, doc))
           }
         }
+        */
+        return deleteActions.concat(insertActions)
       }
       const doc = tracker.doc()
       const states = kb.any(tracker, ns.wf('issueClass'))
-      const cats = kb.each(tracker, ns.wf('issueCategory'))
-      var insertables = []
-      var deletables = []
-      cats.push(states)
+      const cats = kb.each(tracker, ns.wf('issueCategory')).concat([states])
+      let damage = [] // to make totally functionaly  need to deal with map over async.
       for (const klass of cats) {
-        await checkOneSuperclass(klass)
+        damage = await damage.concat(checkOneSuperclass(klass))
       }
-      const damage = insertables.length + deletables.length
-      if (damage) {
-        alert(`Internal error: s${damage} subclasses inconsistences!`)
-        /*
+      if (damage.length) {
+        const insertables = damage.filter(fix => fix.action === 'insert').map(fix => fix.st)
+        const deletables = damage.filter(fix => fix.action === 'delete').map(fix => fix.st)
+        // alert(`Internal error: s${damage} subclasses inconsistences!`)
+        console.log('Damage:', damage)
         if (confirm(`Fix ${damage} inconsistent subclasses in tracker config?`)) {
           await kb.updater.update(deletables, insertables)
-        */
+        }
       }
     }
 
     /** /////////////////////////// Board
     */
     function renderBoard (tracker, klass) {
-      const states = store.any(tracker, ns.wf('issueClass'))
+      const states = kb.any(tracker, ns.wf('issueClass'))
       klass = klass || states // default to states
       const doingStates = klass.sameTerm(states)
 
       // These are states we will show by default: the open issues.
-      const stateArray = store.any(klass, ns.owl('disjointUnionOf'))
+      const stateArray = kb.any(klass, ns.owl('disjointUnionOf'))
       if (!stateArray) {
         return complain(`Configuration error: state ${states} does not have substates`)
       }
       let columnValues = stateArray.elements
       if (doingStates && columnValues.length > 2 // and there are more than two
       ) { // strip out closed states
-        columnValues = columnValues.filter(state => store.holds(state, ns.rdfs('subClassOf'), ns.wf('Open')) || state.sameTerm(ns.wf('Open')))
+        columnValues = columnValues.filter(state => kb.holds(state, ns.rdfs('subClassOf'), ns.wf('Open')) || state.sameTerm(ns.wf('Open')))
       }
 
       async function columnDropHandler (issue, newState) {
         const currentState = getState(issue, klass)
-        const tracker = store.the(issue, ns.wf('tracker'), null, issue.doc())
-        const stateStore = store.any(tracker, ns.wf('stateStore'))
+        const tracker = kb.the(issue, ns.wf('tracker'), null, issue.doc())
+        const stateStore = kb.any(tracker, ns.wf('stateStore'))
 
         if (newState.sameTerm(currentState)) {
           // alert('Same state ' + UI.utils.label(currentState)) // @@ remove
           return
         }
         try {
-          await store.updater.update(
+          await kb.updater.update(
             [$rdf.st(issue, ns.rdf('type'), currentState, stateStore)],
             [$rdf.st(issue, ns.rdf('type'), newState, stateStore)])
         } catch (err) {
@@ -216,7 +224,7 @@ export default {
       }
 
       function isOpen (issue) {
-        const types = store.findTypeURIs(issue)
+        const types = kb.findTypeURIs(issue)
         return !!types[ns.wf('Open').uri]
       }
 
@@ -237,7 +245,7 @@ export default {
       const refreshButton = widgets.button(dom, UI.icons.iconBase + 'noun_479395.svg',
         'refresh table', async _event => {
           try {
-            await store.fetcher.load(stateStore, { force: true, clearPreviousData: true })
+            await kb.fetcher.load(stateStore, { force: true, clearPreviousData: true })
           } catch (err) {
             alert(err)
             return
@@ -253,10 +261,10 @@ export default {
         query.pat.optional.push(clause)
         return clause
       }
-      const states = store.any(subject, ns.wf('issueClass'))
-      const cats = store.each(tracker, ns.wf('issueCategory')) // zero or more
+      const states = kb.any(subject, ns.wf('issueClass'))
+      const cats = kb.each(tracker, ns.wf('issueCategory')) // zero or more
       const vars = ['issue', 'state', 'created']
-      var query = new $rdf.Query(UI.utils.label(subject))
+      const query = new $rdf.Query(UI.utils.label(subject))
       for (let i = 0; i < cats.length; i++) {
         vars.push('_cat_' + i)
       }
@@ -278,7 +286,7 @@ export default {
         clause.add(v['_cat_' + i], ns.rdfs('subClassOf'), cats[i])
       }
 
-      const propertyList = store.any(tracker, ns.wf('propertyList')) // List of extra properties
+      const propertyList = kb.any(tracker, ns.wf('propertyList')) // List of extra properties
       if (propertyList) {
         const properties = propertyList.elements
         for (let p = 0; p < properties.length; p++) {
@@ -294,10 +302,10 @@ export default {
       }
 
       const selectedStates = {}
-      const possible = store.each(undefined, ns.rdfs('subClassOf'), states)
+      const possible = kb.each(undefined, ns.rdfs('subClassOf'), states)
       possible.forEach(function (s) {
         if (
-          store.holds(s, ns.rdfs('subClassOf'), ns.wf('Open')) ||
+          kb.holds(s, ns.rdfs('subClassOf'), ns.wf('Open')) ||
           s.sameTerm(ns.wf('Open'))
         ) {
           selectedStates[s.uri] = true
@@ -321,7 +329,7 @@ export default {
           '?state': { initialSelection: selectedStates, label: 'Status' }
         }
       })
-      const stateStore = store.any(subject, ns.wf('stateStore'))
+      const stateStore = kb.any(subject, ns.wf('stateStore'))
       tableDiv.appendChild(tableRefreshButton(stateStore, tableDiv))
       return tableDiv
     }
@@ -329,7 +337,7 @@ export default {
     // Allow user to create new things within the folder
     function renderCreationControl (refreshTarget) {
       const creationDiv = dom.createElement('div')
-      const me = authn.currentUser()
+      const me = UI.authn.currentUser()
       const creationContext = {
         // folder: subject,
         div: creationDiv,
@@ -348,7 +356,7 @@ export default {
     function renderInstances (theClass) {
       const instancesDiv = dom.createElement('div')
       const context = { dom, div: instancesDiv, noun: 'tracker' }
-      UI.login.registrationList(context, { public: true, private: true, type: theClass }).then(_context2 => {
+      UI.authn.registrationList(context, { public: true, private: true, type: theClass }).then(_context2 => {
         instancesDiv.appendChild(renderCreationControl(instancesDiv))
         /* // keep this code in case we need a form
         const InstancesForm = ns.wf('TrackerInstancesForm')
@@ -364,10 +372,10 @@ export default {
       const settingsDiv = dom.createElement('div')
       // A registration control allows the to record this tracker in their type index
       const context = { dom, div: settingsDiv, noun: 'tracker' }
-      UI.login.registrationControl(context, tracker, ns.wf('Tracker')).then(_context2 => {
+      UI.authn.registrationControl(context, tracker, ns.wf('Tracker')).then(_context2 => {
         const settingsForm = ns.wf('TrackerSettingsForm')
         const text = trackerSettingsFormText
-        $rdf.parse(text, store, settingsForm.doc().uri, 'text/turtle')
+        $rdf.parse(text, kb, settingsForm.doc().uri, 'text/turtle')
         widgets.appendForm(dom, settingsDiv, {}, tracker, settingsForm,
           tracker.doc(), complainIfBad)
       })
@@ -385,25 +393,25 @@ export default {
           ele.appendChild(renderSettings(tracker))
         } else if (object.sameTerm(instancesView)) {
           ele.appendChild(renderInstances(ns.wf('Tracker')))
-        } else if ((store.holds(tracker, ns.wf('issueCategory'), object)) ||
-                   (store.holds(tracker, ns.wf('issueClass'), object))) {
+        } else if ((kb.holds(tracker, ns.wf('issueCategory'), object)) ||
+                   (kb.holds(tracker, ns.wf('issueClass'), object))) {
           ele.appendChild(renderBoard(tracker, object))
         } else {
           throw new Error('Unexpected tab type: ' + object)
         }
       }
-      const states = store.any(tracker, ns.wf('issueClass'))
+      const states = kb.any(tracker, ns.wf('issueClass'))
       const items = [instancesView, tableView, states]
-        .concat(store.each(tracker, ns.wf('issueCategory')))
+        .concat(kb.each(tracker, ns.wf('issueCategory')))
       items.push(settingsView)
       const selectedTab = tableView
       const options = { renderMain, items, selectedTab }
 
       // Add stuff to the ontologies which we believe but they don't say
       const doc = instancesView.doc()
-      store.add(instancesView, ns.rdfs('label'), 'My Trackers', doc) // @@ squatting on wf ns
-      store.add(settingsView, ns.rdfs('label'), 'Settings', doc) // @@ squatting on wf ns
-      store.add(states, ns.rdfs('label'), 'By State', doc) // @@ squatting on wf ns
+      kb.add(instancesView, ns.rdfs('label'), 'My Trackers', doc) // @@ squatting on wf ns
+      kb.add(settingsView, ns.rdfs('label'), 'Settings', doc) // @@ squatting on wf ns
+      kb.add(states, ns.rdfs('label'), 'By State', doc) // @@ squatting on wf ns
 
       const tabs = UI.tabs.tabWidget(options)
       return tabs
@@ -418,17 +426,17 @@ export default {
       tracker = subject
 
       try {
-        await fixSubClasses(store, tracker)
+        await fixSubClasses(kb, tracker)
       } catch (err) {
         console.log('@@@ Error fixing subclasses in config: ' + err)
       }
 
-      const states = store.any(subject, ns.wf('issueClass'))
+      const states = kb.any(subject, ns.wf('issueClass'))
       if (!states) throw new Error('This tracker has no issueClass')
-      const stateStore = store.any(subject, ns.wf('stateStore'))
+      const stateStore = kb.any(subject, ns.wf('stateStore'))
       if (!stateStore) throw new Error('This tracker has no stateStore')
 
-      authn.checkUser() // kick off async operation
+      UI.authn.checkUser() // kick off async operation
 
       const h = dom.createElement('h2')
       h.setAttribute('style', 'font-size: 150%')
@@ -437,7 +445,7 @@ export default {
       h.appendChild(dom.createTextNode(classLabel + ' list')) // Use class label @@I18n
 
       // New Issue button
-      var b = dom.createElement('button')
+      const b = dom.createElement('button')
       const container = dom.createElement('div')
       b.setAttribute('type', 'button')
       b.setAttribute('style', 'padding: 0.3em; font-size: 100%; margin: 0.5em;')
@@ -454,7 +462,7 @@ export default {
         'click',
         function (_event) {
           b.disabled = true
-          container.appendChild(newIssueForm(dom, store, tracker, null, showNewIssue))
+          container.appendChild(newIssueForm(dom, kb, tracker, null, showNewIssue))
         },
         false
       )
@@ -490,28 +498,28 @@ export default {
     const settingsView = ns.wf('SettingsView')
     const instancesView = ns.wf('InstancesView')
 
-    const updater = store.updater
-    const t = store.findTypeURIs(subject)
+    const updater = kb.updater
+    const t = kb.findTypeURIs(subject)
     let tracker
 
     // Whatever we are rendering, lets load the ontology
     const flowOntology = UI.ns.wf('').doc()
-    if (!store.holds(undefined, undefined, undefined, flowOntology)) {
+    if (!kb.holds(undefined, undefined, undefined, flowOntology)) {
       // If not loaded already
-      $rdf.parse(require('./wf.js'), store, flowOntology.uri, 'text/turtle') // Load ontology directly
+      $rdf.parse(require('./wf.js'), kb, flowOntology.uri, 'text/turtle') // Load ontology directly
     }
     const userInterfaceOntology = UI.ns.ui('').doc()
-    if (!store.holds(undefined, undefined, undefined, userInterfaceOntology)) {
+    if (!kb.holds(undefined, undefined, undefined, userInterfaceOntology)) {
       // If not loaded already
-      $rdf.parse(require('./ui.js'), store, userInterfaceOntology.uri, 'text/turtle') // Load ontology directly
+      $rdf.parse(require('./ui.js'), kb, userInterfaceOntology.uri, 'text/turtle') // Load ontology directly
     }
 
     // Render a single issue
     if (
       t['http://www.w3.org/2005/01/wf/flow#Task'] ||
-      store.holds(subject, UI.ns.wf('tracker'))
+      kb.holds(subject, UI.ns.wf('tracker'))
     ) {
-      tracker = store.any(subject, ns.wf('tracker'))
+      tracker = kb.any(subject, ns.wf('tracker'))
       if (!tracker) throw new Error('This issue ' + subject + 'has no tracker')
 
       // Much data is in the tracker instance, so wait for the data from it
@@ -519,7 +527,7 @@ export default {
       context.session.store.fetcher
         .load(tracker.doc())
         .then(function (_xhrs) {
-          const stateStore = store.any(tracker, ns.wf('stateStore'))
+          const stateStore = kb.any(tracker, ns.wf('stateStore'))
           context.session.store.fetcher.nowOrWhenFetched(
             stateStore,
             subject,
@@ -572,9 +580,7 @@ export default {
     overlay.style = OVERFLOW_STYLE
     overlay.style.visibility = 'hidden'
 
-    // var overlayPane = null // overlay.appendChild(dom.createElement('div')) // avoid stomping on style by pane
-
-    authn.checkUser().then(webId => {
+    UI.authn.checkUser().then(webId => {
       if (webId) {
         console.log('Web ID set already: ' + webId)
         context.me = webId
@@ -582,9 +588,9 @@ export default {
         return
       }
 
-      loginOutButton = UI.login.loginStatusBox(dom, webIdUri => {
+      loginOutButton = UI.authn.loginStatusBox(dom, webIdUri => {
         if (webIdUri) {
-          context.me = store.sym(webIdUri)
+          context.me = kb.sym(webIdUri)
           console.log('Web ID set from login button: ' + webIdUri)
           paneDiv.removeChild(loginOutButton)
           // enable things

package/newIssue.js

@@ -100,7 +100,7 @@ export function newIssueForm (dom, kb, tracker, superIssue, showNewIssue) {
     '</h2><p>Title of new ' +
     classLabel +
     ':</p>'
-  var titlefield = dom.createElement('input')
+  const titlefield = dom.createElement('input')
   titlefield.setAttribute('type', 'text')
   titlefield.setAttribute(
     'style',

package/newTracker.js

@@ -1,9 +1,9 @@
 import * as UI from 'solid-ui'
-import { store } from 'solid-logic'
 
 const $rdf = UI.rdf
 const ns = UI.ns
-const updater = store.updater
+const kb = UI.store
+const updater = kb.updater
 
 /* Button for making a whole new tracker
 ** This is the least tesetd part of the tracker system at the moment.
@@ -16,17 +16,30 @@ export function newTrackerButton (thisTracker, context) {
   }
 
   // const dom = context.dom
-  const button = UI.login.newAppInstance(context.dom, { noun: 'tracker' }, function (
+  const button = UI.authn.newAppInstance(context.dom, { noun: 'tracker' }, function (
     ws,
     base
   ) {
+    function morph (x) {
+      // Move any URIs in this space into that space
+      if (x.elements !== undefined) return x.elements.map(morph) // Morph within lists
+      if (x.uri === undefined) return x
+      let u = x.uri
+      if (u === stateStore.uri) return newStore // special case
+      if (u.slice(0, oldBase.length) === oldBase) {
+        u = base + u.slice(oldBase.length)
+        $rdf.log.debug(' Map ' + x.uri + ' to ' + u)
+      }
+      return kb.sym(u)
+    }
+
     const appPathSegment = 'issuetracker.w3.org' // how to allocate this string and connect to
     // console.log("Ready to make new instance at "+ws)
     const sp = UI.ns.space
-    const store = context.session.store
+    const kb = context.session.store
 
     if (!base) {
-      base = store.any(ws, sp('uriPrefix')).value
+      base = kb.any(ws, sp('uriPrefix')).value
       if (base.slice(-1) !== '/') {
         $rdf.log.error(
           appPathSegment + ': No / at end of uriPrefix ' + base
@@ -39,29 +52,17 @@ export function newTrackerButton (thisTracker, context) {
       }
     }
 
-    const stateStore = store.any(thisTracker, ns.wf('stateStore'))
-    const newStore = store.sym(base + 'store.ttl')
+    const stateStore = kb.any(thisTracker, ns.wf('stateStore'))
+    const newStore = kb.sym(base + 'store.ttl')
 
     const here = thisTracker.doc()
 
     const oldBase = here.uri.slice(0, here.uri.lastIndexOf('/') + 1)
 
-    const morph = function (x) {
-      // Move any URIs in this space into that space
-      if (x.elements !== undefined) return x.elements.map(morph) // Morph within lists
-      if (x.uri === undefined) return x
-      let u = x.uri
-      if (u === stateStore.uri) return newStore // special case
-      if (u.slice(0, oldBase.length) === oldBase) {
-        u = base + u.slice(oldBase.length)
-        $rdf.log.debug(' Map ' + x.uri + ' to ' + u)
-      }
-      return store.sym(u)
-    }
     const there = morph(here)
     const newTracker = morph(thisTracker)
 
-    const myConfig = store.statementsMatching(
+    const myConfig = kb.statementsMatching(
       undefined,
       undefined,
       undefined,
@@ -69,7 +70,7 @@ export function newTrackerButton (thisTracker, context) {
     )
     for (let i = 0; i < myConfig.length; i++) {
       const st = myConfig[i]
-      store.add(
+      kb.add(
         morph(st.subject),
         morph(st.predicate),
         morph(st.object),
@@ -79,15 +80,15 @@ export function newTrackerButton (thisTracker, context) {
 
     // Keep a paper trail   @@ Revisit when we have non-public ones @@ Privacy
     //
-    store.add(newTracker, UI.ns.space('inspiration'), thisTracker, stateStore)
+    kb.add(newTracker, UI.ns.space('inspiration'), thisTracker, stateStore)
 
-    store.add(newTracker, UI.ns.space('inspiration'), thisTracker, there)
+    kb.add(newTracker, UI.ns.space('inspiration'), thisTracker, there)
 
     // $rdf.log.debug("\n Ready to put " + kb.statementsMatching(undefined, undefined, undefined, there)); //@@
 
     updater.put(
       there,
-      store.statementsMatching(undefined, undefined, undefined, there),
+      kb.statementsMatching(undefined, undefined, undefined, there),
       'text/turtle',
       function (uri2, ok, message) {
         if (ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "issue-pane",
-  "version": "2.4.9-5fd734ff",
+  "version": "2.4.9-e1b104be",
   "description": "Solid-compatible Panes: issue editor",
   "main": "./issuePane.js",
   "scripts": {
@@ -34,10 +34,9 @@
   },
   "homepage": "https://github.com/solid/issue-pane",
   "dependencies": {
-    "pane-registry": "2.4.6-7ecb64b0",
+    "pane-registry": "^2.4.6",
     "rdflib": "^2.2.17",
-    "solid-logic": "1.3.13-60e05a84",
-    "solid-ui": "2.4.16-74e478b4"
+    "solid-ui": "^2.4.15"
   },
   "devDependencies": {
     "eslint": "^7.32.0",