diff --git a/frontend/app/components/Dashboard/components/DashboardList/NewDashModal/SelectCard.tsx b/frontend/app/components/Dashboard/components/DashboardList/NewDashModal/SelectCard.tsx index 1804e029f..0d6431479 100644 --- a/frontend/app/components/Dashboard/components/DashboardList/NewDashModal/SelectCard.tsx +++ b/frontend/app/components/Dashboard/components/DashboardList/NewDashModal/SelectCard.tsx @@ -6,7 +6,7 @@ import { CARD_LIST, CARD_CATEGORIES, CardType } from './ExampleCards'; import { useStore } from 'App/mstore'; import Option from './Option'; import CardsLibrary from 'Components/Dashboard/components/DashboardList/NewDashModal/CardsLibrary'; -import { FUNNEL } from 'App/constants/card'; +import { FUNNEL, TABLE } from 'App/constants/card'; import { useHistory } from 'react-router'; import { FilterKey } from 'Types/filter/filterType'; import FilterSeries from '@/mstore/types/filterSeries'; @@ -72,9 +72,18 @@ const SelectCard: React.FC = (props: SelectCardProps) => { name: "Series 1", filter: { filters: selectedCard.filters, + eventsOrder: selectedCard.cardType === TABLE ? 'and' : 'then' } }) ]; + } else if (selectedCard.cardType === TABLE) { + cardData.series = [new FilterSeries().fromJson({ + name: "Series 1", + filter: { + filters: [], + eventsOrder: 'and' + } + })]; } if (selectedCard.cardType === FUNNEL) { diff --git a/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx b/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx index 965a515e2..48a81c87b 100644 --- a/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx +++ b/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx @@ -11,7 +11,7 @@ import useIsMounted from 'App/hooks/useIsMounted'; import AnimatedSVG, {ICONS} from 'Shared/AnimatedSVG/AnimatedSVG'; import {numberWithCommas} from 'App/utils'; import {HEATMAP} from 'App/constants/card'; -import {Tag} from 'antd'; +import { Tag, Typography } from 'antd'; interface Props { className?: string; @@ -75,7 +75,7 @@ function WidgetSessions(props: Props) { setLoading(false); }); }; - + const fetchClickmapSessions = (customFilters: Record) => { sessionStore.getSessions(customFilters).then((data) => { setData([{...data, seriesId: 1, seriesName: 'Clicks'}]); @@ -148,7 +148,13 @@ function WidgetSessions(props: Props) { {hasFilters && widget.metricType === 'table' && -
{filterText}
} +
+ + + {filterText} + + +
}
diff --git a/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx b/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx index b68711e86..bbf5f19aa 100644 --- a/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx +++ b/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx @@ -194,6 +194,9 @@ const FilterAutoComplete: React.FC = ({ const data = await searchService.fetchAutoCompleteValues({ ..._params, q: inputValue }); const _options = data.map((i: any) => ({ value: i.value, label: i.value })) || []; setOptions(_options); + if (inputRef.current === document.activeElement) { + setMenuIsOpen(true); + } callback(_options); } catch (e) { throw new Error(e); diff --git a/frontend/app/mstore/filterStore.ts b/frontend/app/mstore/filterStore.ts index 3ffd9023c..fa67bae39 100644 --- a/frontend/app/mstore/filterStore.ts +++ b/frontend/app/mstore/filterStore.ts @@ -20,6 +20,7 @@ export default class FilterStore { } setTopValues = (key: string, values: TopValue[]) => { + if(!Array.isArray(values)) return; this.topValues[key] = values?.filter((value) => value !== null && value.value !== ''); }; diff --git a/scripts/helmcharts/openreplay/charts/frontend/Chart.yaml b/scripts/helmcharts/openreplay/charts/frontend/Chart.yaml index e015da529..13531203d 100644 --- a/scripts/helmcharts/openreplay/charts/frontend/Chart.yaml +++ b/scripts/helmcharts/openreplay/charts/frontend/Chart.yaml @@ -18,4 +18,4 @@ version: 0.1.10 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -AppVersion: "v1.21.31" +AppVersion: "v1.21.32"