solid-panes 3.5.14 → 3.5.16-alpha-07d0f77b

package/lib/outline/manager.js

@@ -9,6 +9,8 @@ exports["default"] = _default;
 
 var UI = _interopRequireWildcard(require("solid-ui"));
 
+var _solidLogic = require("solid-logic");
+
 var panes = _interopRequireWildcard(require("pane-registry"));
 
 var $rdf = _interopRequireWildcard(require("rdflib"));
@@ -63,9 +65,9 @@ function _default(context) {
   this.ancestor = UI.utils.ancestor; // make available as outline.ancestor in callbacks
 
   this.sparql = UI.rdf.UpdateManager;
-  this.kb = UI.store;
-  var kb = UI.store;
-  var sf = UI.store.fetcher;
+  this.kb = _solidLogic.store;
+  var kb = _solidLogic.store;
+  var sf = _solidLogic.store.fetcher;
   dom.outline = this;
   this.qs = new _queryByExample["default"].QuerySource(); // Track queries in queryByExample
   // var selection = []  // Array of statements which have been selected
@@ -368,7 +370,9 @@ function _default(context) {
 
                 containerDiv.innerHTML = '';
                 var table = containerDiv.appendChild(dom.createElement('table'));
-                var me = UI.authn.currentUser();
+
+                var me = _solidLogic.authn.currentUser();
+
                 thisOutline.GotoSubject(item.subject || me, true, pane, false, undefined, table);
               };
 
@@ -380,7 +384,7 @@ function _default(context) {
               options = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
               console.log('globalAppTabs @@');
               div = dom.createElement('div');
-              me = UI.authn.currentUser();
+              me = _solidLogic.authn.currentUser();
 
               if (me) {
                 _context.next = 9;
@@ -428,32 +432,32 @@ function _default(context) {
   }
 
   function _getDashboardItems() {
-    _getDashboardItems = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+    _getDashboardItems = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
       var me, div, _yield$Promise$all, _yield$Promise$all2, books, pods, getPods, _getPods, getAddressBooks, _getAddressBooks;
 
-      return regeneratorRuntime.wrap(function _callee6$(_context7) {
+      return regeneratorRuntime.wrap(function _callee7$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               _getAddressBooks = function _getAddressBooks3() {
-                _getAddressBooks = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
-                  var _context5;
+                _getAddressBooks = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+                  var _context6;
 
-                  return regeneratorRuntime.wrap(function _callee5$(_context6) {
+                  return regeneratorRuntime.wrap(function _callee6$(_context7) {
                     while (1) {
-                      switch (_context6.prev = _context6.next) {
+                      switch (_context7.prev = _context7.next) {
                         case 0:
-                          _context6.prev = 0;
-                          _context6.next = 3;
-                          return UI.authn.findAppInstances({
+                          _context7.prev = 0;
+                          _context7.next = 3;
+                          return UI.login.findAppInstances({
                             me: me,
                             div: div,
                             dom: dom
                           }, ns.vcard('AddressBook'));
 
                         case 3:
-                          _context5 = _context6.sent;
-                          return _context6.abrupt("return", (_context5.instances || []).map(function (book, index) {
+                          _context6 = _context7.sent;
+                          return _context7.abrupt("return", (_context6.instances || []).map(function (book, index) {
                             return {
                               paneName: 'contact',
                               tabName: "contact-".concat(index),
@@ -464,19 +468,19 @@ function _default(context) {
                           }));
 
                         case 7:
-                          _context6.prev = 7;
-                          _context6.t0 = _context6["catch"](0);
+                          _context7.prev = 7;
+                          _context7.t0 = _context7["catch"](0);
                           console.error('oops in globalAppTabs AddressBook');
 
                         case 10:
-                          return _context6.abrupt("return", []);
+                          return _context7.abrupt("return", []);
 
                         case 11:
                         case "end":
-                          return _context6.stop();
+                          return _context7.stop();
                       }
                     }
-                  }, _callee5, null, [[0, 7]]);
+                  }, _callee6, null, [[0, 7]]);
                 }));
                 return _getAddressBooks.apply(this, arguments);
               };
@@ -486,142 +490,171 @@ function _default(context) {
               };
 
               _getPods = function _getPods3() {
-                _getPods = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
-                  var addPodRoot, _addPodRoot, addPodRootFromUrl, _addPodRootFromUrl, pods, uri, podUrl;
+                _getPods = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+                  var addPodStorage, _addPodStorage, addPodStorageFromUrl, _addPodStorageFromUrl, pods, uri, podUrl, uniques;
 
-                  return regeneratorRuntime.wrap(function _callee4$(_context4) {
+                  return regeneratorRuntime.wrap(function _callee5$(_context5) {
                     while (1) {
-                      switch (_context4.prev = _context4.next) {
+                      switch (_context5.prev = _context5.next) {
                         case 0:
-                          _addPodRootFromUrl = function _addPodRootFromUrl3() {
-                            _addPodRootFromUrl = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(url) {
-                              var podStorage;
-                              return regeneratorRuntime.wrap(function _callee3$(_context3) {
+                          uniques = function _uniques(nodes) {
+                            var uniqueNodes = [];
+                            nodes.forEach(function (node) {
+                              if (!uniqueNodes.find(function (uniqueNode) {
+                                return uniqueNode.equals(node);
+                              })) uniqueNodes.push(node);
+                            });
+                            return uniqueNodes;
+                          };
+
+                          _addPodStorageFromUrl = function _addPodStorageFromUrl3() {
+                            _addPodStorageFromUrl = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(url) {
+                              var podStorage, pathStorage;
+                              return regeneratorRuntime.wrap(function _callee4$(_context4) {
                                 while (1) {
-                                  switch (_context3.prev = _context3.next) {
+                                  switch (_context4.prev = _context4.next) {
                                     case 0:
-                                      podStorage = new URL(url); // check that origin is not included in pods array
-
-                                      if (pods.some(function (pod) {
-                                        return pod.uri.includes(podStorage.origin);
-                                      })) {
-                                        _context3.next = 10;
-                                        break;
-                                      }
+                                      podStorage = new URL(url); // check for predicate pim:Storage in containers up the path tree
 
-                                      _context3.t0 = podStorage.pathname === '/';
+                                      pathStorage = podStorage.pathname;
 
-                                      if (_context3.t0) {
-                                        _context3.next = 7;
+                                    case 2:
+                                      if (!pathStorage.length) {
+                                        _context4.next = 10;
                                         break;
                                       }
 
-                                      _context3.next = 6;
-                                      return addPodRoot(kb.sym("".concat(podStorage.origin, "/").concat(podStorage.pathname.split('/')[1], "/")));
+                                      pathStorage = pathStorage.substring(0, pathStorage.lastIndexOf('/'));
+                                      _context4.next = 6;
+                                      return addPodStorage(kb.sym("".concat(podStorage.origin).concat(pathStorage, "/")));
 
                                     case 6:
-                                      _context3.t0 = !_context3.sent;
-
-                                    case 7:
-                                      if (!_context3.t0) {
-                                        _context3.next = 10;
+                                      if (!_context4.sent) {
+                                        _context4.next = 8;
                                         break;
                                       }
 
-                                      _context3.next = 10;
-                                      return addPodRoot(kb.sym("".concat(podStorage.origin, "/")));
+                                      return _context4.abrupt("return");
+
+                                    case 8:
+                                      _context4.next = 2;
+                                      break;
 
                                     case 10:
                                     case "end":
-                                      return _context3.stop();
+                                      return _context4.stop();
                                   }
                                 }
-                              }, _callee3);
+                              }, _callee4);
                             }));
-                            return _addPodRootFromUrl.apply(this, arguments);
+                            return _addPodStorageFromUrl.apply(this, arguments);
                           };
 
-                          addPodRootFromUrl = function _addPodRootFromUrl2(_x8) {
-                            return _addPodRootFromUrl.apply(this, arguments);
+                          addPodStorageFromUrl = function _addPodStorageFromUrl2(_x8) {
+                            return _addPodStorageFromUrl.apply(this, arguments);
                           };
 
-                          _addPodRoot = function _addPodRoot3() {
-                            _addPodRoot = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(pod) {
-                              return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                          _addPodStorage = function _addPodStorage3() {
+                            _addPodStorage = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(pod) {
+                              return regeneratorRuntime.wrap(function _callee3$(_context3) {
                                 while (1) {
-                                  switch (_context2.prev = _context2.next) {
+                                  switch (_context3.prev = _context3.next) {
                                     case 0:
-                                      _context2.next = 2;
-                                      return checkForContainerRepresentation(pod);
+                                      _context3.next = 2;
+                                      return loadContainerRepresentation(pod);
 
                                     case 2:
                                       if (!kb.holds(pod, ns.rdf('type'), ns.space('Storage'), pod.doc())) {
-                                        _context2.next = 5;
+                                        _context3.next = 5;
                                         break;
                                       }
 
                                       pods.push(pod);
-                                      return _context2.abrupt("return", true);
+                                      return _context3.abrupt("return", true);
 
                                     case 5:
-                                      return _context2.abrupt("return", false);
+                                      return _context3.abrupt("return", false);
 
                                     case 6:
                                     case "end":
-                                      return _context2.stop();
+                                      return _context3.stop();
                                   }
                                 }
-                              }, _callee2);
+                              }, _callee3);
                             }));
-                            return _addPodRoot.apply(this, arguments);
+                            return _addPodStorage.apply(this, arguments);
                           };
 
-                          addPodRoot = function _addPodRoot2(_x7) {
-                            return _addPodRoot.apply(this, arguments);
+                          addPodStorage = function _addPodStorage2(_x7) {
+                            return _addPodStorage.apply(this, arguments);
                           };
 
-                          _context4.prev = 4;
-                          _context4.next = 7;
+                          _context5.prev = 5;
+                          _context5.next = 8;
                           return kb.fetcher.load(me.doc());
 
-                        case 7:
-                          _context4.next = 13;
+                        case 8:
+                          _context5.next = 14;
                           break;
 
-                        case 9:
-                          _context4.prev = 9;
-                          _context4.t0 = _context4["catch"](4);
-                          console.error('Unable to load profile', _context4.t0);
-                          return _context4.abrupt("return", []);
+                        case 10:
+                          _context5.prev = 10;
+                          _context5.t0 = _context5["catch"](5);
+                          console.error('Unable to load profile', _context5.t0);
+                          return _context5.abrupt("return", []);
 
-                        case 13:
+                        case 14:
+                          // load pod's storages from profile
                           pods = kb.each(me, ns.space('storage'), null, me.doc());
-                          _context4.prev = 14;
+                          pods.map( /*#__PURE__*/function () {
+                            var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(pod) {
+                              return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                                while (1) {
+                                  switch (_context2.prev = _context2.next) {
+                                    case 0:
+                                      _context2.next = 2;
+                                      return loadContainerRepresentation(pod);
+
+                                    case 2:
+                                    case "end":
+                                      return _context2.stop();
+                                  }
+                                }
+                              }, _callee2);
+                            }));
+
+                            return function (_x9) {
+                              return _ref.apply(this, arguments);
+                            };
+                          }());
+                          _context5.prev = 16;
                           // if uri then SolidOS is a browse.html web app
                           uri = new URL(window.location.href).searchParams.get('uri');
                           podUrl = uri || window.location.href;
-                          _context4.next = 19;
-                          return addPodRootFromUrl(podUrl.substring(0, podUrl.lastIndexOf('/') + 1));
+                          _context5.next = 21;
+                          return addPodStorageFromUrl(podUrl);
 
-                        case 19:
-                          _context4.next = 24;
+                        case 21:
+                          _context5.next = 26;
                           break;
 
-                        case 21:
-                          _context4.prev = 21;
-                          _context4.t1 = _context4["catch"](14);
-                          console.error('cannot load container', _context4.t1);
+                        case 23:
+                          _context5.prev = 23;
+                          _context5.t1 = _context5["catch"](16);
+                          console.error('cannot load container', _context5.t1);
+
+                        case 26:
+                          pods = uniques(pods);
 
-                        case 24:
                           if (pods.length) {
-                            _context4.next = 26;
+                            _context5.next = 29;
                             break;
                           }
 
-                          return _context4.abrupt("return", []);
+                          return _context5.abrupt("return", []);
 
-                        case 26:
-                          return _context4.abrupt("return", pods.map(function (pod, index) {
+                        case 29:
+                          return _context5.abrupt("return", pods.map(function (pod, index) {
                             function split(item) {
                               return item.uri.split('//')[1].slice(0, -1);
                             }
@@ -636,12 +669,12 @@ function _default(context) {
                             };
                           }));
 
-                        case 27:
+                        case 30:
                         case "end":
-                          return _context4.stop();
+                          return _context5.stop();
                       }
                     }
-                  }, _callee4, null, [[4, 9], [14, 21]]);
+                  }, _callee5, null, [[5, 10], [16, 23]]);
                 }));
                 return _getPods.apply(this, arguments);
               };
@@ -650,17 +683,26 @@ function _default(context) {
                 return _getPods.apply(this, arguments);
               };
 
-              me = UI.authn.currentUser();
+              me = _solidLogic.authn.currentUser();
+
+              if (me) {
+                _context8.next = 7;
+                break;
+              }
+
+              return _context8.abrupt("return", []);
+
+            case 7:
               div = dom.createElement('div');
-              _context7.next = 8;
+              _context8.next = 10;
               return Promise.all([getAddressBooks(), getPods()]);
 
-            case 8:
-              _yield$Promise$all = _context7.sent;
+            case 10:
+              _yield$Promise$all = _context8.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               books = _yield$Promise$all2[0];
               pods = _yield$Promise$all2[1];
-              return _context7.abrupt("return", [{
+              return _context8.abrupt("return", [{
                 paneName: 'home',
                 label: 'Your stuff',
                 icon: UI.icons.iconBase + 'noun_547570.svg'
@@ -674,12 +716,12 @@ function _default(context) {
                 icon: UI.icons.iconBase + 'noun_492246.svg'
               }].concat(books).concat(pods));
 
-            case 13:
+            case 15:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return _getDashboardItems.apply(this, arguments);
   }
@@ -698,7 +740,7 @@ function _default(context) {
   }
 
   function _showDashboard() {
-    _showDashboard = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+    _showDashboard = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
       var options,
           dashboardContainer,
           outlineContainer,
@@ -706,23 +748,23 @@ function _default(context) {
           dashboard,
           tab,
           closeDashboard,
-          _args7 = arguments;
+          _args8 = arguments;
 
-      return regeneratorRuntime.wrap(function _callee7$(_context8) {
+      return regeneratorRuntime.wrap(function _callee8$(_context9) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
               closeDashboard = function _closeDashboard() {
                 dashboardContainer.style.display = 'none';
                 outlineContainer.style.display = 'inherit';
               };
 
-              options = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
+              options = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
               dashboardContainer = getDashboardContainer();
               outlineContainer = getOutlineContainer(); // reuse dashboard if already children already is inserted
 
               if (!(dashboardContainer.childNodes.length > 0 && options.pane)) {
-                _context8.next = 12;
+                _context9.next = 12;
                 break;
               }
 
@@ -731,28 +773,30 @@ function _default(context) {
               _tab = dashboardContainer.querySelector("[data-global-pane-name=\"".concat(options.pane, "\"]"));
 
               if (!_tab) {
-                _context8.next = 11;
+                _context9.next = 11;
                 break;
               }
 
               _tab.click();
 
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
 
             case 11:
               console.warn('Did not find the referred tab in global dashboard, will open first one');
 
             case 12:
-              _context8.next = 14;
+              _context9.next = 14;
               return globalAppTabs({
                 selectedTab: options.pane,
                 onClose: closeDashboard
               });
 
             case 14:
-              dashboard = _context8.sent;
+              dashboard = _context9.sent;
+
               // close the dashboard if user log out
-              UI.authn.authSession.onLogout(closeDashboard); // finally - switch to showing dashboard
+              _solidLogic.authSession.onLogout(closeDashboard); // finally - switch to showing dashboard
+
 
               outlineContainer.style.display = 'none';
               dashboardContainer.appendChild(dashboard);
@@ -764,10 +808,10 @@ function _default(context) {
 
             case 20:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }
-      }, _callee7);
+      }, _callee8);
     }));
     return _showDashboard.apply(this, arguments);
   }
@@ -798,23 +842,23 @@ function _default(context) {
     }();
   }
 
-  function checkForContainerRepresentation(_x) {
-    return _checkForContainerRepresentation.apply(this, arguments);
+  function loadContainerRepresentation(_x) {
+    return _loadContainerRepresentation.apply(this, arguments);
   }
 
-  function _checkForContainerRepresentation() {
-    _checkForContainerRepresentation = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(subject) {
+  function _loadContainerRepresentation() {
+    _loadContainerRepresentation = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(subject) {
       var response, containerTurtle;
-      return regeneratorRuntime.wrap(function _callee8$(_context9) {
+      return regeneratorRuntime.wrap(function _callee9$(_context10) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
               if (kb.any(subject, ns.ldp('contains'), undefined, subject.doc())) {
-                _context9.next = 6;
+                _context10.next = 6;
                 break;
               }
 
-              _context9.next = 3;
+              _context10.next = 3;
               return kb.fetcher.webOperation('GET', subject.uri, kb.fetcher.initFetchOptions(subject.uri, {
                 headers: {
                   accept: 'text/turtle'
@@ -822,18 +866,18 @@ function _default(context) {
               }));
 
             case 3:
-              response = _context9.sent;
+              response = _context10.sent;
               containerTurtle = response.responseText;
               $rdf.parse(containerTurtle, kb, subject.uri, 'text/turtle');
 
             case 6:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
         }
-      }, _callee8);
+      }, _callee9);
     }));
-    return _checkForContainerRepresentation.apply(this, arguments);
+    return _loadContainerRepresentation.apply(this, arguments);
   }
 
   function getRelevantPanes(_x2, _x3) {
@@ -841,19 +885,19 @@ function _default(context) {
   }
 
   function _getRelevantPanes() {
-    _getRelevantPanes = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(subject, context) {
+    _getRelevantPanes = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10(subject, context) {
       var panes, relevantPanes, filteredPanes, firstRelevantPaneIndex, firstFilteredPaneIndex;
-      return regeneratorRuntime.wrap(function _callee9$(_context10) {
+      return regeneratorRuntime.wrap(function _callee10$(_context11) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
               if (!subject.uri.endsWith('/')) {
-                _context10.next = 3;
+                _context11.next = 3;
                 break;
               }
 
-              _context10.next = 3;
-              return checkForContainerRepresentation(subject);
+              _context11.next = 3;
+              return loadContainerRepresentation(subject);
 
             case 3:
               panes = context.session.paneRegistry;
@@ -862,38 +906,38 @@ function _default(context) {
               });
 
               if (!(relevantPanes.length === 0)) {
-                _context10.next = 7;
+                _context11.next = 7;
                 break;
               }
 
-              return _context10.abrupt("return", [panes.byName('internal')]);
+              return _context11.abrupt("return", [panes.byName('internal')]);
 
             case 7:
-              _context10.next = 9;
-              return UI.authn.filterAvailablePanes(relevantPanes);
+              _context11.next = 9;
+              return UI.login.filterAvailablePanes(relevantPanes);
 
             case 9:
-              filteredPanes = _context10.sent;
+              filteredPanes = _context11.sent;
 
               if (!(filteredPanes.length === 0)) {
-                _context10.next = 12;
+                _context11.next = 12;
                 break;
               }
 
-              return _context10.abrupt("return", [relevantPanes[0]]);
+              return _context11.abrupt("return", [relevantPanes[0]]);
 
             case 12:
               firstRelevantPaneIndex = panes.list.indexOf(relevantPanes[0]);
               firstFilteredPaneIndex = panes.list.indexOf(filteredPanes[0]); // if the first relevant pane is loaded before the panes available wrt role, we still want to offer the most relevant pane
 
-              return _context10.abrupt("return", firstRelevantPaneIndex < firstFilteredPaneIndex ? [relevantPanes[0]].concat(filteredPanes) : filteredPanes);
+              return _context11.abrupt("return", firstRelevantPaneIndex < firstFilteredPaneIndex ? [relevantPanes[0]].concat(filteredPanes) : filteredPanes);
 
             case 15:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
         }
-      }, _callee9);
+      }, _callee10);
     }));
     return _getRelevantPanes.apply(this, arguments);
   }
@@ -931,50 +975,50 @@ function _default(context) {
 
 
   function _expandedHeaderTR() {
-    _expandedHeaderTR = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(subject, requiredPane, options) {
+    _expandedHeaderTR = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12(subject, requiredPane, options) {
       var renderPaneIconTray, _renderPaneIconTray, tr, td, header, showHeader, icon, strong;
 
-      return regeneratorRuntime.wrap(function _callee11$(_context12) {
+      return regeneratorRuntime.wrap(function _callee12$(_context13) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
               _renderPaneIconTray = function _renderPaneIconTray3() {
-                _renderPaneIconTray = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10(td) {
+                _renderPaneIconTray = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(td) {
                   var options,
                       paneShownStyle,
                       paneHiddenStyle,
                       paneIconTray,
                       relevantPanes,
                       paneNumber,
-                      _args10 = arguments;
-                  return regeneratorRuntime.wrap(function _callee10$(_context11) {
+                      _args11 = arguments;
+                  return regeneratorRuntime.wrap(function _callee11$(_context12) {
                     while (1) {
-                      switch (_context11.prev = _context11.next) {
+                      switch (_context12.prev = _context12.next) {
                         case 0:
-                          options = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : {};
+                          options = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : {};
                           paneShownStyle = 'width: 24px; border-radius: 0.5em; border-top: solid #222 1px; border-left: solid #222 0.1em; border-bottom: solid #eee 0.1em; border-right: solid #eee 0.1em; margin-left: 1em; padding: 3px; background-color:   #ffd;';
                           paneHiddenStyle = 'width: 24px; border-radius: 0.5em; margin-left: 1em; padding: 3px';
                           paneIconTray = td.appendChild(dom.createElement('nav'));
                           paneIconTray.style = 'display:flex; justify-content: flex-start; align-items: center;';
 
                           if (!options.hideList) {
-                            _context11.next = 9;
+                            _context12.next = 9;
                             break;
                           }
 
-                          _context11.t0 = [];
-                          _context11.next = 12;
+                          _context12.t0 = [];
+                          _context12.next = 12;
                           break;
 
                         case 9:
-                          _context11.next = 11;
+                          _context12.next = 11;
                           return getRelevantPanes(subject, context);
 
                         case 11:
-                          _context11.t0 = _context11.sent;
+                          _context12.t0 = _context12.sent;
 
                         case 12:
-                          relevantPanes = _context11.t0;
+                          relevantPanes = _context12.t0;
                           tr.firstPane = requiredPane || getPane(relevantPanes, subject);
                           paneNumber = relevantPanes.indexOf(tr.firstPane);
 
@@ -1091,19 +1135,19 @@ function _default(context) {
                             });
                           }
 
-                          return _context11.abrupt("return", paneIconTray);
+                          return _context12.abrupt("return", paneIconTray);
 
                         case 17:
                         case "end":
-                          return _context11.stop();
+                          return _context12.stop();
                       }
                     }
-                  }, _callee10);
+                  }, _callee11);
                 }));
                 return _renderPaneIconTray.apply(this, arguments);
               };
 
-              renderPaneIconTray = function _renderPaneIconTray2(_x9) {
+              renderPaneIconTray = function _renderPaneIconTray2(_x10) {
                 return _renderPaneIconTray.apply(this, arguments);
               };
 
@@ -1135,16 +1179,16 @@ function _default(context) {
                 UI.widgets.makeDraggable(strong, subject);
               }
 
-              _context12.t0 = header;
-              _context12.next = 16;
+              _context13.t0 = header;
+              _context13.next = 16;
               return renderPaneIconTray(td, {
                 hideList: showHeader
               });
 
             case 16:
-              _context12.t1 = _context12.sent;
+              _context13.t1 = _context13.sent;
 
-              _context12.t0.appendChild.call(_context12.t0, _context12.t1);
+              _context13.t0.appendChild.call(_context13.t0, _context13.t1);
 
               // set DOM methods
               tr.firstChild.tabulatorSelect = function () {
@@ -1155,14 +1199,14 @@ function _default(context) {
                 setSelected(this, false);
               };
 
-              return _context12.abrupt("return", tr);
+              return _context13.abrupt("return", tr);
 
             case 21:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
         }
-      }, _callee11);
+      }, _callee12);
     }));
     return _expandedHeaderTR.apply(this, arguments);
   }
@@ -1652,7 +1696,7 @@ function _default(context) {
 
     if (target.label) {
       window.content.location = target.label; // The following alternative does not work in the extension.
-      // var s = UI.store.sym(target.label);
+      // var s = store.sym(target.label);
       // outline.GotoSubject(s, true);
     }
   };
@@ -1726,7 +1770,7 @@ function _default(context) {
         // don't do these for headers or base nodes
         var source = st.why; // var target = st.why
 
-        var editable = UI.store.updater.editable(source.uri, kb);
+        var editable = _solidLogic.store.updater.editable(source.uri, kb);
 
         if (!editable) {// let target = node.parentNode.AJAR_inverse ? st.object : st.subject
         } // left hand side
@@ -1914,7 +1958,7 @@ function _default(context) {
           // I don't know why 'HTML'
           var object = UI.utils.getAbout(kb, selectedTd);
           target = selectedTd.parentNode.AJAR_statement.why;
-          editable = UI.store.updater.editable(target.uri, kb);
+          editable = _solidLogic.store.updater.editable(target.uri, kb);
 
           if (object) {
             // <Feature about='enterToExpand'>
@@ -1975,7 +2019,7 @@ function _default(context) {
       case 8:
         // backspace
         target = selectedTd.parentNode.AJAR_statement.why;
-        editable = UI.store.updater.editable(target.uri, kb);
+        editable = _solidLogic.store.updater.editable(target.uri, kb);
 
         if (editable) {
           e.preventDefault(); // prevent from going back
@@ -2244,7 +2288,9 @@ function _default(context) {
       if (!st) return; // For example in the title TD of an expanded pane
 
       var _target = st.why;
-      var editable = UI.store.updater.editable(_target.uri, kb);
+
+      var editable = _solidLogic.store.updater.editable(_target.uri, kb);
+
       if (sel && editable) thisOutline.UserInput.Click(e, selection[0]); // was next 2 lines
       // var text='TabulatorMouseDown@Outline()';
       // HCIoptions['able to edit in Discovery Mode by mouse'].setupHere([sel,e,thisOutline,selection[0]],text);