Skip to content

Commit c8e2ab8

Browse files
nowgnuesLeenowgnuesLee
committed
fix(FR-1019): add error handling for 409 error code to InviteFolderSettingModal
1 parent d7bcb17 commit c8e2ab8

22 files changed

+54
-25
lines changed

‎react/src/components/InviteFolderSettingModal.tsx

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ const InviteFolderSettingModal: React.FC<InviteFolderSettingModalProps> = ({
104104
inviteFormRef.current
105105
?.validateFields()
106106
.then((values) => {
107-
const { emails, permission } = values;
107+
const { email, permission } = values;
108108
inviteUser.mutate(
109109
{
110110
perm: permission,
111-
emails: emails.split(',').map((email: string) => email.trim()),
111+
emails: [email.trim()],
112112
id: vfolderId ?? '',
113113
},
114114
{
@@ -117,7 +117,15 @@ const InviteFolderSettingModal: React.FC<InviteFolderSettingModalProps> = ({
117117
inviteFormRef.current?.resetFields();
118118
refetch();
119119
},
120-
onError: (err) => {
120+
onError: (err: any) => {
121+
if (err?.statusCode === 409) {
122+
message.error(
123+
t('data.invitation.UserIsAlreadyInvited', {
124+
email: email.trim(),
125+
}),
126+
);
127+
return;
128+
}
121129
message.error(
122130
painKiller.relieve(err?.message) ||
123131
t('data.invitation.FolderSharingNotAvailableToUser'),
@@ -172,7 +180,7 @@ const InviteFolderSettingModal: React.FC<InviteFolderSettingModalProps> = ({
172180
<Flex align="start" justify="between" style={{ width: '100%' }}>
173181
{/* TODO: support multi invitations */}
174182
<Form.Item
175-
name="emails"
183+
name="email"
176184
label={t('general.E-Mail')}
177185
rules={[
178186
{

‎resources/i18n/de.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Es wurden keine gültigen E-Mails eingegeben",
425425
"Shared": "Gruppenordner erfolgreich freigegeben",
426426
"SharingError": "Die Freigabe ist fehlgeschlagen. Der Benutzer ist möglicherweise bereits freigegeben oder gehört nicht zu dem entsprechenden Projekt.",
427-
"SuccessfullyLeftSharedFolder": "Erfolgreich den gemeinsam genutzten Ordner verlassen"
427+
"SuccessfullyLeftSharedFolder": "Erfolgreich den gemeinsam genutzten Ordner verlassen",
428+
"UserIsAlreadyInvited": "{{email}} ist bereits eingeladen"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Artikel hinzugefügt",

‎resources/i18n/el.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,8 @@
421421
"NoValidEmails": "Δεν καταχωρήθηκαν έγκυρα μηνύματα ηλεκτρονικού ταχυδρομείου",
422422
"Shared": "Κοινοποιήθηκε επιτυχώς ο φάκελος της ομάδας",
423423
"SharingError": "Η κοινή χρήση απέτυχε. Ο χρήστης ενδέχεται να έχει ήδη κοινοποιηθεί ή δεν ανήκει σε κατάλληλο έργο.",
424-
"SuccessfullyLeftSharedFolder": "Άφησε επιτυχώς τον κοινόχρηστο φάκελο"
424+
"SuccessfullyLeftSharedFolder": "Άφησε επιτυχώς τον κοινόχρηστο φάκελο",
425+
"UserIsAlreadyInvited": "{{email}} έχει ήδη προσκληθεί"
425426
},
426427
"modelStore": {
427428
"AddedItems": "Προστέθηκαν στοιχεία",

‎resources/i18n/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,8 @@
426426
"NoValidEmails": "No valid emails were entered",
427427
"Shared": "Successfully shared the group folder",
428428
"SharingError": "Sharing failed. User may already be shared or does not belong to appropriate project.",
429-
"SuccessfullyLeftSharedFolder": "Successfully left the shared folder"
429+
"SuccessfullyLeftSharedFolder": "Successfully left the shared folder",
430+
"UserIsAlreadyInvited": "{{email}} is already invited"
430431
},
431432
"modelStore": {
432433
"AddedItems": "Added items",

‎resources/i18n/es.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "No se han introducido correos electrónicos válidos",
425425
"Shared": "Compartida con éxito la carpeta de grupo",
426426
"SharingError": "Error al compartir. Es posible que el usuario ya esté compartido o que no pertenezca al proyecto adecuado.",
427-
"SuccessfullyLeftSharedFolder": "Dejó con éxito la carpeta compartida"
427+
"SuccessfullyLeftSharedFolder": "Dejó con éxito la carpeta compartida",
428+
"UserIsAlreadyInvited": "{{email}} ya está invitado"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Artículos agregados",

‎resources/i18n/fi.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@
423423
"NoValidEmails": "Kelvollisia sähköposteja ei ole syötetty",
424424
"Shared": "Ryhmäkansion jakaminen onnistui",
425425
"SharingError": "Jakaminen epäonnistui. Käyttäjä on ehkä jo jaettu tai ei kuulu asianmukaiseen projektiin.",
426-
"SuccessfullyLeftSharedFolder": "Jäljellä jaetussa kansiossa"
426+
"SuccessfullyLeftSharedFolder": "Jäljellä jaetussa kansiossa",
427+
"UserIsAlreadyInvited": "{{email}} on jo kutsuttu"
427428
},
428429
"modelStore": {
429430
"AddedItems": "Lisätyt kohteet",

‎resources/i18n/fr.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Aucun e-mail valide n'a été saisi",
425425
"Shared": "Le dossier de groupe a été partagé avec succès",
426426
"SharingError": "Le partage a échoué. L'utilisateur est peut-être déjà partagé ou n'appartient pas au projet approprié.",
427-
"SuccessfullyLeftSharedFolder": "Qui a réussi à quitter le dossier partagé"
427+
"SuccessfullyLeftSharedFolder": "Qui a réussi à quitter le dossier partagé",
428+
"UserIsAlreadyInvited": "{{email}} est déjà invité"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Éléments ajoutés",

‎resources/i18n/id.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@
423423
"NoValidEmails": "Tidak ada email valid yang dimasukkan",
424424
"Shared": "Folder grup berhasil dibagikan",
425425
"SharingError": "Gagal berbagi. Pengguna mungkin sudah dibagikan atau tidak ada dalamm proyek yang sesuai.",
426-
"SuccessfullyLeftSharedFolder": "Berhasil meninggalkan folder bersama"
426+
"SuccessfullyLeftSharedFolder": "Berhasil meninggalkan folder bersama",
427+
"UserIsAlreadyInvited": "{{email}} sudah diundang"
427428
},
428429
"modelStore": {
429430
"AddedItems": "Item yang ditambahkan",

‎resources/i18n/it.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@
423423
"NoValidEmails": "Non sono state inserite email valide",
424424
"Shared": "Condivisione riuscita della cartella del gruppo",
425425
"SharingError": "Condivisione non riuscita. L'utente potrebbe essere già condiviso o non appartenere al progetto appropriato.",
426-
"SuccessfullyLeftSharedFolder": "Ha lasciato correttamente la cartella condivisa"
426+
"SuccessfullyLeftSharedFolder": "Ha lasciato correttamente la cartella condivisa",
427+
"UserIsAlreadyInvited": "{{email}} è già invitato"
427428
},
428429
"modelStore": {
429430
"AddedItems": "Elementi aggiunti",

‎resources/i18n/ja.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@
423423
"NoValidEmails": "有効なメールが入力されていません",
424424
"Shared": "グループフォルダを正常に共有しました",
425425
"SharingError": "共有に失敗しました。ユーザーはすでに共有されているか、適切なプロジェクトに属していない可能性があります。",
426-
"SuccessfullyLeftSharedFolder": "共有フォルダーを正常に残しました"
426+
"SuccessfullyLeftSharedFolder": "共有フォルダーを正常に残しました",
427+
"UserIsAlreadyInvited": "{{email}}はすでに招待されています"
427428
},
428429
"modelStore": {
429430
"AddedItems": "追加された項目",

‎resources/i18n/ko.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,8 @@
426426
"NoValidEmails": "입력하신 이메일이 존재하지 않는 것 같습니다. 주소를 다시 확인해주세요.",
427427
"Shared": "그룹 폴더를 공유했습니다",
428428
"SharingError": "공유에 실패했습니다. 이미 공유받은 사용자거나 프로젝트에 소속된 사용자가 아닐 수 있습니다.",
429-
"SuccessfullyLeftSharedFolder": "공유 폴더 연결이 성공적으로 해제되었습니다"
429+
"SuccessfullyLeftSharedFolder": "공유 폴더 연결이 성공적으로 해제되었습니다",
430+
"UserIsAlreadyInvited": "{{email}}은 이미 초대되었습니다"
430431
},
431432
"modelStore": {
432433
"AddedItems": "추가된 항목",

‎resources/i18n/mn.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@
423423
"NoValidEmails": "Хүчинтэй имэйл оруулаагүй болно",
424424
"Shared": "Бүлгийн фолдерыг амжилттай хуваалцав",
425425
"SharingError": "Хуваалцаж чадсангүй. Хэрэглэгчийг аль хэдийн хуваалцсан эсвэл зохих төсөлд хамрагдаагүй байж болзошгүй.",
426-
"SuccessfullyLeftSharedFolder": "Хуваалцсан фолдерыг амжилттай орхисон"
426+
"SuccessfullyLeftSharedFolder": "Хуваалцсан фолдерыг амжилттай орхисон",
427+
"UserIsAlreadyInvited": "{{email}} нь аль хэдийн уригдсан байна"
427428
},
428429
"modelStore": {
429430
"AddedItems": "Нэмэгдсэн зүйлс",

‎resources/i18n/ms.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@
423423
"NoValidEmails": "Tidak ada e-mel yang sah dimasukkan",
424424
"Shared": "Berjaya berkongsi folder kumpulan",
425425
"SharingError": "Perkongsian gagal. Pengguna mungkin sudah dikongsi atau tidak tergolong dalam projek yang sesuai.",
426-
"SuccessfullyLeftSharedFolder": "Berjaya meninggalkan folder kongsi"
426+
"SuccessfullyLeftSharedFolder": "Berjaya meninggalkan folder kongsi",
427+
"UserIsAlreadyInvited": "{{email}} sudah dijemput"
427428
},
428429
"modelStore": {
429430
"AddedItems": "Item ditambah",

‎resources/i18n/pl.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Nie wprowadzono poprawnych adresów e-mail",
425425
"Shared": "Pomyślnie udostępniono folder grupy",
426426
"SharingError": "Udostępnianie nie powiodło się. Użytkownik może już być udostępniony lub nie należy do odpowiedniego projektu.",
427-
"SuccessfullyLeftSharedFolder": "Z powodzeniem zostawił wspólny folder"
427+
"SuccessfullyLeftSharedFolder": "Z powodzeniem zostawił wspólny folder",
428+
"UserIsAlreadyInvited": "{{email}} jest już zaproszony"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Dodane elementy",

‎resources/i18n/pt-BR.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Nenhum e-mail válido foi inserido",
425425
"Shared": "Compartilhou com sucesso a pasta do grupo",
426426
"SharingError": "O compartilhamento falhou. O usuário pode já estar compartilhado ou não pertencer ao projeto apropriado.",
427-
"SuccessfullyLeftSharedFolder": "Deixou com sucesso a pasta compartilhada"
427+
"SuccessfullyLeftSharedFolder": "Deixou com sucesso a pasta compartilhada",
428+
"UserIsAlreadyInvited": "{{email}} já está convidado"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Itens adicionados",

‎resources/i18n/pt.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Nenhum e-mail válido foi inserido",
425425
"Shared": "Compartilhou com sucesso a pasta do grupo",
426426
"SharingError": "O compartilhamento falhou. O usuário pode já estar compartilhado ou não pertencer ao projeto apropriado.",
427-
"SuccessfullyLeftSharedFolder": "Deixou com sucesso a pasta compartilhada"
427+
"SuccessfullyLeftSharedFolder": "Deixou com sucesso a pasta compartilhada",
428+
"UserIsAlreadyInvited": "{{email}} já está convidado"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Itens adicionados",

‎resources/i18n/ru.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Не введены действительные адреса электронной почты",
425425
"Shared": "Успешно предоставлен доступ к групповой папке",
426426
"SharingError": "Не удалось отправить. Возможно, пользователь уже находится в совместном доступе или не принадлежит соответствующему проекту.",
427-
"SuccessfullyLeftSharedFolder": "Успешно оставил общую папку"
427+
"SuccessfullyLeftSharedFolder": "Успешно оставил общую папку",
428+
"UserIsAlreadyInvited": "{{email}} уже приглашен"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Добавлены предметы",

‎resources/i18n/th.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "ไม่มีอีเมลที่ถูกต้องถูกป้อน",
425425
"Shared": "แชร์โฟลเดอร์กลุ่มสำเร็จแล้ว",
426426
"SharingError": "การแชร์ล้มเหลว ผู้ใช้อาจได้รับการแชร์แล้วหรือไม่ได้อยู่ในโครงการที่เหมาะสม",
427-
"SuccessfullyLeftSharedFolder": "ออกจากโฟลเดอร์ที่ใช้ร่วมกันสำเร็จ"
427+
"SuccessfullyLeftSharedFolder": "ออกจากโฟลเดอร์ที่ใช้ร่วมกันสำเร็จ",
428+
"UserIsAlreadyInvited": "{{email}} ได้รับเชิญไปแล้ว"
428429
},
429430
"modelStore": {
430431
"AddedItems": "เพิ่มรายการแล้ว",

‎resources/i18n/tr.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Geçerli e-posta girilmedi",
425425
"Shared": "Grup klasörü başarıyla paylaşıldı",
426426
"SharingError": "Paylaşım başarısız oldu. Kullanıcı zaten paylaşılmış olabilir veya uygun projeye ait değil.",
427-
"SuccessfullyLeftSharedFolder": "Paylaşılan klasörü başarıyla bıraktı"
427+
"SuccessfullyLeftSharedFolder": "Paylaşılan klasörü başarıyla bıraktı",
428+
"UserIsAlreadyInvited": "{{email}} zaten davet edildi"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Eklenen öğeler",

‎resources/i18n/vi.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "Không có email hợp lệ nào được nhập",
425425
"Shared": "Đã chia sẻ thành công thư mục nhóm",
426426
"SharingError": "Chia sẻ không thành công. Người dùng có thể đã được chia sẻ hoặc không thuộc dự án thích hợp.",
427-
"SuccessfullyLeftSharedFolder": "Thành công để lại thư mục chia sẻ"
427+
"SuccessfullyLeftSharedFolder": "Thành công để lại thư mục chia sẻ",
428+
"UserIsAlreadyInvited": "{{email}} đã được mời"
428429
},
429430
"modelStore": {
430431
"AddedItems": "Các mục đã thêm",

‎resources/i18n/zh-CN.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@
424424
"NoValidEmails": "没有输入有效的电子邮件",
425425
"Shared": "已成功共享群组文件夹",
426426
"SharingError": "分享失败。用户可能已被共享或不属于适当的项目。",
427-
"SuccessfullyLeftSharedFolder": "成功离开共享文件夹"
427+
"SuccessfullyLeftSharedFolder": "成功离开共享文件夹",
428+
"UserIsAlreadyInvited": "{{email}}已经被邀请"
428429
},
429430
"modelStore": {
430431
"AddedItems": "添加的项目",

‎resources/i18n/zh-TW.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@
425425
"NoValidEmails": "沒有輸入有效的電子郵件",
426426
"Shared": "已成功共享群組文件夾",
427427
"SharingError": "分享失敗。用戶可能已被共享或不屬於適當的項目。",
428-
"SuccessfullyLeftSharedFolder": "成功離開共享文件夾"
428+
"SuccessfullyLeftSharedFolder": "成功離開共享文件夾",
429+
"UserIsAlreadyInvited": "{{email}}已經被邀請"
429430
},
430431
"modelStore": {
431432
"AddedItems": "新增的項目",

0 commit comments

Comments
 (0)