apply suggestions

reearth · Jul 2, 2024 · 9bd8688 · 9bd8688
1 parent 4460719
commit 9bd8688
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 18 deletions.
diff --git a/web/src/components/molecules/Content/Table/types.ts b/web/src/components/molecules/Content/Table/types.ts
@@ -1,5 +1,3 @@
-import { t } from "i18next";
-
 import { StretchColumn } from "@reearth-cms/components/atoms/ProTable";
 import { ContentTableField } from "@reearth-cms/components/molecules/Content/types";
 import { FieldType, TypeProperty } from "@reearth-cms/components/molecules/Schema/types";
@@ -13,6 +11,7 @@ import {
   MultipleOperator,
 } from "@reearth-cms/components/molecules/View/types";
 import { Member } from "@reearth-cms/components/molecules/Workspace/types";
+import { t } from "@reearth-cms/i18n";
 
 export type ColorType = "#BFBFBF" | "#52C41A" | "#FA8C16";
 export type StateType = "DRAFT" | "PUBLIC" | "REVIEW";

diff --git a/web/src/components/molecules/Member/MemberAddModal/index.tsx b/web/src/components/molecules/Member/MemberAddModal/index.tsx
@@ -70,16 +70,20 @@ const MemberAddModal: React.FC<Props> = ({
 
   const handleSubmit = useCallback(async () => {
     if (searchedUserList.length === 0) return;
-    await onSubmit(
-      searchedUserList.map(user => ({
-        userId: user.id,
-        role: "READER",
-      })),
-    );
-    changeSearchedUser(undefined);
-    changeSearchedUserList([]);
-    onClose();
-    form.resetFields();
+    try {
+      await onSubmit(
+        searchedUserList.map(user => ({
+          userId: user.id,
+          role: "READER",
+        })),
+      );
+      changeSearchedUser(undefined);
+      changeSearchedUserList([]);
+      onClose();
+      form.resetFields();
+    } catch (error) {
+      console.error(error);
+    }
   }, [form, searchedUserList, changeSearchedUser, changeSearchedUserList, onClose, onSubmit]);
 
   const handleClose = useCallback(() => {

diff --git a/web/src/components/molecules/Member/MemberRoleModal/index.tsx b/web/src/components/molecules/Member/MemberRoleModal/index.tsx
@@ -34,9 +34,13 @@ const MemberRoleModal: React.FC<Props> = ({ open, member, loading, onClose, onSu
 
   const handleSubmit = useCallback(async () => {
     const values = await form.validateFields();
-    await onSubmit(member.userId, values.role);
-    onClose();
-    form.resetFields();
+    try {
+      await onSubmit(member.userId, values.role);
+      onClose();
+      form.resetFields();
+    } catch (error) {
+      console.error(error);
+    }
   }, [member, form, onSubmit, onClose]);
 
   const handleClose = useCallback(() => {

diff --git a/web/src/components/molecules/Schema/fieldTypes.ts b/web/src/components/molecules/Schema/fieldTypes.ts
@@ -1,4 +1,4 @@
-import { t } from "i18next";
+import { t } from "@reearth-cms/i18n";
 
 import type { FieldType } from "./types";
 

diff --git a/web/src/components/molecules/Workspace/types.ts b/web/src/components/molecules/Workspace/types.ts
@@ -1,7 +1,6 @@
-import { t } from "i18next";
-
 import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
 import { IntegrationMember } from "@reearth-cms/components/molecules/Integration/types";
+import { t } from "@reearth-cms/i18n";
 
 export interface Project {
   id: string;

diff --git a/web/src/i18n/index.tsx b/web/src/i18n/index.tsx
@@ -1,5 +1,6 @@
 import { useTranslation } from "react-i18next";
 
+export { t } from "i18next";
 export { Trans } from "react-i18next";
 export { default as Provider } from "./provider";
 export { localesWithLabel } from "./locale";