From b0d7342e1f524e4b21e23ed68456edca77c9fb61 Mon Sep 17 00:00:00 2001
From: Wojciech Mista <wojciech.mista@hotmail.com>
Date: Thu, 4 Aug 2022 08:40:14 +0200
Subject: [PATCH] Fix "Add Staff Member" form errors on inputs  (#2186)

* Fix input errors in staff member forms

* Remove unused import
---
 .../StaffAddMemberDialog.tsx                  | 33 +++++++------------
 .../StaffProperties/StaffProperties.tsx       | 26 +++++++++------
 .../__snapshots__/Stories.test.ts.snap        | 21 +++++++-----
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx
index d54364f9a..ad1968139 100644
--- a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx
+++ b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx
@@ -19,7 +19,6 @@ import { commonMessages } from "@saleor/intl";
 import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui";
 import { FetchMoreProps, RelayToFlat, SearchPageProps } from "@saleor/types";
 import { getFormErrors } from "@saleor/utils/errors";
-import getStaffErrorMessage from "@saleor/utils/errors/staff";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
@@ -81,6 +80,14 @@ const StaffAddMemberDialog: React.FC<StaffAddMemberDialogProps> = props => {
     dialogErrors,
   );
 
+  const getFieldProps = (name: string) => ({
+    disabled: props.disabled,
+    error: !!formErrors[name],
+    helperText: formErrors[name]?.message,
+    label: intl.formatMessage(commonMessages[name]),
+    name,
+  });
+
   return (
     <Dialog onClose={onClose} open={open}>
       <Form initial={initialForm} onSubmit={onConfirm}>
@@ -96,25 +103,13 @@ const StaffAddMemberDialog: React.FC<StaffAddMemberDialogProps> = props => {
             <DialogContent>
               <div className={classes.textFieldGrid}>
                 <TextField
-                  error={!!formErrors.firstName}
-                  helperText={
-                    !!formErrors.firstName &&
-                    getStaffErrorMessage(formErrors.firstName, intl)
-                  }
-                  label={intl.formatMessage(commonMessages.firstName)}
-                  name="firstName"
+                  {...getFieldProps("firstName")}
                   type="text"
                   value={formData.firstName}
                   onChange={change}
                 />
                 <TextField
-                  error={!!formErrors.lastName}
-                  helperText={
-                    !!formErrors.lastName &&
-                    getStaffErrorMessage(formErrors.lastName, intl)
-                  }
-                  label={intl.formatMessage(commonMessages.lastName)}
-                  name="lastName"
+                  {...getFieldProps("lastName")}
                   type="text"
                   value={formData.lastName}
                   onChange={change}
@@ -122,14 +117,8 @@ const StaffAddMemberDialog: React.FC<StaffAddMemberDialogProps> = props => {
               </div>
               <FormSpacer />
               <TextField
-                error={!!formErrors.email}
                 fullWidth
-                helperText={
-                  !!formErrors.email &&
-                  getStaffErrorMessage(formErrors.email, intl)
-                }
-                label={intl.formatMessage(commonMessages.email)}
-                name="email"
+                {...getFieldProps("email")}
                 type="email"
                 value={formData.email}
                 onChange={change}
diff --git a/src/staff/components/StaffProperties/StaffProperties.tsx b/src/staff/components/StaffProperties/StaffProperties.tsx
index 668ce5e25..a77c04e5f 100644
--- a/src/staff/components/StaffProperties/StaffProperties.tsx
+++ b/src/staff/components/StaffProperties/StaffProperties.tsx
@@ -128,10 +128,22 @@ const StaffProperties: React.FC<StaffPropertiesProps> = props => {
   const imgInputAnchor = React.createRef<HTMLInputElement>();
 
   const clickImgInput = () => imgInputAnchor.current.click();
-  const formErrors = getFormErrors(["id"], errors || []);
+  const formErrors = getFormErrors(
+    ["id", "firstName", "lastName", "email"],
+    errors || [],
+  );
 
   const hasAvatar = !!staffMember?.avatar?.url;
 
+  const getFieldProps = (name: string) => ({
+    disabled: props.disabled,
+    error: !!formErrors[name],
+    helperText: formErrors[name]?.message,
+    label: intl.formatMessage(commonMessages[name]),
+    name,
+    value: data[name],
+  });
+
   return (
     <Card className={className}>
       <CardTitle
@@ -197,27 +209,21 @@ const StaffProperties: React.FC<StaffPropertiesProps> = props => {
             <div className={classes.propGrid}>
               <div className={classes.prop}>
                 <TextField
-                  label={intl.formatMessage(commonMessages.firstName)}
-                  value={data.firstName}
-                  name="firstName"
+                  {...getFieldProps("firstName")}
                   onChange={onChange}
                   fullWidth
                 />
               </div>
               <div className={classes.prop}>
                 <TextField
-                  label={intl.formatMessage(commonMessages.lastName)}
-                  value={data.lastName}
-                  name="lastName"
+                  {...getFieldProps("lastName")}
                   onChange={onChange}
                   fullWidth
                 />
               </div>
               <div className={classes.prop}>
                 <TextField
-                  label={intl.formatMessage(commonMessages.email)}
-                  value={data.email}
-                  name="email"
+                  {...getFieldProps("email")}
                   onChange={onChange}
                   fullWidth
                 />
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index ba826ca8a..eec3cfbf9 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -248304,17 +248304,18 @@ exports[`Storyshots Views / Staff / Staff member details loading 1`] = `
                         class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
                       >
                         <label
-                          class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                          class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
                           data-shrink="false"
                         >
                           First Name
                         </label>
                         <div
-                          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                         >
                           <input
                             aria-invalid="false"
-                            class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                            class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
+                            disabled=""
                             name="firstName"
                             type="text"
                             value=""
@@ -248341,17 +248342,18 @@ exports[`Storyshots Views / Staff / Staff member details loading 1`] = `
                         class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
                       >
                         <label
-                          class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                          class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
                           data-shrink="false"
                         >
                           Last Name
                         </label>
                         <div
-                          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                         >
                           <input
                             aria-invalid="false"
-                            class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                            class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
+                            disabled=""
                             name="lastName"
                             type="text"
                             value=""
@@ -248378,17 +248380,18 @@ exports[`Storyshots Views / Staff / Staff member details loading 1`] = `
                         class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
                       >
                         <label
-                          class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                          class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
                           data-shrink="false"
                         >
                           Email address
                         </label>
                         <div
-                          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                         >
                           <input
                             aria-invalid="false"
-                            class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                            class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
+                            disabled=""
                             name="email"
                             type="text"
                             value=""