contacts-pane 2.6.4-fa583353 → 2.6.4-ffd7d417

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 a other 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contacts-pane",
-  "version": "2.6.4-fa583353",
+  "version": "2.6.4-ffd7d417",
   "description": "Contacts Pane: Contacts manager for Address Book, Groups, and Individuals.",
   "main": "./contactsPane.js",
   "scripts": {

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