github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Display ENVIRONMENT_ALL label instead of value (#133616)

Browse source 
* Fix ENVIRONMENT_ALL label

* Add e2e test

* Fix all option
This commit is contained in:
Katerina Patticha 2022-06-07 12:16:07 +02:00 • committed by GitHub
parent 6014b1ef74
commit 9d860432e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
x-pack/plugins/apm/common/agent_configuration/all_option.ts
View file

@ -6,7 +6,6 @@
*/
import { i18n } from '@kbn/i18n';
export const ALL_OPTION_VALUE = 'ALL_OPTION_VALUE';
// human-readable label for service and environment. The "All" option should be translated.
@ -24,3 +23,8 @@ export function getOptionLabel(value: string | undefined) {
export function omitAllOption(value?: string) {
return value === ALL_OPTION_VALUE ? undefined : value;
}
export const ALL_OPTION = {
value: ALL_OPTION_VALUE,
label: getOptionLabel(ALL_OPTION_VALUE),
};

25
x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/settings/agent_configurations.spec.ts
View file

@ -101,4 +101,29 @@ describe('Agent configuration', () => {
cy.wait('@serviceEnvironmentApi');
cy.contains('production');
});
it('displays All label when selecting all option', () => {
cy.intercept(
'GET',
'/api/apm/settings/agent-configuration/environments'
).as('serviceEnvironmentApi');
cy.contains('Create configuration').click();
cy.get('[data-test-subj="serviceNameComboBox"]')
.click()
.type('All')
.type('{enter}');
cy.contains('All').realClick();
cy.wait('@serviceEnvironmentApi');
cy.get('[data-test-subj="serviceEnviromentComboBox"]')
.click({ force: true })
.type('All');
cy.get('mark').contains('All').click();
cy.contains('Next step').click();
cy.contains('Service name All');
cy.contains('Environment All');
cy.contains('Edit').click();
cy.wait('@serviceEnvironmentApi');
cy.contains('All');
});
});

9
x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx
View file

@ -9,7 +9,10 @@ import { EuiDescribedFormGroup, EuiFormRow } from '@elastic/eui';
import React from 'react';
import { i18n } from '@kbn/i18n';
import { SuggestionsSelect } from '../../../../../shared/suggestions_select';
import { ENVIRONMENT_ALL } from '../../../../../../../common/environment_filter_values';
import {
getOptionLabel,
ALL_OPTION,
} from '../../../../../../../common/agent_configuration/all_option';
interface Props {
title: string;
@ -40,8 +43,8 @@ export function FormRowSuggestionsSelect({
>
<EuiFormRow label={fieldLabel}>
<SuggestionsSelect
customOptions={allowAll ? [ENVIRONMENT_ALL] : undefined}
defaultValue={value}
customOptions={allowAll ? [ALL_OPTION] : undefined}
defaultValue={value ? getOptionLabel(value) : undefined}
fieldName={fieldName}
onChange={onChange}
isClearable={false}