fix(ui) - icon button

This commit is contained in:
Shekar Siri 2022-06-23 18:35:37 +02:00
parent 0034a22fd1
commit b22f1488a6
3 changed files with 9 additions and 15 deletions

View file

@ -9,7 +9,7 @@ import {
editSeriesFilter,
} from 'Duck/customMetrics';
import { connect } from 'react-redux';
import { IconButton, Icon } from 'UI';
import { Button, Icon } from 'UI';
import FilterSelection from 'Shared/Filters/FilterSelection';
import SeriesName from './SeriesName';
import cn from 'classnames';
@ -20,7 +20,7 @@ interface Props {
series: any;
edit: typeof edit;
updateSeries: typeof updateSeries;
onRemoveSeries: (seriesIndex) => void;
onRemoveSeries: (seriesIndex: any) => void;
canDelete?: boolean;
addSeriesFilterFilter: typeof addSeriesFilterFilter;
editSeriesFilterFilter: typeof editSeriesFilterFilter;
@ -38,19 +38,19 @@ function FilterSeries(props: Props) {
useEffect(observeChanges, [series.filter]);
const onAddFilter = (filter) => {
const onAddFilter = (filter: any) => {
series.filter.addFilter(filter)
}
const onUpdateFilter = (filterIndex, filter) => {
const onUpdateFilter = (filterIndex: any, filter: any) => {
series.filter.updateFilter(filterIndex, filter)
}
const onChangeEventsOrder = (e, { name, value }) => {
const onChangeEventsOrder = (e, { name, value }: any) => {
series.filter.updateKey(name, value)
}
const onRemoveFilter = (filterIndex) => {
const onRemoveFilter = (filterIndex: any) => {
series.filter.removeFilter(filterIndex)
}
@ -92,7 +92,7 @@ function FilterSeries(props: Props) {
filter={undefined}
onFilterClick={onAddFilter}
>
<IconButton primaryText label="ADD STEP" icon="plus" />
<Button variant="text-primary" icon="plus">ADD STEP</Button>
</FilterSelection>
</div>
</div>

View file

@ -88,10 +88,6 @@ function WidgetForm(props: Props) {
}
}
const onObserveChanges = () => {
// metricStore.fetchMetricChartData(metric);
}
return useObserver(() => (
<div className="p-6">
<div className="form-group">
@ -177,14 +173,12 @@ function WidgetForm(props: Props) {
hideHeader={ isTable }
seriesIndex={index}
series={series}
// onRemoveSeries={() => removeSeries(index)}
onRemoveSeries={() => metric.removeSeries(index)}
canDelete={metric.series.length > 1}
emptyMessage={isTable ?
'Filter data using any event or attribute. Use Add Step button below to do so.' :
'Add user event or filter to define the series by clicking Add Step.'
}
// observeChanges={onObserveChanges}
/>
</div>
))}

View file

@ -38,10 +38,9 @@ export interface IWidget {
page: number
limit: number
params: any
period: any
hasChanges: boolean
updateKey(key: string, value: any): void
removeSeries(index: number): void
@ -81,6 +80,7 @@ export default class Widget implements IWidget {
params: any = { density: 70 }
period: any = Period({ rangeName: LAST_24_HOURS }) // temp value in detail view
hasChanges: boolean = false
sessionsLoading: boolean = false