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.

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(surveys): survey results viz fixes #20345

Merged
merged 15 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cypress/e2e/surveys.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe('Surveys', () => {
// refresh, see survey show up on page
cy.reload()

cy.contains('Unique users viewed').should('exist')
cy.contains('Unique users shown').should('exist')

// stop survey
cy.contains('Stop').click()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/scenes/surveys/SurveyEdit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ export default function SurveyEdit(): JSX.Element {
value={!hasTargetingSet}
options={[
{ label: 'All users', value: true },
{ label: 'Users who match...', value: false },
{ label: 'Users who match all of the following...', value: false },
]}
/>
{!hasTargetingSet ? (
Expand Down
29 changes: 28 additions & 1 deletion frontend/src/scenes/surveys/SurveyView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@ import { EditableField } from 'lib/components/EditableField/EditableField'
import { PageHeader } from 'lib/components/PageHeader'
import { FEATURE_FLAGS } from 'lib/constants'
import { dayjs } from 'lib/dayjs'
import { IconBarChart } from 'lib/lemon-ui/icons'
import { More } from 'lib/lemon-ui/LemonButton/More'
import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
import { LemonTabs } from 'lib/lemon-ui/LemonTabs'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { capitalizeFirstLetter, pluralize } from 'lib/utils'
import { useEffect, useState } from 'react'
import { urls } from 'scenes/urls'

import { Query } from '~/queries/Query/Query'
import { NodeKind } from '~/queries/schema'
import { PropertyFilterType, PropertyOperator, Survey, SurveyQuestionType, SurveyType } from '~/types'
import { InsightType, PropertyFilterType, PropertyOperator, Survey, SurveyQuestionType, SurveyType } from '~/types'

import { SURVEY_EVENT_NAME } from './constants'
import { SurveyReleaseSummary } from './Survey'
Expand Down Expand Up @@ -316,6 +318,31 @@ export function SurveyResult({ disableEventsTable }: { disableEventsTable?: bool
}
})}
</>
<div className="max-w-40 mb-4">
<LemonButton
type="primary"
data-attr="survey-results-explore"
icon={<IconBarChart />}
to={urls.insightNew({
insight: InsightType.TRENDS,
events: [
{ id: 'survey sent', name: 'survey sent', type: 'events' },
{ id: 'survey shown', name: 'survey shown', type: 'events' },
{ id: 'survey dismissed', name: 'survey dismissed', type: 'events' },
],
properties: [
{
key: '$survey_id',
value: survey.id,
operator: PropertyOperator.Exact,
type: PropertyFilterType.Event,
},
],
})}
>
Explore results
</LemonButton>
</div>
{!disableEventsTable && (surveyLoading ? <LemonSkeleton /> : <Query query={dataTableQuery} />)}
</>
)
Expand Down
24 changes: 18 additions & 6 deletions frontend/src/scenes/surveys/surveyViewViz.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { BindLogic, useActions, useValues } from 'kea'
import { IconInfo } from 'lib/lemon-ui/icons'
import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { useEffect } from 'react'
import { useEffect, useState } from 'react'
import { insightLogic } from 'scenes/insights/insightLogic'
import { LineGraph } from 'scenes/insights/views/LineGraph/LineGraph'
import { PieChart } from 'scenes/insights/views/LineGraph/PieChart'
Expand Down Expand Up @@ -36,8 +36,8 @@ const formatCount = (count: number, total: number): string => {
export function UsersCount({ surveyUserStats }: { surveyUserStats: SurveyUserStats }): JSX.Element {
const { seen, dismissed, sent } = surveyUserStats
const total = seen + dismissed + sent
const labelTotal = total === 1 ? 'Unique user viewed' : 'Unique users viewed'
const labelSent = sent === 1 ? 'Response submitted' : 'Responses submitted'
const labelTotal = total === 1 ? 'Unique user shown' : 'Unique users shown'
const labelSent = sent === 1 ? 'Response sent' : 'Responses sent'

return (
<div className="inline-flex mb-4">
Expand Down Expand Up @@ -71,7 +71,7 @@ export function UsersStackedBar({ surveyUserStats }: { surveyUserStats: SurveyUs
{[
{
count: seen,
label: 'Viewed',
label: 'Shown',
classes: `rounded-l ${dismissed === 0 && sent === 0 ? 'rounded-r' : ''}`,
style: { backgroundColor: '#1D4AFF', width: `${seenPercentage}%` },
},
Expand All @@ -87,7 +87,7 @@ export function UsersStackedBar({ surveyUserStats }: { surveyUserStats: SurveyUs
},
{
count: sent,
label: 'Submitted',
label: 'Sent',
classes: `rounded-r ${seen === 0 && dismissed === 0 ? 'rounded-l' : ''}`,
style: {
backgroundColor: '#529B08',
Expand Down Expand Up @@ -378,6 +378,7 @@ export function MultipleChoiceQuestionBarChart({
}): JSX.Element {
const { loadSurveyMultipleChoiceResults } = useActions(surveyLogic)
const { survey } = useValues(surveyLogic)
const [chartHeight, setChartHeight] = useState(200)
const barColor = '#1d4aff'

const question = survey.questions[questionIndex]
Expand All @@ -389,6 +390,12 @@ export function MultipleChoiceQuestionBarChart({
loadSurveyMultipleChoiceResults({ questionIndex })
}, [questionIndex])

useEffect(() => {
if (surveyMultipleChoiceResults?.[questionIndex]?.data?.length) {
setChartHeight(100 + 20 * surveyMultipleChoiceResults[questionIndex].data.length)
}
}, [surveyMultipleChoiceResults])

return (
<div className="mb-4">
{!surveyMultipleChoiceResultsReady[questionIndex] ? (
Expand All @@ -399,7 +406,12 @@ export function MultipleChoiceQuestionBarChart({
<div className="mb-8">
<div className="font-semibold text-muted-alt">Multiple choice</div>
<div className="text-xl font-bold mb-2">{question.question}</div>
<div className="border rounded pt-6 pr-10">

<div
className="border rounded pt-6 pr-10"
// eslint-disable-next-line react/forbid-dom-props
style={{ height: Math.min(chartHeight, 600) }}
>
<BindLogic logic={insightLogic} props={insightProps}>
<LineGraph
inSurveyView={true}
Expand Down
Loading