jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change(ui) - funnels checking for min two events

Browse source
This commit is contained in:
Shekar Siri 2022-06-24 18:56:39 +02:00
parent fc01ffb6bf
commit 399352dd7f
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
frontend/app/components/Dashboard/components/WidgetForm/WidgetForm.tsx
View file

@ -5,7 +5,7 @@ import { useStore } from 'App/mstore';
import { useObserver } from 'mobx-react-lite';
import { Button, Icon } from 'UI'
import FilterSeries from '../FilterSeries';
import { confirm } from 'UI';
import { confirm, Popup } from 'UI';
import Select from 'Shared/Select'
import { withSiteId, dashboardMetricDetails, metricDetails } from 'App/routes'
import DashboardSelectionModal from '../DashboardSelectionModal/DashboardSelectionModal';
@ -30,7 +30,8 @@ function WidgetForm(props: Props) {
const isFunnel = metric.metricType === 'funnel';
const canAddToDashboard = metric.exists() && dashboards.length > 0;
const canAddSeries = metric.series.length < 3;
const cannotSaveFunnel = isFunnel && !metric.series[0] && metric.series[0].filter.filters.length <= 1;
const eventsLength = useObserver(() => metric.series[0].filter.filters.filter((i: any) => i.isEvent).length)
const cannotSaveFunnel = isFunnel && (!metric.series[0] || eventsLength <= 1);
const writeOption = ({ value, name }: any) => {
value = Array.isArray(value) ? value : value.value
@ -186,13 +187,18 @@ function WidgetForm(props: Props) {
</div>
<div className="form-groups flex items-center justify-between">
<Button
variant="primary"
onClick={onSave}
disabled={isSaving || cannotSaveFunnel}
<Popup
content="Cannot save funnel metric without at least 2 events"
disabled={!cannotSaveFunnel}
>
{metric.exists() ? 'Update' : 'Create'}
</Button>
<Button
variant="primary"
onClick={onSave}
disabled={isSaving || cannotSaveFunnel}
>
{metric.exists() ? 'Update' : 'Create'}
</Button>
</Popup>
<div className="flex items-center">
{metric.exists() && (
<>

1
frontend/app/components/Dashboard/components/WidgetView/WidgetView.tsx
View file

@ -25,7 +25,6 @@ function WidgetView(props: Props) {
const loading = useObserver(() => metricStore.isLoading);
const [expanded, setExpanded] = useState(!metricId || metricId === 'create');
const hasChanged = useObserver(() => widget.hasChanged)
console.log('hasChanged', hasChanged)
const dashboards = useObserver(() => dashboardStore.dashboards);
const dashboard = useObserver(() => dashboards.find((d: any) => d.dashboardId == dashboardId));