Merge branch 'feat/ui-v0.4' of git.backyard.segmentfault.com:opensource/answer into feat/ui-v0.4

i18n/en_US.yaml

@@ -507,6 +507,7 @@ ui:
     search_tag: Search tag
     hint: "Describe what your question is about, at least one tag is required."
     no_result: No tags matched
+    tag_required_text: Required tag (at least one)
   header:
     nav:
       question: Questions

ui/src/components/TagSelector/index.tsx

@@ -19,6 +19,7 @@ interface IProps {
   onBlur?: () => void;
   hiddenDescription?: boolean;
   hiddenCreateBtn?: boolean;
+  showRequiredTagText?: boolean;
   alwaysShowAddBtn?: boolean;
 }
 
@@ -32,6 +33,7 @@ const TagSelector: FC<IProps> = ({
   hiddenDescription = false,
   hiddenCreateBtn = false,
   alwaysShowAddBtn = false,
+  showRequiredTagText = false,
 }) => {
   const [initialValue, setInitialValue] = useState<Type.Tag[]>([...value]);
   const [currentIndex, setCurrentIndex] = useState<number>(0);
@@ -224,14 +226,16 @@ const TagSelector: FC<IProps> = ({
                   </Form>
                 </Dropdown.Header>
               )}
-              {tags && tags.filter((v) => v.recommend)?.length > 0 && (
-                <Dropdown.Item
-                  disabled
-                  style={{ fontWeight: 500 }}
-                  className="text-secondary">
-                  Required tag (at least one)
-                </Dropdown.Item>
-              )}
+              {showRequiredTagText &&
+                tags &&
+                tags.filter((v) => v.recommend)?.length > 0 && (
+                  <Dropdown.Item
+                    disabled
+                    style={{ fontWeight: 500 }}
+                    className="text-secondary">
+                    {t('tag_required_text')}
+                  </Dropdown.Item>
+                )}
 
               {tags?.map((item, index) => {
                 return (

ui/src/components/Unactivate/index.tsx

@@ -60,7 +60,7 @@ const Index: React.FC<IProps> = ({ visible = false }) => {
       })
       .catch((err) => {
         if (err.isError) {
-          const data = handleFormError(err.list, formData);
+          const data = handleFormError(err, formData);
           setFormData({ ...data });
         }
       })

ui/src/pages/Admin/Branding/index.tsx

@@ -115,7 +115,7 @@ const Index: FC = () => {
       })
       .catch((err) => {
         if (err.isError) {
-          const data = handleFormError(err.list, formData);
+          const data = handleFormError(err, formData);
           setFormData({ ...data });
         }
       });

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

@@ -348,6 +348,7 @@ const Ask = () => {
                 <TagSelector
                   value={formData.tags.value}
                   onChange={handleTagsChange}
+                  showRequiredTagText
                 />
                 <Form.Control.Feedback type="invalid">
                   {formData.tags.errorMsg}

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

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