Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix: has_not_done breakdown modals (#5009)
Karl-Aksel Puulmannab77402f7ece
diff --git a/assets/js/dashboard/query.ts b/assets/js/dashboard/query.tsindex cb34a23664..424fac127a 100644--- a/assets/js/dashboard/query.ts+++ b/assets/js/dashboard/query.ts@@ -76,11 +76,15 @@ export function postProcessFilters(filters: Array<Filter>): Array<Filter> {// goals with the same currency. Used to decide whether to render// revenue metrics in a dashboard report or not.export function revenueAvailable(query: DashboardQuery, site: PlausibleSite) {- const revenueGoalsInFilter = site.revenueGoals.filter((rg) => {+ const revenueGoalsInFilter = site.revenueGoals.filter((revenueGoal) => {const goalFilters: Filter[] = getFiltersByKeyPrefix(query, 'goal')- return goalFilters.some(([_op, _key, clauses]) => {- return clauses.includes(rg.display_name)+ return goalFilters.some(([operation, _key, clauses]) => {+ return (+ [FILTER_OPERATIONS.is, FILTER_OPERATIONS.contains].includes(+ operation+ ) && clauses.includes(revenueGoal.display_name)+ )})})diff --git a/assets/js/dashboard/stats/behaviours/goal-conversions.js b/assets/js/dashboard/stats/behaviours/goal-conversions.jsindex 11fe75b4aa..5be1569a54 100644--- a/assets/js/dashboard/stats/behaviours/goal-conversions.js+++ b/assets/js/dashboard/stats/behaviours/goal-conversions.js@@ -4,7 +4,7 @@ import ListReport from "../reports/list"import * as metrics from '../reports/metrics'import * as url from "../../util/url"import * as api from "../../api"-import { EVENT_PROPS_PREFIX, getGoalFilter } from "../../util/filters"+import { EVENT_PROPS_PREFIX, getGoalFilter, FILTER_OPERATIONS } from "../../util/filters"import { useSiteContext } from "../../site-context"import { useQueryContext } from "../../query-context"import { customPropsRoute } from "../../router"@@ -22,8 +22,8 @@ function getSpecialGoal(query) {if (!goalFilter) {return null}- const [_operation, _filterKey, clauses] = goalFilter- if (clauses.length == 1) {+ const [operation, _filterKey, clauses] = goalFilter+ if (operation === FILTER_OPERATIONS.is && clauses.length == 1) {return SPECIAL_GOALS[clauses[0]] || null}return nulldiff --git a/assets/js/dashboard/stats/behaviours/index.js b/assets/js/dashboard/stats/behaviours/index.jsindex f1ccfcd25e..62634d8130 100644--- a/assets/js/dashboard/stats/behaviours/index.js+++ b/assets/js/dashboard/stats/behaviours/index.js@@ -7,7 +7,7 @@ import ImportedQueryUnsupportedWarning from '../imported-query-unsupported-warniimport GoalConversions, { specialTitleWhenGoalFilter, SPECIAL_GOALS } from './goal-conversions'import Properties from './props'import { FeatureSetupNotice } from '../../components/notice'-import { hasGoalFilter } from '../../util/filters'+import { hasConversionGoalFilter } from '../../util/filters'import { useSiteContext } from '../../site-context'import { useQueryContext } from '../../query-context'import { useUserContext } from '../../user-context'@@ -70,13 +70,13 @@ export default function Behaviours({ importedDataInView }) {}, [])useEffect(() => {- const justRemovedGoalFilter = !hasGoalFilter(query)+ const justRemovedGoalFilter = !hasConversionGoalFilter(query)if (mode === PROPS && justRemovedGoalFilter && showingPropsForGoalFilter) {setShowingPropsForGoalFilter(false)setMode(CONVERSIONS)}// eslint-disable-next-line react-hooks/exhaustive-deps- }, [hasGoalFilter(query)])+ }, [hasConversionGoalFilter(query)])useEffect(() => {setMode(defaultMode())diff --git a/assets/js/dashboard/stats/behaviours/props.js b/assets/js/dashboard/stats/behaviours/props.jsindex 2f61140ba5..4a76f44466 100644--- a/assets/js/dashboard/stats/behaviours/props.js+++ b/assets/js/dashboard/stats/behaviours/props.js@@ -5,7 +5,7 @@ import * as metrics from '../reports/metrics';import * as api from '../../api';import * as url from '../../util/url';import * as storage from "../../util/storage";-import { EVENT_PROPS_PREFIX, getGoalFilter, FILTER_OPERATIONS, hasGoalFilter } from "../../util/filters";+import { EVENT_PROPS_PREFIX, getGoalFilter, FILTER_OPERATIONS, hasConversionGoalFilter } from "../../util/filters";import classNames from "classnames";import { useQueryContext } from "../../query-context";import { useSiteContext } from "../../site-context";@@ -95,8 +95,8 @@ export default function Properties({ afterFetchData }) {return [metrics.createVisitors({ renderLabel: (_query) => "Visitors", meta: { plot: true } }),metrics.createEvents({ renderLabel: (_query) => "Events", meta: { hiddenOnMobile: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),- !hasGoalFilter(query) && metrics.createPercentage(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),+ !hasConversionGoalFilter(query) && metrics.createPercentage(),BUILD_EXTRA && metrics.createTotalRevenue({ meta: { hiddenOnMobile: true } }),BUILD_EXTRA && metrics.createAverageRevenue({ meta: { hiddenOnMobile: true } })].filter(metric => !!metric)diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.jsindex ab8ec720f5..fcd99216c9 100644--- a/assets/js/dashboard/stats/devices/index.js+++ b/assets/js/dashboard/stats/devices/index.js@@ -1,6 +1,6 @@import React, { useEffect, useState } from 'react';import * as storage from '../../util/storage';-import { getFiltersByKeyPrefix, hasGoalFilter, isFilteringOnFixedValue } from '../../util/filters';+import { getFiltersByKeyPrefix, hasConversionGoalFilter, isFilteringOnFixedValue } from '../../util/filters';import ListReport from '../reports/list';import * as metrics from '../reports/metrics';import * as api from '../../api';@@ -71,8 +71,8 @@ function Browsers({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),- !hasGoalFilter(query) && metrics.createPercentage()+ hasConversionGoalFilter(query) && metrics.createConversionRate(),+ !hasConversionGoalFilter(query) && metrics.createPercentage()].filter(metric => !!metric)}@@ -113,8 +113,8 @@ function BrowserVersions({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),- !hasGoalFilter(query) && metrics.createPercentage()+ hasConversionGoalFilter(query) && metrics.createConversionRate(),+ !hasConversionGoalFilter(query) && metrics.createPercentage()].filter(metric => !!metric)}@@ -180,8 +180,8 @@ function OperatingSystems({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),- !hasGoalFilter(query) && metrics.createPercentage({ meta: { hiddenonMobile: true } })+ hasConversionGoalFilter(query) && metrics.createConversionRate(),+ !hasConversionGoalFilter(query) && metrics.createPercentage({ meta: { hiddenonMobile: true } })].filter(metric => !!metric)}@@ -227,8 +227,8 @@ function OperatingSystemVersions({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),- !hasGoalFilter(query) && metrics.createPercentage()+ hasConversionGoalFilter(query) && metrics.createConversionRate(),+ !hasConversionGoalFilter(query) && metrics.createPercentage()].filter(metric => !!metric)}@@ -268,8 +268,8 @@ function ScreenSizes({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),- !hasGoalFilter(query) && metrics.createPercentage()+ hasConversionGoalFilter(query) && metrics.createConversionRate(),+ !hasConversionGoalFilter(query) && metrics.createPercentage()].filter(metric => !!metric)}diff --git a/assets/js/dashboard/stats/graph/graph-util.js b/assets/js/dashboard/stats/graph/graph-util.jsindex ee5b6a83dd..f80d105e78 100644--- a/assets/js/dashboard/stats/graph/graph-util.js+++ b/assets/js/dashboard/stats/graph/graph-util.js@@ -1,9 +1,9 @@-import { getFiltersByKeyPrefix, hasGoalFilter } from '../../util/filters'+import { getFiltersByKeyPrefix, hasConversionGoalFilter } from '../../util/filters'import { revenueAvailable } from '../../query'export function getGraphableMetrics(query, site) {const isRealtime = query.period === 'realtime'- const isGoalFilter = hasGoalFilter(query)+ const isGoalFilter = hasConversionGoalFilter(query)const isPageFilter = getFiltersByKeyPrefix(query, "page").length > 0if (isRealtime && isGoalFilter) {diff --git a/assets/js/dashboard/stats/graph/line-graph.js b/assets/js/dashboard/stats/graph/line-graph.jsindex 6c0b1e3a9a..9b5db4db60 100644--- a/assets/js/dashboard/stats/graph/line-graph.js+++ b/assets/js/dashboard/stats/graph/line-graph.js@@ -7,7 +7,7 @@ import { buildDataSet, METRIC_LABELS } from './graph-util'import dateFormatter from './date-formatter';import FadeIn from '../../fade-in';import classNames from 'classnames';-import { hasGoalFilter } from '../../util/filters';+import { hasConversionGoalFilter } from '../../util/filters';import { MetricFormatterShort } from '../reports/metric-formatter'const calculateMaximumY = function(dataset) {@@ -32,7 +32,7 @@ class LineGraph extends React.Component {getGraphMetric() {let metric = this.props.graphData.metric- if (metric == 'visitors' && hasGoalFilter(this.props.query)) {+ if (metric == 'visitors' && hasConversionGoalFilter(this.props.query)) {return 'conversions'} else {return metricdiff --git a/assets/js/dashboard/stats/locations/index.js b/assets/js/dashboard/stats/locations/index.jsindex 886ed245de..932609abba 100644--- a/assets/js/dashboard/stats/locations/index.js+++ b/assets/js/dashboard/stats/locations/index.js@@ -7,7 +7,7 @@ import * as api from '../../api';import { apiPath } from '../../util/url';import ListReport from '../reports/list';import * as metrics from '../reports/metrics';-import { hasGoalFilter, getFiltersByKeyPrefix } from '../../util/filters';+import { hasConversionGoalFilter, getFiltersByKeyPrefix } from '../../util/filters';import ImportedQueryUnsupportedWarning from '../imported-query-unsupported-warning';import { citiesRoute, countriesRoute, regionsRoute } from '../../router';import { useQueryContext } from '../../query-context';@@ -33,7 +33,7 @@ function Countries({ query, site, onClick, afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: {plot: true}}),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}@@ -72,7 +72,7 @@ function Regions({ query, site, onClick, afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: {plot: true}}),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}@@ -111,7 +111,7 @@ function Cities({ query, site, afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: {plot: true}}),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}diff --git a/assets/js/dashboard/stats/modals/devices/choose-metrics.js b/assets/js/dashboard/stats/modals/devices/choose-metrics.jsindex 9deebb8f99..b2ca3b8a04 100644--- a/assets/js/dashboard/stats/modals/devices/choose-metrics.js+++ b/assets/js/dashboard/stats/modals/devices/choose-metrics.js@@ -1,8 +1,8 @@-import { hasGoalFilter, isRealTimeDashboard } from "../../../util/filters";+import { hasConversionGoalFilter, isRealTimeDashboard } from "../../../util/filters";import * as metrics from '../../reports/metrics'export default function chooseMetrics(query) {- if (hasGoalFilter(query)) {+ if (hasConversionGoalFilter(query)) {return [metrics.createTotalVisitors(),metrics.createVisitors({ renderLabel: (_query) => 'Conversions', width: 'w-28' }),@@ -23,4 +23,4 @@ export default function chooseMetrics(query) {metrics.createBounceRate(),metrics.createVisitDuration()]-}\ No newline at end of file+}diff --git a/assets/js/dashboard/stats/modals/entry-pages.js b/assets/js/dashboard/stats/modals/entry-pages.jsindex 79963046fb..77c5364dd1 100644--- a/assets/js/dashboard/stats/modals/entry-pages.js+++ b/assets/js/dashboard/stats/modals/entry-pages.js@@ -1,6 +1,6 @@import React, { useCallback } from "react";import Modal from './modal'-import { hasGoalFilter, isRealTimeDashboard } from "../../util/filters";+import { hasConversionGoalFilter, isRealTimeDashboard } from "../../util/filters";import { addFilter } from '../../query'import BreakdownModal from "./breakdown-modal";import * as metrics from '../reports/metrics'@@ -33,7 +33,7 @@ function EntryPagesModal() {}, [reportInfo.dimension])function chooseMetrics() {- if (hasGoalFilter(query)) {+ if (hasConversionGoalFilter(query)) {return [metrics.createTotalVisitors(),metrics.createVisitors({ renderLabel: (_query) => 'Conversions', width: 'w-28' }),diff --git a/assets/js/dashboard/stats/modals/exit-pages.js b/assets/js/dashboard/stats/modals/exit-pages.jsindex 413c890568..57e6568d85 100644--- a/assets/js/dashboard/stats/modals/exit-pages.js+++ b/assets/js/dashboard/stats/modals/exit-pages.js@@ -1,6 +1,6 @@import React, { useCallback } from "react";import Modal from './modal'-import { hasGoalFilter } from "../../util/filters";+import { hasConversionGoalFilter } from "../../util/filters";import { addFilter } from '../../query'import BreakdownModal from "./breakdown-modal";import * as metrics from '../reports/metrics'@@ -33,7 +33,7 @@ function ExitPagesModal() {}, [reportInfo.dimension])function chooseMetrics() {- if (hasGoalFilter(query)) {+ if (hasConversionGoalFilter(query)) {return [metrics.createTotalVisitors(),metrics.createVisitors({ renderLabel: (_query) => 'Conversions', width: 'w-28' }),diff --git a/assets/js/dashboard/stats/modals/locations-modal.js b/assets/js/dashboard/stats/modals/locations-modal.jsindex bfdd471b97..5563484e73 100644--- a/assets/js/dashboard/stats/modals/locations-modal.js+++ b/assets/js/dashboard/stats/modals/locations-modal.js@@ -1,7 +1,7 @@import React, { useCallback } from "react";import Modal from "./modal";-import { hasGoalFilter } from "../../util/filters";+import { hasConversionGoalFilter } from "../../util/filters";import BreakdownModal from "./breakdown-modal";import * as metrics from "../reports/metrics";import * as url from "../../util/url";@@ -36,7 +36,7 @@ function LocationsModal({ currentView }) {}, [reportInfo.dimension])function chooseMetrics() {- if (hasGoalFilter(query)) {+ if (hasConversionGoalFilter(query)) {return [metrics.createTotalVisitors(),metrics.createVisitors({ renderLabel: (_query) => 'Conversions', width: 'w-28' }),diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.jsindex e9521f9774..6129fe444c 100644--- a/assets/js/dashboard/stats/modals/pages.js+++ b/assets/js/dashboard/stats/modals/pages.js@@ -1,6 +1,6 @@import React, {useCallback} from "react";import Modal from './modal'-import { hasGoalFilter, isRealTimeDashboard } from "../../util/filters";+import { hasConversionGoalFilter, isRealTimeDashboard } from "../../util/filters";import { addFilter } from '../../query'import BreakdownModal from "./breakdown-modal";import * as metrics from '../reports/metrics'@@ -33,7 +33,7 @@ function PagesModal() {}, [reportInfo.dimension])function chooseMetrics() {- if (hasGoalFilter(query)) {+ if (hasConversionGoalFilter(query)) {return [metrics.createTotalVisitors(),metrics.createVisitors({renderLabel: (_query) => 'Conversions', width: 'w-28'}),diff --git a/assets/js/dashboard/stats/modals/props.js b/assets/js/dashboard/stats/modals/props.jsindex a131e8a438..62de2ad820 100644--- a/assets/js/dashboard/stats/modals/props.js+++ b/assets/js/dashboard/stats/modals/props.js@@ -4,7 +4,7 @@ import { useParams } from "react-router-dom";import Modal from './modal'import { addFilter, revenueAvailable } from '../../query'import { specialTitleWhenGoalFilter } from "../behaviours/goal-conversions";-import { EVENT_PROPS_PREFIX, hasGoalFilter } from "../../util/filters"+import { EVENT_PROPS_PREFIX, hasConversionGoalFilter } from "../../util/filters"import BreakdownModal from "./breakdown-modal";import * as metrics from "../reports/metrics";import * as url from "../../util/url";@@ -43,8 +43,8 @@ function PropsModal() {return [metrics.createVisitors({ renderLabel: (_query) => "Visitors" }),metrics.createEvents({ renderLabel: (_query) => "Events" }),- hasGoalFilter(query) && metrics.createConversionRate(),- !hasGoalFilter(query) && metrics.createPercentage(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),+ !hasConversionGoalFilter(query) && metrics.createPercentage(),showRevenueMetrics && metrics.createAverageRevenue(),showRevenueMetrics && metrics.createTotalRevenue(),].filter(metric => !!metric)diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.jsindex 264e1d5454..23ee6ec5f3 100644--- a/assets/js/dashboard/stats/modals/referrer-drilldown.js+++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js@@ -2,7 +2,7 @@ import React, { useCallback } from 'react'import { useParams } from 'react-router-dom';import Modal from './modal'-import { hasGoalFilter, isRealTimeDashboard } from "../../util/filters";+import { hasConversionGoalFilter, isRealTimeDashboard } from "../../util/filters";import BreakdownModal from "./breakdown-modal";import * as metrics from "../reports/metrics";import * as url from "../../util/url";@@ -37,7 +37,7 @@ function ReferrerDrilldownModal() {}, [reportInfo.dimension])function chooseMetrics() {- if (hasGoalFilter(query)) {+ if (hasConversionGoalFilter(query)) {return [metrics.createTotalVisitors(),metrics.createVisitors({ renderLabel: (_query) => 'Conversions', width: 'w-28' }),diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.jsindex 3fd0006c71..d78cec9382 100644--- a/assets/js/dashboard/stats/modals/sources.js+++ b/assets/js/dashboard/stats/modals/sources.js@@ -1,6 +1,6 @@import React, { useCallback } from "react";import Modal from './modal'-import { hasGoalFilter, isRealTimeDashboard } from "../../util/filters";+import { hasConversionGoalFilter, isRealTimeDashboard } from "../../util/filters";import BreakdownModal from "./breakdown-modal";import * as metrics from "../reports/metrics";import * as url from "../../util/url";@@ -61,7 +61,7 @@ function SourcesModal({ currentView }) {}, [reportInfo.dimension])function chooseMetrics() {- if (hasGoalFilter(query)) {+ if (hasConversionGoalFilter(query)) {return [metrics.createTotalVisitors(),metrics.createVisitors({ renderLabel: (_query) => 'Conversions', width: 'w-28' }),diff --git a/assets/js/dashboard/stats/pages/index.js b/assets/js/dashboard/stats/pages/index.jsindex 7430c702e6..6f80f1ac77 100644--- a/assets/js/dashboard/stats/pages/index.js+++ b/assets/js/dashboard/stats/pages/index.js@@ -6,7 +6,7 @@ import * as api from '../../api';import ListReport from './../reports/list';import * as metrics from './../reports/metrics';import ImportedQueryUnsupportedWarning from '../imported-query-unsupported-warning';-import { hasGoalFilter } from '../../util/filters';+import { hasConversionGoalFilter } from '../../util/filters';import { useQueryContext } from '../../query-context';import { useSiteContext } from '../../site-context';import { entryPagesRoute, exitPagesRoute, topPagesRoute } from '../../router';@@ -32,7 +32,7 @@ function EntryPages({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ defaultLabel: 'Unique Entrances', width: 'w-36', meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}@@ -71,7 +71,7 @@ function ExitPages({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ defaultLabel: 'Unique Exits', width: 'w-36', meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}@@ -110,7 +110,7 @@ function TopPages({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}diff --git a/assets/js/dashboard/stats/reports/list.js b/assets/js/dashboard/stats/reports/list.jsindex b0cea772f7..a4bafc1ed7 100644--- a/assets/js/dashboard/stats/reports/list.js+++ b/assets/js/dashboard/stats/reports/list.js@@ -14,7 +14,7 @@ import {cleanLabels,replaceFilterByPrefix,isRealTimeDashboard,- hasGoalFilter+ hasConversionGoalFilter} from '../../util/filters'import { plainFilterText } from '../../util/filter-text'import { useQueryContext } from '../../query-context'@@ -152,7 +152,7 @@ export default function ListReport({const [visible, setVisible] = useState(false)const isRealtime = isRealTimeDashboard(query)- const goalFilterApplied = hasGoalFilter(query)+ const goalFilterApplied = hasConversionGoalFilter(query)const getData = useCallback(() => {if (!isRealtime) {diff --git a/assets/js/dashboard/stats/reports/metrics.js b/assets/js/dashboard/stats/reports/metrics.jsindex 816080efc8..b906e5018a 100644--- a/assets/js/dashboard/stats/reports/metrics.js+++ b/assets/js/dashboard/stats/reports/metrics.js@@ -2,7 +2,7 @@import React from 'react'import MetricValue from './metric-value'-import { hasGoalFilter } from '../../util/filters'+import { hasConversionGoalFilter } from '../../util/filters'// Class representation of a metric.@@ -79,7 +79,7 @@ export const createVisitors = (props) => {if (query.period === 'realtime') {return realtimeLabel}- if (query && hasGoalFilter(query)) {+ if (query && hasConversionGoalFilter(query)) {return goalFilterLabel}return defaultLabeldiff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.jsindex 9f49e07623..d21324d8ef 100644--- a/assets/js/dashboard/stats/sources/referrer-list.js+++ b/assets/js/dashboard/stats/sources/referrer-list.js@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';import * as api from '../../api';import * as url from '../../util/url';import * as metrics from '../reports/metrics';-import { hasGoalFilter } from "../../util/filters";+import { hasConversionGoalFilter } from "../../util/filters";import ListReport from '../reports/list';import ImportedQueryUnsupportedWarning from '../../stats/imported-query-unsupported-warning';import { useQueryContext } from '../../query-context';@@ -56,7 +56,7 @@ export default function Referrers({ source }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.jsindex 24c810be26..2f0cfd55d9 100644--- a/assets/js/dashboard/stats/sources/source-list.js+++ b/assets/js/dashboard/stats/sources/source-list.js@@ -6,7 +6,7 @@ import * as api from '../../api';import usePrevious from '../../hooks/use-previous';import ListReport from '../reports/list';import * as metrics from '../reports/metrics';-import { getFiltersByKeyPrefix, hasGoalFilter } from "../../util/filters";+import { getFiltersByKeyPrefix, hasConversionGoalFilter } from "../../util/filters";import { Menu, Transition } from '@headlessui/react';import { ChevronDownIcon } from '@heroicons/react/20/solid';import classNames from 'classnames';@@ -50,7 +50,7 @@ function AllSources({ afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}@@ -86,7 +86,7 @@ function Channels({ onClick, afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}@@ -131,7 +131,7 @@ function UTMSources({ tab, afterFetchData }) {function chooseMetrics() {return [metrics.createVisitors({ meta: { plot: true } }),- hasGoalFilter(query) && metrics.createConversionRate(),+ hasConversionGoalFilter(query) && metrics.createConversionRate(),].filter(metric => !!metric)}diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.jsindex eeca12943e..d59b5f7378 100644--- a/assets/js/dashboard/util/filters.js+++ b/assets/js/dashboard/util/filters.js@@ -103,8 +103,12 @@ export function isFilteringOnFixedValue(query, filterKey, expectedValue) {return false}-export function hasGoalFilter(query) {- return getFiltersByKeyPrefix(query, 'goal').length > 0+export function hasConversionGoalFilter(query) {+ const goalFilters = getFiltersByKeyPrefix(query, 'goal')++ return goalFilters.some(([operation, _filterKey, _clauses]) => {+ return operation !== FILTER_OPERATIONS.has_not_done+ })}export function isRealTimeDashboard(query) {