diff --git a/web-ui/src/pages/SkillReportPage.jsx b/web-ui/src/pages/SkillReportPage.jsx
index 2ad63fd682..e2728e0c90 100644
--- a/web-ui/src/pages/SkillReportPage.jsx
+++ b/web-ui/src/pages/SkillReportPage.jsx
@@ -59,12 +59,12 @@ const SkillReportPage = props => {
let memberSkillsFound;
if (res && res.payload) {
memberSkillsFound =
- res.payload.data.teamMembers && !res.error
+ !res.error && res.payload.data.teamMembers
? res.payload.data.teamMembers
: undefined;
}
// Filter out skills of terminated members
- memberSkillsFound = memberSkillsFound.filter(memberSkill =>
+ memberSkillsFound = memberSkillsFound?.filter(memberSkill =>
memberIds.includes(memberSkill.id)
);
if (memberSkillsFound && memberIds) {
diff --git a/web-ui/src/pages/TeamSkillReportPage.jsx b/web-ui/src/pages/TeamSkillReportPage.jsx
index 7737f30ac6..2b32a25fc0 100644
--- a/web-ui/src/pages/TeamSkillReportPage.jsx
+++ b/web-ui/src/pages/TeamSkillReportPage.jsx
@@ -77,7 +77,7 @@ const TeamSkillReportPage = () => {
let memberSkillsFound;
if (res && res.payload) {
memberSkillsFound =
- res.payload.data.teamMembers && !res.error
+ !res.error && res.payload.data.teamMembers
? res.payload.data.teamMembers
: undefined;
}
diff --git a/web-ui/src/pages/ViewFeedbackPage.jsx b/web-ui/src/pages/ViewFeedbackPage.jsx
index ab72edf7eb..b67fed9c9c 100644
--- a/web-ui/src/pages/ViewFeedbackPage.jsx
+++ b/web-ui/src/pages/ViewFeedbackPage.jsx
@@ -234,10 +234,12 @@ const ViewFeedbackPage = () => {
//and associated template info together
const templateReqs = [];
const templateIds = [];
- for (let i = 0; i < feedbackRequests.length; i++) {
- if (!templateIds.includes(feedbackRequests[i].templateId)) {
- templateIds.push(feedbackRequests[i].templateId);
- templateReqs.push(getTemplateInfo(feedbackRequests[i].templateId));
+ if (feedbackRequests) {
+ for (let i = 0; i < feedbackRequests.length; i++) {
+ if (!templateIds.includes(feedbackRequests[i].templateId)) {
+ templateIds.push(feedbackRequests[i].templateId);
+ templateReqs.push(getTemplateInfo(feedbackRequests[i].templateId));
+ }
}
}
let templates = await Promise.all(templateReqs);
@@ -245,7 +247,7 @@ const ViewFeedbackPage = () => {
map[template.id] = template;
return map;
}, {});
- feedbackRequests.forEach(request => {
+ feedbackRequests?.forEach(request => {
request.templateInfo = templates[request.templateId];
});
return feedbackRequests;