issue-pane 2.4.8-bbf45639 → 2.4.9-e1b104be

package/.github/workflows/ci.yml

@@ -0,0 +1,59 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+    branches:
+      - "**"  
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+       node-version:
+          - 12.x
+          - 14.x
+          - 16.x
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm ci
+      - run: npm run lint --if-present
+      - run: npm test
+      - run: npm run build --if-present
+      - name: Save build
+        if: matrix.node-version == '14.x'
+        uses: actions/upload-artifact@v2
+        with:
+          name: build
+          path: |
+            .
+            !node_modules
+          retention-days: 1
+  npm-publish-build:
+      needs: build
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/download-artifact@v2
+          with:
+            name: build
+        - uses: actions/setup-node@v1
+          with:
+            node-version: 14.x
+        - uses: rlespinasse/github-slug-action@v3.x
+        - name: Append commit hash to package version
+          run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
+        - name: Disable pre- and post-publish actions
+          run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
+        - uses: JS-DevTools/npm-publish@v1
+          with:
+            token: ${{ secrets.NPM_TOKEN }}
+            tag: ${{ env.GITHUB_REF_SLUG }}
+

package/issue.js

@@ -8,11 +8,23 @@ 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 = kb.the(issue, ns.wf('tracker'), null, issue.doc())
   const states = kb.any(tracker, ns.wf('issueClass'))
@@ -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;'
@@ -105,10 +117,9 @@ export function renderIssue (issue, context) {
   function setModifiedDate (subj, kb, doc) {
     if (SET_MODIFIED_DATES) {
       if (!getOption(tracker, 'trackLastModified')) return
-      let deletions = kb.statementsMatching(issue, ns.dct('modified'))
-      deletions = deletions.concat(
-        kb.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))
       kb.updater.update(deletions, insertions, function (_uri, _ok, _body) {})
@@ -150,7 +161,7 @@ export function renderIssue (issue, context) {
 
   function setPaneStyle () {
     const types = kb.findTypeURIs(issue)
-    let mystyle = 'padding: 0.5em 1.5em 1em 1.5em; '
+    const mystyle0 = 'padding: 0.5em 1.5em 1em 1.5em; '
     let backgroundColor = null
     for (const uri in types) {
       backgroundColor = kb.any(
@@ -160,10 +171,12 @@ export function renderIssue (issue, context) {
       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
   const tracker = kb.the(issue, ns.wf('tracker'), null, issue.doc())
   if (!tracker) throw new Error('No tracker')
@@ -171,12 +184,15 @@ export function renderIssue (issue, context) {
   const store = issue.doc()
 
   const issueDiv = dom.createElement('div')
-  var me = authn.currentUser()
+  const me = authn.currentUser()
 
   setPaneStyle()
 
   authn.checkUser() // kick off async operation
 
+  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(
@@ -197,13 +213,13 @@ export function renderIssue (issue, context) {
   issueDiv.appendChild(select)
 
   const cats = kb.each(tracker, ns.wf('issueCategory')) // zero or more
-  for (let i = 0; i < cats.length; i++) {
+  for (const cat of cats) {
     issueDiv.appendChild(
       widgets.makeSelectForCategory(
         dom,
         kb,
         issue,
-        cats[i],
+        cat,
         stateStore,
         function (ok, body) {
           if (ok) {
@@ -297,20 +313,16 @@ export function renderIssue (issue, context) {
   // Anyone assigned to any issue we know about
 
   async function getPossibleAssignees () {
-    let devs = []
     const devGroups = kb.each(issue, ns.wf('assigneeGroup'))
-    for (let i = 0; i < devGroups.length; i++) {
-      const group = devGroups[i]
-      await kb.fetcher.load()
-      devs = devs.concat(kb.each(group, ns.vcard('member')))
-    }
+    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 = kb.any(null, ns.doap('bug-database'), tracker) // What project?
     if (proj) {
       await kb.fetcher.load(proj)
-      devs = devs.concat(kb.each(proj, ns.doap('developer')))
     }
-    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?? @@
@@ -446,12 +458,11 @@ 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',

package/issuePane.js

@@ -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) {
@@ -148,33 +148,41 @@ 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)
-        */
+        }
       }
     }
 
@@ -256,7 +264,7 @@ export default {
       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)
       }
@@ -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;')
@@ -572,8 +580,6 @@ export default {
     overlay.style = OVERFLOW_STYLE
     overlay.style.visibility = 'hidden'
 
-    // var overlayPane = null // overlay.appendChild(dom.createElement('div')) // avoid stomping on style by pane
-
     UI.authn.checkUser().then(webId => {
       if (webId) {
         console.log('Web ID set already: ' + webId)

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

@@ -20,6 +20,19 @@ export function newTrackerButton (thisTracker, context) {
     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
@@ -46,18 +59,6 @@ export function newTrackerButton (thisTracker, context) {
 
     const oldBase = here.uri.slice(0, here.uri.lastIndexOf('/') + 1)
 
-    var 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 kb.sym(u)
-    }
     const there = morph(here)
     const newTracker = morph(thisTracker)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "issue-pane",
-  "version": "2.4.8-bbf45639",
+  "version": "2.4.9-e1b104be",
   "description": "Solid-compatible Panes: issue editor",
   "main": "./issuePane.js",
   "scripts": {
@@ -8,8 +8,8 @@
     "lint": "eslint '*.js'",
     "lint-fix": "eslint '*.js' --fix",
     "test": "npm run lint",
-    "prepublishOnly": "npm test",
-    "postpublish": "git push origin main --follow-tags"
+    "ignore:prepublishOnly": "npm test",
+    "ignore:postpublish": "git push origin main --follow-tags"
   },
   "repository": {
     "type": "git",
@@ -34,9 +34,9 @@
   },
   "homepage": "https://github.com/solid/issue-pane",
   "dependencies": {
-    "pane-registry": "^2.4.5-bbf45639",
-    "rdflib": "^2.2.15-bbf45639",
-    "solid-ui": "^2.4.14-bbf45639"
+    "pane-registry": "^2.4.6",
+    "rdflib": "^2.2.17",
+    "solid-ui": "^2.4.15"
   },
   "devDependencies": {
     "eslint": "^7.32.0",