@@ -97,20 +97,17 @@ export class NewsListItemComponent implements OnInit, OnChanges, OnDestroy {
9797 }
9898
9999 addReply ( news ) {
100- const label = this . formLabel ( news ) ;
100+ const viewableBy = news . viewableBy || ( this . item && this . item . doc && this . item . doc . viewableBy ) || this [ 'viewableBy' ] || 'community' ;
101+ const patchedNews = { ...news , viewableBy } ;
102+ const label = this . formLabel ( patchedNews ) ;
101103 this . authService . checkAuthenticationStatus ( ) . subscribe ( ( ) => {
102104 this . updateNews . emit ( {
103105 title : $localize `Reply to ${ label } ` ,
104106 placeholder : $localize `Your ${ label } ` ,
105107 initialValue : '' ,
106- news : {
107- replyTo : news . _id ,
108- messagePlanetCode : news . messagePlanetCode ,
109- messageType : news . messageType ,
110- viewIn : news . viewIn
111- }
108+ news : { ...patchedNews , replyTo : news . _id }
112109 } ) ;
113- this . sendNewsNotifications ( news ) ;
110+ this . sendNewsNotifications ( patchedNews ) ;
114111 } ) ;
115112 }
116113
@@ -151,18 +148,21 @@ export class NewsListItemComponent implements OnInit, OnChanges, OnDestroy {
151148 }
152149
153150 editNews ( news ) {
154- const label = this . formLabel ( news ) ;
151+ const viewableBy = news . viewableBy || ( this . item && this . item . doc && this . item . doc . viewableBy ) || this [ 'viewableBy' ] || 'community' ;
152+ const patchedNews = { ...news , viewableBy } ;
153+ const label = this . formLabel ( patchedNews ) ;
155154 const initialValue = news . message === '</br>' ? '' : news . message ;
156155 this . updateNews . emit ( {
157156 title : $localize `Edit ${ label } ` ,
158157 placeholder : $localize `Your ${ label } ` ,
159158 initialValue,
160- news
159+ news : patchedNews
161160 } ) ;
162161 }
163162
164163 formLabel ( news ) {
165- return news . viewableBy === 'teams' ? $localize `Message` : $localize `Voice` ;
164+ const viewableBy = news . viewableBy || ( this . item && this . item . doc && this . item . doc . viewableBy ) || this [ 'viewableBy' ] || 'community' ;
165+ return [ 'team' , 'teams' ] . includes ( viewableBy ) ? $localize `Message` : $localize `Voice` ;
166166 }
167167
168168 showReplies ( news ) {
0 commit comments