Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make survey spacing consistent between visualizations #28562

Merged
merged 1 commit into from
Feb 12, 2025
Merged

fix: make survey spacing consistent between visualizations #28562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 66 additions & 68 deletions frontend/src/scenes/surveys/SurveyView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,77 +474,75 @@ export function SurveyResult({ disableEventsTable }: { disableEventsTable?: bool
} = useValues(surveyLogic)

return (
<>
<>
<Summary surveyUserStatsLoading={surveyUserStatsLoading} surveyUserStats={surveyUserStats} />
{survey.questions.map((question, i) => {
if (question.type === SurveyQuestionType.Rating) {
return (
<>
{question.scale === 10 && (
<>
<div className="text-4xl font-bold">{surveyNPSScore}</div>
<div className="mb-2 font-semibold text-secondary">Latest NPS Score</div>
<SurveyNPSResults survey={survey as Survey} />
</>
)}

<RatingQuestionBarChart
key={`survey-q-${i}`}
surveyRatingResults={surveyRatingResults}
surveyRatingResultsReady={surveyRatingResultsReady}
questionIndex={i}
iteration={survey.current_iteration}
/>
<div className="space-y-4">
<Summary surveyUserStatsLoading={surveyUserStatsLoading} surveyUserStats={surveyUserStats} />
{survey.questions.map((question, i) => {
if (question.type === SurveyQuestionType.Rating) {
return (
<>
{question.scale === 10 && (
<div>
<div className="text-4xl font-bold">{surveyNPSScore}</div>
<div className="mb-2 font-semibold text-secondary">Latest NPS Score</div>
<SurveyNPSResults survey={survey as Survey} />
</div>
)}

{survey.iteration_count &&
survey.iteration_count > 0 &&
survey.current_iteration &&
survey.current_iteration > 1 &&
survey.iteration_start_dates &&
survey.iteration_start_dates.length > 0 && (
<NPSSurveyResultsBarChart
key={`nps-survey-results-q-${i}`}
surveyRecurringNPSResults={surveyRecurringNPSResults}
surveyRecurringNPSResultsReady={surveyRecurringNPSResultsReady}
iterationStartDates={survey.iteration_start_dates}
currentIteration={survey.current_iteration}
questionIndex={i}
/>
)}
</>
)
} else if (question.type === SurveyQuestionType.SingleChoice) {
return (
<SingleChoiceQuestionPieChart
key={`survey-q-${i}`}
surveySingleChoiceResults={surveySingleChoiceResults}
surveySingleChoiceResultsReady={surveySingleChoiceResultsReady}
questionIndex={i}
/>
)
} else if (question.type === SurveyQuestionType.MultipleChoice) {
return (
<MultipleChoiceQuestionBarChart
<RatingQuestionBarChart
key={`survey-q-${i}`}
surveyMultipleChoiceResults={surveyMultipleChoiceResults}
surveyMultipleChoiceResultsReady={surveyMultipleChoiceResultsReady}
surveyRatingResults={surveyRatingResults}
surveyRatingResultsReady={surveyRatingResultsReady}
questionIndex={i}
iteration={survey.current_iteration}
/>
)
} else if (question.type === SurveyQuestionType.Open) {
return (
<OpenTextViz
key={`survey-q-${i}`}
surveyOpenTextResults={surveyOpenTextResults}
surveyOpenTextResultsReady={surveyOpenTextResultsReady}
questionIndex={i}
/>
)
}
})}
</>
<div className="mb-4 max-w-40">

{survey.iteration_count &&
survey.iteration_count > 0 &&
survey.current_iteration &&
survey.current_iteration > 1 &&
survey.iteration_start_dates &&
survey.iteration_start_dates.length > 0 && (
<NPSSurveyResultsBarChart
key={`nps-survey-results-q-${i}`}
surveyRecurringNPSResults={surveyRecurringNPSResults}
surveyRecurringNPSResultsReady={surveyRecurringNPSResultsReady}
iterationStartDates={survey.iteration_start_dates}
currentIteration={survey.current_iteration}
questionIndex={i}
/>
)}
</>
)
} else if (question.type === SurveyQuestionType.SingleChoice) {
return (
<SingleChoiceQuestionPieChart
key={`survey-q-${i}`}
surveySingleChoiceResults={surveySingleChoiceResults}
surveySingleChoiceResultsReady={surveySingleChoiceResultsReady}
questionIndex={i}
/>
)
} else if (question.type === SurveyQuestionType.MultipleChoice) {
return (
<MultipleChoiceQuestionBarChart
key={`survey-q-${i}`}
surveyMultipleChoiceResults={surveyMultipleChoiceResults}
surveyMultipleChoiceResultsReady={surveyMultipleChoiceResultsReady}
questionIndex={i}
/>
)
} else if (question.type === SurveyQuestionType.Open) {
return (
<OpenTextViz
key={`survey-q-${i}`}
surveyOpenTextResults={surveyOpenTextResults}
surveyOpenTextResultsReady={surveyOpenTextResultsReady}
questionIndex={i}
/>
)
}
})}
<div className="max-w-40">
<LemonButton
type="primary"
data-attr="survey-results-explore"
Expand All @@ -555,7 +553,7 @@ export function SurveyResult({ disableEventsTable }: { disableEventsTable?: bool
</LemonButton>
</div>
{!disableEventsTable && (surveyLoading ? <LemonSkeleton /> : <Query query={dataTableQuery} />)}
</>
</div>
)
}

Expand Down
23 changes: 11 additions & 12 deletions frontend/src/scenes/surveys/surveyViewViz.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ import { maxGlobalLogic } from 'scenes/max/maxGlobalLogic'
import { PersonDisplay } from 'scenes/persons/PersonDisplay'
import { AIConsentPopoverWrapper } from 'scenes/settings/organization/AIConsentPopoverWrapper'

import { GraphType } from '~/types'
import { InsightLogicProps, SurveyQuestionType } from '~/types'
import { GraphType, InsightLogicProps, SurveyQuestionType } from '~/types'

import {
QuestionResultsReady,
Expand Down Expand Up @@ -86,7 +85,7 @@ export function UsersStackedBar({ surveyUserStats }: { surveyUserStats: SurveyUs
return (
<>
{total > 0 && (
<div className="mb-8">
<div>
<div className="relative w-full mx-auto h-10 mb-4">
{[
{
Expand Down Expand Up @@ -169,7 +168,7 @@ export function Summary({
surveyUserStatsLoading: boolean
}): JSX.Element {
return (
<div className="mb-4 mt-2">
<div>
{surveyUserStatsLoading ? (
<LemonTable dataSource={[]} columns={[]} loading={true} />
) : (
Expand Down Expand Up @@ -210,13 +209,13 @@ export function RatingQuestionBarChart({
}, [questionIndex])

return (
<div className="mb-4">
<div>
{!surveyRatingResultsReady[questionIndex] ? (
<LemonTable dataSource={[]} columns={[]} loading={true} />
) : !surveyRatingResults[questionIndex]?.total ? (
<></>
) : (
<div className="mb-8">
<div>
<div className="font-semibold text-secondary">{`${
question.scale === 10
? '0 - 10'
Expand Down Expand Up @@ -305,13 +304,13 @@ export function NPSSurveyResultsBarChart({
}, [questionIndex])

return (
<div className="mb-4">
<div>
{!surveyRecurringNPSResultsReady[questionIndex] ? (
<LemonTable dataSource={[]} columns={[]} loading={true} />
) : !surveyRecurringNPSResults[questionIndex]?.total ? (
<></>
) : (
<div className="mb-8">
<div>
<div className="font-semibold text-secondary">{`${
question.scale === 10 ? '0 - 10' : '1 - 5'
} rating`}</div>
Expand Down Expand Up @@ -402,13 +401,13 @@ export function SingleChoiceQuestionPieChart({
}, [questionIndex])

return (
<div className="mb-4">
<div>
{!surveySingleChoiceResultsReady[questionIndex] ? (
<LemonTable dataSource={[]} columns={[]} loading={true} />
) : !surveySingleChoiceResults[questionIndex]?.data.length ? (
<></>
) : (
<div className="mb-8">
<div>
<div className="font-semibold text-secondary">Single choice</div>
<div className="text-xl font-bold mb-2">{question.question}</div>
<div className="h-80 overflow-y-auto border rounded pt-4 pb-2 flex">
Expand Down Expand Up @@ -513,7 +512,7 @@ export function MultipleChoiceQuestionBarChart({
}, [surveyMultipleChoiceResults])

return (
<div className="mb-4">
<div>
{!surveyMultipleChoiceResultsReady[questionIndex] ? (
<LemonTable dataSource={[]} columns={[]} loading={true} />
) : !surveyMultipleChoiceResults[questionIndex]?.data.length ? (
Expand Down Expand Up @@ -590,7 +589,7 @@ export function OpenTextViz({
}, [questionIndex])

return (
<div className="mb-4">
<div>
{!surveyOpenTextResultsReady[questionIndex] ? (
<LemonTable dataSource={[]} columns={[]} loading={true} />
) : !surveyOpenTextResults[questionIndex]?.events.length ? (
Expand Down
Loading