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

[Fleet] Support editing bool variable in agent policy (#85070) (#85472)

Browse source
This commit is contained in:
Nicolas Chaulet 2020-12-09 17:13:18 -05:00 • committed by GitHub
parent 236c223b34
commit ccdd8c9dd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
x-pack/plugins/fleet/common/types/models/epm.ts
View file

@ -222,6 +222,7 @@ export interface RegistryElasticsearch {
'index_template.mappings'?: object;
}
export type RegistryVarType = 'integer' | 'bool' | 'password' | 'text' | 'yaml';
// EPR types this as `[]map[string]interface{}`
// which means the official/possible type is Record<string, any>
// but we effectively only see this shape
@ -229,7 +230,7 @@ export interface RegistryVarsEntry {
name: string;
title?: string;
description?: string;
type: string;
type: RegistryVarType;
required?: boolean;
show_user?: boolean;
multi?: boolean;

31
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
View file

@ -6,7 +6,14 @@
import React, { useState, memo, useMemo } from 'react';
import ReactMarkdown from 'react-markdown';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiFormRow, EuiFieldText, EuiComboBox, EuiText, EuiCodeEditor } from '@elastic/eui';
import {
EuiFormRow,
EuiSwitch,
EuiFieldText,
EuiComboBox,
EuiText,
EuiCodeEditor,
} from '@elastic/eui';
import { RegistryVarsEntry } from '../../../../types';
import 'brace/mode/yaml';
@ -23,6 +30,7 @@ export const PackagePolicyInputVarField: React.FunctionComponent<{
const { multi, required, type, title, name, description } = varDef;
const isInvalid = (isDirty || forceShowErrors) && !!varErrors;
const errors = isInvalid ? varErrors : null;
const fieldLabel = title || name;
const field = useMemo(() => {
if (multi) {
@ -59,6 +67,18 @@ export const PackagePolicyInputVarField: React.FunctionComponent<{
/>
);
}
if (type === 'bool') {
return (
<EuiSwitch
label={fieldLabel}
checked={value}
showLabel={false}
onChange={(e) => onChange(e.target.checked)}
onBlur={() => setIsDirty(true)}
/>
);
}
return (
<EuiFieldText
isInvalid={isInvalid}
@ -67,15 +87,18 @@ export const PackagePolicyInputVarField: React.FunctionComponent<{
onBlur={() => setIsDirty(true)}
/>
);
}, [isInvalid, multi, onChange, type, value]);
}, [isInvalid, multi, onChange, type, value, fieldLabel]);
// Boolean cannot be optional by default set to false
const isOptional = type !== 'bool' && !required;
return (
<EuiFormRow
isInvalid={isInvalid}
error={errors}
label={title || name}
label={fieldLabel}
labelAppend={
!required ? (
isOptional ? (
<EuiText size="xs" color="subdued">
<FormattedMessage
id="xpack.fleet.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"