diff --git a/src/renderer/components/Announcements/AnnouncementsPost.vue b/src/renderer/components/Announcements/AnnouncementsPost.vue index 6d07922ac4..f444fb09ce 100644 --- a/src/renderer/components/Announcements/AnnouncementsPost.vue +++ b/src/renderer/components/Announcements/AnnouncementsPost.vue @@ -88,8 +88,8 @@ export default { required: true }, summary: { - type: String, - required: true + required: true, + validator: value => typeof value === 'string' || value === null }, url: { type: String, diff --git a/src/renderer/models/announcement.js b/src/renderer/models/announcement.js index 7c925109f2..f048119d85 100644 --- a/src/renderer/models/announcement.js +++ b/src/renderer/models/announcement.js @@ -10,10 +10,11 @@ export default new BaseModel({ }, title: {}, summary: { - format: (data) => trunc(data['content:encoded'], 300).text + type: ['string', 'null'], + format: data => trunc(data['content:encoded'], 300).text }, url: { - format: (data) => data.link + format: data => data.link }, isRead: { format: () => false diff --git a/src/renderer/store/migrations/2.8.2 - remove summary from read announcements.js b/src/renderer/store/migrations/2.8.2 - remove summary from read announcements.js new file mode 100644 index 0000000000..cbd8336cce --- /dev/null +++ b/src/renderer/store/migrations/2.8.2 - remove summary from read announcements.js @@ -0,0 +1,6 @@ +export default store => { + const readAnnouncements = store.getters['announcements/read'] + store.dispatch('announcements/markAsReadBulk', readAnnouncements) + + store.dispatch('app/setLatestAppliedMigration', '2.8.2') +} diff --git a/src/renderer/store/modules/announcements.js b/src/renderer/store/modules/announcements.js index f367acbdcf..c28456c343 100644 --- a/src/renderer/store/modules/announcements.js +++ b/src/renderer/store/modules/announcements.js @@ -31,6 +31,7 @@ export default { const readAnnouncementIndex = state.announcements.findIndex(announcement => announcement.guid === readAnnouncement.guid) Vue.set(state.announcements, readAnnouncementIndex, { ...readAnnouncement, + summary: null, isRead: true }) }, @@ -45,6 +46,7 @@ export default { announcementsToUpdate.push({ ...announcement, + summary: isRead ? null : announcement.summary, isRead }) }