solid-ui 2.4.23 → 2.4.24

package/lib/login/login.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -21,65 +19,45 @@ exports.renderScopeHeadingRow = renderScopeHeadingRow;
 exports.renderSignInPopup = renderSignInPopup;
 exports.scopeLabel = scopeLabel;
 exports.selectWorkspace = selectWorkspace;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _rdflib = require("rdflib");
-
 var _solidLogic = require("solid-logic");
-
 var debug = _interopRequireWildcard(require("../debug"));
-
 var _log = require("../log");
-
 var ns = _interopRequireWildcard(require("../ns.js"));
-
 var _signup = require("../signup/signup.js");
-
 var _style = require("../style");
-
 var utils = _interopRequireWildcard(require("../utils"));
-
 var widgets = _interopRequireWildcard(require("../widgets"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 var store = _solidLogic.solidLogicSingleton.store;
 var _solidLogicSingleton$ = _solidLogic.solidLogicSingleton.profile,
-    loadPreferences = _solidLogicSingleton$.loadPreferences,
-    loadProfile = _solidLogicSingleton$.loadProfile;
+  loadPreferences = _solidLogicSingleton$.loadPreferences,
+  loadProfile = _solidLogicSingleton$.loadProfile;
 var _solidLogicSingleton$2 = _solidLogic.solidLogicSingleton.typeIndex,
-    getScopedAppInstances = _solidLogicSingleton$2.getScopedAppInstances,
-    getRegistrations = _solidLogicSingleton$2.getRegistrations,
-    loadAllTypeIndexes = _solidLogicSingleton$2.loadAllTypeIndexes,
-    getScopedAppsFromIndex = _solidLogicSingleton$2.getScopedAppsFromIndex,
-    deleteTypeIndexRegistration = _solidLogicSingleton$2.deleteTypeIndexRegistration;
+  getScopedAppInstances = _solidLogicSingleton$2.getScopedAppInstances,
+  getRegistrations = _solidLogicSingleton$2.getRegistrations,
+  loadAllTypeIndexes = _solidLogicSingleton$2.loadAllTypeIndexes,
+  getScopedAppsFromIndex = _solidLogicSingleton$2.getScopedAppsFromIndex,
+  deleteTypeIndexRegistration = _solidLogicSingleton$2.deleteTypeIndexRegistration;
+
 /**
  * Resolves with the logged in user's WebID
  *
  * @param context
  */
 // used to be logIn
-
 function ensureLoggedIn(context) {
   var me = _solidLogic.authn.currentUser();
-
   if (me) {
     _solidLogic.authn.saveUser(me, context);
-
     return Promise.resolve(context);
   }
-
   return new Promise(function (resolve) {
     _solidLogic.authn.checkUser().then(function (webId) {
       // Already logged in?
@@ -87,20 +65,19 @@ function ensureLoggedIn(context) {
         debug.log("logIn: Already logged in as ".concat(webId));
         return resolve(context);
       }
-
       if (!context.div || !context.dom) {
         return resolve(context);
       }
-
       var box = loginStatusBox(context.dom, function (webIdUri) {
         _solidLogic.authn.saveUser(webIdUri, context);
-
         resolve(context); // always pass growing context
       });
+
       context.div.appendChild(box);
     });
   });
 }
+
 /**
  * Loads preference file
  * Do this after having done log in and load profile
@@ -110,8 +87,6 @@ function ensureLoggedIn(context) {
  * @param context
  */
 // used to be logInLoadPreferences
-
-
 function ensureLoadedPreferences(_x) {
   return _ensureLoadedPreferences.apply(this, arguments);
 }
@@ -123,8 +98,6 @@ function ensureLoadedPreferences(_x) {
  * @returns Resolves with the context after login / fetch
  */
 // used to be logInLoadProfile
-
-
 function _ensureLoadedPreferences() {
   _ensureLoadedPreferences = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(context) {
     var statusArea, progressDisplay, complain, preferencesFile, m2;
@@ -134,117 +107,93 @@ function _ensureLoadedPreferences() {
           case 0:
             complain = function _complain(message) {
               message = "ensureLoadedPreferences: ".concat(message);
-
               if (statusArea) {
                 // statusArea.innerHTML = ''
                 statusArea.appendChild(widgets.errorMessageBlock(context.dom, message));
               }
-
-              debug.log(message); // reject(new Error(message))
+              debug.log(message);
+              // reject(new Error(message))
             };
-
             if (!context.preferencesFile) {
               _context4.next = 3;
               break;
             }
-
             return _context4.abrupt("return", Promise.resolve(context));
-
           case 3:
             // already done
             statusArea = context.statusArea || context.div || null;
             _context4.prev = 4;
             _context4.next = 7;
             return ensureLoadedProfile(context);
-
           case 7:
             context = _context4.sent;
             _context4.next = 10;
             return loadPreferences(context.me);
-
           case 10:
             preferencesFile = _context4.sent;
-
             if (progressDisplay) {
               progressDisplay.parentNode.removeChild(progressDisplay);
             }
-
             context.preferencesFile = preferencesFile;
             _context4.next = 51;
             break;
-
           case 15:
             _context4.prev = 15;
             _context4.t0 = _context4["catch"](4);
-
             if (!(_context4.t0 instanceof _solidLogic.UnauthorizedError)) {
               _context4.next = 22;
               break;
             }
-
             m2 = 'Ooops - you are not authenticated (properly logged in) to for me to read your preference file.  Try loggin out and logging in?';
             (0, _log.alert)(m2);
             _context4.next = 51;
             break;
-
           case 22:
             if (!(_context4.t0 instanceof _solidLogic.CrossOriginForbiddenError)) {
               _context4.next = 28;
               break;
             }
-
             m2 = "Unauthorized: Assuming preference file blocked for origin ".concat(window.location.origin);
             context.preferencesFileError = m2;
             return _context4.abrupt("return", context);
-
           case 28:
             if (!(_context4.t0 instanceof _solidLogic.SameOriginForbiddenError)) {
               _context4.next = 34;
               break;
             }
-
             m2 = 'You are not authorized to read your preference file. This may be because you are using an untrusted web app.';
             debug.warn(m2);
             return _context4.abrupt("return", context);
-
           case 34:
             if (!(_context4.t0 instanceof _solidLogic.NotEditableError)) {
               _context4.next = 40;
               break;
             }
-
             m2 = 'You are not authorized to edit your preference file. This may be because you are using an untrusted web app.';
             debug.warn(m2);
             return _context4.abrupt("return", context);
-
           case 40:
             if (!(_context4.t0 instanceof _solidLogic.WebOperationError)) {
               _context4.next = 45;
               break;
             }
-
             m2 = 'You are not authorized to edit your preference file. This may be because you are using an untrusted web app.';
             debug.warn(m2);
             _context4.next = 51;
             break;
-
           case 45:
             if (!(_context4.t0 instanceof _solidLogic.FetchError)) {
               _context4.next = 50;
               break;
             }
-
             m2 = "Strange: Error ".concat(_context4.t0.status, " trying to read your preference file.").concat(_context4.t0.message);
             (0, _log.alert)(m2);
             _context4.next = 51;
             break;
-
           case 50:
             throw new Error("(via loadPrefs) ".concat(_context4.t0));
-
           case 51:
             return _context4.abrupt("return", context);
-
           case 52:
           case "end":
             return _context4.stop();
@@ -254,7 +203,6 @@ function _ensureLoadedPreferences() {
   }));
   return _ensureLoadedPreferences.apply(this, arguments);
 }
-
 function ensureLoadedProfile(_x2) {
   return _ensureLoadedProfile.apply(this, arguments);
 }
@@ -263,8 +211,6 @@ function ensureLoadedProfile(_x2) {
   *
   * leaving the `isPublic` param undefined will bring in community index things, too
   */
-
-
 function _ensureLoadedProfile() {
   _ensureLoadedProfile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(context) {
     var logInContext;
@@ -276,46 +222,34 @@ function _ensureLoadedProfile() {
               _context5.next = 2;
               break;
             }
-
             return _context5.abrupt("return", context);
-
           case 2:
             _context5.prev = 2;
             _context5.next = 5;
             return ensureLoggedIn(context);
-
           case 5:
             logInContext = _context5.sent;
-
             if (logInContext.me) {
               _context5.next = 8;
               break;
             }
-
             throw new Error('Could not log in');
-
           case 8:
             _context5.next = 10;
             return loadProfile(logInContext.me);
-
           case 10:
             context.publicProfile = _context5.sent;
             _context5.next = 17;
             break;
-
           case 13:
             _context5.prev = 13;
             _context5.t0 = _context5["catch"](2);
-
             if (context.div && context.dom) {
               context.div.appendChild(widgets.errorMessageBlock(context.dom, _context5.t0.message));
             }
-
             throw new Error("Can't log in: ".concat(_context5.t0));
-
           case 17:
             return _context5.abrupt("return", context);
-
           case 18:
           case "end":
             return _context5.stop();
@@ -325,11 +259,9 @@ function _ensureLoadedProfile() {
   }));
   return _ensureLoadedProfile.apply(this, arguments);
 }
-
 function findAppInstances(_x3, _x4, _x5) {
   return _findAppInstances.apply(this, arguments);
 }
-
 function _findAppInstances() {
   _findAppInstances = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(context, theClass, isPublic) {
     var items;
@@ -341,21 +273,16 @@ function _findAppInstances() {
               _context6.next = 6;
               break;
             }
-
             _context6.next = 3;
             return getScopedAppInstances(theClass, context.me);
-
           case 3:
             _context6.t0 = _context6.sent;
             _context6.next = 7;
             break;
-
           case 6:
             _context6.t0 = [];
-
           case 7:
             items = _context6.t0;
-
             if (isPublic === true) {
               // old API - not recommended!
               items = items.filter(function (item) {
@@ -366,12 +293,10 @@ function _findAppInstances() {
                 return item.scope.label === 'private';
               });
             }
-
             context.instances = items.map(function (item) {
               return item.instance;
             });
             return _context6.abrupt("return", context);
-
           case 11:
           case "end":
             return _context6.stop();
@@ -381,7 +306,6 @@ function _findAppInstances() {
   }));
   return _findAppInstances.apply(this, arguments);
 }
-
 function scopeLabel(context, scope) {
   var mine = context.me && context.me.sameTerm(scope.agent);
   var name = mine ? '' : utils.label(scope.agent) + ' ';
@@ -390,16 +314,12 @@ function scopeLabel(context, scope) {
 /**
  * UI to control registration of instance
  */
-
-
 function registrationControl(_x6, _x7, _x8) {
   return _registrationControl.apply(this, arguments);
 }
-
 function _registrationControl() {
   _registrationControl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(context, instance, theClass) {
     var registrationStatements, renderScopeCheckbox, dom, box, me, scopes, msg, tbody, form, _iterator, _step, scope, row;
-
     return _regenerator["default"].wrap(function _callee7$(_context7) {
       while (1) {
         switch (_context7.prev = _context7.next) {
@@ -410,52 +330,40 @@ function _registrationControl() {
               var label = "".concat(name, " link to this ").concat(context.noun);
               return widgets.buildCheckboxForm(context.dom, _solidLogic.solidLogicSingleton.store, label, null, statements, form, scope.index);
             };
-
             registrationStatements = function _registrationStatemen(index) {
               var registrations = getRegistrations(instance, theClass);
               var reg = registrations.length ? registrations[0] : widgets.newThing(index);
               return [(0, _rdflib.st)(reg, ns.solid('instance'), instance, index), (0, _rdflib.st)(reg, ns.solid('forClass'), theClass, index)];
             };
-
             /// / body of registrationControl
             dom = context.dom;
-
             if (!(!dom || !context.div)) {
               _context7.next = 5;
               break;
             }
-
             throw new Error('registrationControl: need dom and div');
-
           case 5:
             box = dom.createElement('div');
             context.div.appendChild(box);
             context.me = _solidLogic.authn.currentUser(); // @@
-
             me = context.me;
-
             if (me) {
               _context7.next = 12;
               break;
             }
-
             box.innerHTML = '<p style="margin:2em;">(Log in to save a link to this)</p>';
             return _context7.abrupt("return", context);
-
           case 12:
             _context7.prev = 12;
             _context7.next = 15;
             return loadAllTypeIndexes(me);
-
           case 15:
             scopes = _context7.sent;
             _context7.next = 23;
             break;
-
           case 18:
             _context7.prev = 18;
             _context7.t0 = _context7["catch"](12);
-
             if (context.div && context.preferencesFileError) {
               msg = '(Lists of stuff not available)';
               context.div.appendChild(dom.createElement('p')).textContent = msg;
@@ -463,19 +371,14 @@ function _registrationControl() {
               msg = "registrationControl: Type indexes not available: ".concat(_context7.t0);
               context.div.appendChild(widgets.errorMessageBlock(context.dom, _context7.t0));
             }
-
             debug.log(msg);
             return _context7.abrupt("return", context);
-
           case 23:
             box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
-
             box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid gray 0.05em;');
             tbody = box.children[0].children[0];
             form = new _rdflib.BlankNode(); // @@ say for now
-
             _iterator = _createForOfIteratorHelper(scopes);
-
             try {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
                 scope = _step.value;
@@ -487,9 +390,7 @@ function _registrationControl() {
             } finally {
               _iterator.f();
             }
-
             return _context7.abrupt("return", context);
-
           case 30:
           case "end":
             return _context7.stop();
@@ -499,7 +400,6 @@ function _registrationControl() {
   }));
   return _registrationControl.apply(this, arguments);
 }
-
 function renderScopeHeadingRow(context, store, scope) {
   var backgroundColor = {
     "private": '#fee',
@@ -519,17 +419,12 @@ function renderScopeHeadingRow(context, store, scope) {
 /**
   * UI to List at all registered things
   */
-
-
 function registrationList(_x9, _x10) {
   return _registrationList.apply(this, arguments);
 } // registrationList
-
-
 function _registrationList() {
   _registrationList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(context, options) {
     var dom, div, box, scopes, table, tbody, _iterator2, _step2, scope, headingRow, items, _iterator3, _step3, _loop;
-
     return _regenerator["default"].wrap(function _callee9$(_context9) {
       while (1) {
         switch (_context9.prev = _context9.next) {
@@ -539,53 +434,44 @@ function _registrationList() {
             box = dom.createElement('div');
             div.appendChild(box);
             context.me = _solidLogic.authn.currentUser(); // @@
-
             if (context.me) {
               _context9.next = 8;
               break;
             }
-
             box.innerHTML = '<p style="margin:2em;">(Log in list your stuff)</p>';
             return _context9.abrupt("return", context);
-
           case 8:
             _context9.next = 10;
             return loadAllTypeIndexes(context.me);
-
           case 10:
             scopes = _context9.sent;
             // includes community indexes
+
             // console.log('@@ registrationList ', scopes)
             box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
-
             box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid #eee 0.5em;');
             table = box.firstChild;
             tbody = table.firstChild;
             _iterator2 = _createForOfIteratorHelper(scopes);
             _context9.prev = 16;
-
             _iterator2.s();
-
           case 18:
             if ((_step2 = _iterator2.n()).done) {
               _context9.next = 30;
               break;
             }
-
             scope = _step2.value;
             // need some predicate for listing/adding agents
             headingRow = renderScopeHeadingRow(context, store, scope);
             tbody.appendChild(headingRow);
             _context9.next = 24;
             return getScopedAppsFromIndex(scope, options.type || null);
-
           case 24:
             items = _context9.sent;
             // any class
-            if (items.length === 0) headingRow.style.display = 'none'; // console.log(`registrationList: @@ instance items for class ${options.type || 'undefined' }:`, items)
-
+            if (items.length === 0) headingRow.style.display = 'none';
+            // console.log(`registrationList: @@ instance items for class ${options.type || 'undefined' }:`, items)
             _iterator3 = _createForOfIteratorHelper(items);
-
             try {
               _loop = function _loop() {
                 var item = _step3.value;
@@ -598,10 +484,8 @@ function _registrationList() {
                             case 0:
                               _context8.next = 2;
                               return deleteTypeIndexRegistration(item);
-
                             case 2:
                               tbody.removeChild(row);
-
                             case 3:
                             case "end":
                               return _context8.stop();
@@ -609,18 +493,15 @@ function _registrationList() {
                         }
                       }, _callee8);
                     }));
-
                     function deleteFunction() {
                       return _deleteFunction.apply(this, arguments);
                     }
-
                     return deleteFunction;
                   }()
                 });
                 row.children[0].style.paddingLeft = '3em';
                 tbody.appendChild(row);
               };
-
               for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
                 _loop();
               }
@@ -629,31 +510,22 @@ function _registrationList() {
             } finally {
               _iterator3.f();
             }
-
           case 28:
             _context9.next = 18;
             break;
-
           case 30:
             _context9.next = 35;
             break;
-
           case 32:
             _context9.prev = 32;
             _context9.t0 = _context9["catch"](16);
-
             _iterator2.e(_context9.t0);
-
           case 35:
             _context9.prev = 35;
-
             _iterator2.f();
-
             return _context9.finish(35);
-
           case 38:
             return _context9.abrupt("return", context);
-
           case 39:
           case "end":
             return _context9.stop();
@@ -663,10 +535,10 @@ function _registrationList() {
   }));
   return _registrationList.apply(this, arguments);
 }
-
 function getDefaultSignInButtonStyle() {
   return 'padding: 1em; border-radius:0.5em; font-size: 100%;';
 }
+
 /**
  * Bootstrapping identity
  * (Called by `loginStatusBox()`)
@@ -676,48 +548,43 @@ function getDefaultSignInButtonStyle() {
  *
  * @returns
  */
-
-
 function signInOrSignUpBox(dom, setUserCallback) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   options = options || {};
-  var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle(); // @@ TODO Remove the need to cast HTML element to any
+  var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
 
+  // @@ TODO Remove the need to cast HTML element to any
   var box = dom.createElement('div');
   var magicClassName = 'SolidSignInOrSignUpBox';
   debug.log('widgets.signInOrSignUpBox');
   box.setUserCallback = setUserCallback;
   box.setAttribute('class', magicClassName);
   box.style = 'display:flex;'; // @@ fix all typecasts like this
-  // Sign in button with PopUP
 
+  // Sign in button with PopUP
   var signInPopUpButton = dom.createElement('input'); // multi
-
   box.appendChild(signInPopUpButton);
   signInPopUpButton.setAttribute('type', 'button');
   signInPopUpButton.setAttribute('value', 'Log in');
   signInPopUpButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eef;"));
-
   _solidLogic.authSession.onLogin(function () {
-    var me = _solidLogic.authn.currentUser(); // const sessionInfo = authSession.info
+    var me = _solidLogic.authn.currentUser();
+    // const sessionInfo = authSession.info
     // if (sessionInfo && sessionInfo.isLoggedIn) {
-
-
     if (me) {
       // const webIdURI = sessionInfo.webId
-      var webIdURI = me.uri; // setUserCallback(webIdURI)
-
+      var webIdURI = me.uri;
+      // setUserCallback(webIdURI)
       var divs = dom.getElementsByClassName(magicClassName);
-      debug.log("Logged in, ".concat(divs.length, " panels to be serviced")); // At the same time, satisfy all the other login boxes
-
+      debug.log("Logged in, ".concat(divs.length, " panels to be serviced"));
+      // At the same time, satisfy all the other login boxes
       for (var i = 0; i < divs.length; i++) {
-        var div = divs[i]; // @@ TODO Remove the need to manipulate HTML elements
-
+        var div = divs[i];
+        // @@ TODO Remove the need to manipulate HTML elements
         if (div.setUserCallback) {
           try {
             div.setUserCallback(webIdURI);
             var parent = div.parentNode;
-
             if (parent) {
               parent.removeChild(div);
             }
@@ -729,13 +596,13 @@ function signInOrSignUpBox(dom, setUserCallback) {
       }
     }
   });
-
   signInPopUpButton.addEventListener('click', function () {
     var offline = (0, _solidLogic.offlineTestID)();
     if (offline) return setUserCallback(offline.uri);
     renderSignInPopup(dom);
-  }, false); // Sign up button
+  }, false);
 
+  // Sign up button
   var signupButton = dom.createElement('input');
   box.appendChild(signupButton);
   signupButton.setAttribute('type', 'button');
@@ -750,7 +617,6 @@ function signInOrSignUpBox(dom, setUserCallback) {
   }, false);
   return box;
 }
-
 function renderSignInPopup(dom) {
   /**
    * Issuer Menu
@@ -775,7 +641,6 @@ function renderSignInPopup(dom) {
   });
   issuerPopupBoxTopMenu.appendChild(issuerPopupBoxLabel);
   issuerPopupBoxTopMenu.appendChild(issuerPopupBoxCloseButton);
-
   var loginToIssuer = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(issuerUri) {
       var preLoginRedirectHash;
@@ -786,28 +651,23 @@ function renderSignInPopup(dom) {
               _context.prev = 0;
               // Save hash
               preLoginRedirectHash = new URL(window.location.href).hash;
-
               if (preLoginRedirectHash) {
                 window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
               }
-
-              window.localStorage.setItem('loginIssuer', issuerUri); // Login
-
+              window.localStorage.setItem('loginIssuer', issuerUri);
+              // Login
               _context.next = 6;
               return _solidLogic.authSession.login({
                 redirectUrl: window.location.href,
                 oidcIssuer: issuerUri
               });
-
             case 6:
               _context.next = 11;
               break;
-
             case 8:
               _context.prev = 8;
               _context.t0 = _context["catch"](0);
               (0, _log.alert)(_context.t0.message);
-
             case 11:
             case "end":
               return _context.stop();
@@ -815,16 +675,14 @@ function renderSignInPopup(dom) {
         }
       }, _callee, null, [[0, 8]]);
     }));
-
     return function loginToIssuer(_x11) {
       return _ref.apply(this, arguments);
     };
   }();
+
   /**
    * Text-based idp selection
    */
-
-
   var issuerTextContainer = dom.createElement('div');
   issuerTextContainer.setAttribute('style', "\n      border-bottom: 1px solid #DDD;\n      display: flex;\n      flex-direction: column;\n      padding-top: 10px;\n    ");
   var issuerTextInputContainer = dom.createElement('div');
@@ -848,10 +706,10 @@ function renderSignInPopup(dom) {
   issuerTextInputContainer.appendChild(issuerTextGoButton);
   issuerTextContainer.appendChild(issuerTextInputContainer);
   issuerPopupBox.appendChild(issuerTextContainer);
+
   /**
    * Button-based idp selection
    */
-
   var issuerButtonContainer = dom.createElement('div');
   issuerButtonContainer.setAttribute('style', "\n      display: flex;\n      flex-direction: column;\n      padding-top: 10px;\n    ");
   var issuerBottonLabel = dom.createElement('label');
@@ -869,6 +727,7 @@ function renderSignInPopup(dom) {
   });
   issuerPopupBox.appendChild(issuerButtonContainer);
 }
+
 /**
  * Login status box
  *
@@ -879,110 +738,86 @@ function renderSignInPopup(dom) {
  *
  * @returns
  */
-
-
 function loginStatusBox(dom) {
   var listener = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   // 20190630
-  var me = (0, _solidLogic.offlineTestID)(); // @@ TODO Remove the need to cast HTML element to any
-
+  var me = (0, _solidLogic.offlineTestID)();
+  // @@ TODO Remove the need to cast HTML element to any
   var box = dom.createElement('div');
-
   function setIt(newidURI) {
     if (!newidURI) {
       return;
-    } // const uri = newidURI.uri || newidURI
-    // me = sym(uri)
-
+    }
 
+    // const uri = newidURI.uri || newidURI
+    // me = sym(uri)
     me = _solidLogic.authn.saveUser(newidURI);
     box.refresh();
     if (listener) listener(me.uri);
   }
-
   function logoutButtonHandler(_event) {
     var oldMe = me;
-
     _solidLogic.authSession.logout().then(function () {
       var message = "Your WebID was ".concat(oldMe, ". It has been forgotten.");
       me = null;
-
       try {
         (0, _log.alert)(message);
       } catch (e) {
         window.alert(message);
       }
-
       box.refresh();
       if (listener) listener(null);
     }, function (err) {
       (0, _log.alert)('Fail to log out:' + err);
     });
   }
-
   function logoutButton(me, options) {
     var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
     var logoutLabel = 'WebID logout';
-
     if (me) {
       var nick = _solidLogic.solidLogicSingleton.store.any(me, ns.foaf('nick')) || _solidLogic.solidLogicSingleton.store.any(me, ns.foaf('name'));
-
       if (nick) {
         logoutLabel = 'Logout ' + nick.value;
       }
     }
-
-    var signOutButton = dom.createElement('input'); // signOutButton.className = 'WebIDCancelButton'
-
+    var signOutButton = dom.createElement('input');
+    // signOutButton.className = 'WebIDCancelButton'
     signOutButton.setAttribute('type', 'button');
     signOutButton.setAttribute('value', logoutLabel);
     signOutButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eee;"));
     signOutButton.addEventListener('click', logoutButtonHandler, false);
     return signOutButton;
   }
-
   box.refresh = function () {
     var sessionInfo = _solidLogic.authSession.info;
-
     if (sessionInfo && sessionInfo.webId && sessionInfo.isLoggedIn) {
       me = _solidLogic.solidLogicSingleton.store.sym(sessionInfo.webId);
     } else {
       me = null;
     }
-
     if (me && box.me !== me.uri || !me && box.me) {
       widgets.clearElement(box);
-
       if (me) {
         box.appendChild(logoutButton(me, options));
       } else {
         box.appendChild(signInOrSignUpBox(dom, setIt, options));
       }
     }
-
     box.me = me ? me.uri : null;
   };
-
   box.refresh();
-
   function trackSession() {
     me = _solidLogic.authn.currentUser();
     box.refresh();
   }
-
   trackSession();
-
   _solidLogic.authSession.onLogin(trackSession);
-
   _solidLogic.authSession.onLogout(trackSession);
-
   box.me = '99999'; // Force refresh
-
   box.refresh();
   return box;
 }
-
 _solidLogic.authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
   var issuer, wellKnownUri, wellKnownResult, openidConfiguration;
   return _regenerator["default"].wrap(function _callee2$(_context2) {
@@ -990,53 +825,41 @@ _solidLogic.authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"]
       switch (_context2.prev = _context2.next) {
         case 0:
           issuer = window.localStorage.getItem('loginIssuer');
-
           if (!issuer) {
             _context2.next = 19;
             break;
           }
-
           _context2.prev = 2;
           wellKnownUri = new URL(issuer);
           wellKnownUri.pathname = '/.well-known/openid-configuration';
           _context2.next = 7;
           return fetch(wellKnownUri.toString());
-
         case 7:
           wellKnownResult = _context2.sent;
-
           if (!(wellKnownResult.status === 200)) {
             _context2.next = 15;
             break;
           }
-
           _context2.next = 11;
           return wellKnownResult.json();
-
         case 11:
           openidConfiguration = _context2.sent;
-
           if (!(openidConfiguration && openidConfiguration.end_session_endpoint)) {
             _context2.next = 15;
             break;
           }
-
           _context2.next = 15;
           return fetch(openidConfiguration.end_session_endpoint, {
             credentials: 'include'
           });
-
         case 15:
           _context2.next = 19;
           break;
-
         case 17:
           _context2.prev = 17;
           _context2.t0 = _context2["catch"](2);
-
         case 19:
           window.location.reload();
-
         case 20:
         case "end":
           return _context2.stop();
@@ -1044,6 +867,7 @@ _solidLogic.authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"]
     }
   }, _callee2, null, [[2, 17]]);
 })));
+
 /**
  * Workspace selection etc
  * See https://github.com/solidos/userguide/issues/16
@@ -1067,8 +891,6 @@ _solidLogic.authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"]
  * @param appDetails
  * @param callbackWS
  */
-
-
 function selectWorkspace(dom, appDetails, callbackWS) {
   var noun = appDetails.noun;
   var appPathSegment = appDetails.appPathSegment;
@@ -1079,41 +901,30 @@ function selectWorkspace(dom, appDetails, callbackWS) {
     dom: dom,
     div: box
   };
-
   function say(s, background) {
     box.appendChild(widgets.errorMessageBlock(dom, s, background));
   }
-
   function figureOutBase(ws) {
     var newBaseNode = _solidLogic.solidLogicSingleton.store.any(ws, ns.space('uriPrefix'));
-
     var newBaseString;
-
     if (!newBaseNode) {
       newBaseString = ws.uri.split('#')[0];
     } else {
       newBaseString = newBaseNode.value;
     }
-
     if (newBaseString.slice(-1) !== '/') {
       debug.log("".concat(appPathSegment, ": No / at end of uriPrefix ").concat(newBaseString)); // @@ paramater?
-
       newBaseString = "".concat(newBaseString, "/");
     }
-
     var now = new Date();
     newBaseString += "".concat(appPathSegment, "/id").concat(now.getTime(), "/"); // unique id
-
     return newBaseString;
   }
-
   function displayOptions(context) {
     // console.log('displayOptions!', context)
     function makeNewWorkspace(_x12) {
       return _makeNewWorkspace.apply(this, arguments);
     } // const status = ''
-
-
     function _makeNewWorkspace() {
       _makeNewWorkspace = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_event) {
         var row, cell, newBase, newWs, newData;
@@ -1128,25 +939,21 @@ function selectWorkspace(dom, appDetails, callbackWS) {
                 _context3.t0 = encodeURI;
                 _context3.next = 7;
                 return widgets.askName(dom, _solidLogic.solidLogicSingleton.store, cell, ns.solid('URL'), ns.space('Workspace'), 'Workspace');
-
               case 7:
                 _context3.t1 = _context3.sent;
                 newBase = (0, _context3.t0)(_context3.t1);
                 newWs = widgets.newThing(context.preferencesFile);
-                newData = [(0, _rdflib.st)(context.me, ns.space('workspace'), newWs, context.preferencesFile), // eslint-disable-next-line camelcase
+                newData = [(0, _rdflib.st)(context.me, ns.space('workspace'), newWs, context.preferencesFile),
+                // eslint-disable-next-line camelcase
                 (0, _rdflib.st)(newWs, ns.space('uriPrefix'), newBase, context.preferencesFile)];
-
                 if (_solidLogic.solidLogicSingleton.store.updater) {
                   _context3.next = 13;
                   break;
                 }
-
                 throw new Error('store has no updater');
-
               case 13:
                 _context3.next = 15;
                 return _solidLogic.solidLogicSingleton.store.updater.update([], newData);
-
               case 15:
               case "end":
                 return _context3.stop();
@@ -1156,18 +963,15 @@ function selectWorkspace(dom, appDetails, callbackWS) {
       }));
       return _makeNewWorkspace.apply(this, arguments);
     }
-
     var id = context.me;
     var preferencesFile = context.preferencesFile;
-    var newBase = null; // A workspace specifically defined in the private preference file:
+    var newBase = null;
 
+    // A workspace specifically defined in the private preference file:
     var w = _solidLogic.solidLogicSingleton.store.each(id, ns.space('workspace'), undefined, preferencesFile); // Only trust preference file here
-    // A workspace in a storage in the public profile:
-
 
+    // A workspace in a storage in the public profile:
     var storages = _solidLogic.solidLogicSingleton.store.each(id, ns.space('storage')); // @@ No provenance requirement at the moment
-
-
     if (w.length === 0 && storages) {
       say("You don't seem to have any workspaces. You have ".concat(storages.length, " storage spaces."), 'white');
       storages.map(function (s) {
@@ -1177,41 +981,40 @@ function selectWorkspace(dom, appDetails, callbackWS) {
         return file.id ? ['public', 'private'].includes(file.id().toLowerCase()) : '';
       });
     }
-
     if (w.length === 1) {
       say("Workspace used: ".concat(w[0].uri), 'white'); // @@ allow user to see URI
-
-      newBase = figureOutBase(w[0]); // callbackWS(w[0], newBase)
+      newBase = figureOutBase(w[0]);
+      // callbackWS(w[0], newBase)
       // } else if (w.length === 0) {
-    } // Prompt for ws selection or creation
+    }
+
+    // Prompt for ws selection or creation
     // say( w.length + " workspaces for " + id + "Choose one.");
+    var table = dom.createElement('table');
+    table.setAttribute('style', 'border-collapse:separate; border-spacing: 0.5em;');
 
+    // const popup = window.open(undefined, '_blank', { height: 300, width:400 }, false)
+    box.appendChild(table);
 
-    var table = dom.createElement('table');
-    table.setAttribute('style', 'border-collapse:separate; border-spacing: 0.5em;'); // const popup = window.open(undefined, '_blank', { height: 300, width:400 }, false)
+    //  Add a field for directly adding the URI yourself
 
-    box.appendChild(table); //  Add a field for directly adding the URI yourself
     // const hr = box.appendChild(dom.createElement('hr')) // @@
-
     box.appendChild(dom.createElement('hr')); // @@
 
     var p = box.appendChild(dom.createElement('p'));
     p.style = _style.commentStyle;
-    p.textContent = "Where would you like to store the data for the ".concat(noun, "?\n    Give the URL of the folder where you would like the data stored.\n    It can be anywhere in solid world - this URI is just an idea."); // @@ TODO Remove the need to cast baseField to any
-
+    p.textContent = "Where would you like to store the data for the ".concat(noun, "?\n    Give the URL of the folder where you would like the data stored.\n    It can be anywhere in solid world - this URI is just an idea.");
+    // @@ TODO Remove the need to cast baseField to any
     var baseField = box.appendChild(dom.createElement('input'));
     baseField.setAttribute('type', 'text');
     baseField.style = _style.textInputStyle;
     baseField.size = 80; // really a string
-
     baseField.label = 'base URL';
     baseField.autocomplete = 'on';
-
     if (newBase) {
       // set to default
       baseField.value = newBase;
     }
-
     context.baseField = baseField;
     box.appendChild(dom.createElement('br')); // @@
 
@@ -1220,27 +1023,27 @@ function selectWorkspace(dom, appDetails, callbackWS) {
     button.textContent = "Start new ".concat(noun, " at this URI");
     button.addEventListener('click', function (_event) {
       var newBase = baseField.value.replace(' ', '%20'); // do not re-encode in general, as % encodings may exist
-
       if (newBase.slice(-1) !== '/') {
         newBase += '/';
       }
-
       callbackWS(null, newBase);
-    }); // Now go set up the table of spaces
-    // const row = 0
+    });
 
+    // Now go set up the table of spaces
+
+    // const row = 0
     w = w.filter(function (x) {
-      return !_solidLogic.solidLogicSingleton.store.holds(x, ns.rdf('type'), // Ignore master workspaces
+      return !_solidLogic.solidLogicSingleton.store.holds(x, ns.rdf('type'),
+      // Ignore master workspaces
       ns.space('MasterWorkspace'));
     });
     var col1, col2, col3, tr, ws, style, comment;
     var cellStyle = 'height: 3em; margin: 1em; padding: 1em white; border-radius: 0.3em;';
-    var deselectedStyle = "".concat(cellStyle, "border: 0px;"); // const selectedStyle = cellStyle + 'border: 1px solid black;'
-
+    var deselectedStyle = "".concat(cellStyle, "border: 0px;");
+    // const selectedStyle = cellStyle + 'border: 1px solid black;'
     for (var i = 0; i < w.length; i++) {
       ws = w[i];
       tr = dom.createElement('tr');
-
       if (i === 0) {
         col1 = dom.createElement('td');
         col1.setAttribute('rowspan', "".concat(w.length));
@@ -1248,10 +1051,8 @@ function selectWorkspace(dom, appDetails, callbackWS) {
         col1.setAttribute('style', 'vertical-align:middle;');
         tr.appendChild(col1);
       }
-
       col2 = dom.createElement('td');
       style = _solidLogic.solidLogicSingleton.store.anyValue(ws, ns.ui('style'));
-
       if (!style) {
         // Otherwise make up arbitrary colour
         var hash = function hash(x) {
@@ -1260,32 +1061,24 @@ function selectWorkspace(dom, appDetails, callbackWS) {
             return a & a;
           }, 0);
         };
-
         var bgcolor = "#".concat((hash(ws.uri) & 0xffffff | 0xc0c0c0).toString(16)); // c0c0c0  forces pale
-
         style = "color: black ; background-color: ".concat(bgcolor, ";");
       }
-
       col2.setAttribute('style', deselectedStyle + style);
       tr.target = ws.uri;
-
       var label = _solidLogic.solidLogicSingleton.store.any(ws, ns.rdfs('label'));
-
       if (!label) {
         label = ws.uri.split('/').slice(-1)[0] || ws.uri.split('/').slice(-2)[0];
       }
-
       col2.textContent = label || '???';
       tr.appendChild(col2);
-
       if (i === 0) {
         col3 = dom.createElement('td');
-        col3.setAttribute('rowspan', "".concat(w.length, "1")); // col3.textContent = '@@@@@ remove';
-
+        col3.setAttribute('rowspan', "".concat(w.length, "1"));
+        // col3.textContent = '@@@@@ remove';
         col3.setAttribute('style', 'width:50%;');
         tr.appendChild(col3);
       }
-
       table.appendChild(tr);
       comment = _solidLogic.solidLogicSingleton.store.any(ws, ns.rdfs('comment'));
       comment = comment ? comment.value : 'Use this workspace';
@@ -1293,8 +1086,8 @@ function selectWorkspace(dom, appDetails, callbackWS) {
         col3.textContent = comment ? comment.value : '';
         col3.setAttribute('style', deselectedStyle + style);
         var button = dom.createElement('button');
-        button.textContent = 'Continue'; // button.setAttribute('style', style);
-
+        button.textContent = 'Continue';
+        // button.setAttribute('style', style);
         var newBase = figureOutBase(ws);
         baseField.value = newBase; // show user proposed URI
 
@@ -1303,12 +1096,11 @@ function selectWorkspace(dom, appDetails, callbackWS) {
           callbackWS(ws, newBase);
           button.textContent = '---->';
         }, true); // capture vs bubble
-
         col3.appendChild(button);
       }, true); // capture vs bubble
-    } // last line with "Make new workspace"
-
+    }
 
+    // last line with "Make new workspace"
     var trLast = dom.createElement('tr');
     col2 = dom.createElement('td');
     col2.setAttribute('style', cellStyle);
@@ -1317,9 +1109,8 @@ function selectWorkspace(dom, appDetails, callbackWS) {
     trLast.appendChild(col2);
     table.appendChild(trLast);
   } // displayOptions
-  // console.log('kicking off async operation')
-
 
+  // console.log('kicking off async operation')
   ensureLoadedPreferences(context) // kick off async operation
   .then(displayOptions)["catch"](function (err) {
     // console.log("err from async op")
@@ -1344,14 +1135,11 @@ function selectWorkspace(dom, appDetails, callbackWS) {
  *
  * @returns A div with a button in it for making a new app instance
  */
-
-
 function newAppInstance(dom, appDetails, callback) {
   var gotWS = function gotWS(ws, base) {
     // log.debug("newAppInstance: Selected workspace = " + (ws? ws.uri : 'none'))
     callback(ws, base);
   };
-
   var div = dom.createElement('div');
   var b = dom.createElement('button');
   b.setAttribute('type', 'button');
@@ -1367,20 +1155,15 @@ function newAppInstance(dom, appDetails, callback) {
  * Retrieves whether the currently logged in user is a power user
  * and/or a developer
  */
-
-
 function getUserRoles() {
   return _getUserRoles.apply(this, arguments);
 }
 /**
  * Filters which panes should be available, based on the result of [[getUserRoles]]
  */
-
-
 function _getUserRoles() {
   _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
     var _yield$ensureLoadedPr, me, preferencesFile, preferencesFileError;
-
     return _regenerator["default"].wrap(function _callee10$(_context10) {
       while (1) {
         switch (_context10.prev = _context10.next) {
@@ -1388,31 +1171,24 @@ function _getUserRoles() {
             _context10.prev = 0;
             _context10.next = 3;
             return ensureLoadedPreferences({});
-
           case 3:
             _yield$ensureLoadedPr = _context10.sent;
             me = _yield$ensureLoadedPr.me;
             preferencesFile = _yield$ensureLoadedPr.preferencesFile;
             preferencesFileError = _yield$ensureLoadedPr.preferencesFileError;
-
             if (!(!preferencesFile || preferencesFileError)) {
               _context10.next = 9;
               break;
             }
-
             throw new Error(preferencesFileError);
-
           case 9:
             return _context10.abrupt("return", _solidLogic.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc()));
-
           case 12:
             _context10.prev = 12;
             _context10.t0 = _context10["catch"](0);
             debug.warn('Unable to fetch your preferences - this was the error: ', _context10.t0);
-
           case 15:
             return _context10.abrupt("return", []);
-
           case 16:
           case "end":
             return _context10.stop();
@@ -1422,11 +1198,9 @@ function _getUserRoles() {
   }));
   return _getUserRoles.apply(this, arguments);
 }
-
 function filterAvailablePanes(_x13) {
   return _filterAvailablePanes.apply(this, arguments);
 }
-
 function _filterAvailablePanes() {
   _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(panes) {
     var userRoles;
@@ -1436,13 +1210,11 @@ function _filterAvailablePanes() {
           case 0:
             _context11.next = 2;
             return getUserRoles();
-
           case 2:
             userRoles = _context11.sent;
             return _context11.abrupt("return", panes.filter(function (pane) {
               return isMatchingAudience(pane, userRoles);
             }));
-
           case 4:
           case "end":
             return _context11.stop();
@@ -1452,7 +1224,6 @@ function _filterAvailablePanes() {
   }));
   return _filterAvailablePanes.apply(this, arguments);
 }
-
 function isMatchingAudience(pane, userRoles) {
   var audience = pane.audience || [];
   return audience.reduce(function (isMatch, audienceRole) {