Skip to content

Commit 14d9247

Browse files
jessewashburndogi
andauthored
teams: smoother voices markdowning (fixes #8940) (#8941)
Co-authored-by: dogi <[email protected]>
1 parent c499038 commit 14d9247

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "planet",
33
"license": "AGPL-3.0",
4-
"version": "0.20.6",
4+
"version": "0.20.8",
55
"myplanet": {
6-
"latest": "v0.28.92",
7-
"min": "v0.27.92"
6+
"latest": "v0.29.10",
7+
"min": "v0.28.10"
88
},
99
"scripts": {
1010
"ng": "ng",

src/app/news/news-list-item.component.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -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) {

src/app/news/news-list.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ export class NewsListComponent implements OnInit, OnChanges, AfterViewInit, OnDe
7171
let isLatest = true;
7272
this.replyObject = {};
7373
this.items.forEach(item => {
74+
if (!item.doc.viewableBy || item.doc.viewableBy !== this.viewableBy) {
75+
item.doc.viewableBy = this.viewableBy;
76+
}
7477
this.replyObject[item.doc.replyTo || 'root'] = [ ...(this.replyObject[item.doc.replyTo || 'root'] || []), item ];
7578
if (!item.doc.replyTo && isLatest) {
7679
item.latestMessage = true;

0 commit comments

Comments
 (0)