mapping the error instead of showing from the backend

elastic · Feb 17, 2022 · b6b06d0 · b6b06d0
1 parent 1333a06
commit b6b06d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/...public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx b/...public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx
@@ -39,7 +39,7 @@ const StyledEuiAccordion = styled(EuiAccordion)`
 `;
 
 interface Props {
-  updateAgentPolicy: (u: AgentPolicy | null, errorMessage?: string) => void;
+  updateAgentPolicy: (u: AgentPolicy | null, errorMessage?: JSX.Element) => void;
   isFleetServerPolicy?: boolean;
   agentPolicyName: string;
 }
@@ -84,12 +84,24 @@ export const AgentPolicyCreateInlineForm: React.FunctionComponent<Props> = ({
         updateAgentPolicy(resp.data.item);
       }
     } catch (e) {
-      updateAgentPolicy(null, e.message);
+      updateAgentPolicy(null, mapError(e));
     } finally {
       setIsLoading(false);
     }
   }, [newAgentPolicy, withSysMonitoring, updateAgentPolicy]);
 
+  function mapError(e: { statusCode: number }): JSX.Element | undefined {
+    switch (e.statusCode) {
+      case 409:
+        return (
+          <FormattedMessage
+            id="xpack.fleet.agentPolicyCreation.errorMessage"
+            defaultMessage="An agent policy already exists with this name."
+          />
+        );
+    }
+  }
+
   return (
     <EuiForm>
       <EuiText>

diff --git a/...eet/public/applications/fleet/sections/agents/components/agent_policy_created_callout.tsx b/...eet/public/applications/fleet/sections/agents/components/agent_policy_created_callout.tsx
@@ -17,7 +17,7 @@ export enum CREATE_STATUS {
 
 export interface AgentPolicyCreateState {
   status: CREATE_STATUS;
-  errorMessage?: string;
+  errorMessage?: JSX.Element;
 }
 
 interface Props {
@@ -52,12 +52,7 @@ export const AgentPolicyCreatedCallOut: React.FunctionComponent<Props> = ({ crea
           color="danger"
           iconType="cross"
         >
-          {createState.errorMessage ? (
-            <FormattedMessage
-              id="xpack.fleet.agentPolicyCreation.errorMessage"
-              defaultMessage={createState.errorMessage}
-            />
-          ) : null}
+          {createState.errorMessage ?? null}
         </EuiCallOut>
       )}
     </>

diff --git a/...ck/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_select_create.tsx b/...ck/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_select_create.tsx
@@ -55,7 +55,7 @@ export const SelectCreateAgentPolicy: React.FC<Props> = ({
   }, [agentPolicies, isFleetServerPolicy]);
 
   const onAgentPolicyCreated = useCallback(
-    async (policy: AgentPolicy | null, errorMessage?: string) => {
+    async (policy: AgentPolicy | null, errorMessage?: JSX.Element) => {
       if (!policy) {
         setCreateState({ status: CREATE_STATUS.FAILED, errorMessage });
         return;