Merge branch 'feat/ui-0.5.0' into 'test'

Feat/ui 0.5.0

See merge request opensource/answer!284

ui/src/pages/Questions/Ask/index.tsx

@@ -27,35 +27,35 @@ interface FormDataItem {
   answer: Type.FormValue<string>;
   edit_summary: Type.FormValue<string>;
 }
-const initFormData = {
-  title: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-  tags: {
-    value: [],
-    isInvalid: false,
-    errorMsg: '',
-  },
-  content: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-  answer: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-  edit_summary: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-};
 
 const Ask = () => {
+  const initFormData = {
+    title: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    tags: {
+      value: [],
+      isInvalid: false,
+      errorMsg: '',
+    },
+    content: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    answer: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    edit_summary: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+  };
   const { t } = useTranslation('translation', { keyPrefix: 'ask' });
   const [formData, setFormData] = useState<FormDataItem>(initFormData);
   const [checked, setCheckState] = useState(false);

ui/src/pages/Users/AccountForgot/components/sendEmail.tsx

@@ -84,17 +84,9 @@ const Index: FC<IProps> = ({ visible = false, callback }) => {
         setModalState(false);
       })
       .catch((err) => {
-        // if (err.isError && err.key) {
-        //   formData[err.key].isInvalid = true;
-        //   formData[err.key].errorMsg = err.value;
-        //   if (err.key.indexOf('captcha') < 0) {
-        //     setModalState(false);
-        //   }
-        // }
-
         if (err.isError) {
           const data = handleFormError(err, formData);
-          if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) {
+          if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) {
             setModalState(false);
           }
           setFormData({ ...data });

ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx

@@ -86,7 +86,7 @@ const Index: FC = () => {
       .catch((err) => {
         if (err.isError) {
           const data = handleFormError(err, formData);
-          if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) {
+          if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) {
             setModalState(false);
           }
           setFormData({ ...data });

ui/src/pages/Users/Login/index.tsx

@@ -131,7 +131,7 @@ const Index: React.FC = () => {
         // }
         if (err.isError) {
           const data = handleFormError(err, formData);
-          if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) {
+          if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) {
             setModalState(false);
           }
           setFormData({ ...data });