Merge branch 'main' into editChat-merging

Author: bourgeoa

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-ui",
-  "version": "2.4.14-bbf45639",
+  "version": "2.4.15",
   "description": "UI library for writing Solid read-write-web applications",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -60,11 +60,11 @@
     "jss": "^10.9.0",
     "jss-preset-default": "^10.9.0",
     "mime-types": "^2.1.34",
-    "pane-registry": "^2.4.5",
+    "pane-registry": "^2.4.6",
     "path-browserify": "^1.0.1",
     "postcss-flexbugs-fixes": "^5.0.2",
-    "rdflib": "^2.2.15",
-    "solid-logic": "^1.3.12",
+    "rdflib": "^2.2.17",
+    "solid-logic": "^1.3.13",
     "solid-namespace": "^0.5.2",
     "stream-browserify": "^3.0.0",
     "uuid": "^8.3.2"
@@ -92,8 +92,8 @@
     "autoprefixer": "^10.4.0",
     "babel-loader": "^8.2.3",
     "eslint": "^7.32.0",
-    "eslint-plugin-jest": "^25.3.0",
     "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-jest": "^25.3.0",
     "husky": "^7.0.4",
     "jest": "^27.4.5",
     "jsdom": "^19.0.0",

package.json

@@ -4,15 +4,14 @@
  * @packageDocumentation
  */
 
-import { fetcher, IndexedFormula, NamedNode, sym } from 'rdflib'
+import { fetcher, IndexedFormula, NamedNode, sym, LiveStore } from 'rdflib'
 import { ACLbyCombination, readACL } from './acl'
 import * as widgets from '../widgets'
 import * as ns from '../ns'
 import { AccessController } from './access-controller'
 import { AgentMapMap, ComboList, PartialAgentTriple } from './types'
 import { AddAgentButtons } from './add-agent-buttons'
 import * as debug from '../debug'
-import { LiveStore } from 'solid-logic'
 
 const ACL = ns.acl
 
@@ -186,7 +185,7 @@ export class AccessGroups {
     if (!agent && !secondAttempt) {
       debug.log(`   Not obvious: looking up dropped thing ${thing}`)
       try {
-        await this._store.fetcher.load(thing.doc())
+        await this._store?.fetcher?.load(thing.doc())
       } catch (error) {
         const message = `Ignore error looking up dropped thing: ${error}`
         debug.error(message)

src/acl/access-groups.ts

@@ -10,8 +10,8 @@ import { solidLogicSingleton } from '../logic'
 import * as utils from '../utils'
 import { AgentMapMap, AgentMapUnion, ComboList } from './types'
 import * as debug from '../debug'
-import { graph, IndexedFormula, NamedNode, serialize, st, Statement, sym } from 'rdflib'
-import { ACL_LINK, LiveStore } from 'solid-logic'
+import { graph, IndexedFormula, NamedNode, serialize, st, Statement, sym, LiveStore } from 'rdflib'
+import { ACL_LINK } from 'solid-logic'
 
 const kb = solidLogicSingleton.store
 
@@ -329,17 +329,17 @@ export function putACLbyCombo (
   makeACLGraphbyCombo(kb2, x, byCombo, aclDoc, true)
 
   // const str = makeACLString = function(x, ac, aclDoc)
-  kb.updater.put(
+  kb.updater?.put(
     aclDoc,
     kb2.statementsMatching(undefined, undefined, undefined, aclDoc),
     'text/turtle',
     function (uri, ok, message) {
       if (!ok) {
         callbackFunction(ok, message)
       } else {
-        kb.fetcher.unload(aclDoc)
+        kb.fetcher?.unload(aclDoc)
         makeACLGraphbyCombo(kb, x, byCombo, aclDoc, true)
-        kb.fetcher.requested[aclDoc.uri] = 'done' // missing: save headers
+        kb.fetcher!.requested[aclDoc.uri] = 'done' // missing: save headers
         callbackFunction(ok)
       }
     }

src/acl/acl.ts

@@ -254,9 +254,9 @@ export function createUserMenuItem (child: HTMLElement): HTMLElement {
  * @ignore exporting this only for the unit test
  */
 export function getProfileImg (store: IndexedFormula, user: NamedNode): string | HTMLElement {
-  const profileUrl = null
+  let profileUrl = null
   try {
-    const profileUrl = widgets.findImage(user)
+    profileUrl = widgets.findImage(user)
     if (!profileUrl) {
       return emptyProfile
     }
@@ -266,7 +266,7 @@ export function getProfileImg (store: IndexedFormula, user: NamedNode): string |
 
   const profileImage = document.createElement('div')
   addStyleClassToElement(profileImage, ['header-user-menu__photo'])
-  profileImage.style.backgroundImage = `url("${profileUrl}")`
+  profileImage.style.backgroundImage = `url(${profileUrl})`
   return profileImage
 }
 

src/header/index.ts

@@ -64,7 +64,7 @@ export function autocompleteField (
     // console.log(`AC form: ${deletables.length} to delete and ${insertables.length} to insert`)
     try {
       // console.log('@@@ AC updating ', deletables, insertables)
-      await kb.updater.updateMany(deletables, insertables)
+      await kb.updater?.updateMany(deletables, insertables)
     } catch (err) {
       callbackFunction(false, err)
       box.appendChild(widgets.errorMessageBlock(dom, 'Autocomplete form data update error:' + err, null, err))
@@ -88,7 +88,7 @@ export function autocompleteField (
     // console.log(`AC form delete: ${deletables.length} to delete and ${insertables.length} to insert`)
     try {
       // console.log('@@@ AC updating ', deletables, insertables)
-      await kb.updater.updateMany(deletables, insertables)
+      await kb.updater?.updateMany(deletables, insertables)
     } catch (err) {
       const e2 = new Error('Autocomplete form data delete error:' + err)
       callbackFunction(false, err)
@@ -179,7 +179,7 @@ export function autocompleteField (
   }
   // It can be cleaner to just remove empty fields if you can't edit them anyway
   const suppressEmptyUneditable = kb.anyJS(form, ns.ui('suppressEmptyUneditable'), null, formDoc)
-  const editable = kb.updater.editable((doc as NamedNode).uri)
+  const editable = kb.updater?.editable((doc as NamedNode).uri)
 
   const autocompleteOptions:AutocompleteOptions = { // cancelButton?: HTMLElement,
     permanent: true,

src/widgets/forms/autocomplete/autocompleteField.ts

@@ -33,7 +33,7 @@ export function addDefaults (array) {
 
 export async function getPreferredLanguagesFor (person: NamedNode) {
   const doc = person.doc()
-  await kb.fetcher.load(doc)
+  await kb.fetcher?.load(doc)
   const list = kb.any(person, ns.schema('knowsLanguage'), null, doc) as Collection | undefined
   if (!list) {
     // console.log(`User ${person} has not set their languages in their profile.`)

src/widgets/forms/autocomplete/language.ts

@@ -283,8 +283,8 @@ export async function queryESCODataByName (filter: string, theClass:NamedNode, q
     .replace('$(targetClass)', theClass.toNT())
   debug.log('Querying ESCO data - uri: ' + queryURI)
 
-  const response = await kb.fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData)
-  const text = response.responseText || ''
+  const response = await kb.fetcher?.webOperation('GET', queryURI, fetcherOptionsJsonPublicData)
+  const text = response?.responseText || ''
   debug.log('    Query result  text' + text.slice(0, 500) + '...')
   if (text.length === 0) throw new Error('Wot no text back from ESCO query ' + queryURI)
   const json = JSON.parse(text)
@@ -336,7 +336,7 @@ export async function queryPublicDataByName (
     const queryURI = substituteStrings(queryTarget.searchByNameURI)
     let response
     try {
-      response = await kb.fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData)
+      response = await kb.fetcher?.webOperation('GET', queryURI, fetcherOptionsJsonPublicData)
     } catch (err) {
       throw new Error(`Exception when trying to fetch ${queryURI} \n ${err}`)
     }
@@ -377,9 +377,9 @@ export async function queryPublicDataSelect (sparql: string, queryTarget: QueryP
     headers: headers
   }
 
-  const response = await kb.fetcher.webOperation('GET', queryURI, options)
+  const response = await kb.fetcher?.webOperation('GET', queryURI, options)
 
-  const text = response.responseText || ''
+  const text = response?.responseText || ''
   if (text.length === 0) throw new Error('No text back from query ' + queryURI)
   const text2 = fixWikidataJSON(text)
   const json = JSON.parse(text2)
@@ -403,8 +403,8 @@ export async function queryPublicDataConstruct (sparql: string, pubicId: NamedNo
     credentials: 'omit' as 'include' | 'omit' | undefined, // CORS // @tsc pain
     headers: headers // ({ Accept: 'text/turtle' } as Headers)
   }
-  const response = await kb.fetcher.webOperation('GET', queryURI, options)
-  const text = response.responseText || 'No response text?'
+  const response = await kb.fetcher?.webOperation('GET', queryURI, options)
+  const text = response?.responseText || 'No response text?'
   const report = text.length > 500 ? text.slice(0, 200) + ' ... ' + text.slice(-200) : text
   debug.log('    queryPublicDataConstruct result text:' + report)
   if (text.length === 0) throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI)

src/widgets/forms/autocomplete/publicData.ts

@@ -1,4 +1,5 @@
-import { DataBrowserContext, LiveStore } from 'pane-registry'
+import { DataBrowserContext } from 'pane-registry'
+import { LiveStore } from 'rdflib'
 
 export function createDataBrowserContext (
   dom: HTMLDocument,

test/unit/helpers/createDataBrowserContext.ts

@@ -1,5 +1,4 @@
-import { fetcher, graph, UpdateManager } from 'rdflib'
-import { LiveStore } from 'pane-registry'
+import { fetcher, graph, UpdateManager, LiveStore } from 'rdflib'
 
 export function createLiveStore (): LiveStore { // will change this to LiveStore when pane-registry is updated
   const store = graph()