profile-pane 3.1.2-85b34f39 → 3.1.2-ccc559aa

package/lib/addMeToYourContacts.js

@@ -67,7 +67,6 @@ const createAddMeToYourContactsButton = async (subject, context) => {
     needsBorder: true
   });
   button.setAttribute('id', 'add-to-contacts-button');
-  //button.refresh = refreshButton(context, subject, addressBooksData)
   button.refresh = refreshButton();
   function refreshButton() {
     if ((0, _buttonsHelper.checkIfAnyUserLoggedIn)(me)) {
@@ -77,6 +76,7 @@ const createAddMeToYourContactsButton = async (subject, context) => {
         //logged in and friend exists or friend was just added
         button.innerHTML = _texts.contactExistsAlreadyButtonText.toUpperCase();
         button.onclick = null;
+        button.setAttribute('disabled', 'true');
       } else if (contactExistsByName) {
         button.innerHTML = _texts.contactExistsAlreadyByNameButtonText.toUpperCase();
       } else {

package/lib/contactsHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contactsHelpers.d.ts","sourceRoot":"","sources":["../src/contactsHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,QAAQ,CAAA;AAE/D,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,2BAA2B,CAAA;AAElC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAgB,SAAS,EAAgB,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAMnJ,iBAAe,uBAAuB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,cAAc,iBAM1B;AA8GD,iBAAe,mBAAmB,CAChC,OAAO,EAAE,kBAAkB,EAC3B,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,gBAAgB,CAAC,CAY3B;AAkBD,iBAAe,cAAc,CAC3B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,WAAW,CAAC,CAiCtB;AAED,iBAAe,mCAAmC,CAChD,OAAO,EAAC,kBAAkB,EAC1B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;IAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAA;CAAE,CAAC,CAwBlF;AAED,iBAAe,0BAA0B,CACvC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,EACxB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAqFD,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC,CAuBlB;AAED,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,iBA0BhB;AAED,iBAAS,aAAa,CACpB,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,QAuBvB;AAEH,iBAAS,2BAA2B,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,MAAM,GACjB,OAAO,CAIT;AAED,iBAAS,0BAA0B,CACjC,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAYf;AAED,iBAAe,yBAAyB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,iBASnB;AA6CD,iBAAS,yBAAyB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,SAAS,GACf,OAAO,CA0BT;AAED,iBAAe,yBAAyB,CACtC,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC,CAsCjB;AAED,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,qBAAqB,EACrB,aAAa,EACb,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,mCAAmC,EACnC,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,EAC1B,CAAA"}
+{"version":3,"file":"contactsHelpers.d.ts","sourceRoot":"","sources":["../src/contactsHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,QAAQ,CAAA;AAE/D,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,2BAA2B,CAAA;AAElC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAgB,SAAS,EAAgB,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAMnJ,iBAAe,uBAAuB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,cAAc,iBAM1B;AAgHD,iBAAe,mBAAmB,CAChC,OAAO,EAAE,kBAAkB,EAC3B,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,gBAAgB,CAAC,CAY3B;AAkBD,iBAAe,cAAc,CAC3B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,WAAW,CAAC,CA8BtB;AAED,iBAAe,mCAAmC,CAChD,OAAO,EAAC,kBAAkB,EAC1B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;IAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA2BlF;AAED,iBAAe,0BAA0B,CACvC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,EACxB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAqFD,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC,CAuBlB;AAED,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,iBA0BhB;AAED,iBAAS,aAAa,CACpB,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,QAuBvB;AAEH,iBAAS,2BAA2B,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,MAAM,GACjB,OAAO,CAGT;AAED,iBAAS,0BAA0B,CACjC,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAYf;AAED,iBAAe,yBAAyB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,iBASnB;AA6CD,iBAAS,yBAAyB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,SAAS,GACf,OAAO,CA0BT;AAED,iBAAe,yBAAyB,CACtC,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC,CAsCjB;AAED,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,qBAAqB,EACrB,aAAa,EACb,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,mCAAmC,EACnC,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,EAC1B,CAAA"}

package/lib/contactsHelpers.js

@@ -88,9 +88,10 @@ async function getAddressBooks(context, contactsModule) {
     };
     // let addressBookUris = await contactsModule.listAddressBooks(me.value) 
 
-    const publicAddressBookPromises = await addressBookUris.publicUris.map(addressBook => getAddressData(context, contactsModule, addressBook));
+    const publicAddressBookPromises = addressBookUris.publicUris.map(addressBook => getAddressData(context, contactsModule, addressBook));
     const publicAddressBooksData = await Promise.all(publicAddressBookPromises);
     publicAddressBooksData.map(addressBook => {
+      if (!addressBook) return;
       addressBooksData.public.set(addressBook.uri, {
         name: addressBook.title,
         groups: addressBook.groups,
@@ -104,6 +105,7 @@ async function getAddressBooks(context, contactsModule) {
     const privateAddressBookPromises = addressBookUris.privateUris.map(addressBook => getAddressData(context, contactsModule, addressBook));
     const privateAddressBooksData = await Promise.all(privateAddressBookPromises);
     privateAddressBooksData.map(addressBook => {
+      if (!addressBook) return;
       addressBooksData.private.set(addressBook.uri, {
         name: addressBook.title,
         groups: addressBook.groups,
@@ -135,7 +137,7 @@ async function processContactWebIDs(context, addressBooksData, allContacts) {
   const contactPromises = allContacts.map(getWebID.bind(null, context));
   const results = await Promise.all(contactPromises);
   results.map(contact => {
-    if (contact) addressBooksData.contactWebIDs.set(contact.webID, contact.uri);
+    if (contact?.webID) addressBooksData.contactWebIDs.set(contact.webID.trim(), contact.uri);
   });
   return addressBooksData;
 }
@@ -164,11 +166,7 @@ async function getContactData(store, subject) {
       phoneNumber
     });
   });
-
-  // Need to fix below right now don't want to add
-  // while testing
-  // const webID = subject.value 
-  const webID = 'https://testingsolidos.solidcommunity.net/profile/card#me';
+  const webID = subject.value;
   return {
     name,
     emails,
@@ -181,6 +179,12 @@ async function addANewAddressBookUriToAddressBooks(context, contactsModule, addr
   let contactsAddressBook = null;
   try {
     const addressBook = await getAddressData(context, contactsModule, enteredAddressBookUri);
+    if (!addressBook) {
+      return {
+        addressBooksData,
+        addressBook: null
+      };
+    }
     contactsAddressBook = {
       name: addressBook.title,
       groups: addressBook.groups,
@@ -341,8 +345,8 @@ function refreshButton(context, addressBooksData, contactData) {
   }
 }
 function checkIfContactExistsByWebID(addressBooksData, subjectUri) {
-  if (addressBooksData.contactWebIDs.has(subjectUri)) return true;
-  return false;
+  if (!subjectUri?.trim()) return false;
+  return addressBooksData.contactWebIDs.has(subjectUri.trim());
 }
 function checkIfContactExistsByName(addressBooksData, name) {
   let normalizedContactName = null;

package/lib/profile-pane.js

@@ -11966,9 +11966,11 @@ async function getAddressBooks(context, contactsModule) {
             privateUris: []
         };
         // let addressBookUris = await contactsModule.listAddressBooks(me.value) 
-        const publicAddressBookPromises = await addressBookUris.publicUris.map(addressBook => getAddressData(context, contactsModule, addressBook));
+        const publicAddressBookPromises = addressBookUris.publicUris.map(addressBook => getAddressData(context, contactsModule, addressBook));
         const publicAddressBooksData = await Promise.all(publicAddressBookPromises);
         publicAddressBooksData.map((addressBook) => {
+            if (!addressBook)
+                return;
             addressBooksData.public.set(addressBook.uri, {
                 name: addressBook.title,
                 groups: addressBook.groups,
@@ -11982,6 +11984,8 @@ async function getAddressBooks(context, contactsModule) {
         const privateAddressBookPromises = addressBookUris.privateUris.map(addressBook => getAddressData(context, contactsModule, addressBook));
         const privateAddressBooksData = await Promise.all(privateAddressBookPromises);
         privateAddressBooksData.map((addressBook) => {
+            if (!addressBook)
+                return;
             addressBooksData.private.set(addressBook.uri, {
                 name: addressBook.title,
                 groups: addressBook.groups,
@@ -12016,8 +12020,8 @@ async function processContactWebIDs(context, addressBooksData, allContacts) {
     const contactPromises = allContacts.map(getWebID.bind(null, context));
     const results = await Promise.all(contactPromises);
     results.map((contact) => {
-        if (contact)
-            addressBooksData.contactWebIDs.set(contact.webID, contact.uri);
+        if (contact === null || contact === void 0 ? void 0 : contact.webID)
+            addressBooksData.contactWebIDs.set(contact.webID.trim(), contact.uri);
     });
     return addressBooksData;
 }
@@ -12040,10 +12044,7 @@ async function getContactData(store, subject) {
         type = store.any(node, external_UI_.ns.rdf('type'), null, subject.doc());
         phoneNumbers.push({ type, phoneNumber });
     });
-    // Need to fix below right now don't want to add
-    // while testing
-    // const webID = subject.value 
-    const webID = 'https://testingsolidos.solidcommunity.net/profile/card#me';
+    const webID = subject.value;
     return {
         name,
         emails,
@@ -12056,6 +12057,9 @@ async function addANewAddressBookUriToAddressBooks(context, contactsModule, addr
     let contactsAddressBook = null;
     try {
         const addressBook = await getAddressData(context, contactsModule, enteredAddressBookUri);
+        if (!addressBook) {
+            return { addressBooksData, addressBook: null };
+        }
         contactsAddressBook = {
             name: addressBook.title,
             groups: addressBook.groups,
@@ -12236,9 +12240,9 @@ function refreshButton(context, addressBooksData, contactData) {
     }
 }
 function checkIfContactExistsByWebID(addressBooksData, subjectUri) {
-    if (addressBooksData.contactWebIDs.has(subjectUri))
-        return true;
-    return false;
+    if (!(subjectUri === null || subjectUri === void 0 ? void 0 : subjectUri.trim()))
+        return false;
+    return addressBooksData.contactWebIDs.has(subjectUri.trim());
 }
 function checkIfContactExistsByName(addressBooksData, name) {
     let normalizedContactName = null;
@@ -13270,7 +13274,6 @@ const createAddMeToYourContactsButton = async (subject, context) => {
         needsBorder: true,
     });
     button.setAttribute('id', 'add-to-contacts-button');
-    //button.refresh = refreshButton(context, subject, addressBooksData)
     button.refresh = refreshButton();
     function refreshButton() {
         if (checkIfAnyUserLoggedIn(me)) {
@@ -13280,6 +13283,7 @@ const createAddMeToYourContactsButton = async (subject, context) => {
                 //logged in and friend exists or friend was just added
                 button.innerHTML = contactExistsAlreadyButtonText.toUpperCase();
                 button.onclick = null;
+                button.setAttribute('disabled', 'true');
             }
             else if (contactExistsByName) {
                 button.innerHTML = contactExistsAlreadyByNameButtonText.toUpperCase();