Fix #7141 - Wrong conversion of to a boolean value

strapi · Jul 24, 2020 · 4e27468 · 4e27468
1 parent 8fd98b0
commit 4e27468
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 28 deletions.
diff --git a/packages/strapi-admin/admin/src/components/Webhooks/Inputs/index.js b/packages/strapi-admin/admin/src/components/Webhooks/Inputs/index.js
@@ -46,7 +46,7 @@ function Inputs({
       ) : (
         <Error inputError={inputError} name={name} type="text" validations={validations}>
           {({ canCheck, error, dispatch }) => {
-            const hasError = error && error !== null;
+            const hasError = Boolean(error);
 
             const handleChange = e => {
               if (!canCheck) {

diff --git a/packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/index.js b/packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/index.js
@@ -44,20 +44,13 @@ class InputJSONWithErrors extends React.Component {
     const handleBlur = isFunction(onBlur) ? onBlur : this.handleBlur;
 
     return (
-      <Error
-        inputError={inputError}
-        name={name}
-        type="text"
-        validations={validations}
-      >
+      <Error inputError={inputError} name={name} type="text" validations={validations}>
         {({ canCheck, onBlur, error, dispatch }) => {
-          const hasError = error && error !== null;
+          const hasError = Boolean(error);
 
           return (
             <Wrapper
-              className={`${cn(!isEmpty(className) && className)} ${
-                hasError ? 'bordered' : ''
-              }`}
+              className={`${cn(!isEmpty(className) && className)} ${hasError ? 'bordered' : ''}`}
             >
               <Label htmlFor={name}>{label}</Label>
               <InputJSON
@@ -87,9 +80,7 @@ class InputJSONWithErrors extends React.Component {
                 tabIndex={tabIndex}
                 value={value}
               />
-              {!hasError && inputDescription && (
-                <Description>{inputDescription}</Description>
-              )}
+              {!hasError && inputDescription && <Description>{inputDescription}</Description>}
               {hasError && <ErrorMessage>{error}</ErrorMessage>}
             </Wrapper>
           );

diff --git a/packages/strapi-plugin-content-manager/admin/src/components/InputUID/index.js b/packages/strapi-plugin-content-manager/admin/src/components/InputUID/index.js
@@ -203,7 +203,7 @@ const InputUID = ({
       validations={{ ...validations, regex: UID_REGEX }}
     >
       {({ canCheck, onBlur, error, dispatch }) => {
-        const hasError = error && error !== null;
+        const hasError = Boolean(error);
 
         return (
           <Wrapper ref={wrapperRef}>

diff --git a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygWithErrors/index.js b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygWithErrors/index.js
@@ -41,20 +41,13 @@ class WysiwygWithErrors extends React.Component {
     } = this.props;
 
     return (
-      <Error
-        inputError={inputError}
-        name={name}
-        type="text"
-        validations={validations}
-      >
+      <Error inputError={inputError} name={name} type="text" validations={validations}>
         {({ canCheck, onBlur, error, dispatch }) => {
-          const hasError = error && error !== null;
+          const hasError = Boolean(error);
 
           return (
             <Wrapper
-              className={`${cn(!isEmpty(className) && className)} ${
-                hasError ? 'bordered' : ''
-              }`}
+              className={`${cn(!isEmpty(className) && className)} ${hasError ? 'bordered' : ''}`}
               style={style}
             >
               <Label htmlFor={name}>{label}</Label>
@@ -86,9 +79,7 @@ class WysiwygWithErrors extends React.Component {
                 tabIndex={tabIndex}
                 value={value}
               />
-              {!hasError && inputDescription && (
-                <Description>{inputDescription}</Description>
-              )}
+              {!hasError && inputDescription && <Description>{inputDescription}</Description>}
               {hasError && <ErrorMessage>{error}</ErrorMessage>}
             </Wrapper>
           );