Skip to content
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.

Sign up for GitHub

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

[7.12] [ML] Data Frame Analytics exploration page: filters improvements (#91748) #92210

Merged
merged 1 commit into from
Feb 22, 2021
Merged

[7.12] [ML] Data Frame Analytics exploration page: filters improvements (#91748) #92210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions ...cs/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
* 2.0.
*/

import React, { FC, useEffect, useState } from 'react';
import React, { FC, useEffect, useMemo, useState } from 'react';
import { EuiButtonGroup, EuiCode, EuiFlexGroup, EuiFlexItem, EuiInputPopover } from '@elastic/eui';
import { i18n } from '@kbn/i18n';

import { debounce } from 'lodash';
import { Dictionary } from '../../../../../../../common/types/common';
import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns';
import {
Expand Down Expand Up @@ -59,6 +60,33 @@ export const ExplorationQueryBar: FC<ExplorationQueryBarProps> = ({

const searchChangeHandler = (q: Query) => setSearchInput(q);

const regex = useMemo(() => new RegExp(`${filters?.columnId}\s?:\s?(true|false)`, 'g'), [
filters?.columnId,
]);

/**
* Restoring state from the URL once on load. If a filter option is active
* in the url set the corresponding options button to selected mode.
*/
useEffect(function updateIdToSelectedMap() {
if (filters !== undefined) {
const match: string[] | null = query.query.match(regex);
let filterKeyInEffect: string | undefined;

if (match !== null && match[0].includes('true')) {
// set { training: true }
filterKeyInEffect = Object.keys(filters.key).find((i) => filters.key[i] === true);
} else if (match !== null && match[0].includes('false')) {
// set { testing: true }
filterKeyInEffect = Object.keys(filters.key).find((i) => filters.key[i] === false);
}

if (filterKeyInEffect) {
setIdToSelectedMap({ [filterKeyInEffect]: true });
}
}
}, []);

/**
* Component is responsible for parsing the query string,
* hence it should sync submitted query string.
Expand Down Expand Up @@ -107,11 +135,10 @@ export const ExplorationQueryBar: FC<ExplorationQueryBarProps> = ({
});
};

const handleFilterUpdate = (optionId: string, currentIdToSelectedMap: any) => {
const debouncedHandleFilterUpdate = debounce((optionId: string, currentIdToSelectedMap: any) => {
let newQuery = '';
const filterValue = filters?.key[optionId];
const filterQueryString = `${filters?.columnId}:${filterValue}`;
const regex = new RegExp(`${filters?.columnId}\s?:\s?(true|false)`, 'g');

// Toggling selected optionId to 'off' - remove column id query from filter
if (currentIdToSelectedMap[optionId] === false) {
Expand Down Expand Up @@ -140,7 +167,7 @@ export const ExplorationQueryBar: FC<ExplorationQueryBarProps> = ({

setSearchInput(newSearchInput);
searchSubmitHandler(newSearchInput, true);
};
}, 200);

return (
<EuiInputPopover
Expand Down Expand Up @@ -189,7 +216,7 @@ export const ExplorationQueryBar: FC<ExplorationQueryBarProps> = ({
onChange={(optionId: string) => {
const newIdToSelectedMap = { [optionId]: !idToSelectedMap[optionId] };
setIdToSelectedMap(newIdToSelectedMap);
handleFilterUpdate(optionId, newIdToSelectedMap);
debouncedHandleFilterUpdate(optionId, newIdToSelectedMap);
}}
/>
</EuiFlexItem>
Expand Down