Merge branch 'feat/ui-v0.4' into 'test'

fix(legal&write): avoid some read properties of null/undefined error

See merge request opensource/answer!265

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

@@ -78,11 +78,13 @@ const Legal: FC = () => {
 
   useEffect(() => {
     getLegalSetting().then((setting) => {
-      const formMeta = { ...formData };
-      formMeta.terms_of_service.value = setting.terms_of_service_original_text;
-      formMeta.privacy_policy.value = setting.privacy_policy_original_text;
-
-      setFormData(formMeta);
+      if (setting) {
+        const formMeta = { ...formData };
+        formMeta.terms_of_service.value =
+          setting.terms_of_service_original_text;
+        formMeta.privacy_policy.value = setting.privacy_policy_original_text;
+        setFormData(formMeta);
+      }
     });
   }, []);
 

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

@@ -62,14 +62,19 @@ const Legal: FC = () => {
   const onSubmit = (evt) => {
     evt.preventDefault();
     evt.stopPropagation();
-
+    let recommend_tags = [];
+    if (formData.recommend_tags.value?.trim()) {
+      recommend_tags = formData.recommend_tags.value.trim().split('\n');
+    }
+    let reserved_tags = [];
+    if (formData.reserved_tags.value?.trim()) {
+      reserved_tags = formData.reserved_tags.value.trim().split('\n');
+    }
     const reqParams: Type.AdminSettingsWrite = {
-      recommend_tags: formData.recommend_tags.value.trim().split('\n'),
+      recommend_tags,
+      reserved_tags,
       required_tag: formData.required_tag.value,
-      reserved_tags: formData.reserved_tags.value.trim().split('\n'),
     };
-
-    console.log(reqParams);
     postRequireAndReservedTag(reqParams)
       .then(() => {
         Toast.onShow({
@@ -87,9 +92,13 @@ const Legal: FC = () => {
 
   const initData = () => {
     getRequireAndReservedTag().then((res) => {
-      formData.recommend_tags.value = res.recommend_tags.join('\n');
+      if (Array.isArray(res.recommend_tags)) {
+        formData.recommend_tags.value = res.recommend_tags.join('\n');
+      }
       formData.required_tag.value = res.required_tag;
-      formData.reserved_tags.value = res.reserved_tags.join('\n');
+      if (Array.isArray(res.reserved_tags)) {
+        formData.reserved_tags.value = res.reserved_tags.join('\n');
+      }
       setFormData({ ...formData });
     });
   };

ui/src/pages/Legal/index.tsx

@@ -8,7 +8,7 @@ const Index: FC = () => {
   return (
     <Container className="pt-4 mt-2 mb-5">
       <Row className="justify-content-center">
-        <Col xxl={12} sm={10} xs={10}>
+        <Col xxl={10}>
           <Nav
             className="mb-4 flex-nowrap"
             variant="pills"
@@ -21,7 +21,7 @@ const Index: FC = () => {
             </NavLink>
           </Nav>
         </Col>
-        <Col xxl={12} sm={10} xs={10}>
+        <Col xxl={10}>
           <Outlet />
         </Col>
       </Row>