Skip to content

Commit

Permalink
fix conflicst
Browse files Browse the repository at this point in the history
  • Loading branch information
shahzad31 committed Oct 6, 2020
1 parent 07e6eac commit 82ae87c
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions x-pack/plugins/observability/public/pages/overview/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ export function OverviewPage({ routeParams }: Props) {
// read time from state and update the url
const timePickerSharedState = plugins.data.query.timefilter.timefilter.getTime();

const timePickerTime = useKibanaUISettings<TimePickerTime>(UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS);

const timePickerDefaults = useKibanaUISettings<TimePickerTime>(
UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS
);
const relativeTime = {
start: routeParams.query.rangeFrom || timePickerSharedState.from || timePickerDefaults.from,
end: routeParams.query.rangeTo || timePickerSharedState.to || timePickerDefaults.to,
Expand All @@ -64,9 +65,6 @@ export function OverviewPage({ routeParams }: Props) {
const { data: newsFeed } = useFetcher(() => getNewsFeed({ core }), [core]);

const theme = useContext(ThemeContext);
const timePickerDefaults = useKibanaUISettings<TimePickerTime>(
UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS
);

const result = useFetcher(
() => fetchHasData(absoluteTime),
Expand Down

0 comments on commit 82ae87c

Please sign in to comment.