solid-ui 2.4.22-ecb6aa47 → 2.4.22-efbe9e52

package/lib/login/login.js

@@ -17,13 +17,9 @@ exports.loginStatusBox = loginStatusBox;
 exports.newAppInstance = newAppInstance;
 exports.registrationControl = registrationControl;
 exports.registrationList = registrationList;
-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");
@@ -40,7 +36,7 @@ var _signup = require("../signup/signup.js");
 
 var _style = require("../style");
 
-var utils = _interopRequireWildcard(require("../utils"));
+var _index = require("../utils/index");
 
 var widgets = _interopRequireWildcard(require("../widgets"));
 
@@ -48,20 +44,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
-var store = _solidLogic.solidLogicSingleton.store;
 /**
  * Resolves with the logged in user's WebID
  *
  * @param context
  */
 // used to be logIn
-
 function ensureLoggedIn(context) {
   var me = _solidLogic.authn.currentUser();
 
@@ -103,7 +93,7 @@ function ensureLoggedIn(context) {
 // used to be logInLoadPreferences
 
 
-function ensureLoadedPreferences(_x) {
+function ensureLoadedPreferences(_x2) {
   return _ensureLoadedPreferences.apply(this, arguments);
 }
 /**
@@ -117,9 +107,9 @@ function ensureLoadedPreferences(_x) {
 
 
 function _ensureLoadedPreferences() {
-  _ensureLoadedPreferences = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(context) {
+  _ensureLoadedPreferences = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(context) {
     var statusArea, progressDisplay, complain, preferencesFile, m2;
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
@@ -151,7 +141,7 @@ function _ensureLoadedPreferences() {
           case 7:
             context = _context4.sent;
             _context4.next = 10;
-            return (0, _solidLogic.loadPreferences)(context.me);
+            return _solidLogic.solidLogicSingleton.loadPreferences(context.me);
 
           case 10:
             preferencesFile = _context4.sent;
@@ -161,7 +151,7 @@ function _ensureLoadedPreferences() {
             }
 
             context.preferencesFile = preferencesFile;
-            _context4.next = 51;
+            _context4.next = 48;
             break;
 
           case 15:
@@ -175,7 +165,7 @@ function _ensureLoadedPreferences() {
 
             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;
+            _context4.next = 48;
             break;
 
           case 22:
@@ -190,53 +180,57 @@ function _ensureLoadedPreferences() {
 
           case 28:
             if (!(_context4.t0 instanceof _solidLogic.SameOriginForbiddenError)) {
-              _context4.next = 34;
+              _context4.next = 33;
               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);
+            _context4.next = 48;
+            break;
 
-          case 34:
-            if (!(_context4.t0 instanceof _solidLogic.NotEditableError)) {
-              _context4.next = 40;
+          case 33:
+            if (!(_context4.t0 instanceof _solidLogic.NotFoundError)) {
+              _context4.next = 42;
               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;
+            if (!confirm("You do not currently have a preference file. OK for me to create an empty one? ".concat(_context4.t0.preferencesFile || ''))) {
+              _context4.next = 39;
               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;
+            // @@@ code me  ... weird to have a name of the file but no file
+            (0, _log.alert)("Sorry; I am not prepared to do this. Please create an empty file at ".concat(_context4.t0.preferencesFile || '(?)'));
+            complain(new Error('Sorry; no code yet to create a preference file at '));
+            _context4.next = 40;
             break;
 
-          case 45:
+          case 39:
+            throw new Error("User declined to create a preference file at ".concat(_context4.t0.preferencesFile || '(?)'));
+
+          case 40:
+            _context4.next = 48;
+            break;
+
+          case 42:
             if (!(_context4.t0 instanceof _solidLogic.FetchError)) {
-              _context4.next = 50;
+              _context4.next = 47;
               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;
+            _context4.next = 48;
             break;
 
-          case 50:
+          case 47:
             throw new Error("(via loadPrefs) ".concat(_context4.t0));
 
-          case 51:
+          case 48:
             return _context4.abrupt("return", context);
 
-          case 52:
+          case 49:
           case "end":
             return _context4.stop();
         }
@@ -246,20 +240,21 @@ function _ensureLoadedPreferences() {
   return _ensureLoadedPreferences.apply(this, arguments);
 }
 
-function ensureLoadedProfile(_x2) {
+function ensureLoadedProfile(_x3) {
   return _ensureLoadedProfile.apply(this, arguments);
 }
 /**
-  * Returns promise of context with arrays of symbols
-  *
-  * leaving the `isPublic` param undefined will bring in community index things, too
-  */
+ * Returns promise of context with arrays of symbols
+ *
+ * 2016-12-11 change to include forClass arc a la
+ * https://github.com/solid/solid/blob/main/proposals/data-discovery.md
+ */
 
 
 function _ensureLoadedProfile() {
-  _ensureLoadedProfile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(context) {
+  _ensureLoadedProfile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(context) {
     var logInContext;
-    return _regenerator["default"].wrap(function _callee5$(_context5) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
         switch (_context5.prev = _context5.next) {
           case 0:
@@ -287,7 +282,7 @@ function _ensureLoadedProfile() {
 
           case 8:
             _context5.next = 10;
-            return (0, _solidLogic.loadProfile)(logInContext.me);
+            return _solidLogic.solidLogicSingleton.loadProfile(logInContext.me);
 
           case 10:
             context.publicProfile = _context5.sent;
@@ -317,138 +312,210 @@ function _ensureLoadedProfile() {
   return _ensureLoadedProfile.apply(this, arguments);
 }
 
-function findAppInstances(_x3, _x4, _x5) {
+function findAppInstances(_x4, _x5, _x6) {
   return _findAppInstances.apply(this, arguments);
 }
+/**
+ * UI to control registration of instance
+ */
+
 
 function _findAppInstances() {
-  _findAppInstances = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(context, theClass, isPublic) {
-    var items;
-    return _regenerator["default"].wrap(function _callee6$(_context6) {
+  _findAppInstances = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(context, theClass, isPublic) {
+    var visibility, index, thisIndex, registrations, instances, containers, unique, e, i, cont;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            if (!context.me) {
-              _context6.next = 6;
+            unique = function _unique(arr) {
+              return Array.from(new Set(arr));
+            };
+
+            if (!(isPublic === undefined)) {
+              _context6.next = 7;
               break;
             }
 
-            _context6.next = 3;
-            return (0, _solidLogic.getScopedAppInstances)(theClass, context.me);
+            _context6.next = 4;
+            return findAppInstances(context, theClass, true);
 
-          case 3:
-            _context6.t0 = _context6.sent;
-            _context6.next = 7;
-            break;
+          case 4:
+            _context6.next = 6;
+            return findAppInstances(context, theClass, false);
 
           case 6:
-            _context6.t0 = [];
+            return _context6.abrupt("return", context);
 
           case 7:
-            items = _context6.t0;
+            _context6.prev = 7;
+            _context6.next = 10;
+            return isPublic ? ensureLoadedProfile(context) : ensureLoadedPreferences(context);
 
-            if (isPublic === true) {
-              // old API - not recommended!
-              items = items.filter(function (item) {
-                return item.scope.label === 'public';
-              });
-            } else if (isPublic === false) {
-              items = items.filter(function (item) {
-                return item.scope.label === 'private';
-              });
+          case 10:
+            _context6.next = 15;
+            break;
+
+          case 12:
+            _context6.prev = 12;
+            _context6.t0 = _context6["catch"](7);
+            widgets.complain(context, "loadIndex: login and load problem ".concat(_context6.t0));
+
+          case 15:
+            // console.log('awaited LogInLoad!', context)
+            visibility = isPublic ? 'public' : 'private';
+            _context6.prev = 16;
+            _context6.next = 19;
+            return (0, _solidLogic.loadIndex)(context, isPublic);
+
+          case 19:
+            _context6.next = 24;
+            break;
+
+          case 21:
+            _context6.prev = 21;
+            _context6.t1 = _context6["catch"](16);
+            debug.error(_context6.t1);
+
+          case 24:
+            index = context.index;
+            thisIndex = index[visibility];
+            registrations = thisIndex.map(function (ix) {
+              return _solidLogic.solidLogicSingleton.store.each(undefined, ns.solid('forClass'), theClass, ix);
+            }).reduce(function (acc, curr) {
+              return acc.concat(curr);
+            }, []);
+            instances = registrations.map(function (reg) {
+              return _solidLogic.solidLogicSingleton.store.each(reg, ns.solid('instance'));
+            }).reduce(function (acc, curr) {
+              return acc.concat(curr);
+            }, []);
+            containers = registrations.map(function (reg) {
+              return _solidLogic.solidLogicSingleton.store.each(reg, ns.solid('instanceContainer'));
+            }).reduce(function (acc, curr) {
+              return acc.concat(curr);
+            }, []);
+            context.instances = context.instances || [];
+            context.instances = unique(context.instances.concat(instances));
+            context.containers = context.containers || [];
+            context.containers = unique(context.containers.concat(containers));
+
+            if (containers.length) {
+              _context6.next = 35;
+              break;
             }
 
-            context.instances = items.map(function (item) {
-              return item.instance;
+            return _context6.abrupt("return", context);
+
+          case 35:
+            _context6.prev = 35;
+            _context6.next = 38;
+            return _solidLogic.solidLogicSingleton.load(containers);
+
+          case 38:
+            _context6.next = 45;
+            break;
+
+          case 40:
+            _context6.prev = 40;
+            _context6.t2 = _context6["catch"](35);
+            e = new Error("[FAI] Unable to load containers".concat(_context6.t2));
+            debug.log(e); // complain
+
+            widgets.complain(context, "Error looking for ".concat(_index.utils.label(theClass), ":  ").concat(_context6.t2)); // but then ignore it
+            // throw new Error(e)
+
+          case 45:
+            i = 0;
+
+          case 46:
+            if (!(i < containers.length)) {
+              _context6.next = 56;
+              break;
+            }
+
+            cont = containers[i];
+            _context6.t3 = context.instances;
+            _context6.next = 51;
+            return _solidLogic.solidLogicSingleton.getContainerMembers(cont.value);
+
+          case 51:
+            _context6.t4 = _context6.sent.map(function (uri) {
+              return _solidLogic.solidLogicSingleton.store.sym(uri);
             });
+            context.instances = _context6.t3.concat.call(_context6.t3, _context6.t4);
+
+          case 53:
+            i++;
+            _context6.next = 46;
+            break;
+
+          case 56:
             return _context6.abrupt("return", context);
 
-          case 11:
+          case 57:
           case "end":
             return _context6.stop();
         }
       }
-    }, _callee6);
+    }, _callee6, null, [[7, 12], [16, 21], [35, 40]]);
   }));
   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) + ' ';
-  return "".concat(name).concat(scope.label);
+function registrationControl(_x7, _x8, _x9) {
+  return _registrationControl.apply(this, arguments);
 }
 /**
- * UI to control registration of instance
+ * UI to List at all registered things
  */
 
 
-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;
+  _registrationControl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(context, instance, theClass) {
+    var dom, box, context2, msg, tbody, form, registrationStatements, index, statements, _msg;
 
-    return _regenerator["default"].wrap(function _callee7$(_context7) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) {
         switch (_context7.prev = _context7.next) {
           case 0:
-            renderScopeCheckbox = function _renderScopeCheckbox(scope) {
-              var statements = registrationStatements(scope.index);
-              var name = scopeLabel(context, scope);
-              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 = (0, _solidLogic.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;
+              _context7.next = 3;
               break;
             }
 
-            throw new Error('registrationControl: need dom and div');
+            return _context7.abrupt("return", context);
 
-          case 5:
+          case 3:
             box = dom.createElement('div');
             context.div.appendChild(box);
             context.me = _solidLogic.authn.currentUser(); // @@
 
-            me = context.me;
-
-            if (me) {
-              _context7.next = 12;
+            if (context.me) {
+              _context7.next = 9;
               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 (0, _solidLogic.loadAllTypeIndexes)(me);
+          case 9:
+            _context7.prev = 9;
+            _context7.next = 12;
+            return (0, _solidLogic.ensureTypeIndexes)(context);
 
-          case 15:
-            scopes = _context7.sent;
-            _context7.next = 23;
+          case 12:
+            context2 = _context7.sent;
+            _context7.next = 19;
             break;
 
-          case 18:
-            _context7.prev = 18;
-            _context7.t0 = _context7["catch"](12);
+          case 15:
+            _context7.prev = 15;
+            _context7.t0 = _context7["catch"](9);
 
             if (context.div && context.preferencesFileError) {
-              msg = '(Lists of stuff not available)';
+              msg = '(Preferences not available)';
               context.div.appendChild(dom.createElement('p')).textContent = msg;
             } else if (context.div) {
               msg = "registrationControl: Type indexes not available: ".concat(_context7.t0);
@@ -456,201 +523,153 @@ function _registrationControl() {
             }
 
             debug.log(msg);
-            return _context7.abrupt("return", context);
 
-          case 23:
-            box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
+          case 19:
+            box.innerHTML = '<table><tbody><tr></tr><tr></tr></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);
+            registrationStatements = function registrationStatements(index) {
+              var registrations = _solidLogic.solidLogicSingleton.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)];
+            };
 
             try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                scope = _step.value;
-                row = tbody.appendChild(dom.createElement('tr'));
-                row.appendChild(renderScopeCheckbox(scope)); // @@ index
+              if (context2.index && context2.index["public"] && context2.index["public"].length > 0) {
+                index = context2.index["public"][0];
+                statements = registrationStatements(index);
+                tbody.children[0].appendChild(widgets.buildCheckboxForm(context2.dom, _solidLogic.solidLogicSingleton.store, "Public link to this ".concat(context2.noun), null, statements, form, index));
+              }
+
+              if (context2.index && context2.index["private"] && context2.index["private"].length > 0) {
+                index = context2.index["private"][0];
+                statements = registrationStatements(index);
+                tbody.children[1].appendChild(widgets.buildCheckboxForm(context2.dom, _solidLogic.solidLogicSingleton.store, "Personal note of this ".concat(context2.noun), null, statements, form, index));
+              }
+            } catch (e) {
+              _msg = "registrationControl: Error making panel: ".concat(e);
+
+              if (context.div) {
+                context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
               }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
+
+              debug.log(_msg);
             }
 
-            return _context7.abrupt("return", context);
+            return _context7.abrupt("return", context2);
 
-          case 30:
+          case 26:
           case "end":
             return _context7.stop();
         }
       }
-    }, _callee7, null, [[12, 18]]);
+    }, _callee7, null, [[9, 15]]);
   }));
   return _registrationControl.apply(this, arguments);
 }
 
-function renderScopeHeadingRow(context, store, scope) {
-  var backgroundColor = {
-    "private": '#fee',
-    "public": '#efe'
-  };
-  var dom = context.dom;
-  var name = scopeLabel(context, scope);
-  var row = dom.createElement('tr');
-  var cell = row.appendChild(dom.createElement('td'));
-  cell.setAttribute('colspan', '3');
-  cell.style.backgoundColor = backgroundColor[scope.label] || 'white';
-  var header = cell.appendChild(dom.createElement('h3'));
-  header.textContent = name + ' links';
-  header.style.textAlign = 'left';
-  return row;
-}
-/**
-  * UI to List at all registered things
-  */
-
-
-function registrationList(_x9, _x10) {
+function registrationList(_x10, _x11) {
   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) {
+  _registrationList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(context0, options) {
+    var dom, div, box;
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
       while (1) {
-        switch (_context9.prev = _context9.next) {
+        switch (_context8.prev = _context8.next) {
           case 0:
-            dom = context.dom;
-            div = context.div;
+            dom = context0.dom;
+            div = context0.div;
             box = dom.createElement('div');
             div.appendChild(box);
-            context.me = _solidLogic.authn.currentUser(); // @@
+            context0.me = _solidLogic.authn.currentUser(); // @@
 
-            if (context.me) {
-              _context9.next = 8;
+            if (context0.me) {
+              _context8.next = 8;
               break;
             }
 
             box.innerHTML = '<p style="margin:2em;">(Log in list your stuff)</p>';
-            return _context9.abrupt("return", context);
+            return _context8.abrupt("return", context0);
 
           case 8:
-            _context9.next = 10;
-            return (0, _solidLogic.loadAllTypeIndexes)(store, 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;
-            }
+            return _context8.abrupt("return", (0, _solidLogic.ensureTypeIndexes)(context0).then(function (context) {
+              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;');
+              var table = box.firstChild;
+              var ix = [];
+              var sts = [];
+              var vs = ['private', 'public'];
+              vs.forEach(function (visibility) {
+                if (context.index && context.index[visibility].length > 0 && options[visibility]) {
+                  ix = ix.concat(context.index[visibility][0]);
+                  sts = sts.concat(_solidLogic.solidLogicSingleton.store.statementsMatching(undefined, ns.solid('instance'), undefined, context.index[visibility][0]));
+                }
+              });
 
-            scope = _step2.value;
-            // need some predicate for listing/adding agents
-            headingRow = renderScopeHeadingRow(context, store, scope);
-            tbody.appendChild(headingRow);
-            _context9.next = 24;
-            return (0, _solidLogic.getScopedAppsFromIndex)(scope, options.type || null);
+              var _loop = function _loop(i) {
+                var statement = sts[i];
 
-          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 (options.type) {
+                  // now check  terms:forClass
+                  if (!_solidLogic.solidLogicSingleton.store.holds(statement.subject, ns.solid('forClass'), options.type, statement.why)) {
+                    return "continue"; // skip irrelevant ones
+                  }
+                } // const cla = statement.subject
 
-            _iterator3 = _createForOfIteratorHelper(items);
 
-            try {
-              _loop = function _loop() {
-                var item = _step3.value;
-                var row = widgets.personTR(dom, ns.solid('instance'), item.instance, {
-                  deleteFunction: function () {
-                    var _deleteFunction = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
-                      return _regenerator["default"].wrap(function _callee8$(_context8) {
-                        while (1) {
-                          switch (_context8.prev = _context8.next) {
-                            case 0:
-                              _context8.next = 2;
-                              return (0, _solidLogic.deleteTypeIndexRegistration)(item);
-
-                            case 2:
-                              tbody.removeChild(row);
-
-                            case 3:
-                            case "end":
-                              return _context8.stop();
-                          }
-                        }
-                      }, _callee8);
-                    }));
-
-                    function deleteFunction() {
-                      return _deleteFunction.apply(this, arguments);
+                var inst = statement.object;
+                table.appendChild(widgets.personTR(dom, ns.solid('instance'), inst, {
+                  deleteFunction: function deleteFunction(_x) {
+                    if (!_solidLogic.solidLogicSingleton.store.updater) {
+                      throw new Error('Cannot delete this, store has no updater');
                     }
 
-                    return deleteFunction;
-                  }()
-                });
-                row.children[0].style.paddingLeft = '3em';
-                tbody.appendChild(row);
+                    _solidLogic.solidLogicSingleton.store.updater.update([statement], [], function (uri, ok, errorBody) {
+                      if (ok) {
+                        debug.log("Removed from index: ".concat(statement.subject));
+                      } else {
+                        debug.log("Error: Cannot delete ".concat(statement, ": ").concat(errorBody));
+                      }
+                    });
+                  }
+                }));
               };
 
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                _loop();
-              }
-            } catch (err) {
-              _iterator3.e(err);
-            } finally {
-              _iterator3.f();
-            }
+              for (var i = 0; i < sts.length; i++) {
+                var _ret = _loop(i);
 
-          case 28:
-            _context9.next = 18;
-            break;
+                if (_ret === "continue") continue;
+              } // registrationList
 
-          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;
+              /*
+                  //const containers = solidLogicSingleton.store.each(theClass, ns.solid('instanceContainer'));
+                  if (containers.length) {
+                  fetcher.load(containers).then(function(xhrs){
+                  for (const i=0; i<containers.length; i++) {
+                  const cont = containers[i];
+                  instances = instances.concat(solidLogicSingleton.store.each(cont, ns.ldp('contains')));
+                  }
+                  });
+                  }
+                  */
 
-            _iterator2.f();
 
-            return _context9.finish(35);
-
-          case 38:
-            return _context9.abrupt("return", context);
+              return context;
+            }));
 
-          case 39:
+          case 9:
           case "end":
-            return _context9.stop();
+            return _context8.stop();
         }
       }
-    }, _callee9, null, [[16, 32, 35, 38]]);
+    }, _callee8);
   }));
   return _registrationList.apply(this, arguments);
 }
@@ -768,9 +787,9 @@ function renderSignInPopup(dom) {
   issuerPopupBoxTopMenu.appendChild(issuerPopupBoxCloseButton);
 
   var loginToIssuer = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(issuerUri) {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(issuerUri) {
       var preLoginRedirectHash;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -807,7 +826,7 @@ function renderSignInPopup(dom) {
       }, _callee, null, [[0, 8]]);
     }));
 
-    return function loginToIssuer(_x11) {
+    return function loginToIssuer(_x12) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -968,9 +987,9 @@ function loginStatusBox(dom) {
   return box;
 }
 
-_solidLogic.authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+_solidLogic.authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
   var issuer, wellKnownUri, wellKnownResult, openidConfiguration;
-  return _regenerator["default"].wrap(function _callee2$(_context2) {
+  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
     while (1) {
       switch (_context2.prev = _context2.next) {
         case 0:
@@ -1094,15 +1113,15 @@ function selectWorkspace(dom, appDetails, callbackWS) {
 
   function displayOptions(context) {
     // console.log('displayOptions!', context)
-    function makeNewWorkspace(_x12) {
+    function makeNewWorkspace(_x13) {
       return _makeNewWorkspace.apply(this, arguments);
     } // const status = ''
 
 
     function _makeNewWorkspace() {
-      _makeNewWorkspace = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_event) {
+      _makeNewWorkspace = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_event) {
         var row, cell, newBase, newWs, newData;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -1363,77 +1382,77 @@ function getUserRoles() {
 
 
 function _getUserRoles() {
-  _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
+  _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
     var _yield$ensureLoadedPr, me, preferencesFile, preferencesFileError;
 
-    return _regenerator["default"].wrap(function _callee10$(_context10) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
       while (1) {
-        switch (_context10.prev = _context10.next) {
+        switch (_context9.prev = _context9.next) {
           case 0:
-            _context10.prev = 0;
-            _context10.next = 3;
+            _context9.prev = 0;
+            _context9.next = 3;
             return ensureLoadedPreferences({});
 
           case 3:
-            _yield$ensureLoadedPr = _context10.sent;
+            _yield$ensureLoadedPr = _context9.sent;
             me = _yield$ensureLoadedPr.me;
             preferencesFile = _yield$ensureLoadedPr.preferencesFile;
             preferencesFileError = _yield$ensureLoadedPr.preferencesFileError;
 
             if (!(!preferencesFile || preferencesFileError)) {
-              _context10.next = 9;
+              _context9.next = 9;
               break;
             }
 
             throw new Error(preferencesFileError);
 
           case 9:
-            return _context10.abrupt("return", _solidLogic.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc()));
+            return _context9.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);
+            _context9.prev = 12;
+            _context9.t0 = _context9["catch"](0);
+            debug.warn('Unable to fetch your preferences - this was the error: ', _context9.t0);
 
           case 15:
-            return _context10.abrupt("return", []);
+            return _context9.abrupt("return", []);
 
           case 16:
           case "end":
-            return _context10.stop();
+            return _context9.stop();
         }
       }
-    }, _callee10, null, [[0, 12]]);
+    }, _callee9, null, [[0, 12]]);
   }));
   return _getUserRoles.apply(this, arguments);
 }
 
-function filterAvailablePanes(_x13) {
+function filterAvailablePanes(_x14) {
   return _filterAvailablePanes.apply(this, arguments);
 }
 
 function _filterAvailablePanes() {
-  _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(panes) {
+  _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(panes) {
     var userRoles;
-    return _regenerator["default"].wrap(function _callee11$(_context11) {
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
       while (1) {
-        switch (_context11.prev = _context11.next) {
+        switch (_context10.prev = _context10.next) {
           case 0:
-            _context11.next = 2;
+            _context10.next = 2;
             return getUserRoles();
 
           case 2:
-            userRoles = _context11.sent;
-            return _context11.abrupt("return", panes.filter(function (pane) {
+            userRoles = _context10.sent;
+            return _context10.abrupt("return", panes.filter(function (pane) {
               return isMatchingAudience(pane, userRoles);
             }));
 
           case 4:
           case "end":
-            return _context11.stop();
+            return _context10.stop();
         }
       }
-    }, _callee11);
+    }, _callee10);
   }));
   return _filterAvailablePanes.apply(this, arguments);
 }