Skip to content

Commit 99fb33f

Browse files
sanne-sansanne-san
committed
Undo conversion rate on hover behaviour
- Unlike percentages, CR should show permanently.
1 parent 954f3e1 commit 99fb33f

8 files changed

Lines changed: 20 additions & 32 deletions

File tree

‎assets/js/dashboard/stats/behaviours/conversions.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export default function Conversions({ afterFetchData, onGoalFilterClick }) {
3333
renderLabel: (_query) => 'Total',
3434
meta: { hiddenOnMobile: true }
3535
}),
36+
metrics.createConversionRate(),
3637
BUILD_EXTRA &&
3738
metrics.createTotalRevenue({ meta: { hiddenOnMobile: true } }),
3839
BUILD_EXTRA &&

‎assets/js/dashboard/stats/behaviours/props.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import * as storage from '../../util/storage'
88
import {
99
EVENT_PROPS_PREFIX,
1010
getGoalFilter,
11-
FILTER_OPERATIONS
11+
FILTER_OPERATIONS,
12+
hasConversionGoalFilter
1213
} from '../../util/filters'
1314
import classNames from 'classnames'
1415
import { useQueryContext } from '../../query-context'
@@ -114,6 +115,8 @@ export default function Properties({ afterFetchData }) {
114115
renderLabel: (_query) => 'Events',
115116
meta: { hiddenOnMobile: true }
116117
}),
118+
hasConversionGoalFilter(query) && metrics.createConversionRate(),
119+
!hasConversionGoalFilter(query) && metrics.createPercentage(),
117120
BUILD_EXTRA &&
118121
metrics.createTotalRevenue({ meta: { hiddenOnMobile: true } }),
119122
BUILD_EXTRA &&

‎assets/js/dashboard/stats/devices/index.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function Browsers({ afterFetchData }) {
7979
!hasConversionGoalFilter(query) &&
8080
metrics.createPercentage({ meta: { showOnHover: true } }),
8181
hasConversionGoalFilter(query) &&
82-
metrics.createConversionRate({ meta: { showOnHover: true } })
82+
metrics.createConversionRate()
8383
].filter((metric) => !!metric)
8484
}
8585

@@ -126,7 +126,7 @@ function BrowserVersions({ afterFetchData }) {
126126
!hasConversionGoalFilter(query) &&
127127
metrics.createPercentage({ meta: { showOnHover: true } }),
128128
hasConversionGoalFilter(query) &&
129-
metrics.createConversionRate({ meta: { showOnHover: true } })
129+
metrics.createConversionRate()
130130
].filter((metric) => !!metric)
131131
}
132132

@@ -196,7 +196,7 @@ function OperatingSystems({ afterFetchData }) {
196196
meta: { showOnHover: true, hiddenOnMobile: true }
197197
}),
198198
hasConversionGoalFilter(query) &&
199-
metrics.createConversionRate({ meta: { showOnHover: true } })
199+
metrics.createConversionRate()
200200
].filter((metric) => !!metric)
201201
}
202202

@@ -248,7 +248,7 @@ function OperatingSystemVersions({ afterFetchData }) {
248248
!hasConversionGoalFilter(query) &&
249249
metrics.createPercentage({ meta: { showOnHover: true } }),
250250
hasConversionGoalFilter(query) &&
251-
metrics.createConversionRate({ meta: { showOnHover: true } })
251+
metrics.createConversionRate()
252252
].filter((metric) => !!metric)
253253
}
254254

@@ -293,7 +293,7 @@ function ScreenSizes({ afterFetchData }) {
293293
!hasConversionGoalFilter(query) &&
294294
metrics.createPercentage({ meta: { showOnHover: true } }),
295295
hasConversionGoalFilter(query) &&
296-
metrics.createConversionRate({ meta: { showOnHover: true } })
296+
metrics.createConversionRate()
297297
].filter((metric) => !!metric)
298298
}
299299

‎assets/js/dashboard/stats/locations/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function Countries({ query, site, onClick, afterFetchData }) {
4040
!hasConversionGoalFilter(query) &&
4141
metrics.createPercentage({ meta: { showOnHover: true } }),
4242
hasConversionGoalFilter(query) &&
43-
metrics.createConversionRate({ meta: { showOnHover: true } })
43+
metrics.createConversionRate()
4444
].filter((metric) => !!metric)
4545
}
4646

@@ -85,7 +85,7 @@ function Regions({ query, site, onClick, afterFetchData }) {
8585
!hasConversionGoalFilter(query) &&
8686
metrics.createPercentage({ meta: { showOnHover: true } }),
8787
hasConversionGoalFilter(query) &&
88-
metrics.createConversionRate({ meta: { showOnHover: true } })
88+
metrics.createConversionRate()
8989
].filter((metric) => !!metric)
9090
}
9191

@@ -127,7 +127,7 @@ function Cities({ query, site, afterFetchData }) {
127127
!hasConversionGoalFilter(query) &&
128128
metrics.createPercentage({ meta: { showOnHover: true } }),
129129
hasConversionGoalFilter(query) &&
130-
metrics.createConversionRate({ meta: { showOnHover: true } })
130+
metrics.createConversionRate()
131131
].filter((metric) => !!metric)
132132
}
133133

‎assets/js/dashboard/stats/modals/breakdown-modal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export default function BreakdownModal<TListItem extends { name: string }>({
147147
)
148148
},
149149
...breakdownMetrics
150-
.filter((m) => m.key !== 'percentage' && m.key !== 'conversion_rate')
150+
.filter((m) => m.key !== 'percentage')
151151
.map(
152152
(m): ColumnConfiguraton<TListItem> => ({
153153
label: m.renderLabel(query),

‎assets/js/dashboard/stats/pages/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function EntryPages({ afterFetchData }) {
4040
!hasConversionGoalFilter(query) &&
4141
metrics.createPercentage({ meta: { showOnHover: true } }),
4242
hasConversionGoalFilter(query) &&
43-
metrics.createConversionRate({ meta: { showOnHover: true } })
43+
metrics.createConversionRate()
4444
].filter((metric) => !!metric)
4545
}
4646

@@ -89,7 +89,7 @@ function ExitPages({ afterFetchData }) {
8989
!hasConversionGoalFilter(query) &&
9090
metrics.createPercentage({ meta: { showOnHover: true } }),
9191
hasConversionGoalFilter(query) &&
92-
metrics.createConversionRate({ meta: { showOnHover: true } })
92+
metrics.createConversionRate()
9393
].filter((metric) => !!metric)
9494
}
9595

@@ -134,7 +134,7 @@ function TopPages({ afterFetchData }) {
134134
!hasConversionGoalFilter(query) &&
135135
metrics.createPercentage({ meta: { showOnHover: true } }),
136136
hasConversionGoalFilter(query) &&
137-
metrics.createConversionRate({ meta: { showOnHover: true } })
137+
metrics.createConversionRate()
138138
].filter((metric) => !!metric)
139139
}
140140

‎assets/js/dashboard/stats/reports/metric-value.tsx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,6 @@ export default function MetricValue(props: {
8181
? percentageFormatter(percentageValue)
8282
: null
8383

84-
const conversionRateValue = listItem['conversion_rate' as Metric]
85-
const shouldShowConversionRate =
86-
detailedView &&
87-
metric === 'visitors' &&
88-
isRowHovered &&
89-
conversionRateValue != null
90-
const conversionRateFormatter = MetricFormatterShort['conversion_rate']
91-
const conversionRateDisplay = shouldShowConversionRate
92-
? conversionRateFormatter(conversionRateValue)
93-
: null
94-
9584
if (value === null && (!comparison || comparison.value === null)) {
9685
return <span data-testid="metric-value">{displayFormatter(value)}</span>
9786
}
@@ -106,11 +95,6 @@ export default function MetricValue(props: {
10695
{percentageDisplay}
10796
</span>
10897
)}
109-
{conversionRateDisplay && (
110-
<span className="mr-3 text-gray-500 dark:text-gray-400">
111-
{conversionRateDisplay}
112-
</span>
113-
)}
11498
{displayFormatter(value)}
11599
{comparison ? (
116100
<ChangeArrow

‎assets/js/dashboard/stats/sources/source-list.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function AllSources({ afterFetchData }) {
7373
!hasConversionGoalFilter(query) &&
7474
metrics.createPercentage({ meta: { showOnHover: true } }),
7575
hasConversionGoalFilter(query) &&
76-
metrics.createConversionRate({ meta: { showOnHover: true } })
76+
metrics.createConversionRate()
7777
].filter((metric) => !!metric)
7878
}
7979

@@ -112,7 +112,7 @@ function Channels({ onClick, afterFetchData }) {
112112
!hasConversionGoalFilter(query) &&
113113
metrics.createPercentage({ meta: { showOnHover: true } }),
114114
hasConversionGoalFilter(query) &&
115-
metrics.createConversionRate({ meta: { showOnHover: true } })
115+
metrics.createConversionRate()
116116
].filter((metric) => !!metric)
117117
}
118118

@@ -163,7 +163,7 @@ function UTMSources({ tab, afterFetchData }) {
163163
!hasConversionGoalFilter(query) &&
164164
metrics.createPercentage({ meta: { showOnHover: true } }),
165165
hasConversionGoalFilter(query) &&
166-
metrics.createConversionRate({ meta: { showOnHover: true } })
166+
metrics.createConversionRate()
167167
].filter((metric) => !!metric)
168168
}
169169

0 commit comments

Comments
 (0)