From 4e274cb30ee863e9ecb643029c71982a064e599c Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Tue, 3 Dec 2024 11:19:11 +0100 Subject: [PATCH] ui: change new series btn --- .../components/WidgetForm/WidgetFormNew.tsx | 58 ++++--------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx b/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx index ee7284d7a..edf218709 100644 --- a/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx +++ b/frontend/app/components/Dashboard/components/WidgetForm/WidgetFormNew.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Card, Space, Typography, Button, Alert, Form } from 'antd'; -import { FilterList } from 'Shared/Filters/FilterList'; +import { Card, Space, Button, Alert, Form } from 'antd'; import { useStore } from 'App/mstore'; import { eventKeys } from 'Types/filter/newFilter'; @@ -14,31 +13,25 @@ import { USER_PATH } from 'App/constants/card'; import FilterSeries from 'Components/Dashboard/components/FilterSeries/FilterSeries'; -import { issueCategories, metricOf } from 'App/constants/filterOptions'; -import { AudioWaveform, ChevronDown, ChevronUp, PlusIcon } from 'lucide-react'; +import { issueCategories } from 'App/constants/filterOptions'; +import { PlusIcon } from 'lucide-react'; import { observer } from 'mobx-react-lite'; -import AddStepButton from 'Components/Dashboard/components/FilterSeries/AddStepButton'; import FilterItem from 'Shared/Filters/FilterItem'; import { FilterKey } from 'Types/filter/filterType'; import Select from 'Shared/Select'; function WidgetFormNew() { - const { metricStore, dashboardStore, aiFiltersStore } = useStore(); + const { metricStore } = useStore(); const metric: any = metricStore.instance; - const eventsLength = metric.series[0].filter.filters.filter((i: any) => i && i.isEvent).length; - const filtersLength = metric.series[0].filter.filters.filter((i: any) => i && !i.isEvent).length; const isClickMap = metric.metricType === HEATMAP; const isPathAnalysis = metric.metricType === USER_PATH; const excludeFilterKeys = isClickMap || isPathAnalysis ? eventKeys : []; - const hasFilters = filtersLength > 0 || eventsLength > 0; const isPredefined = metric.metricType === ERRORS return isPredefined ? : ( - {/*{!hasFilters && ()}*/} - {/*{hasFilters && ()}*/} ); @@ -57,31 +50,6 @@ const FilterSection = observer(({ metric, excludeFilterKeys }: any) => { const isSingleSeries = isTable || isFunnel || isClickMap || isInsights || isRetention; - const onUpdateFilter = (filterIndex: any, filter: any) => { - metric.series[0].filter.updateFilter(filterIndex, filter); - metric.updateKey('hasChanged', true) - }; - - const onFilterMove = (newFilters: any) => { - metric.series[0].filter.replaceFilters(newFilters.toArray()); - metric.updateKey('hasChanged', true) - }; - - const onChangeEventsOrder = (_: any, { name, value }: any) => { - metric.series[0].filter.updateKey(name, value); - metric.updateKey('hasChanged', true) - }; - - const onRemoveFilter = (filterIndex: any) => { - metric.series[0].filter.removeFilter(filterIndex); - metric.updateKey('hasChanged', true) - }; - - const onAddFilter = (filter: any) => { - metric.series[0].filter.addFilter(filter); - metric.updateKey('hasChanged', true) - } - return ( <> {metric.series.length > 0 && @@ -120,20 +88,16 @@ const FilterSection = observer(({ metric, excludeFilterKeys }: any) => { styles={{ body: { padding: '4px' } }} className="rounded-xl shadow-sm mb-2" > - + + Add Series + )} @@ -207,7 +171,7 @@ const InsightsFilter = observer(({ metric, writeOption }: any) => { }); const AdditionalFilters = observer(() => { - const { metricStore, dashboardStore, aiFiltersStore } = useStore(); + const { metricStore } = useStore(); const metric: any = metricStore.instance; const writeOption = ({ value, name }: { value: any; name: any }) => {