-
Notifications
You must be signed in to change notification settings - Fork 8.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[App Search] Convert Analytics views to new page template #102851
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
...arch/public/applications/app_search/components/analytics/components/analytics_filters.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import React, { useState } from 'react'; | ||
|
|
||
| import { useValues } from 'kea'; | ||
| import moment from 'moment'; | ||
| import queryString from 'query-string'; | ||
|
|
||
| import { | ||
| EuiFlexGroup, | ||
| EuiFlexItem, | ||
| EuiSelect, | ||
| EuiDatePickerRange, | ||
| EuiDatePicker, | ||
| EuiButton, | ||
| } from '@elastic/eui'; | ||
| import { i18n } from '@kbn/i18n'; | ||
|
|
||
| import { AnalyticsLogic } from '../'; | ||
| import { KibanaLogic } from '../../../../shared/kibana'; | ||
|
|
||
| import { DEFAULT_START_DATE, DEFAULT_END_DATE, SERVER_DATE_FORMAT } from '../constants'; | ||
| import { convertTagsToSelectOptions } from '../utils'; | ||
|
|
||
| export const AnalyticsFilters: React.FC = () => { | ||
| const { allTags } = useValues(AnalyticsLogic); | ||
| const { history } = useValues(KibanaLogic); | ||
|
|
||
| // Parse out existing filters from URL query string | ||
| const { start, end, tag } = queryString.parse(history.location.search); | ||
| const [startDate, setStartDate] = useState( | ||
| start ? moment(start, SERVER_DATE_FORMAT) : moment(DEFAULT_START_DATE) | ||
| ); | ||
| const [endDate, setEndDate] = useState( | ||
| end ? moment(end, SERVER_DATE_FORMAT) : moment(DEFAULT_END_DATE) | ||
| ); | ||
| const [currentTag, setCurrentTag] = useState((tag as string) || ''); | ||
|
|
||
| // Set the current URL query string on filter | ||
| const onApplyFilters = () => { | ||
| const search = queryString.stringify({ | ||
| start: moment(startDate).format(SERVER_DATE_FORMAT), | ||
| end: moment(endDate).format(SERVER_DATE_FORMAT), | ||
| tag: currentTag || undefined, | ||
| }); | ||
| history.push({ search }); | ||
| }; | ||
|
|
||
| const hasInvalidDateRange = startDate > endDate; | ||
|
|
||
| return ( | ||
| <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="m"> | ||
| <EuiFlexItem> | ||
| <EuiSelect | ||
| options={convertTagsToSelectOptions(allTags)} | ||
| value={currentTag} | ||
| onChange={(e) => setCurrentTag(e.target.value)} | ||
| aria-label={i18n.translate( | ||
| 'xpack.enterpriseSearch.appSearch.engine.analytics.filters.tagAriaLabel', | ||
| { defaultMessage: 'Filter by analytics tag"' } | ||
| )} | ||
| fullWidth | ||
| /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem> | ||
| <EuiDatePickerRange | ||
| startDateControl={ | ||
| <EuiDatePicker | ||
| selected={startDate} | ||
| onChange={(date) => date && setStartDate(date)} | ||
| startDate={startDate} | ||
| endDate={endDate} | ||
| isInvalid={hasInvalidDateRange} | ||
| aria-label={i18n.translate( | ||
| 'xpack.enterpriseSearch.appSearch.engine.analytics.filters.startDateAriaLabel', | ||
| { defaultMessage: 'Filter by start date' } | ||
| )} | ||
| /> | ||
| } | ||
| endDateControl={ | ||
| <EuiDatePicker | ||
| selected={endDate} | ||
| onChange={(date) => date && setEndDate(date)} | ||
| startDate={startDate} | ||
| endDate={endDate} | ||
| isInvalid={hasInvalidDateRange} | ||
| aria-label={i18n.translate( | ||
| 'xpack.enterpriseSearch.appSearch.engine.analytics.filters.endDateAriaLabel', | ||
| { defaultMessage: 'Filter by end date' } | ||
| )} | ||
| /> | ||
| } | ||
| fullWidth | ||
| /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem grow={false}> | ||
| <EuiButton fill isDisabled={hasInvalidDateRange} onClick={onApplyFilters}> | ||
| {i18n.translate( | ||
| 'xpack.enterpriseSearch.appSearch.engine.analytics.filters.applyButtonLabel', | ||
| { defaultMessage: 'Apply filters' } | ||
| )} | ||
| </EuiButton> | ||
| </EuiFlexItem> | ||
| </EuiFlexGroup> | ||
| ); | ||
| }; |
15 changes: 0 additions & 15 deletions
15
...arch/public/applications/app_search/components/analytics/components/analytics_header.scss
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[non-blocking] It was a little confusing seeing that a
pageChromeparameter accepted breadcrumbs as a parameter. I would have expected the parameter to be named something likebreadcrumbs.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't forget it's setting the document title too, which is very important 😄 That's why it's not just
breadcrumbs, although maybe I should clarify the typing on that