mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 09:48:58 -04:00
[Controls] Delete sync with query bar setting (#131554)
* Delete sync with query bar settings * Removed query sync functional tests
This commit is contained in:
parent
c05f891793
commit
f71e5582b4
2 changed files with 1 additions and 117 deletions
|
@ -14,9 +14,8 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
import { omit } from 'lodash';
|
||||
import fastIsEqual from 'fast-deep-equal';
|
||||
import React, { useCallback, useMemo, useState } from 'react';
|
||||
import React, { useCallback, useState } from 'react';
|
||||
import {
|
||||
EuiFlyoutHeader,
|
||||
EuiButtonGroup,
|
||||
|
@ -31,8 +30,6 @@ import {
|
|||
EuiSpacer,
|
||||
EuiCheckbox,
|
||||
EuiForm,
|
||||
EuiAccordion,
|
||||
useGeneratedHtmlId,
|
||||
EuiSwitch,
|
||||
EuiText,
|
||||
EuiHorizontalRule,
|
||||
|
@ -68,7 +65,6 @@ export const ControlGroupEditor = ({
|
|||
onClose,
|
||||
}: EditControlGroupProps) => {
|
||||
const [resetAllWidths, setResetAllWidths] = useState(false);
|
||||
const advancedSettingsAccordionId = useGeneratedHtmlId({ prefix: 'advancedSettingsAccordion' });
|
||||
|
||||
const [controlGroupEditorState, setControlGroupEditorState] = useState<EditorControlGroupInput>({
|
||||
defaultControlWidth: DEFAULT_CONTROL_WIDTH,
|
||||
|
@ -99,14 +95,6 @@ export const ControlGroupEditor = ({
|
|||
[controlGroupEditorState]
|
||||
);
|
||||
|
||||
const fullQuerySyncActive = useMemo(
|
||||
() =>
|
||||
!Object.values(omit(controlGroupEditorState.ignoreParentSettings, 'ignoreValidations')).some(
|
||||
Boolean
|
||||
),
|
||||
[controlGroupEditorState]
|
||||
);
|
||||
|
||||
const applyChangesToInput = useCallback(() => {
|
||||
const inputToApply = { ...controlGroupEditorState };
|
||||
if (resetAllWidths) {
|
||||
|
@ -177,70 +165,6 @@ export const ControlGroupEditor = ({
|
|||
</>
|
||||
</EuiFormRow>
|
||||
<EuiHorizontalRule margin="m" />
|
||||
<EuiFlexGroup>
|
||||
<EuiFlexItem grow={false}>
|
||||
<EuiSpacer size="xs" />
|
||||
<EuiSwitch
|
||||
label={ControlGroupStrings.management.querySync.getQuerySettingsTitle()}
|
||||
data-test-subj="control-group-query-sync"
|
||||
showLabel={false}
|
||||
checked={fullQuerySyncActive}
|
||||
onChange={(e) => {
|
||||
const newSetting = !e.target.checked;
|
||||
updateIgnoreSetting({
|
||||
ignoreFilters: newSetting,
|
||||
ignoreTimerange: newSetting,
|
||||
ignoreQuery: newSetting,
|
||||
});
|
||||
}}
|
||||
/>
|
||||
</EuiFlexItem>
|
||||
<EuiFlexItem>
|
||||
<EuiTitle size="xxs">
|
||||
<h3>{ControlGroupStrings.management.querySync.getQuerySettingsTitle()}</h3>
|
||||
</EuiTitle>
|
||||
<EuiText size="s">
|
||||
<p>{ControlGroupStrings.management.querySync.getQuerySettingsSubtitle()}</p>
|
||||
</EuiText>
|
||||
<EuiSpacer size="s" />
|
||||
<EuiAccordion
|
||||
data-test-subj="control-group-query-sync-advanced"
|
||||
id={advancedSettingsAccordionId}
|
||||
initialIsOpen={!fullQuerySyncActive}
|
||||
buttonContent={ControlGroupStrings.management.querySync.getAdvancedSettingsTitle()}
|
||||
>
|
||||
<EuiSpacer size="s" />
|
||||
<EuiFormRow hasChildLabel display="columnCompressedSwitch">
|
||||
<EuiSwitch
|
||||
data-test-subj="control-group-query-sync-time-range"
|
||||
label={ControlGroupStrings.management.querySync.getIgnoreTimerangeTitle()}
|
||||
compressed
|
||||
checked={Boolean(controlGroupEditorState.ignoreParentSettings?.ignoreTimerange)}
|
||||
onChange={(e) => updateIgnoreSetting({ ignoreTimerange: e.target.checked })}
|
||||
/>
|
||||
</EuiFormRow>
|
||||
<EuiFormRow hasChildLabel display="columnCompressedSwitch">
|
||||
<EuiSwitch
|
||||
data-test-subj="control-group-query-sync-query"
|
||||
label={ControlGroupStrings.management.querySync.getIgnoreQueryTitle()}
|
||||
compressed
|
||||
checked={Boolean(controlGroupEditorState.ignoreParentSettings?.ignoreQuery)}
|
||||
onChange={(e) => updateIgnoreSetting({ ignoreQuery: e.target.checked })}
|
||||
/>
|
||||
</EuiFormRow>
|
||||
<EuiFormRow hasChildLabel display="columnCompressedSwitch">
|
||||
<EuiSwitch
|
||||
data-test-subj="control-group-query-sync-filters"
|
||||
label={ControlGroupStrings.management.querySync.getIgnoreFilterPillsTitle()}
|
||||
compressed
|
||||
checked={Boolean(controlGroupEditorState.ignoreParentSettings?.ignoreFilters)}
|
||||
onChange={(e) => updateIgnoreSetting({ ignoreFilters: e.target.checked })}
|
||||
/>
|
||||
</EuiFormRow>
|
||||
</EuiAccordion>
|
||||
</EuiFlexItem>
|
||||
</EuiFlexGroup>
|
||||
<EuiHorizontalRule margin="m" />
|
||||
<EuiFlexGroup>
|
||||
<EuiFlexItem grow={false}>
|
||||
<EuiSpacer size="xs" />
|
||||
|
|
|
@ -264,46 +264,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
|
|||
});
|
||||
});
|
||||
|
||||
describe('Does not apply query settings to controls', async () => {
|
||||
before(async () => {
|
||||
await dashboardControls.updateAllQuerySyncSettings(false);
|
||||
});
|
||||
|
||||
after(async () => {
|
||||
await dashboardControls.updateAllQuerySyncSettings(true);
|
||||
});
|
||||
|
||||
it('Does not apply query to options list control', async () => {
|
||||
await queryBar.setQuery('isDog : true ');
|
||||
await queryBar.submitQuery();
|
||||
await dashboard.waitForRenderComplete();
|
||||
await header.waitUntilLoadingHasFinished();
|
||||
await ensureAvailableOptionsEql(allAvailableOptions);
|
||||
await queryBar.setQuery('');
|
||||
await queryBar.submitQuery();
|
||||
});
|
||||
|
||||
it('Does not apply filters to options list control', async () => {
|
||||
await filterBar.addFilter('sound.keyword', 'is one of', ['bark', 'bow ow ow', 'ruff']);
|
||||
await dashboard.waitForRenderComplete();
|
||||
await header.waitUntilLoadingHasFinished();
|
||||
await ensureAvailableOptionsEql(allAvailableOptions);
|
||||
await filterBar.removeFilter('sound.keyword');
|
||||
});
|
||||
|
||||
it('Does not apply time range to options list control', async () => {
|
||||
// set time range to time with no documents
|
||||
await timePicker.setAbsoluteRange(
|
||||
'Jan 1, 2017 @ 00:00:00.000',
|
||||
'Jan 1, 2017 @ 00:00:00.000'
|
||||
);
|
||||
await dashboard.waitForRenderComplete();
|
||||
await header.waitUntilLoadingHasFinished();
|
||||
await ensureAvailableOptionsEql(allAvailableOptions);
|
||||
await timePicker.setDefaultDataRange();
|
||||
});
|
||||
});
|
||||
|
||||
describe('Selections made in control apply to dashboard', async () => {
|
||||
it('Shows available options in options list', async () => {
|
||||
await ensureAvailableOptionsEql(allAvailableOptions);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue