#101 display the shared addressbook owner in the selection when creating a new contact

Author: rezk2ll

src/linagora.esn.contact/app/contact/form/contact-edition-form.directive.js

@@ -6,7 +6,10 @@ angular.module('linagora.esn.contact')
 
 function contactEditionForm(
   $rootScope,
+  $q,
   session,
+  userAPI,
+  userUtils,
   contactAddressbookDisplayService,
   contactAddressbookService,
   CONTACT_ATTRIBUTES_ORDER,
@@ -33,19 +36,48 @@ function contactEditionForm(
       });
 
       function _fetchAvailableAddressBooks() {
-        contactAddressbookService.listAddressbooksUserCanCreateContact().then(function(addressbooks) {
-          return contactAddressbookDisplayService.convertShellsToDisplayShells(addressbooks, { includePriority: true });
-        })
-          .then(function(addressbookDisplayShells) {
-            $scope.availableAddressbooks = contactAddressbookDisplayService.sortAddressbookDisplayShells(addressbookDisplayShells)
-              .map(function(addressbookDisplayShell) {
-                return {
-                  path: addressbookDisplayShell.shell.href,
-                  displayName: addressbookDisplayShell.displayName
-                };
-              });
+        contactAddressbookService
+          .listAddressbooksUserCanCreateContact()
+          .then(_loadAdressbooksOwners)
+          .then(addressbooks => contactAddressbookDisplayService.convertShellsToDisplayShells(
+            addressbooks,
+            { includePriority: true }
+          ))
+          .then(addressbookDisplayShells => {
+            $scope.availableAddressbooks = contactAddressbookDisplayService
+              .sortAddressbookDisplayShells(addressbookDisplayShells)
+              .map(({ shell: { href, owner }, displayName }) => ({
+                path: href,
+                displayName,
+                owner
+              }));
+
+            console.log($scope.availableAddressbooks);
           });
       }
+
+      function _loadAdressbooksOwners(addressbooks) {
+        const subscriptionOwnerIds = addressbooks
+          .map(({ isSubscription, group, source }) => (isSubscription && !group ? source.bookId : null))
+          .filter(Boolean) // remove null values
+          .reduce((uniqueUserIds, userId) => (uniqueUserIds.includes(userId) ? uniqueUserIds : [...uniqueUserIds, userId]), []); // remove duplicates
+
+        const ownerPromises = subscriptionOwnerIds.map(_fetchOwner);
+
+        return $q.all(ownerPromises).then(owners => addressbooks.map(addressbook => {
+          if (addressbook.isSubscription) {
+            const owner = owners.find(({ id }) => id === addressbook.source.bookId);
+
+            addressbook = Object.keys(owner) ? { ...addressbook, owner } : addressbook;
+          }
+
+          return addressbook;
+        }));
+      }
+
+      function _fetchOwner(id) {
+        return userAPI.user(id).then(({ data }) => ({ id, displayName: userUtils.displayNameOf(data) }));
+      }
     }
   };
 }

src/linagora.esn.contact/app/contact/form/contact-edition-form.directive.spec.js

@@ -1,23 +1,50 @@
 'use strict';
 
-/* global chai: false */
+/* global chai, sinon: false */
 
 var expect = chai.expect;
 
-describe('The contactEditionForm directive', function() {
+describe.only('The contactEditionForm directive', function() {
   var $compile, $rootScope, $scope, session;
   var CONTACT_AVATAR_SIZE, DEFAULT_ADDRESSBOOK_NAME, CONTACT_COLLECTED_ADDRESSBOOK_NAME;
   var contactAddressbookService, esnConfigMock;
+  let userAPIMock, contactAddressbookDisplayServiceMock;
 
   beforeEach(function() {
+    contactAddressbookDisplayServiceMock = {
+      convertShellsToDisplayShells: sinon.spy(function(shells) {
+        return shells.map(shell => ({
+          bookName: shell.bookName,
+          shell: shell
+        }));
+      }),
+      sortAddressbookDisplayShells: shells => shells
+    };
     angular.mock.module('esn.core');
     angular.mock.module('linagora.esn.contact');
     angular.mock.module(function($provide) {
       esnConfigMock = function() {
         return $q.when(true);
       };
 
+      const user = {
+        data: {
+          id: 123456,
+          firstname: 'john',
+          lastname: 'doe'
+        }
+      };
+
+      userAPIMock = {
+        user: sinon.mock().returns(
+          $q.when(user)
+        ),
+        currentUser: () => $q.when(user)
+      };
+
       $provide.value('esnConfig', esnConfigMock);
+      $provide.value('userAPI', userAPIMock);
+      $provide.value('contactAddressbookDisplayService', contactAddressbookDisplayServiceMock);
     });
   });
 
@@ -46,18 +73,31 @@ describe('The contactEditionForm directive', function() {
       urls: []
     };
     contactAddressbookService.listAddressbooksUserCanCreateContact = function() {
-      return $q.when([{
-        bookName: DEFAULT_ADDRESSBOOK_NAME,
-        href: '/addressbooks/userId/' + DEFAULT_ADDRESSBOOK_NAME + '.json'
-      }, {
-        bookName: CONTACT_COLLECTED_ADDRESSBOOK_NAME,
-        href: '/addressbooks/userId/' + CONTACT_COLLECTED_ADDRESSBOOK_NAME + '.json'
-      }]);
+      return $q.when([
+        {
+          bookName: DEFAULT_ADDRESSBOOK_NAME,
+          href: '/addressbooks/userId/' + DEFAULT_ADDRESSBOOK_NAME + '.json'
+        },
+        {
+          bookName: CONTACT_COLLECTED_ADDRESSBOOK_NAME,
+          href: '/addressbooks/userId/' + CONTACT_COLLECTED_ADDRESSBOOK_NAME + '.json'
+        },
+        {
+          bookName: 'shared',
+          href: '/addressbooks/123456/123456.json',
+          group: undefined,
+          isSubscription: true,
+          source: {
+            bookId: 123456
+          }
+        }
+      ]);
     };
   }));
 
   beforeEach(function() {
     session.user = { _id: 'userId' };
+    session.fetchUser = () => $q.when(session.user);
   });
 
   function initDirective(scope) {
@@ -73,4 +113,10 @@ describe('The contactEditionForm directive', function() {
 
     expect(element.isolateScope().avatarSize).to.equal(CONTACT_AVATAR_SIZE.bigger);
   });
+
+  it('should try to load the user using the userId collected from the shared addressbook', () => {
+    initDirective($scope);
+
+    expect(userAPIMock.user).to.have.been.calledWith(123456);
+  });
 });

src/linagora.esn.contact/app/contact/form/contact-edition-form.pug

@@ -18,7 +18,9 @@ form.contact-form(role="form", name="form", aria-hidden="true", ng-class="{ 'rea
                       ng-repeat='item in availableAddressbooks',
                       ng-selected='item.path === addressbookPath',
                       ng-value='item.path'
-                    ) {{ ::item.displayName }}
+                    )
+                      span {{ ::item.displayName }}
+                      span.ellipsis.addressbook-owner(ng-if='item.owner') - {{ ::item.owner.displayName }} 
           .col-xs-12
             .input-group
               .display-profile

src/linagora.esn.contact/app/contact/form/contact-edition-modal.less

@@ -198,3 +198,7 @@
     }
   }
 }
+
+.addressbook-owner {
+    margin-left: 5px;
+}