contacts-pane 2.6.3 → 2.6.4-31163ac2

package/groupMembershipControl.js

@@ -15,7 +15,18 @@ export async function renderGroupMemberships (person, context) {
   async function removeFromGroup (thing, group) {
     const pname = kb.any(thing, ns.vcard('fn'))
     const gname = kb.any(group, ns.vcard('fn'))
-    const groups = kb.each(null, ns.vcard('hasMember'), thing)
+    // find all WebIDs of thing
+    const thingwebids = kb.each(null, ns.owl('sameAs'), thing, group.doc())
+    // WebID can be deleted only if not used in another thing
+    let webids = []
+    thingwebids.map(webid => {
+      if (kb.any(webid, ns.owl('sameAs'), thing, group.doc()).length = 1 ) webids = webids.concat(webid)
+      }
+    )
+    // const webids = kb.any(webid, ns.owl('sameAs'))
+    let thingOrWebid = thing
+    if (webids.length > 0) thingOrWebid = kb.sym(webids[0])
+    const groups = kb.each(null, ns.vcard('hasMember'), thingOrWebid)
     if (groups.length < 2) {
       alert(
         'Must be a member of at least one group.  Add to another group first.'
@@ -24,9 +35,10 @@ export async function renderGroupMemberships (person, context) {
     }
     const message = 'Remove ' + pname + ' from group ' + gname + '?'
     if (confirm(message)) {
-      const del = kb
+      let del = kb
         .statementsMatching(person, undefined, undefined, group.doc())
         .concat(kb.statementsMatching(undefined, undefined, person, group.doc()))
+      webids.map(webid => del.concat(kb.statementsMatching(undefined,undefined, webid, group.doc())))
       kb.updater.update(del, [], function (uri, ok, err) {
         if (!ok) {
           const message = 'Error removing member from group ' + group + ': ' + err
@@ -52,9 +64,11 @@ export async function renderGroupMemberships (person, context) {
     return tr
   }
 
+  // find all documents where person ns.vcard('fn')
   function syncGroupList () {
-    const groups = kb.each(null, ns.vcard('hasMember'), person)
-
+    // to be changed person and or webids
+    // const groups = kb.each(null, ns.vcard('hasMember'), person)
+    const groups = kb.each(person, ns.vcard('fn'), undefined) // non il faut acceder a la liste des group.doc()
     utils.syncTableToArray(groupList, groups, newRowForGroup)
   }
 

package/mintNewAddressBook.js

@@ -1,6 +1,7 @@
 import * as UI from 'solid-ui'
-import { setACLUserPublic } from 'solid-logic'
+import { solidLogicSingleton } from 'solid-logic'
 
+const { setACLUserPublic } = solidLogicSingleton.acl
 // const mime = require('mime-types')
 // const toolsPane0 = require('./toolsPane')
 // const toolsPane = toolsPane0.toolsPane

package/mugshotGallery.js

@@ -200,8 +200,18 @@ export function renderMugshotGallery (dom, subject) {
       droppedFileHandler
     )
     if (image) {
-      img.setAttribute('src', image.uri)
+      // img.setAttribute('src', image.uri) use token and works with NSS but not with CSS
+      // we need to get image with authenticated fetch
+      store.fetcher._fetch(image.uri)
+        .then(function(response) {
+          return response.blob()
+        })
+        .then(function(myBlob) {
+          const objectURL = URL.createObjectURL(myBlob)
+          img.setAttribute('src', objectURL)
+        })
       UI.widgets.makeDraggable(img, image)
+
     }
     return img
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contacts-pane",
-  "version": "2.6.3",
+  "version": "2.6.4-31163ac2",
   "description": "Contacts Pane: Contacts manager for Address Book, Groups, and Individuals.",
   "main": "./contactsPane.js",
   "scripts": {
@@ -10,8 +10,8 @@
     "lint": "eslint '*.js'",
     "lint-fix": "eslint '*.js' --fix",
     "test": "npm run lint",
-    "prepublishOnly": "npm test && npm run build",
-    "postpublish": "git push origin main --follow-tags"
+    "ignore:prepublishOnly": "npm test && npm run build",
+    "ignore:postpublish": "git push origin main --follow-tags"
   },
   "repository": {
     "type": "git",
@@ -37,19 +37,19 @@
   },
   "homepage": "https://github.com/solid/contacts-pane",
   "dependencies": {
-    "pane-registry": "^2.4.10",
-    "rdflib": "^2.2.19",
-    "solid-logic": "^1.3.17",
-    "solid-ui": "^2.4.22"
+    "pane-registry": "2.4.12",
+    "rdflib": "^2.2.20",
+    "solid-logic": "2.0.0",
+    "solid-ui": "2.4.23"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
-    "@typescript-eslint/parser": "^5.19.0",
-    "eslint": "^8.13.0",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
+    "eslint": "^8.23.0",
     "eslint-plugin-import": "^2.26.0",
-    "husky": "^7.0.4",
-    "lint-staged": "^12.3.7",
-    "typescript": "^4.6.3",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "typescript": "^4.8.2",
     "typescript-transpile-only": "0.0.4"
   },
   "husky": {

package/webidControl.js

@@ -51,12 +51,18 @@ 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())
   ]
+  // 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)
+  const deletables = []
   groups.forEach(group => {
+    deletables.push($rdf.st(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(person, ns.owl('sameAs'), kb.sym(webid), group.doc()))
   })
   try {
-    await updateMany([], insertables)
+    await updateMany(deletables, insertables)
   } catch (err) { throw new Error(`Could not create webId ${WEBID_NOUN}: ${webid}.`) }
 }
 
@@ -79,12 +85,17 @@ export async function removeWebIDFromContacts (person, webid, urlType, kb) {
   await kb.updater.update(deletables, [])
 
   // remove webIDs from groups
-  const groups = kb.each(null, ns.vcard('hasMember'), person)
+  const groups = kb.each(null, ns.vcard('hasMember'), kb.sym(webid))
   const removeFromGroups = []
+  const insertInGroups = []
   groups.forEach(group => {
     removeFromGroups.push($rdf.st(person, ns.owl('sameAs'), kb.sym(webid), group.doc()))
+    if (kb.each(null, ns.owl('sameAs'), kb.sym(webid), group.doc()).length = 1) {
+      removeFromGroups.push($rdf.st(group, ns.vcard('hasMember'), kb.sym(webid)), group.doc())
+      insertInGroups.push($rdf.st(group, ns.vcard('hasMember'), person, group.doc()))
+    }
   })
-  await updateMany(removeFromGroups)
+  await updateMany(removeFromGroups, insertInGroups)
 }
 
 // Trace things the same as this - other IDs for same thing