solid-panes 3.5.11 → 3.5.14-alpha

package/src/mainPage/header.ts

@@ -0,0 +1,75 @@
+import { icons, authn, initHeader } from 'solid-ui'
+/**
+ * menu icons
+*/
+const HELP_MENU_ICON = icons.iconBase + 'noun_help.svg'
+const SOLID_ICON_URL = 'https://solidproject.org/assets/img/solid-emblem.svg'
+
+/**
+ * menu elements
+*/
+const USER_GUIDE_MENU_ITEM = 'User guide'
+const REPORT_A_PROBLEM_MENU_ITEM = 'Report a problem'
+const SHOW_YOUR_PROFILE_MENU_ITEM = 'Show your profile'
+const LOG_OUT_MENU_ITEM = 'Log out'
+/**
+ * URLS
+ */
+const USER_GUIDE_MENU_URL = 'https://solid.github.io/userguide/'
+const REPORT_A_PROBLEM_MENU_URL = 'https://github.com/solid/solidos/issues'
+
+export async function createHeader (store, outliner) {
+  initHeader(store, await setUserMenu(outliner), setHeaderOptions())
+}
+
+function setHeaderOptions () {
+  const helpMenuList = [
+    { label: USER_GUIDE_MENU_ITEM, url: USER_GUIDE_MENU_URL, target: '_blank' },
+    { label: REPORT_A_PROBLEM_MENU_ITEM, url: REPORT_A_PROBLEM_MENU_URL, target: '_blank' }
+  ]
+  const headerOptions = { logo: SOLID_ICON_URL, helpIcon: HELP_MENU_ICON, helpMenuList: helpMenuList }
+
+  return headerOptions
+}
+
+async function setUserMenu (outliner: any) {
+  const showProfile = {
+    label: SHOW_YOUR_PROFILE_MENU_ITEM,
+    onclick: () => openUserProfile(outliner)
+  }
+
+  const logOut = {
+    label: LOG_OUT_MENU_ITEM,
+    onclick: () => {
+      authn.authSession.logout()
+    }
+  }
+
+  // the order of the menu is important here, show profile first and logout last
+  let userMenuList = [showProfile]
+  userMenuList = userMenuList.concat(await getMenuItems(outliner))
+  userMenuList.push(logOut)
+
+  return userMenuList
+}
+
+function openUserProfile (outliner: any) {
+  outliner.GotoSubject(authn.currentUser(), true, undefined, true, undefined)
+  location.reload()
+}
+
+async function getMenuItems (outliner: any) {
+  const items = await outliner.getDashboardItems()
+  return items.map((element) => {
+    return {
+      label: element.label,
+      onclick: () => openDashboardPane(outliner, element.tabName || element.paneName)
+    }
+  })
+}
+
+async function openDashboardPane (outliner: any, pane: string): Promise<void> {
+  outliner.showDashboard({
+    pane
+  })
+}

package/src/mainPage/index.ts

@@ -0,0 +1,20 @@
+/*   Main Page
+ **
+ **  This code is called in mashlib and renders the header and footer of the Databrowser.
+ */
+
+import { IndexedFormula, NamedNode } from 'rdflib'
+import { getOutliner } from '../index'
+import { createHeader } from './header'
+import { createFooter } from './footer'
+
+export default async function initMainPage (store: IndexedFormula, uri?: string|NamedNode|null) {
+  const outliner = getOutliner(document)
+  uri = uri || window.location.href
+  let subject = uri
+  if (typeof uri === 'string') subject = store.sym(uri)
+  outliner.GotoSubject(subject, true, undefined, true, undefined)
+  const header = createHeader(store, outliner)
+  const footer = createFooter(store)
+  return Promise.all([header, footer])
+}

package/src/outline/context.ts

@@ -1,6 +1,6 @@
-import { DataBrowserContext, LiveStore, PaneRegistry } from 'pane-registry'
+import { DataBrowserContext, PaneRegistry } from 'pane-registry'
 import { getOutliner } from '../index'
-import { SolidLogic } from 'solid-logic'
+import { SolidLogic, LiveStore } from 'solid-logic'
 
 export function createContext (
   dom: HTMLDocument,

package/src/outline/manager.js

@@ -392,6 +392,7 @@ export default function (context) {
 
   async function getDashboardItems () {
     const me = UI.authn.currentUser()
+    if (!me) return []
     const div = dom.createElement('div')
     const [books, pods] = await Promise.all([getAddressBooks(), getPods()])
     return [
@@ -416,7 +417,7 @@ export default function (context) {
 
     async function getPods () {
       async function addPodRoot (pod) { // namedNode
-        await kb.fetcher.load(pod, { headers: { accept: 'text/turtle' } })
+        await checkForContainerRepresentation(pod)
         if (kb.holds(pod, ns.rdf('type'), ns.space('Storage'), pod.doc())) {
           pods.push(pod)
           return true
@@ -444,25 +445,17 @@ export default function (context) {
       const pods = kb.each(me, ns.space('storage'), null, me.doc())
 
       try {
-        if (pods.length) {
-          // make sure container representation is loaded (when server returns index.html)
-          // TODO reorder to have 'me' in first position
-          pods.map(async pod => {
-            if (!kb.any(pod, ns.ldp('contains'), undefined, pod.doc())) {
-              await kb.fetcher.load(pod, { headers: { accept: 'text/turtle' } })
-            }
-          })
-        } else { // try to find podRoot from url
-          await addPodRootFromUrl(me.uri)
-        }
-        await addPodRootFromUrl(window.location.href.substring(0, window.location.href.lastIndexOf('/') + 1))
+        // if uri then SolidOS is a browse.html web app
+        const uri = (new URL(window.location.href)).searchParams.get('uri')
+        const podUrl = uri || window.location.href
+        await addPodRootFromUrl(podUrl.substring(0, podUrl.lastIndexOf('/') + 1))
       } catch (err) {
         console.error('cannot load container', err)
-        return []
       }
+      if (!pods.length) return []
       return pods.map((pod, index) => {
-        const label =
-          pods.length > 1 ? pod.uri.split('//')[1].slice(0, -1) : 'Your storage'
+        function split (item) { return item.uri.split('//')[1].slice(0, -1) }
+        const label = split(me).startsWith(split(pod)) ? 'Your storage' : split(pod)
         return {
           paneName: 'folder',
           tabName: `folder-${index}`,
@@ -532,6 +525,12 @@ export default function (context) {
     // finally - switch to showing dashboard
     outlineContainer.style.display = 'none'
     dashboardContainer.appendChild(dashboard)
+    const tab = dashboardContainer.querySelector(
+      `[data-global-pane-name="${options.pane}"]`
+    )
+    if (tab) {
+      tab.click()
+    }
 
     function closeDashboard () {
       dashboardContainer.style.display = 'none'
@@ -567,7 +566,18 @@ export default function (context) {
     )
   }
 
+  async function checkForContainerRepresentation (subject) {
+    // force reload for index.html with RDFa
+    if (!kb.any(subject, ns.ldp('contains'), undefined, subject.doc())) {
+      const response = await kb.fetcher.webOperation('GET', subject.uri, kb.fetcher.initFetchOptions(subject.uri, { headers: { accept: 'text/turtle' } }))
+      const containerTurtle = response.responseText
+      $rdf.parse(containerTurtle, kb, subject.uri, 'text/turtle')
+    }
+  }
+
   async function getRelevantPanes (subject, context) {
+    // make sure container representation is loaded (when server returns index.html)
+    if (subject.uri.endsWith('/')) { await checkForContainerRepresentation(subject) }
     const panes = context.session.paneRegistry
     const relevantPanes = panes.list.filter(
       pane => pane.label(subject, context) && !pane.global

package/src/registerPanes.js

@@ -13,7 +13,6 @@ module.exports = function registerPanes (register) {
   register(require('issue-pane'))
   register(require('contacts-pane'))
   register(require('activitystreams-pane'))
-  register(require('markdown-pane').Pane)
 
   register(require('./pad/padPane'))
   // register(require('./argument/argumentPane.js')) // A position in an argument tree
@@ -54,8 +53,9 @@ module.exports = function registerPanes (register) {
   register(require('./socialPane.js'))
 
   register(require('./humanReadablePane.js')) // A web page as a web page -- how to escape to tabr?
-  register(require('./dataContentPane.js')) // Preferred for a data file
+  // register(require('markdown-pane').Pane) // replaced by markdown in humanReadablePane
 
+  register(require('./dataContentPane.js')) // Preferred for a data file
   register(require('source-pane')) // edit source
   register(require('./n3Pane.js'))
   register(require('./RDFXMLPane.js'))

package/src/versionInfo.ts

@@ -1,25 +1,24 @@
 export default {
-  buildTime: '2021-11-09T21:16:26Z',
-  commit: '354975d41e78769bf91d72a0c115bb9dc3bad510',
+  buildTime: '2022-01-18T23:23:17Z',
+  commit: '36b208831217a00e6be5f0fb39a379468f906c2b',
   npmInfo:
 {
-  'solid-panes': '3.5.10',
-  npm: '6.10.0',
-  ares: '1.15.0',
-  brotli: '1.0.7',
-  cldr: '35.1',
-  http_parser: '2.8.0',
-  icu: '64.2',
-  llhttp: '1.1.4',
-  modules: '72',
-  napi: '4',
-  nghttp2: '1.39.1',
-  node: '12.7.0',
-  openssl: '1.1.1c',
-  tz: '2019a',
-  unicode: '12.1',
-  uv: '1.30.1',
-  v8: '7.5.288.22-node.16',
+  'solid-panes': '3.5.14',
+  npm: '6.14.13',
+  ares: '1.17.1',
+  brotli: '1.0.9',
+  cldr: '39.0',
+  icu: '69.1',
+  llhttp: '2.1.3',
+  modules: '83',
+  napi: '8',
+  nghttp2: '1.42.0',
+  node: '14.17.3',
+  openssl: '1.1.1k',
+  tz: '2021a',
+  unicode: '13.0',
+  uv: '1.41.0',
+  v8: '8.4.371.23-node.67',
   zlib: '1.2.11'
 }
 }

package/webpack.config.js

@@ -38,7 +38,7 @@ module.exports = [{
     '@trust/webcrypto': 'crypto'
   },
   devServer: {
-    contentBase: path.join(__dirname, 'dist'),
+    static: path.join(__dirname, 'dist'),
     compress: true,
     port: 9000
   },