[Fleet] Fix EuiComboBox in agent upgrade modal to disallow clear (#13…

…3427)
elastic · Jun 3, 2022 · 4b273d5 · 4b273d5
1 parent 71652fb
commit 4b273d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/.../fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx b/.../fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
@@ -26,6 +26,7 @@ import type { EuiComboBoxOptionOption } from '@elastic/eui';
 
 import semverCoerce from 'semver/functions/coerce';
 import semverGt from 'semver/functions/gt';
+import semverValid from 'semver/functions/valid';
 
 import { getMinVersion } from '../../../../../../../common/services/get_min_max_version';
 import type { Agent } from '../../../../types';
@@ -199,6 +200,10 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
   }
 
   const onCreateOption = (searchValue: string) => {
+    if (!semverValid(searchValue)) {
+      return;
+    }
+
     const agentVersionNumber = semverCoerce(searchValue);
     if (
       agentVersionNumber?.version &&
@@ -297,8 +302,12 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
           fullWidth
           singleSelection={{ asPlainText: true }}
           options={versionOptions}
+          isClearable={false}
           selectedOptions={selectedVersion}
           onChange={(selected: Array<EuiComboBoxOptionOption<string>>) => {
+            if (!selected.length) {
+              return;
+            }
             setSelectedVersion(selected);
           }}
           onCreateOption={onCreateOption}
@@ -369,10 +378,14 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
           <EuiComboBox
             data-test-subj="agentUpgradeModal.MaintainanceCombobox"
             fullWidth
+            isClearable={false}
             singleSelection={{ asPlainText: true }}
             options={maintainanceOptions}
             selectedOptions={selectedMantainanceWindow}
             onChange={(selected: Array<EuiComboBoxOptionOption<number>>) => {
+              if (!selected.length) {
+                return;
+              }
               setSelectedMantainanceWindow(selected);
             }}
           />

diff --git a/x-pack/plugins/fleet/server/types/rest_spec/agent.ts b/x-pack/plugins/fleet/server/types/rest_spec/agent.ts
@@ -7,6 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import moment from 'moment';
+import semverIsValid from 'semver/functions/valid';
 
 import { NewAgentActionSchema } from '../models';
 
@@ -61,13 +62,21 @@ export const PostBulkAgentUnenrollRequestSchema = {
   }),
 };
 
+function validateVersion(s: string) {
+  if (!semverIsValid(s)) {
+    return 'not a valid semver';
+  }
+}
+
 export const PostAgentUpgradeRequestSchema = {
   params: schema.object({
     agentId: schema.string(),
   }),
   body: schema.object({
     source_uri: schema.maybe(schema.string()),
-    version: schema.string(),
+    version: schema.string({
+      validate: validateVersion,
+    }),
     force: schema.maybe(schema.boolean()),
   }),
 };
@@ -76,7 +85,7 @@ export const PostBulkAgentUpgradeRequestSchema = {
   body: schema.object({
     agents: schema.oneOf([schema.arrayOf(schema.string()), schema.string()]),
     source_uri: schema.maybe(schema.string()),
-    version: schema.string(),
+    version: schema.string({ validate: validateVersion }),
     force: schema.maybe(schema.boolean()),
     rollout_duration_seconds: schema.maybe(schema.number({ min: 600 })),
     start_time: schema.maybe(