Skip to content

Commit 3f11a69

Browse files
committed
Fix sumbission page chart and statistics view
1 parent 8b99ddd commit 3f11a69

File tree

2 files changed

+31
-22
lines changed

2 files changed

+31
-22
lines changed

client/src/components/admin/SubmissionsPage/SurveySubmissionsChart.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ export default function Chart({ submissions, selectedQuestion }: Props) {
260260
return base;
261261
}, [selectedQuestion, surveyLanguage]);
262262

263-
return answerData ? (
263+
if (!answerData) return null;
264+
265+
return (
264266
<Box
265267
sx={{
266268
padding: '1rem',
@@ -320,7 +322,5 @@ export default function Chart({ submissions, selectedQuestion }: Props) {
320322
</ResponsiveContainer>
321323
<LabelTooltip tooltip={tooltip} />
322324
</Box>
323-
) : (
324-
<></>
325325
);
326326
}

client/src/components/admin/SubmissionsPage/SurveySubmissionsPage.tsx

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ import { DataChart } from './DataChart';
3333
import Chart from './SurveySubmissionsChart';
3434
import { AnswerTable } from './AnswerTable';
3535

36+
const CHART_TYPES: SurveyQuestion['type'][] = [
37+
'numeric',
38+
'slider',
39+
'radio',
40+
'checkbox',
41+
];
42+
3643
function isMapEntry(
3744
entry: AnswerEntry,
3845
): entry is AnswerEntry & { type: 'map' } {
@@ -317,27 +324,29 @@ export default function SurveySubmissionsPage() {
317324
}
318325
sidePaneStyle={{ overflowY: 'auto' }}
319326
sidePane={
320-
<Box>
321-
<Chart
322-
submissions={submissions}
323-
selectedQuestion={selectedQuestion}
324-
/>
325-
{selectedQuestion?.type === 'free-text' && (
327+
<>
328+
{CHART_TYPES.includes(selectedQuestion.type) ? (
329+
<Chart
330+
submissions={submissions}
331+
selectedQuestion={selectedQuestion}
332+
/>
333+
) : selectedQuestion?.type === 'free-text' ? (
326334
<AnswerTable submissions={submissions} />
335+
) : (
336+
<AnswerMap
337+
survey={survey}
338+
submissions={submissions}
339+
selectedQuestion={selectedQuestion}
340+
onAnswerClick={(answer) => {
341+
setSelectedAnswer(answer);
342+
}}
343+
onSelectQuestion={(question) => setSelectedQuestion(question)}
344+
selectedAnswer={selectedAnswer}
345+
surveyQuestions={surveyQuestions}
346+
questions={questions}
347+
/>
327348
)}
328-
<AnswerMap
329-
survey={survey}
330-
submissions={submissions}
331-
selectedQuestion={selectedQuestion}
332-
onAnswerClick={(answer) => {
333-
setSelectedAnswer(answer);
334-
}}
335-
onSelectQuestion={(question) => setSelectedQuestion(question)}
336-
selectedAnswer={selectedAnswer}
337-
surveyQuestions={surveyQuestions}
338-
questions={questions}
339-
/>
340-
</Box>
349+
</>
341350
}
342351
mobileDrawer={{
343352
open: mobileDrawerOpen,

0 commit comments

Comments
 (0)