From 32f83be9c03686abd7baef0c164662a41709b367 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:12:51 +1000
Subject: [PATCH] [8.x] Revert &quot;[UII] Fix client-side validation for agent
 policy timeout fields (#191674)&quot; (#194338) (#194491)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Revert &quot;[UII] Fix client-side validation for agent policy
timeout fields (#191674)&quot;
(#194338)](https://github.com/elastic/kibana/pull/194338)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"its.jenetic@gmail.com"},"sourceCommit":{"committedDate":"2024-09-30T21:22:37Z","message":"Revert
\"[UII] Fix client-side validation for agent policy timeout fields
(#191674)\" (#194338)\n\n## Summary\r\n\r\nResolves #194221.\r\n\r\nThis
PR reverts commit f29bf1c3113de90fc0ca08bf7a59a33d53638940.
Timeout\r\nfields should be clearable with undefined value or
zero.","sha":"6792cb4dca5adecf1a48a4d052dae603db5772e3","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","v9.0.0","backport:prev-major"],"title":"Revert
\"[UII] Fix client-side validation for agent policy timeout fields
(#191674)\"","number":194338,"url":"https://github.com/elastic/kibana/pull/194338","mergeCommit":{"message":"Revert
\"[UII] Fix client-side validation for agent policy timeout fields
(#191674)\" (#194338)\n\n## Summary\r\n\r\nResolves #194221.\r\n\r\nThis
PR reverts commit f29bf1c3113de90fc0ca08bf7a59a33d53638940.
Timeout\r\nfields should be clearable with undefined value or
zero.","sha":"6792cb4dca5adecf1a48a4d052dae603db5772e3"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/194338","number":194338,"mergeCommit":{"message":"Revert
\"[UII] Fix client-side validation for agent policy timeout fields
(#191674)\" (#194338)\n\n## Summary\r\n\r\nResolves #194221.\r\n\r\nThis
PR reverts commit f29bf1c3113de90fc0ca08bf7a59a33d53638940.
Timeout\r\nfields should be clearable with undefined value or
zero.","sha":"6792cb4dca5adecf1a48a4d052dae603db5772e3"}}]}] BACKPORT-->

Co-authored-by: Jen Huang <its.jenetic@gmail.com>
---
 .../agent_policy/components/agent_policy_validation.tsx   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_validation.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_validation.tsx
index 109e62b0e0de4..1e81e9fc6bbc3 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_validation.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_validation.tsx
@@ -38,20 +38,20 @@ export const agentPolicyFormValidation = (
     errors.namespace = [namespaceValidation.error];
   }
 
-  if (agentPolicy.unenroll_timeout !== undefined && agentPolicy.unenroll_timeout <= 0) {
+  if (agentPolicy.unenroll_timeout && agentPolicy.unenroll_timeout < 0) {
     errors.unenroll_timeout = [
       <FormattedMessage
         id="xpack.fleet.agentPolicyForm.unenrollTimeoutMinValueErrorMessage"
-        defaultMessage="Unenroll timeout must be an integer greater than zero"
+        defaultMessage="Unenroll timeout must be greater than zero."
       />,
     ];
   }
 
-  if (agentPolicy.inactivity_timeout !== undefined && agentPolicy.inactivity_timeout <= 0) {
+  if (agentPolicy.inactivity_timeout && agentPolicy.inactivity_timeout < 0) {
     errors.inactivity_timeout = [
       <FormattedMessage
         id="xpack.fleet.agentPolicyForm.inactivityTimeoutMinValueErrorMessage"
-        defaultMessage="Inactivity timeout must be an integer greater than zero"
+        defaultMessage="Inactivity timeout must be greater than zero."
       />,
     ];
   }