Dev branch

package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-ui",
-  "version": "0.12.5",
+  "version": "0.12.8-2",
   "description": "UI library for writing Solid read-write-web applications",
   "main": "./lib/index.js",
   "files": [
@@ -44,7 +44,7 @@
     "escape-html": "^1.0.3",
     "mime-types": "^2.1.20",
     "node-uuid": "^1.4.7",
-    "rdflib": ">=0.20.1",
+    "rdflib": "^0.21.1",
     "solid-auth-client": "^2.2.13",
     "solid-auth-tls": "^0.1.2",
     "solid-namespace": "0.2.0"

src/acl-control.js

@@ -544,7 +544,8 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
       } else {
         box.isContainer = targetDoc.uri.slice(-1) === '/' // Give default for all directories
         if (defa) {
-          var defaults = kb.each(undefined, ACL('defaultForNew'), defaultHolder, defaultACLDoc)
+          var defaults = kb.each(undefined, ACL('default'), defaultHolder, defaultACLDoc)
+            .concat(kb.each(undefined, ACL('defaultForNew'), defaultHolder, defaultACLDoc))
           if (!defaults.length) {
             statusBlock.textContent += ' (No defaults given.)'
           } else {
@@ -561,21 +562,23 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
             editPlease.textContent = 'Set specific sharing\nfor this ' + noun
             editPlease.style.cssText = bigButtonStyle
             editPlease.addEventListener('click', async function (event) {
-              kb2.forEach(st => {
+              kb2.statements.forEach(st => {
                 kb.add(st.subject, st.predicate, st.object, targetACLDoc)
               })
               try {
-                fetcher.putBack(targetACLDoc)
+                kb.fetcher.putBack(targetACLDoc)
+                  .then(function () {
+                    statusBlock.textContent = ' (Now editing specific access for this ' + noun + ')'
+                    bottomRightCell.removeChild(editPlease)
+                    renderBox()
+                  })
               } catch (e) {
                 let msg = ' Error writing back access control file! ' + e
                 console.error(msg)
                 statusBlock.textContent += msg
                 return
               }
-              kb.fetcher.requested[targetACLDoc.uri] = 'done' // cheat - say cache is now in sync
-              statusBlock.textContent = ' (Now editing specific access for this ' + noun + ')'
-              bottomRightCell.removeChild(editPlease)
-              renderBox()
+              // kb.fetcher.requested[targetACLDoc.uri] = 'done' // cheat - say cache is now in sync
             })
           } // defaults.length
         } else { // Not using defaults
@@ -592,8 +595,9 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
               kb.fetcher.delete(targetACLDoc.uri)
                 .then(function () {
                   statusBlock.textContent = ' The sharing for this ' + noun + ' is now the default.'
-                  bottomRow.removeChild(useDefault)
+                  bottomRightCell.removeChild(useDefault)
                   box.style.cssText = 'color: #777;'
+                  bottomLeftCell.innerHTML = ''
                   renderBox()
                 })
                 .catch(function (e) {

src/acl.js

@@ -337,6 +337,9 @@ UI.acl.getACLorDefault = function (doc, callbackFunction) {
       }
       var right = uri.lastIndexOf('/')
       var left = uri.indexOf('/', uri.indexOf('//') + 2)
+      if (left >= right) {
+        return callbackFunction(false, true, 404, 'Found no ACL resource')
+      }
       uri = uri.slice(0, right + 1)
       var doc2 = $rdf.sym(uri)
       UI.acl.getACL(doc2, function (ok, status, defaultACLDoc) {
@@ -345,24 +348,19 @@ UI.acl.getACLorDefault = function (doc, callbackFunction) {
         } else if (status === 403) {
           return callbackFunction(false, true, status, '( default ACL file FORBIDDEN. Stop.' + uri + ')')
         } else if (status === 404) {
-          if (left >= right) {
-            return callbackFunction(false, true, 499, 'Nothing to hold a default')
-          } else {
-            tryParent(uri)
-          }
+          return tryParent(uri)
         } else if (status !== 200) {
           return callbackFunction(false, true, status, "Error status '" + status + "' searching for default for " + doc2)
-        } else { // 200
-          // statusBlock.textContent += (" ACCESS set at " + uri + ". End search.")
-          var defaults = kb.each(undefined, ACL('default'), kb.sym(uri), defaultACLDoc)
-              .concat(kb.each(undefined, ACL('defaultForNew'), kb.sym(uri), defaultACLDoc))
-          if (!defaults.length) {
-            tryParent(uri) // Keep searching
-          } else {
-            var defaultHolder = kb.sym(uri)
-            callbackFunction(true, false, doc, aclDoc, defaultHolder, defaultACLDoc)
-          }
         }
+        // 200
+        // statusBlock.textContent += (" ACCESS set at " + uri + ". End search.")
+        var defaults = kb.each(undefined, ACL('default'), kb.sym(uri), defaultACLDoc)
+          .concat(kb.each(undefined, ACL('defaultForNew'), kb.sym(uri), defaultACLDoc))
+        if (!defaults.length) {
+          return tryParent(uri) // Keep searching
+        }
+        var defaultHolder = kb.sym(uri)
+        return callbackFunction(true, false, doc, aclDoc, defaultHolder, defaultACLDoc)
       })
     } // tryParent
 

src/create.js

@@ -144,42 +144,43 @@ function newThingUI (context, thePanes) {
   )
   } // makeNewAppInstance
 
-  var iconArray = []
-  for (var pn in thePanes) {
-    var pane = thePanes[pn]
-    if (pane.mintNew) {
-      var icon = context.div.appendChild(dom.createElement('img'))
-      icon.setAttribute('src', pane.icon)
-      var noun = pane.mintClass ? UI.utils.label(pane.mintClass) : (pane.name + ' @@')
-      icon.setAttribute('title', 'Make new ' + noun)
-      icon.setAttribute('style', iconStyle + 'display: none;')
-      iconArray.push(icon)
-      var foo = function (pane, icon, noun) {
-        var iconEle = icon
-        var thisPane = pane
-        var thisNoun = noun
-        if (!icon.disabled) {
-          icon.addEventListener('click', function (e) {
-            selectTool(iconEle)
-            var options = {
-              event: e,
-              folder: context.folder,
-              iconEle: iconEle,
-              pane: thisPane,
-              noun: thisNoun,
-              noIndexHTML: true, // do NOT @@ for now write a HTML file
-              div: context.div,
-              me: context.me,
-              dom: context.dom,
-              refreshTarget: context.refreshTarget
-            }
-            makeNewAppInstance(options)
-          })
-        }
-      } // foo
-      foo(pane, icon, noun)
+  const iconArray = []
+  const mintingPanes = Object.values(thePanes).filter(pane => pane.mintNew)
+  const mintingClassMap = mintingPanes.reduce((classMap, pane) => {
+    if (pane.mintClass) {
+      classMap[pane.mintClass] = (classMap[pane.mintClass] || 0) + 1
     }
-  }
+    return classMap
+  }, {})
+  mintingPanes.forEach(pane => {
+    const icon = context.div.appendChild(dom.createElement('img'))
+    icon.setAttribute('src', pane.icon)
+    const noun = pane.mintClass
+      ? (mintingClassMap[pane.mintClass] > 1
+        ? `${UI.utils.label(pane.mintClass)} (using ${pane.name} pane)`
+        : UI.utils.label(pane.mintClass))
+      : (pane.name + ' @@')
+    icon.setAttribute('title', 'Make new ' + noun)
+    icon.setAttribute('style', iconStyle + 'display: none;')
+    iconArray.push(icon)
+    if (!icon.disabled) {
+      icon.addEventListener('click', function (e) {
+        selectTool(icon)
+        makeNewAppInstance({
+          event: e,
+          folder: context.folder,
+          iconEle: icon,
+          pane,
+          noun,
+          noIndexHTML: true, // do NOT @@ for now write a HTML file
+          div: context.div,
+          me: context.me,
+          dom: context.dom,
+          refreshTarget: context.refreshTarget
+        })
+      })
+    }
+  })
 
   var styleTheIcons = function (style) {
     for (var i = 0; i < iconArray.length; i++) {

src/signin.js

@@ -776,6 +776,7 @@ function genACLText (docURI, me, aclURI, options = {}) {
   g.add(a, UI.ns.rdf('type'), auth('Authorization'), acl)
   g.add(a, auth('accessTo'), doc, acl)
   if (options.defaultForNew) {
+    // TODO: Should this be auth('default') instead?
     g.add(a, auth('defaultForNew'), doc, acl)
   }
   g.add(a, auth('agent'), me, acl)

src/style.js

@@ -9,6 +9,7 @@ module.exports = {
   buttonStyle: 'background-color: #fff; padding: 0.5em;  border: .01em solid white; font-size: 100%;', // 'background-color: #eef;
 // The width of the text field must bot be 100% or it switches to overlapping
   messageBodyStyle: 'white-space: pre-wrap; width: 99%; font-size:100%; border: 0.07em solid #eee; padding: .3em 0.5em; margin: 0.1em;',
-  pendingeditModifier: 'color: #bbb;'
+  pendingeditModifier: 'color: #bbb;',
+  highlightColor: '#7C4DFF' // Solid lavendar https://design.inrupt.com/atomic-core/?cat=Core
 
 }

src/tabs.js

@@ -292,7 +292,21 @@ UI.tabs.tabWidget = function (options) {
   box.refresh = sync
   sync()
 
-  if (!options.startEmpty && tabContainer.children.length) {
+// From select-tabs branch by hand
+  if (!options.startEmpty && tabContainer.children.length && options.selectedTab) {
+    var tab
+    var found = false
+    for (var i = 0; i < tabContainer.children.length; i++) {
+      tab = tabContainer.children[i]
+      if (tab.firstChild && tab.firstChild.dataset.name === options.selectedTab) {
+        tab.firstChild.click()
+        found = true
+      }
+    }
+    if (!found) {
+      tabContainer.children[0].firstChild.click() // Open first tab
+    }
+  } else if (!options.startEmpty && tabContainer.children.length) {
     tabContainer.children[0].firstChild.click() // Open first tab
   }
   return box

src/widgets/index.js

@@ -904,11 +904,8 @@ UI.widgets.field[UI.ns.ui('PhoneField').uri] =
 
                           store = store || UI.widgets.fieldStore(subject, property, store)
 
-                          var obj = kb.any(subject, property, undefined, store)
-                          if (!obj) {
-                            obj = kb.any(form, ui('default'))
-                            if (obj) kb.add(subject, property, obj, store)
-                          }
+                          var obj = kb.any(subject, property, undefined, store) ||
+                            kb.any(form, ui('default'))
                           if (obj && obj.uri && params.uriPrefix) { // eg tel: or mailto:
                             field.value = decodeURIComponent(obj.uri.replace(params.uriPrefix, '')) // should have no spaces but in case
                               .replace(/ /g, '')