fix: Navigate to conversation url from start ui (#9340)

wireapp · Aug 7, 2020 · 4cd29b2 · 4cd29b2
1 parent de152c1
commit 4cd29b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/script/components/groupList.ts b/src/script/components/groupList.ts
@@ -21,6 +21,7 @@ import ko from 'knockout';
 
 import {ParticipantAvatar} from 'Components/participantAvatar';
 import type {Conversation} from '../entity/Conversation';
+import {generateConversationUrl} from '../router/routeGenerator';
 
 interface GroupListViewModelParams {
   click: (group: Conversation) => void;
@@ -31,19 +32,21 @@ class GroupListViewModel {
   groups: ko.ObservableArray<Conversation[]>;
   onSelect: (group: Conversation) => void;
   ParticipantAvatar: typeof ParticipantAvatar;
+  readonly getConversationUrl: (conversationId: string) => string;
 
   constructor(params: GroupListViewModelParams) {
     this.groups = params.groups;
     this.onSelect = params.click;
     this.ParticipantAvatar = ParticipantAvatar;
+    this.getConversationUrl = generateConversationUrl;
   }
 }
 
 // Knockout registration of the group list component.
 ko.components.register('group-list', {
   template: `
     <div class="search-list search-list-lg" data-bind="foreach: {data: groups, as: 'group', noChildContext: true}">
-      <div class="search-list-item" data-bind="click: () => onSelect(group), attr: {'data-uie-uid': group.id, 'data-uie-value': group.display_name}" data-uie-name="item-group">
+      <div class="search-list-item" data-bind="link_to: getConversationUrl(group.id), click: () => onSelect(group), attr: {'data-uie-uid': group.id, 'data-uie-value': group.display_name}" data-uie-name="item-group">
         <div class="search-list-item-image">
           <!-- ko if: group.is1to1() -->
             <participant-avatar params="participant: group.participating_user_ets()[0], size: ParticipantAvatar.SIZE.SMALL"></participant-avatar>

diff --git a/src/script/components/list/conversationListCallingCell.ts b/src/script/components/list/conversationListCallingCell.ts
@@ -238,8 +238,8 @@ ko.components.register('conversation-list-calling-cell', {
           </div>
         <!-- /ko -->
 
-        <div class="conversation-list-cell-center" data-bind="css: {'conversation-list-cell-center-no-left': temporaryUserStyle}">
-          <span class="conversation-list-cell-name" data-bind="link_to: conversationUrl, text: conversation().display_name()"></span>
+        <div class="conversation-list-cell-center" data-bind="link_to: conversationUrl, css: {'conversation-list-cell-center-no-left': temporaryUserStyle}">
+          <span class="conversation-list-cell-name" data-bind="text: conversation().display_name()"></span>
           <!-- ko if: isIncoming() -->
             <!-- ko if: call.isGroup -->
               <span class="conversation-list-cell-description" data-bind="text: t('callStateIncomingGroup', call.creatingUser.name())" data-uie-name="call-label-incoming"></span>