contacts-pane 2.6.5-alpha → 2.6.5-ea0d5381

package/contactsPane.js

@@ -604,23 +604,33 @@ export default {
             let ds = []
             let ins = []
             groups.forEach(group => {
+              // check for WebId's in VCARD('hasMember)
+              const members = kb.statementsMatching(group, ns.vcard('hasMember'), null, group.doc()).map(st => st.object)
+              console.log('Alain ' + members)
+              const newModel = members.some(member => !kb.any(member, ns.vcard('fn'), null, group.doc())) ? true : false
+              // if newModel, shall we check that sameAs is in expected order ?
+              console.log(newModel)
+              if (!newModel) {
+              // update to new model
               let vcardOrWebids = kb.statementsMatching(null, ns.owl('sameAs'), null, group.doc()).map(st => st.subject)
-              const strings = new Set(vcardOrWebids.map(contact => contact.uri)) // remove dups
-              vcardOrWebids = [...strings].map(uri => kb.sym(uri))
-              vcardOrWebids.forEach(item => {
-                if (kb.each(item, ns.vcard('fn'), null, group.doc()).length) {
-                  // delete item, it is an old data model,  item is a card not a webid.
-                  ds = ds.concat(kb
-                    .statementsMatching(item, ns.owl('sameAs'), null, group.doc())
-                    .concat(kb.statementsMatching(undefined, undefined, item, group.doc())))
-                  // add card webids to group
-                  const webids = kb.each(item, ns.owl('sameAs'), null, group.doc())
-                  webids.forEach(webid => {
-                    ins = ins.concat($rdf.st(webid, ns.owl('sameAs'), item, group.doc()))
-                      .concat($rdf.st(group, ns.vcard('hasMember'), webid, group.doc()))
-                  })
-                }
-              })
+                const strings = new Set(vcardOrWebids.map(contact => contact.uri)) // remove dups
+                vcardOrWebids = [...strings].map(uri => kb.sym(uri))
+                vcardOrWebids.forEach(item => {
+                  if (kb.each(item, ns.vcard('fn'), null, group.doc()).length) {
+                    // delete item, it is an old data model,  item is a card not a webid.
+                    ds = ds.concat(kb
+                      .statementsMatching(item, ns.owl('sameAs'), null, group.doc())
+                      .statementsMatching(null, ns.owl('sameAs'), item, group.doc()) // and also reverse
+                      .concat(kb.statementsMatching(undefined, undefined, item, group.doc())))
+                    // add card webids to group
+                    const webids = kb.each(item, ns.owl('sameAs'), null, group.doc())
+                    webids.forEach(webid => {
+                      ins = ins.concat($rdf.st(webid, ns.owl('sameAs'), item, group.doc()))
+                        .concat($rdf.st(group, ns.vcard('hasMember'), webid, group.doc()))
+                    })
+                  }
+                })
+              }
             })
             if (ds.length && confirm('Groups data model need to be updated ?')) {
               await kb.updater.updateMany(ds, ins)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contacts-pane",
-  "version": "2.6.5-alpha",
+  "version": "2.6.5-ea0d5381",
   "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,17 +37,17 @@
   },
   "homepage": "https://github.com/solid/contacts-pane",
   "dependencies": {
-    "pane-registry": "2.4.12",
-    "rdflib": "^2.2.20",
-    "solid-logic": "2.0.0",
-    "solid-ui": "2.4.23"
+    "pane-registry": "2.4.13",
+    "rdflib": "^2.2.21",
+    "solid-logic": "2.0.1",
+    "solid-ui": "2.4.24"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.36.1",
-    "@typescript-eslint/parser": "^5.36.1",
-    "eslint": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
+    "eslint": "^8.27.0",
     "eslint-plugin-import": "^2.26.0",
-    "husky": "^8.0.1",
+    "husky": "^8.0.2",
     "lint-staged": "^13.0.3",
     "typescript": "^4.8.2",
     "typescript-transpile-only": "0.0.4"