contacts-pane 2.4.8 → 2.4.12-beta4

package/webidControl.js

@@ -1,12 +1,17 @@
 // Render a control to record the webids we have for this agent
 /* eslint-disable multiline-ternary */
 import * as UI from 'solid-ui'
+import { store } from 'solid-logic'
+import { updateMany } from './contactLogic'
+// import { renderAutoComplete } from './lib/autocompletePicker' // dbpediaParameters
+import { renderAutocompleteControl } from './lib/autocompleteBar'
+// import { wikidataParameters, loadPublicDataThing, wikidataClasses } from './lib/publicData' // dbpediaParameters
 
 const $rdf = UI.rdf
 const ns = UI.ns
 const widgets = UI.widgets
 const utils = UI.utils
-const kb = UI.store
+const kb = store
 const style = UI.style
 
 const wikidataClasses = widgets.publicData.wikidataClasses // @@ move to solid-logic
@@ -30,6 +35,15 @@ export async function addWebIDToContacts (person, webid, urlType, kb) {
     }
   }
   */
+
+  // check this is a url
+  try {
+    const _url = new URL(webid)
+  } catch (error) {
+    throw new Error(`${WEBID_NOUN}: ${webid} is not a valid url.`)
+  }
+
+  // create a person's webID
   console.log(`Adding to ${person} a ${WEBID_NOUN}: ${webid}.`)
   const vcardURLThing = kb.bnode()
   const insertables = [
@@ -37,11 +51,25 @@ export async function addWebIDToContacts (person, webid, urlType, kb) {
     $rdf.st(vcardURLThing, ns.rdf('type'), urlType, person.doc()),
     $rdf.st(vcardURLThing, ns.vcard('value'), webid, person.doc())
   ]
-  await kb.updater.update([], insertables)
+  // insert WebID in groups
+  // replace person with WebID in vcard:hasMember (WebID may already exist)
+  // insert owl:sameAs
+  const groups = kb.each(null, ns.vcard('hasMember'), person)
+  let deletables = []
+  groups.forEach(group => {
+    deletables = deletables.concat(kb.statementsMatching(group, ns.vcard('hasMember'), person, group.doc()))
+    insertables.push($rdf.st(group, ns.vcard('hasMember'), kb.sym(webid), group.doc())) // May exist; do we need to check?
+    insertables.push($rdf.st(kb.sym(webid), ns.owl('sameAs'), person, group.doc()))
+  })
+  try {
+    await updateMany(deletables, insertables)
+  } catch (err) { throw new Error(`Could not create webId ${WEBID_NOUN}: ${webid}.`) }
 }
 
 export async function removeWebIDFromContacts (person, webid, urlType, kb) {
   console.log(`Removing from ${person} their ${WEBID_NOUN}: ${webid}.`)
+
+  // remove webID from card
   const existing = kb.each(person, ns.vcard('url'), null, person.doc())
     .filter(urlObject => kb.holds(urlObject, ns.rdf('type'), urlType, person.doc()))
     .filter(urlObject => kb.holds(urlObject, ns.vcard('value'), webid, person.doc()))
@@ -55,6 +83,19 @@ export async function removeWebIDFromContacts (person, webid, urlType, kb) {
     $rdf.st(vcardURLThing, ns.vcard('value'), webid, person.doc())
   ]
   await kb.updater.update(deletables, [])
+
+  // remove webIDs from groups
+  const groups = kb.each(null, ns.vcard('hasMember'), kb.sym(webid))
+  let removeFromGroups = []
+  const insertInGroups = []
+  groups.forEach(async group => {
+    removeFromGroups = removeFromGroups.concat(kb.statementsMatching(kb.sym(webid), ns.owl('sameAs'), person, group.doc()))
+    insertInGroups.push($rdf.st(group, ns.vcard('hasMember'), person, group.doc()))
+    if (kb.statementsMatching(kb.sym(webid), ns.owl('sameAs'), null, group.doc()).length < 2) {
+      removeFromGroups = removeFromGroups.concat(kb.statementsMatching(group, ns.vcard('hasMember'), kb.sym(webid), group.doc()))
+    }
+  })
+  await updateMany(removeFromGroups, insertInGroups)
 }
 
 // Trace things the same as this - other IDs for same thing
@@ -86,6 +127,7 @@ export function getSameAs (kb, thing, doc) { // Should this recurse?
   return Array.from(found).map(uri => kb.sym(uri)) // return as array of nodes
 }
 
+// find person webIDs
 export function getPersonas (kb, person) {
   const lits = vcardWebIDs(kb, person).concat(getSameAs(kb, person, person.doc()))
   const strings = new Set(lits.map(lit => lit.value)) // remove dups
@@ -206,7 +248,7 @@ export async function renderIdControl (person, dataBrowserContext, options) {
     mainCell.setAttribute('colspan', 3)
     let main
 
-    var profileIsVisible = true
+    let profileIsVisible = true
 
     const rhs = nav.children[2]
     const openButton = rhs.appendChild(widgets.button(dom, DOWN_ARROW, 'View', profileOpenHandler))
@@ -216,6 +258,7 @@ export async function renderIdControl (person, dataBrowserContext, options) {
     const paneName = isOrganization(person) || isOrganization(persona) ? 'profile' : 'profile' // was default for org
 
     widgets.publicData.loadPublicDataThing(kb, person, persona).then(_resp => {
+    // loadPublicDataThing(kb, person, persona).then(_resp => {
       try {
         main = renderNamedPane(dom, persona, paneName, dataBrowserContext)
         console.log('main: ', main)
@@ -272,8 +315,10 @@ export async function renderIdControl (person, dataBrowserContext, options) {
   table.style.width = '100%'
 
   if (options.editable) { // test
+    options.manualURIEntry = true // introduced in solid-ui 2.4.2
     options.queryParams = options.queryParams || wikidataParameters
-    div.appendChild(await widgets.renderAutocompleteControl(dom, person, options, addOneIdAndRefresh))
+    div.appendChild(await renderAutocompleteControl(dom, person, options, addOneIdAndRefresh))
+    // div.appendChild(await widgets.renderAutocompleteControl(dom, person, options, addOneIdAndRefresh))
   }
   const profileArea = div.appendChild(dom.createElement('div'))
   await refreshWebIDTable()