Merge pull request #2348 from hmhealey/member

Updated Channel Members modal UI

web/react/components/channel_members_modal.jsx

@@ -44,6 +44,7 @@ export default class ChannelMembersModal extends React.Component {
     }
     getStateFromStores() {
         const extraInfo = ChannelStore.getCurrentExtraInfo();
+        const profiles = UserStore.getActiveOnlyProfiles();
 
         if (extraInfo.member_count !== extraInfo.members.length) {
             AsyncClient.getChannelExtraInfo(this.props.channel.id, -1);
@@ -53,9 +54,8 @@ export default class ChannelMembersModal extends React.Component {
             };
         }
 
-        // clone the member list since we mutate it later on
         const memberList = extraInfo.members.map((member) => {
-            return Object.assign({}, member);
+            return profiles[member.id];
         });
 
         function compareByUsername(a, b) {
@@ -130,8 +130,8 @@ export default class ChannelMembersModal extends React.Component {
                 onClick={this.handleRemove.bind(this, user)}
             >
                 <FormattedMessage
-                    id='channel_members_modal.removeMember'
-                    defaultMessage='Remove Member'
+                    id='channel_members_modal.remove'
+                    defaultMessage='Remove'
                 />
             </button>
         );

web/react/components/user_list_row.jsx

@@ -10,9 +10,9 @@ export default function UserListRow({user, actions}) {
 
     let name = user.username;
     if (user.nickname && nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME) {
-        name = `${user.nickname} (${user.username})`;
+        name = `${user.nickname} (@${user.username})`;
     } else if ((user.first_name || user.last_name) && (nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME || nameFormat === Constants.Preferences.DISPLAY_PREFER_FULL_NAME)) {
-        name = `${Utils.getFullName(user)} (${user.username})`;
+        name = `${Utils.getFullName(user)} (@${user.username})`;
     }
 
     const buttons = actions.map((Action, index) => {

web/static/i18n/en.json

@@ -561,7 +561,7 @@
   "channel_loader.wrote": " wrote: ",
   "channel_members_modal.addNew": " Add New Members",
   "channel_members_modal.close": "Close",
-  "channel_members_modal.removeMember": "Remove Member",
+  "channel_members_modal.remove": "Remove",
   "channel_memebers_modal.members": " Members",
   "channel_modal.cancel": "Cancel",
   "channel_modal.channel": "Channel",
@@ -1295,4 +1295,4 @@
   "view_image_popover.download": "Download",
   "view_image_popover.file": "File {count} of {total}",
   "view_image_popover.publicLink": "Get Public Link"
-}
+}

web/static/i18n/es.json

@@ -561,7 +561,6 @@
   "channel_loader.wrote": " escribió: ",
   "channel_members_modal.addNew": " Agregar nuevos Miembros",
   "channel_members_modal.close": "Cerrar",
-  "channel_members_modal.removeMember": "Elminar Miembro",
   "channel_memebers_modal.members": " Miembros",
   "channel_modal.cancel": "Cancelar",
   "channel_modal.channel": "Canal",
@@ -1289,4 +1288,4 @@
   "view_image_popover.download": "Descargar",
   "view_image_popover.file": "Archivo {count} de {total}",
   "view_image_popover.publicLink": "Obtener Enlace Público"
-}
+}

web/static/i18n/pt.json

@@ -558,7 +558,6 @@
   "channel_loader.wrote": " escreveu: ",
   "channel_members_modal.addNew": " Adicionar Novos Membros",
   "channel_members_modal.close": "Fechar",
-  "channel_members_modal.removeMember": "Remover Membro",
   "channel_memebers_modal.members": " Membros",
   "channel_modal.cancel": "Cancelar",
   "channel_modal.channel": "Canal",
@@ -1290,4 +1289,4 @@
   "view_image_popover.download": "Download",
   "view_image_popover.file": "Arquivo {count} de {total}",
   "view_image_popover.publicLink": "Obter O Link Público"
-}
+}