Fix Problem (#1019)

mattermost-community · Aug 18, 2021 · e224b97 · e224b97
1 parent ee5a047
commit e224b97
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/webapp/src/store/contents.ts b/webapp/src/store/contents.ts
@@ -5,7 +5,7 @@ import {createSlice, PayloadAction, createSelector} from '@reduxjs/toolkit'
 
 import {ContentBlock} from '../blocks/contentBlock'
 
-import {getCards} from './cards'
+import {getCards, getTemplates} from './cards'
 import {initialLoad, initialReadOnlyLoad} from './initialLoad'
 
 import {RootState} from './index'
@@ -58,8 +58,9 @@ export function getCardContents(cardId: string): (state: RootState) => Array<Con
  return createSelector(
  getContentsById,
  getCards,
- (contents, cards): Array<ContentBlock|ContentBlock[]> => {
- const card = cards[cardId]
+ getTemplates,
+ (contents, cards, templates): Array<ContentBlock|ContentBlock[]> => {
+ const card = {...cards, ...templates}[cardId]
  const result: Array<ContentBlock|ContentBlock[]> = []
  if (card?.fields?.contentOrder) {
  for (const contentId of card.fields.contentOrder) {