solid-panes 3.5.19 → 3.5.21

package/src/schedule/schedulePane.js

@@ -4,7 +4,8 @@
  */
 /* global alert */
 
-const UI = require('solid-ui')
+import * as UI from 'solid-ui'
+import { authn } from 'solid-logic'
 const $rdf = UI.rdf
 const ns = UI.ns
 
@@ -141,7 +142,7 @@ module.exports = {
       const fetcher = kb.fetcher
       const updater = kb.updater
 
-      let me = options.me || UI.authn.currentUser()
+      let me = options.me || authn.currentUser()
       if (!me) {
         console.log('MUST BE LOGGED IN')
         alert('NOT LOGGED IN')
@@ -203,7 +204,7 @@ module.exports = {
                 newBase + item.local,
                 item.contentType
               )
-              .then(() => UI.authn.checkUser())
+              .then(() => authn.checkUser())
               .then(webId => {
                 me = webId
 
@@ -376,7 +377,7 @@ module.exports = {
 
     let me
 
-    UI.authn.checkUser().then(webId => {
+    authn.checkUser().then(webId => {
       me = webId
 
       if (logInOutButton) {
@@ -395,7 +396,7 @@ module.exports = {
     //
 
     const newInstanceButton = function () {
-      const b = UI.authn.newAppInstance(
+      const b = UI.login.newAppInstance(
         dom,
         { noun: 'scheduler' },
         initializeNewInstanceInWorkspace
@@ -474,7 +475,7 @@ module.exports = {
     const showAppropriateDisplay = function showAppropriateDisplay () {
       console.log('showAppropriateDisplay()')
 
-      UI.authn.checkUser().then(webId => {
+      authn.checkUser().then(webId => {
         if (!webId) {
           return showSignon()
         }
@@ -505,7 +506,7 @@ module.exports = {
     const showSignon = function showSignon () {
       clearElement(naviMain)
       const signonContext = { div: div, dom: dom }
-      UI.authn.logIn(signonContext).then(context => {
+      UI.login.loggedInContext(signonContext).then(context => {
         me = context.me
         waitingForLogin = false // untested
         showAppropriateDisplay()
@@ -515,7 +516,7 @@ module.exports = {
     const showBootstrap = function showBootstrap () {
       const div = clearElement(naviMain)
       div.appendChild(
-        UI.authn.newAppInstance(
+        UI.login.newAppInstance(
           dom,
           { noun: 'poll' },
           initializeNewInstanceInWorkspace
@@ -799,7 +800,7 @@ module.exports = {
         refreshButton.textContent = 'refresh'
         refreshButton.addEventListener('click', function (e) {
           refreshButton.disabled = true
-          UI.store.fetcher.nowOrWhenFetched(subject.doc(), undefined, function (ok, body) {
+          store.fetcher.nowOrWhenFetched(subject.doc(), undefined, function (ok, body) {
             if (!ok) {
               console.log('Cant refresh matrix' + body)
             } else {
@@ -864,7 +865,7 @@ module.exports = {
         dataPointForNT[possibleTimes[j].toNT()] = dataPoint
       }
       if (insertables.length) {
-        UI.store.updater.update([], insertables, function (uri, success, errorBody) {
+        store.updater.update([], insertables, function (uri, success, errorBody) {
           if (!success) {
             complainIfBad(success, errorBody)
           } else {
@@ -1024,12 +1025,12 @@ module.exports = {
       // @@ Give other combos too-- see schedule ontology
       // const possibleAvailabilities = [ SCHED('No'), SCHED('Maybe'), SCHED('Yes') ]
 
-      // const me = UI.authn.currentUser()
+      // const me = authn.currentUser()
 
       const dataPointForNT = []
 
       const loginContext = { div: naviCenter, dom: dom }
-      UI.authn.logIn(loginContext).then(context => {
+      UI.login.loggedInContext(loginContext).then(context => {
         const me = context.me
         const doc = resultsDoc
         options.set_y = options.set_y.filter(function (z) {
@@ -1166,7 +1167,7 @@ module.exports = {
 
     const logInOutButton = null
     /*
-    const logInOutButton = UI.authn.loginStatusBox(dom, setUser)
+    const logInOutButton = UI.login.loginStatusBox(dom, setUser)
     // floating divs lead to a mess
     // logInOutButton.setAttribute('style', 'float: right') // float the beginning of the end
     naviLoginout3.appendChild(logInOutButton)

package/src/socialPane.js

@@ -8,8 +8,9 @@
  **  -- todo: use common code to get username and load profile and set 'me'
  */
 
-const UI = require('solid-ui')
-const $rdf = require('rdflib')
+import * as UI from 'solid-ui'
+import { authn } from 'solid-logic'
+import * as $rdf from 'rdflib'
 
 module.exports = {
   icon: UI.icons.originalIconBase + 'foaf/foafTiny.gif',
@@ -198,11 +199,11 @@ module.exports = {
     let h3 = dom.createElement('H3')
     h3.appendChild(dom.createTextNode(name))
 
-    let me = UI.authn.currentUser()
+    let me = authn.currentUser()
     const meUri = me ? me.uri : null
 
     // @@ Add: event handler to redraw the stuff below when me changes.
-    const loginOutButton = UI.authn.loginStatusBox(dom, webIdUri => {
+    const loginOutButton = UI.login.loginStatusBox(dom, webIdUri => {
       me = kb.sym(webIdUri)
       // @@ To be written:   redraw as a function the new me
       // @@ refresh the sidebars

package/src/transaction/pane.js

@@ -67,7 +67,7 @@ module.exports = {
 
     const t = kb.findTypeURIs(subject)
 
-    // var me = UI.authn.currentUser()
+    // var me = authn.currentUser()
     const predicateURIsDone = {}
     const donePredicate = function (pred) {
       predicateURIsDone[pred.uri] = true

package/src/transaction/period.js

@@ -351,7 +351,7 @@ module.exports = {
 
     // //////////////////////////////////////////////////////////////////////////////
 
-    // var me = UI.authn.currentUser()
+    // var me = authn.currentUser()
 
     //              Render a single Period
 

package/src/trip/tripPane.js

@@ -60,7 +60,7 @@ module.exports = {
 
     const t = kb.findTypeURIs(subject)
 
-    // var me = UI.authn.currentUser()
+    // var me = authn.currentUser()
 
     //      Function: Render a single trip
 

package/src/trustedApplications/trustedApplications.dom.ts

@@ -1,5 +1,6 @@
 import { NamedNode, Statement, sym } from 'rdflib'
-import { ns, store } from 'solid-ui'
+import { ns } from 'solid-ui'
+import { store } from 'solid-logic'
 import { generateRandomString, getStatementsToAdd, getStatementsToDelete } from './trustedApplications.utils'
 
 interface FormElements {

package/src/trustedApplications/trustedApplications.view.ts

@@ -1,7 +1,7 @@
-import { authn, icons, store, widgets } from 'solid-ui'
-import { NamedNode } from 'rdflib'
-
 import { PaneDefinition } from 'pane-registry'
+import { NamedNode } from 'rdflib'
+import { icons, login, widgets } from 'solid-ui'
+import { store } from 'solid-logic'
 import { createApplicationTable, createContainer, createText } from './trustedApplications.dom'
 
 const thisColor = '#418d99'
@@ -32,7 +32,7 @@ const trustedApplicationView: PaneDefinition = {
 }
 
 async function render (dom, main, statusArea): Promise<void> {
-  const authContext = await authn.logInLoadProfile({ dom: dom, div: main, statusArea: statusArea, me: null })
+  const authContext = await login.ensureLoadedProfile({ dom: dom, div: main, statusArea: statusArea, me: null })
   const subject = authContext.me as NamedNode
 
   const profile = subject.doc()

package/src/versionInfo.ts

@@ -1,9 +1,9 @@
 export default {
-  buildTime: '2022-02-23T14:28:35Z',
-  commit: '86ea668bacfb94213d209dd9962722bf0189ddbe',
+  buildTime: '2022-03-01T20:30:41Z',
+  commit: 'b3dce45b53a5e1ff12ca803196b206eaaf3fcb16',
   npmInfo:
 {
-  'solid-panes': '3.5.19',
+  'solid-panes': '3.5.20',
   npm: '6.14.13',
   ares: '1.17.1',
   brotli: '1.0.9',