From ab1cd36c7755ce76d83b13d2ff5b881c1bf71691 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 3 Aug 2015 14:40:18 -0400
Subject: [PATCH] Review delegation dialog in Mail app module

---
 .../MailerUI/UIxMailUserDelegationEditor.wox  | 28 ++++++++-----------
 .../js/Mailer/MailboxesController.js          | 15 +---------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
index 11be01628..0b4a1c773 100644
--- a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
@@ -6,13 +6,13 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-  <md-dialog flex="50" flex-sm="100">
-    <md-toolbar class="sg-padded">
+  <md-dialog flex="30" flex-sm="100">
+    <md-toolbar>
       <div class="md-toolbar-tools">
         <md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
         <div class="pseudo-input-container md-flex">
           <label class="pseudo-input-label"><var:string label:value="Delegation"/></label>
-          <div class="pseudo-input-field sg-md-title">{{delegate.account.name}}</div>
+          <div class="sg-md-title">{{delegate.account.name}}</div>
         </div>
         <md-button class="md-icon-button" ng-click="delegate.closeModal()">
           <md-icon aria-label="Close dialog">close</md-icon>
@@ -21,26 +21,22 @@
     </md-toolbar>
 
     <md-dialog-content>
-      <md-card ng-repeat="user in delegate.users | orderBy:['userClass', 'displayName']"
-               ng-click="delegate.selectUser(user)"
-               ng-class="{ 'sg-collapsed': user.uid != delegate.selectedUser.uid, 'sg-expanded': user.uid == delegate.selectedUser.uid }">
-        <md-button>
+      <md-list>
+        <md-list-item ng-repeat="user in delegate.users | orderBy:['userClass', 'displayName']">
           <div layout="row" layout-align="start center" class="md-flex">
-            <span class="card-picture" ng-switch="user.userClass">
-              <div class="sg-avatar"><!-- normal-user --></div>
-            </span>
+            <sg-avatar-image class="md-tile-left"
+                             sg-email="user.c_email"
+                             size="48"><!-- avatar --></sg-avatar-image>
             <div class="sg-tile-content">
               <div class="sg-md-subhead-multi">{{user.cn}}</div>
               <div class="sg-md-body-multi">{{user.c_email}}</div>
             </div>
-            <md-button ng-click="delegate.removeUser(user)"
-                       type="button"
-                       ng-hide="user.uid != delegate.selectedUser.uid || user.$isSpecial()">
+            <md-button class="sg-icon-button" ng-click="delegate.removeUser(user)">
               <md-icon>delete</md-icon>
             </md-button>
           </div>
-        </md-button>
-      </md-card>
+        </md-list-item>
+      </md-list>
     </md-dialog-content>
 
     <div class="md-actions">
@@ -51,6 +47,7 @@
           md-selected-item="delegate.userToAdd"
           md-selected-item-change="delegate.addUser(user)"
           md-items="user in delegate.userFilter(delegate.searchText)"
+          md-item-text="user.empty"
           md-min-length="3"
           md-no-cache="true"
           label:md-floating-label="Add User">
@@ -64,5 +61,4 @@
       </md-autocomplete>
     </div>
   </md-dialog>
-
 </container>
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index 72e499993..e417be4bf 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -73,14 +73,12 @@
 
         vm.users = account.delegates;
         vm.account = account;
-        vm.selectedUser = null;
         vm.userToAdd = '';
         vm.searchText = '';
         vm.userFilter = userFilter;
         vm.closeModal = closeModal;
         vm.removeUser = removeUser;
         vm.addUser = addUser;
-        vm.selectUser = selectUser;
 
         function userFilter($query) {
           return User.$filter($query, account.delegates);
@@ -91,11 +89,7 @@
         }
 
         function removeUser(user) {
-          account.$removeDelegate(user.uid).then(function() {
-            if (user.uid == vm.selectedUser.uid) {
-              vm.selectedUser = null;
-            }
-          }, function(data, status) {
+          account.$removeDelegate(user.uid).catch(function(data, status) {
             Dialog.alert(l('Warning'), l('An error occured please try again.'));
           });
         }
@@ -110,13 +104,6 @@
             });
           }
         }
-
-        function selectUser(user) {
-          // Check if it is a different user
-          if (vm.selectedUser != user) {
-            vm.selectedUser = user;
-          }
-        }
       }
     } // delegate