feat: enhance member invite error handling and add invite more toggle

apps/web/i18n.lock

@@ -32,6 +32,7 @@ checksums:
     Are%20you%20sure%20you%20want%20to%20delete%20the%20workspace%20%7B0%7D%3F/singular: 27ba2854202dd77c51e78c64e5c93946
     Are%20you%20sure%20you%20want%20to%20delete%20this%20card%3F/singular: 131a5a7cccca7be8b32c987d9fa0b0c0
     Are%20you%20sure%20you%20want%20to%20delete%20this%20comment%3F/singular: 55fe6f1b52b71b91b2a079cfda3cc7fe
+    Are%20you%20sure%20you%20want%20to%20delete%20this%20label%3F/singular: 037fbaf1d04356937e6afb574714f51f
     Are%20you%20sure%20you%20want%20to%20delete%20your%20account%3F/singular: 428b74d781063224c3e63980e1094ec3
     assigned%20%3C0%3E%7BmemberName%7D%3C%2F0%3E%20to%20the%20card/singular: 4fb1c419a78a0f010a3e5790801551fc
     Awaiting%20Customer/singular: 122c108794f321c10e05a08f09b11457
@@ -127,8 +128,10 @@ checksums:
     Enter%20your%20name/singular: cd95fbdd0533f2c2e8edf9d9bd9aa8df
     Enter%20your%20password/singular: ea4fdd034522dead21bae0c0abb52eae
     Error%20deleting%20account/singular: d42965a9bc9e5ec4ed57890268924643
+    Error%20deleting%20label/singular: 94387e3a45ec768ae7715701ae00136e
     Error%20deleting%20workspace/singular: 0aec9bd8170bc84f5ea5c9a47c52ed26
     Error%20disconnecting%20Trello/singular: a8766853864eddc480113778a708871b
+    Error%20inviting%20member/singular: 91553b606a6ebed3534cd2e5635ce004
     Error%20updating%20display%20name/singular: 0d7979a25d290123ed8b8906bf468f1a
     Error%20updating%20profile%20image/singular: 462a56a6e574abc9e13cb48f1266adad
     Error%20updating%20workspace%20description/singular: 7a9fd7c69b90ab848ee1f1d4a4995381
@@ -185,7 +188,9 @@ checksums:
     Individuals/singular: 83bfc81f20e60556c44ec80c7d0603ec
     Integrations/singular: 0ccce343287704cd90150c32e2fcad36
     Interviewing/singular: 4ccdcdc784547e925077c3297bddee95
+    Invalid%20email%20address/singular: b2d9f25626f2d15c7c63e0281bccc247
     Invite/singular: 181884cea804cbde665f160811ee7ad0
+    Invite%20another/singular: acb543563dab7edbcf46060a53ade3a3
     Invite%20member/singular: ade922db1be6b26bc979565ce5de2bc7
     Junior/singular: ed1bd2c59a824fdcdd56fc8a0660fe9f
     Kanban%20is%20better%20with%20a%20team.%20Perfect%20for%20small%20and%20growing%20teams%20looking%20to%20collaborate./singular: a77bee43046b260797c8936ad23e9223
@@ -354,6 +359,7 @@ checksums:
     URL%20must%20be%20at%20least%203%20characters%20long/singular: 1b74ac9ec61fd34b16530ed599009ed1
     Use%20template/singular: 33f0ca0aa8f4b0de99aad267a61a094d
     User/singular: 61073457a5c3901084b557d065f876be
+    User%20is%20already%20a%20member%20of%20this%20workspace/singular: bc246386f0975f750f2133222bb4735e
     Video/singular: 8050c90e4289b105a0780f0fdda6ff66
     View%20and%20manage%20your%20API%20keys./singular: 88e23ee79056846dd9ce63ceee690549
     View%20and%20manage%20your%20billing%20and%20subscription./singular: 7469502543aac6f02149813546d1cb38

apps/web/src/components/DeleteLabelConfirmation.tsx

@@ -1,3 +1,5 @@
+import { t } from "@lingui/core/macro";
+
 import Button from "~/components/Button";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
@@ -17,8 +19,8 @@ export function DeleteLabelConfirmation({
     onSuccess: () => refetch(),
     onError: () =>
       showPopup({
-        header: "Error deleting label",
-        message: "Please try again later, or contact customer support.",
+        header: t`Error deleting label`,
+        message: t`Please try again later, or contact customer support.`,
         icon: "error",
       }),
   });
@@ -34,17 +36,17 @@ export function DeleteLabelConfirmation({
     <div className="p-5">
       <div className="flex w-full flex-col justify-between pb-4">
         <h2 className="text-md pb-4 font-medium text-neutral-900 dark:text-dark-1000">
-          Are you sure you want to delete this label?
+          {t`Are you sure you want to delete this label?`}
         </h2>
         <p className="text-sm font-medium text-light-900 dark:text-dark-900">
-          {"This action can't be undone."}
+          {t`This action can't be undone.`}
         </p>
       </div>
       <div className="mt-5 flex justify-end space-x-2 sm:mt-6">
         <Button variant="secondary" onClick={() => closeModal()}>
-          Cancel
+          {t`Cancel`}
         </Button>
-        <Button onClick={handleDeleteLabel}>Delete</Button>
+        <Button onClick={handleDeleteLabel}>{t`Delete`}</Button>
       </div>
     </div>
   );

apps/web/src/locales/de/messages.po

@@ -75,7 +75,7 @@ msgstr "Beschreibung hinzufügen... (tippe '/' um Befehle zu öffnen)"
 msgid "Add label"
 msgstr "Label hinzufügen"
 
-#: src/views/members/components/InviteMemberForm.tsx:50
+#: src/views/members/components/InviteMemberForm.tsx:85
 #: src/views/card/components/MemberSelector.tsx:130
 msgid "Add member"
 msgstr "Mitglied hinzufügen"
@@ -145,6 +145,10 @@ msgstr "Bist du sicher, dass du diese Karte löschen möchtest?"
 msgid "Are you sure you want to delete this comment?"
 msgstr "Bist du sicher, dass du diesen Kommentar löschen möchtest?"
 
+#: src/components/DeleteLabelConfirmation.tsx:39
+msgid "Are you sure you want to delete this label?"
+msgstr "Sind Sie sicher, dass Sie dieses Label löschen möchten?"
+
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:54
 msgid "Are you sure you want to delete your account?"
 msgstr "Bist du sicher, dass du dein Konto löschen möchtest?"
@@ -248,6 +252,7 @@ msgstr "Fehlerbericht"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/card/components/DeleteCardConfirmation.tsx:86
 #: src/views/card/components/Comment.tsx:156
+#: src/components/DeleteLabelConfirmation.tsx:47
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -418,6 +423,7 @@ msgstr "Dunkel"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:82
 #: src/views/card/components/DeleteCardConfirmation.tsx:92
 #: src/components/LabelForm.tsx:226
+#: src/components/DeleteLabelConfirmation.tsx:49
 msgid "Delete"
 msgstr "Löschen"
 
@@ -531,7 +537,7 @@ msgstr "Bearbeitung"
 msgid "email"
 msgstr "E-Mail"
 
-#: src/views/members/components/InviteMemberForm.tsx:64
+#: src/views/members/components/InviteMemberForm.tsx:99
 msgid "Email"
 msgstr "E-Mail"
 
@@ -555,6 +561,10 @@ msgstr "Gib dein Passwort ein"
 msgid "Error deleting account"
 msgstr "Fehler beim Löschen des Kontos"
 
+#: src/components/DeleteLabelConfirmation.tsx:22
+msgid "Error deleting label"
+msgstr "Fehler beim Löschen des Labels"
+
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:45
 msgid "Error deleting workspace"
 msgstr "Fehler beim Löschen des Arbeitsbereichs"
@@ -563,6 +573,11 @@ msgstr "Fehler beim Löschen des Arbeitsbereichs"
 msgid "Error disconnecting Trello"
 msgstr "Fehler beim Trennen von Trello"
 
+#: src/views/members/components/InviteMemberForm.tsx:57
+#: src/views/members/components/InviteMemberForm.tsx:63
+msgid "Error inviting member"
+msgstr "Fehler beim Einladen des Mitglieds"
+
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:54
 msgid "Error updating display name"
 msgstr "Fehler beim Aktualisieren des Anzeigenamens"
@@ -645,6 +660,7 @@ msgstr "Finden Sie Antworten auf häufige Fragen zum Projekt. Nicht gefunden, wo
 msgid "For long-term sustainability, we recognise all good open source projects need a source of revenue. Ours comes from the paid cloud offering for workspaces with multiple users (free during the beta) and for custom workspace slugs. There's no obligation to use it, and you can self-host the software on your own infrastructure free of charge."
 msgstr "Für langfristige Nachhaltigkeit erkennen wir an, dass alle guten Open-Source-Projekte eine Einnahmequelle benötigen. Unsere stammt aus dem kostenpflichtigen Cloud-Angebot für Workspaces mit mehreren Benutzern (kostenlos während der Beta-Phase) und für benutzerdefinierte Workspace-Slugs. Es besteht keine Verpflichtung, dieses Angebot zu nutzen, und Sie können die Software kostenlos auf Ihrer eigenen Infrastruktur selbst hosten."
 
+#: src/views/home/components/Pricing.tsx:32
 #: src/views/home/components/Pricing.tsx:32
 msgid "Free"
 msgstr "Kostenlos"
@@ -800,11 +816,19 @@ msgstr "Integrationen"
 msgid "Interviewing"
 msgstr "Vorstellungsgespräch"
 
+#: src/views/members/components/InviteMemberForm.tsx:26
+msgid "Invalid email address"
+msgstr "Ungültige E-Mail-Adresse"
+
 #: src/views/members/index.tsx:169
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/views/members/components/InviteMemberForm.tsx:82
+#: src/views/members/components/InviteMemberForm.tsx:113
+msgid "Invite another"
+msgstr "Weitere Person einladen"
+
+#: src/views/members/components/InviteMemberForm.tsx:123
 #: src/views/card/components/MemberSelector.tsx:112
 msgid "Invite member"
 msgstr "Mitglied einladen"
@@ -1060,6 +1084,7 @@ msgstr "Bitte wähle eine Datei zum Hochladen aus."
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/Avatar.tsx:40
 #: src/views/settings/components/Avatar.tsx:98
+#: src/views/members/components/InviteMemberForm.tsx:64
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
 #: src/views/card/index.tsx:159
 #: src/views/card/components/NewCommentForm.tsx:31
@@ -1078,6 +1103,7 @@ msgstr "Bitte wähle eine Datei zum Hochladen aus."
 #: src/views/board/components/NewCardForm.tsx:145
 #: src/components/NewWorkspaceForm.tsx:41
 #: src/components/FeedbackModal.tsx:41
+#: src/components/DeleteLabelConfirmation.tsx:23
 msgid "Please try again later, or contact customer support."
 msgstr "Bitte versuche es später noch einmal oder kontaktiere den Kundensupport."
 
@@ -1336,6 +1362,7 @@ msgstr "Sie werden keinen Zugriff mehr auf diesen Workspace haben."
 
 #: src/views/card/components/DeleteCommentConfirmation.tsx:68
 #: src/views/card/components/DeleteCardConfirmation.tsx:78
+#: src/components/DeleteLabelConfirmation.tsx:42
 msgid "This action can't be undone."
 msgstr "Diese Aktion kann nicht rückgängig gemacht werden."
 
@@ -1531,6 +1558,10 @@ msgstr "Vorlage verwenden"
 msgid "User"
 msgstr "Benutzer"
 
+#: src/views/members/components/InviteMemberForm.tsx:58
+msgid "User is already a member of this workspace"
+msgstr "Benutzer ist bereits Mitglied dieses Arbeitsbereichs"
+
 #: src/views/boards/components/TemplateBoards.tsx:37
 msgid "Video"
 msgstr "Video"

apps/web/src/locales/en/messages.po

@@ -87,7 +87,7 @@ msgstr "Add description... (type '/' to open commands)"
 msgid "Add label"
 msgstr "Add label"
 
-#: src/views/members/components/InviteMemberForm.tsx:50
+#: src/views/members/components/InviteMemberForm.tsx:85
 #: src/views/card/components/MemberSelector.tsx:130
 msgid "Add member"
 msgstr "Add member"
@@ -161,6 +161,10 @@ msgstr "Are you sure you want to delete this card?"
 msgid "Are you sure you want to delete this comment?"
 msgstr "Are you sure you want to delete this comment?"
 
+#: src/components/DeleteLabelConfirmation.tsx:39
+msgid "Are you sure you want to delete this label?"
+msgstr "Are you sure you want to delete this label?"
+
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:54
 msgid "Are you sure you want to delete your account?"
 msgstr "Are you sure you want to delete your account?"
@@ -276,6 +280,7 @@ msgstr "Bug Report"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/card/components/DeleteCardConfirmation.tsx:86
 #: src/views/card/components/Comment.tsx:156
+#: src/components/DeleteLabelConfirmation.tsx:47
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -454,6 +459,7 @@ msgstr "Dark"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:82
 #: src/views/card/components/DeleteCardConfirmation.tsx:92
 #: src/components/LabelForm.tsx:226
+#: src/components/DeleteLabelConfirmation.tsx:49
 msgid "Delete"
 msgstr "Delete"
 
@@ -567,7 +573,7 @@ msgstr "Editing"
 msgid "email"
 msgstr "email"
 
-#: src/views/members/components/InviteMemberForm.tsx:64
+#: src/views/members/components/InviteMemberForm.tsx:99
 msgid "Email"
 msgstr "Email"
 
@@ -591,6 +597,10 @@ msgstr "Enter your password"
 msgid "Error deleting account"
 msgstr "Error deleting account"
 
+#: src/components/DeleteLabelConfirmation.tsx:22
+msgid "Error deleting label"
+msgstr "Error deleting label"
+
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:45
 msgid "Error deleting workspace"
 msgstr "Error deleting workspace"
@@ -599,6 +609,11 @@ msgstr "Error deleting workspace"
 msgid "Error disconnecting Trello"
 msgstr "Error disconnecting Trello"
 
+#: src/views/members/components/InviteMemberForm.tsx:57
+#: src/views/members/components/InviteMemberForm.tsx:63
+msgid "Error inviting member"
+msgstr "Error inviting member"
+
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:54
 msgid "Error updating display name"
 msgstr "Error updating display name"
@@ -841,11 +856,19 @@ msgstr "Integrations"
 msgid "Interviewing"
 msgstr "Interviewing"
 
+#: src/views/members/components/InviteMemberForm.tsx:26
+msgid "Invalid email address"
+msgstr "Invalid email address"
+
 #: src/views/members/index.tsx:169
 msgid "Invite"
 msgstr "Invite"
 
-#: src/views/members/components/InviteMemberForm.tsx:82
+#: src/views/members/components/InviteMemberForm.tsx:113
+msgid "Invite another"
+msgstr "Invite another"
+
+#: src/views/members/components/InviteMemberForm.tsx:123
 #: src/views/card/components/MemberSelector.tsx:112
 msgid "Invite member"
 msgstr "Invite member"
@@ -1105,6 +1128,7 @@ msgstr "Please select a file to upload."
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/Avatar.tsx:40
 #: src/views/settings/components/Avatar.tsx:98
+#: src/views/members/components/InviteMemberForm.tsx:64
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
 #: src/views/card/index.tsx:159
 #: src/views/card/components/NewCommentForm.tsx:31
@@ -1123,6 +1147,7 @@ msgstr "Please select a file to upload."
 #: src/views/board/components/NewCardForm.tsx:145
 #: src/components/NewWorkspaceForm.tsx:41
 #: src/components/FeedbackModal.tsx:41
+#: src/components/DeleteLabelConfirmation.tsx:23
 msgid "Please try again later, or contact customer support."
 msgstr "Please try again later, or contact customer support."
 
@@ -1385,6 +1410,7 @@ msgstr "They won't be able to access this workspace."
 
 #: src/views/card/components/DeleteCommentConfirmation.tsx:68
 #: src/views/card/components/DeleteCardConfirmation.tsx:78
+#: src/components/DeleteLabelConfirmation.tsx:42
 msgid "This action can't be undone."
 msgstr "This action can't be undone."
 
@@ -1584,6 +1610,10 @@ msgstr "Use template"
 msgid "User"
 msgstr "User"
 
+#: src/views/members/components/InviteMemberForm.tsx:58
+msgid "User is already a member of this workspace"
+msgstr "User is already a member of this workspace"
+
 #: src/views/boards/components/TemplateBoards.tsx:37
 msgid "Video"
 msgstr "Video"

apps/web/src/locales/es/messages.po

@@ -75,7 +75,7 @@ msgstr "Añadir descripción... (escribe '/' para abrir comandos)"
 msgid "Add label"
 msgstr "Añadir etiqueta"
 
-#: src/views/members/components/InviteMemberForm.tsx:50
+#: src/views/members/components/InviteMemberForm.tsx:85
 #: src/views/card/components/MemberSelector.tsx:130
 msgid "Add member"
 msgstr "Añadir miembro"
@@ -145,6 +145,10 @@ msgstr "¿Estás seguro de que quieres eliminar esta tarjeta?"
 msgid "Are you sure you want to delete this comment?"
 msgstr "¿Estás seguro de que quieres eliminar este comentario?"
 
+#: src/components/DeleteLabelConfirmation.tsx:39
+msgid "Are you sure you want to delete this label?"
+msgstr "¿Estás seguro de que quieres eliminar esta etiqueta?"
+
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:54
 msgid "Are you sure you want to delete your account?"
 msgstr "¿Estás seguro de que quieres eliminar tu cuenta?"
@@ -248,6 +252,7 @@ msgstr "Informe de error"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/card/components/DeleteCardConfirmation.tsx:86
 #: src/views/card/components/Comment.tsx:156
+#: src/components/DeleteLabelConfirmation.tsx:47
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -418,6 +423,7 @@ msgstr "Oscuro"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:82
 #: src/views/card/components/DeleteCardConfirmation.tsx:92
 #: src/components/LabelForm.tsx:226
+#: src/components/DeleteLabelConfirmation.tsx:49
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -531,7 +537,7 @@ msgstr "Editando"
 msgid "email"
 msgstr "correo electrónico"
 
-#: src/views/members/components/InviteMemberForm.tsx:64
+#: src/views/members/components/InviteMemberForm.tsx:99
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -555,6 +561,10 @@ msgstr "Introduce tu contraseña"
 msgid "Error deleting account"
 msgstr "Error al eliminar la cuenta"
 
+#: src/components/DeleteLabelConfirmation.tsx:22
+msgid "Error deleting label"
+msgstr "Error al eliminar la etiqueta"
+
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:45
 msgid "Error deleting workspace"
 msgstr "Error al eliminar el espacio de trabajo"
@@ -563,6 +573,11 @@ msgstr "Error al eliminar el espacio de trabajo"
 msgid "Error disconnecting Trello"
 msgstr "Error al desconectar Trello"
 
+#: src/views/members/components/InviteMemberForm.tsx:57
+#: src/views/members/components/InviteMemberForm.tsx:63
+msgid "Error inviting member"
+msgstr "Error al invitar al miembro"
+
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:54
 msgid "Error updating display name"
 msgstr "Error al actualizar el nombre visible"
@@ -645,6 +660,7 @@ msgstr "Encuentra respuestas a preguntas frecuentes sobre el proyecto. ¿No encu
 msgid "For long-term sustainability, we recognise all good open source projects need a source of revenue. Ours comes from the paid cloud offering for workspaces with multiple users (free during the beta) and for custom workspace slugs. There's no obligation to use it, and you can self-host the software on your own infrastructure free of charge."
 msgstr "Para la sostenibilidad a largo plazo, reconocemos que todos los buenos proyectos de código abierto necesitan una fuente de ingresos. La nuestra proviene de la oferta de pago en la nube para espacios de trabajo con múltiples usuarios (gratuita durante la beta) y para slugs personalizados de espacios de trabajo. No hay obligación de usarla, y puedes autoalojar el software en tu propia infraestructura sin costo alguno."
 
+#: src/views/home/components/Pricing.tsx:32
 #: src/views/home/components/Pricing.tsx:32
 msgid "Free"
 msgstr "Gratis"
@@ -800,11 +816,19 @@ msgstr "Integraciones"
 msgid "Interviewing"
 msgstr "Entrevistando"
 
+#: src/views/members/components/InviteMemberForm.tsx:26
+msgid "Invalid email address"
+msgstr "Dirección de correo electrónico no válida"
+
 #: src/views/members/index.tsx:169
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/views/members/components/InviteMemberForm.tsx:82
+#: src/views/members/components/InviteMemberForm.tsx:113
+msgid "Invite another"
+msgstr "Invitar a otro"
+
+#: src/views/members/components/InviteMemberForm.tsx:123
 #: src/views/card/components/MemberSelector.tsx:112
 msgid "Invite member"
 msgstr "Invitar miembro"
@@ -1060,6 +1084,7 @@ msgstr "Por favor selecciona un archivo para subir."
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/Avatar.tsx:40
 #: src/views/settings/components/Avatar.tsx:98
+#: src/views/members/components/InviteMemberForm.tsx:64
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
 #: src/views/card/index.tsx:159
 #: src/views/card/components/NewCommentForm.tsx:31
@@ -1078,6 +1103,7 @@ msgstr "Por favor selecciona un archivo para subir."
 #: src/views/board/components/NewCardForm.tsx:145
 #: src/components/NewWorkspaceForm.tsx:41
 #: src/components/FeedbackModal.tsx:41
+#: src/components/DeleteLabelConfirmation.tsx:23
 msgid "Please try again later, or contact customer support."
 msgstr "Por favor, inténtalo de nuevo más tarde o contacta con atención al cliente."
 
@@ -1336,6 +1362,7 @@ msgstr "No podrán acceder a este espacio de trabajo."
 
 #: src/views/card/components/DeleteCommentConfirmation.tsx:68
 #: src/views/card/components/DeleteCardConfirmation.tsx:78
+#: src/components/DeleteLabelConfirmation.tsx:42
 msgid "This action can't be undone."
 msgstr "Esta acción no se puede deshacer."
 
@@ -1531,6 +1558,10 @@ msgstr "Usar plantilla"
 msgid "User"
 msgstr "Usuario"
 
+#: src/views/members/components/InviteMemberForm.tsx:58
+msgid "User is already a member of this workspace"
+msgstr "El usuario ya es miembro de este espacio de trabajo"
+
 #: src/views/boards/components/TemplateBoards.tsx:37
 msgid "Video"
 msgstr "Video"

apps/web/src/locales/fr/messages.po

@@ -75,7 +75,7 @@ msgstr "Ajouter une description... (tapez '/' pour ouvrir les commandes)"
 msgid "Add label"
 msgstr "Ajouter une étiquette"
 
-#: src/views/members/components/InviteMemberForm.tsx:50
+#: src/views/members/components/InviteMemberForm.tsx:85
 #: src/views/card/components/MemberSelector.tsx:130
 msgid "Add member"
 msgstr "Ajouter un membre"
@@ -145,6 +145,10 @@ msgstr "Êtes-vous sûr de vouloir supprimer cette carte ?"
 msgid "Are you sure you want to delete this comment?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
 
+#: src/components/DeleteLabelConfirmation.tsx:39
+msgid "Are you sure you want to delete this label?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette étiquette ?"
+
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:54
 msgid "Are you sure you want to delete your account?"
 msgstr "Êtes-vous sûr de vouloir supprimer votre compte ?"
@@ -248,6 +252,7 @@ msgstr "Rapport de bug"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/card/components/DeleteCardConfirmation.tsx:86
 #: src/views/card/components/Comment.tsx:156
+#: src/components/DeleteLabelConfirmation.tsx:47
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -418,6 +423,7 @@ msgstr "Sombre"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:82
 #: src/views/card/components/DeleteCardConfirmation.tsx:92
 #: src/components/LabelForm.tsx:226
+#: src/components/DeleteLabelConfirmation.tsx:49
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -531,7 +537,7 @@ msgstr "Édition"
 msgid "email"
 msgstr "e-mail"
 
-#: src/views/members/components/InviteMemberForm.tsx:64
+#: src/views/members/components/InviteMemberForm.tsx:99
 msgid "Email"
 msgstr "E-mail"
 
@@ -555,6 +561,10 @@ msgstr "Saisissez votre mot de passe"
 msgid "Error deleting account"
 msgstr "Erreur lors de la suppression du compte"
 
+#: src/components/DeleteLabelConfirmation.tsx:22
+msgid "Error deleting label"
+msgstr "Erreur lors de la suppression de l'étiquette"
+
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:45
 msgid "Error deleting workspace"
 msgstr "Erreur lors de la suppression de l'espace de travail"
@@ -563,6 +573,11 @@ msgstr "Erreur lors de la suppression de l'espace de travail"
 msgid "Error disconnecting Trello"
 msgstr "Erreur lors de la déconnexion de Trello"
 
+#: src/views/members/components/InviteMemberForm.tsx:57
+#: src/views/members/components/InviteMemberForm.tsx:63
+msgid "Error inviting member"
+msgstr "Erreur lors de l'invitation du membre"
+
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:54
 msgid "Error updating display name"
 msgstr "Erreur lors de la mise à jour du nom d'affichage"
@@ -645,6 +660,7 @@ msgstr "Trouvez des réponses aux questions fréquentes sur le projet. Vous ne t
 msgid "For long-term sustainability, we recognise all good open source projects need a source of revenue. Ours comes from the paid cloud offering for workspaces with multiple users (free during the beta) and for custom workspace slugs. There's no obligation to use it, and you can self-host the software on your own infrastructure free of charge."
 msgstr "Pour une durabilité à long terme, nous reconnaissons que tous les bons projets open source ont besoin d'une source de revenus. La nôtre provient de l'offre cloud payante pour les espaces de travail avec plusieurs utilisateurs (gratuite pendant la bêta) et pour les slugs d'espace de travail personnalisés. Il n'y a aucune obligation de l'utiliser, et vous pouvez auto-héberger le logiciel sur votre propre infrastructure gratuitement."
 
+#: src/views/home/components/Pricing.tsx:32
 #: src/views/home/components/Pricing.tsx:32
 msgid "Free"
 msgstr "Gratuit"
@@ -800,11 +816,19 @@ msgstr "Intégrations"
 msgid "Interviewing"
 msgstr "Entretien"
 
+#: src/views/members/components/InviteMemberForm.tsx:26
+msgid "Invalid email address"
+msgstr "Adresse e-mail invalide"
+
 #: src/views/members/index.tsx:169
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/views/members/components/InviteMemberForm.tsx:82
+#: src/views/members/components/InviteMemberForm.tsx:113
+msgid "Invite another"
+msgstr "Inviter un autre"
+
+#: src/views/members/components/InviteMemberForm.tsx:123
 #: src/views/card/components/MemberSelector.tsx:112
 msgid "Invite member"
 msgstr "Inviter un membre"
@@ -1060,6 +1084,7 @@ msgstr "Veuillez sélectionner un fichier à télécharger."
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/Avatar.tsx:40
 #: src/views/settings/components/Avatar.tsx:98
+#: src/views/members/components/InviteMemberForm.tsx:64
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
 #: src/views/card/index.tsx:159
 #: src/views/card/components/NewCommentForm.tsx:31
@@ -1078,6 +1103,7 @@ msgstr "Veuillez sélectionner un fichier à télécharger."
 #: src/views/board/components/NewCardForm.tsx:145
 #: src/components/NewWorkspaceForm.tsx:41
 #: src/components/FeedbackModal.tsx:41
+#: src/components/DeleteLabelConfirmation.tsx:23
 msgid "Please try again later, or contact customer support."
 msgstr "Veuillez réessayer plus tard ou contacter le service client."
 
@@ -1336,6 +1362,7 @@ msgstr "Ils ne pourront plus accéder à cet espace de travail."
 
 #: src/views/card/components/DeleteCommentConfirmation.tsx:68
 #: src/views/card/components/DeleteCardConfirmation.tsx:78
+#: src/components/DeleteLabelConfirmation.tsx:42
 msgid "This action can't be undone."
 msgstr "Cette action ne peut pas être annulée."
 
@@ -1531,6 +1558,10 @@ msgstr "Utiliser le modèle"
 msgid "User"
 msgstr "Utilisateur"
 
+#: src/views/members/components/InviteMemberForm.tsx:58
+msgid "User is already a member of this workspace"
+msgstr "L'utilisateur est déjà membre de cet espace de travail"
+
 #: src/views/boards/components/TemplateBoards.tsx:37
 msgid "Video"
 msgstr "Vidéo"

apps/web/src/locales/it/messages.po

@@ -75,7 +75,7 @@ msgstr "Aggiungi descrizione... (digita '/' per aprire i comandi)"
 msgid "Add label"
 msgstr "Aggiungi etichetta"
 
-#: src/views/members/components/InviteMemberForm.tsx:50
+#: src/views/members/components/InviteMemberForm.tsx:85
 #: src/views/card/components/MemberSelector.tsx:130
 msgid "Add member"
 msgstr "Aggiungi membro"
@@ -145,6 +145,10 @@ msgstr "Sei sicuro di voler eliminare questa carta?"
 msgid "Are you sure you want to delete this comment?"
 msgstr "Sei sicuro di voler eliminare questo commento?"
 
+#: src/components/DeleteLabelConfirmation.tsx:39
+msgid "Are you sure you want to delete this label?"
+msgstr "Sei sicuro di voler eliminare questa etichetta?"
+
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:54
 msgid "Are you sure you want to delete your account?"
 msgstr "Sei sicuro di voler eliminare il tuo account?"
@@ -248,6 +252,7 @@ msgstr "Segnalazione bug"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/card/components/DeleteCardConfirmation.tsx:86
 #: src/views/card/components/Comment.tsx:156
+#: src/components/DeleteLabelConfirmation.tsx:47
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -418,6 +423,7 @@ msgstr "Scuro"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:82
 #: src/views/card/components/DeleteCardConfirmation.tsx:92
 #: src/components/LabelForm.tsx:226
+#: src/components/DeleteLabelConfirmation.tsx:49
 msgid "Delete"
 msgstr "Elimina"
 
@@ -531,7 +537,7 @@ msgstr "Modifica"
 msgid "email"
 msgstr "email"
 
-#: src/views/members/components/InviteMemberForm.tsx:64
+#: src/views/members/components/InviteMemberForm.tsx:99
 msgid "Email"
 msgstr "Email"
 
@@ -555,6 +561,10 @@ msgstr "Inserisci la tua password"
 msgid "Error deleting account"
 msgstr "Errore durante l'eliminazione dell'account"
 
+#: src/components/DeleteLabelConfirmation.tsx:22
+msgid "Error deleting label"
+msgstr "Errore durante l'eliminazione dell'etichetta"
+
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:45
 msgid "Error deleting workspace"
 msgstr "Errore durante l'eliminazione dell'area di lavoro"
@@ -563,6 +573,11 @@ msgstr "Errore durante l'eliminazione dell'area di lavoro"
 msgid "Error disconnecting Trello"
 msgstr "Errore durante la disconnessione da Trello"
 
+#: src/views/members/components/InviteMemberForm.tsx:57
+#: src/views/members/components/InviteMemberForm.tsx:63
+msgid "Error inviting member"
+msgstr "Errore durante l'invito del membro"
+
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:54
 msgid "Error updating display name"
 msgstr "Errore durante l'aggiornamento del nome visualizzato"
@@ -645,6 +660,7 @@ msgstr "Trova risposte alle domande comuni sul progetto. Non trovi quello che st
 msgid "For long-term sustainability, we recognise all good open source projects need a source of revenue. Ours comes from the paid cloud offering for workspaces with multiple users (free during the beta) and for custom workspace slugs. There's no obligation to use it, and you can self-host the software on your own infrastructure free of charge."
 msgstr "Per la sostenibilità a lungo termine, riconosciamo che tutti i buoni progetti open source necessitano di una fonte di entrate. La nostra proviene dall'offerta cloud a pagamento per workspace con più utenti (gratuita durante la beta) e per slug di workspace personalizzati. Non c'è alcun obbligo di utilizzarla, e puoi ospitare autonomamente il software sulla tua infrastruttura gratuitamente."
 
+#: src/views/home/components/Pricing.tsx:32
 #: src/views/home/components/Pricing.tsx:32
 msgid "Free"
 msgstr "Gratuito"
@@ -800,11 +816,19 @@ msgstr "Integrazioni"
 msgid "Interviewing"
 msgstr "Colloquio"
 
+#: src/views/members/components/InviteMemberForm.tsx:26
+msgid "Invalid email address"
+msgstr "Indirizzo email non valido"
+
 #: src/views/members/index.tsx:169
 msgid "Invite"
 msgstr "Invita"
 
-#: src/views/members/components/InviteMemberForm.tsx:82
+#: src/views/members/components/InviteMemberForm.tsx:113
+msgid "Invite another"
+msgstr "Invita un altro"
+
+#: src/views/members/components/InviteMemberForm.tsx:123
 #: src/views/card/components/MemberSelector.tsx:112
 msgid "Invite member"
 msgstr "Invita membro"
@@ -1060,6 +1084,7 @@ msgstr "Seleziona un file da caricare."
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/Avatar.tsx:40
 #: src/views/settings/components/Avatar.tsx:98
+#: src/views/members/components/InviteMemberForm.tsx:64
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
 #: src/views/card/index.tsx:159
 #: src/views/card/components/NewCommentForm.tsx:31
@@ -1078,6 +1103,7 @@ msgstr "Seleziona un file da caricare."
 #: src/views/board/components/NewCardForm.tsx:145
 #: src/components/NewWorkspaceForm.tsx:41
 #: src/components/FeedbackModal.tsx:41
+#: src/components/DeleteLabelConfirmation.tsx:23
 msgid "Please try again later, or contact customer support."
 msgstr "Riprova più tardi o contatta l'assistenza clienti."
 
@@ -1336,6 +1362,7 @@ msgstr "Non potranno accedere a questo spazio di lavoro."
 
 #: src/views/card/components/DeleteCommentConfirmation.tsx:68
 #: src/views/card/components/DeleteCardConfirmation.tsx:78
+#: src/components/DeleteLabelConfirmation.tsx:42
 msgid "This action can't be undone."
 msgstr "Questa azione non può essere annullata."
 
@@ -1531,6 +1558,10 @@ msgstr "Usa template"
 msgid "User"
 msgstr "Utente"
 
+#: src/views/members/components/InviteMemberForm.tsx:58
+msgid "User is already a member of this workspace"
+msgstr "L'utente è già membro di questo spazio di lavoro"
+
 #: src/views/boards/components/TemplateBoards.tsx:37
 msgid "Video"
 msgstr "Video"

apps/web/src/locales/nl/messages.po

@@ -75,7 +75,7 @@ msgstr "Voeg beschrijving toe... (typ '/' om commando's te openen)"
 msgid "Add label"
 msgstr "Label toevoegen"
 
-#: src/views/members/components/InviteMemberForm.tsx:50
+#: src/views/members/components/InviteMemberForm.tsx:85
 #: src/views/card/components/MemberSelector.tsx:130
 msgid "Add member"
 msgstr "Lid toevoegen"
@@ -145,6 +145,10 @@ msgstr "Weet je zeker dat je deze kaart wilt verwijderen?"
 msgid "Are you sure you want to delete this comment?"
 msgstr "Weet je zeker dat je deze opmerking wilt verwijderen?"
 
+#: src/components/DeleteLabelConfirmation.tsx:39
+msgid "Are you sure you want to delete this label?"
+msgstr "Weet je zeker dat je dit label wilt verwijderen?"
+
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:54
 msgid "Are you sure you want to delete your account?"
 msgstr "Weet je zeker dat je je account wilt verwijderen?"
@@ -248,6 +252,7 @@ msgstr "Bugrapport"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/card/components/DeleteCardConfirmation.tsx:86
 #: src/views/card/components/Comment.tsx:156
+#: src/components/DeleteLabelConfirmation.tsx:47
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -418,6 +423,7 @@ msgstr "Donker"
 #: src/views/card/components/DeleteCommentConfirmation.tsx:82
 #: src/views/card/components/DeleteCardConfirmation.tsx:92
 #: src/components/LabelForm.tsx:226
+#: src/components/DeleteLabelConfirmation.tsx:49
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -531,7 +537,7 @@ msgstr "Bewerken"
 msgid "email"
 msgstr "e-mail"
 
-#: src/views/members/components/InviteMemberForm.tsx:64
+#: src/views/members/components/InviteMemberForm.tsx:99
 msgid "Email"
 msgstr "E-mail"
 
@@ -555,6 +561,10 @@ msgstr "Voer je wachtwoord in"
 msgid "Error deleting account"
 msgstr "Fout bij verwijderen account"
 
+#: src/components/DeleteLabelConfirmation.tsx:22
+msgid "Error deleting label"
+msgstr "Fout bij het verwijderen van label"
+
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:45
 msgid "Error deleting workspace"
 msgstr "Fout bij verwijderen werkruimte"
@@ -563,6 +573,11 @@ msgstr "Fout bij verwijderen werkruimte"
 msgid "Error disconnecting Trello"
 msgstr "Fout bij ontkoppelen van Trello"
 
+#: src/views/members/components/InviteMemberForm.tsx:57
+#: src/views/members/components/InviteMemberForm.tsx:63
+msgid "Error inviting member"
+msgstr "Fout bij het uitnodigen van lid"
+
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:54
 msgid "Error updating display name"
 msgstr "Fout bij bijwerken weergavenaam"
@@ -645,6 +660,7 @@ msgstr "Vind antwoorden op veelgestelde vragen over het project. Kun je niet vin
 msgid "For long-term sustainability, we recognise all good open source projects need a source of revenue. Ours comes from the paid cloud offering for workspaces with multiple users (free during the beta) and for custom workspace slugs. There's no obligation to use it, and you can self-host the software on your own infrastructure free of charge."
 msgstr "Voor duurzaamheid op lange termijn erkennen we dat alle goede open source projecten een inkomstenbron nodig hebben. De onze komt van de betaalde cloudoplossing voor werkruimtes met meerdere gebruikers (gratis tijdens de bèta) en voor aangepaste werkruimte-slugs. Je bent niet verplicht om hiervan gebruik te maken en je kunt de software gratis op je eigen infrastructuur hosten."
 
+#: src/views/home/components/Pricing.tsx:32
 #: src/views/home/components/Pricing.tsx:32
 msgid "Free"
 msgstr "Gratis"
@@ -800,11 +816,19 @@ msgstr "Integraties"
 msgid "Interviewing"
 msgstr "Interviewen"
 
+#: src/views/members/components/InviteMemberForm.tsx:26
+msgid "Invalid email address"
+msgstr "Ongeldig e-mailadres"
+
 #: src/views/members/index.tsx:169
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: src/views/members/components/InviteMemberForm.tsx:82
+#: src/views/members/components/InviteMemberForm.tsx:113
+msgid "Invite another"
+msgstr "Nog iemand uitnodigen"
+
+#: src/views/members/components/InviteMemberForm.tsx:123
 #: src/views/card/components/MemberSelector.tsx:112
 msgid "Invite member"
 msgstr "Lid uitnodigen"
@@ -1060,6 +1084,7 @@ msgstr "Selecteer een bestand om te uploaden."
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/Avatar.tsx:40
 #: src/views/settings/components/Avatar.tsx:98
+#: src/views/members/components/InviteMemberForm.tsx:64
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
 #: src/views/card/index.tsx:159
 #: src/views/card/components/NewCommentForm.tsx:31
@@ -1078,6 +1103,7 @@ msgstr "Selecteer een bestand om te uploaden."
 #: src/views/board/components/NewCardForm.tsx:145
 #: src/components/NewWorkspaceForm.tsx:41
 #: src/components/FeedbackModal.tsx:41
+#: src/components/DeleteLabelConfirmation.tsx:23
 msgid "Please try again later, or contact customer support."
 msgstr "Probeer het later opnieuw of neem contact op met de klantenservice."
 
@@ -1336,6 +1362,7 @@ msgstr "Ze zullen geen toegang meer hebben tot deze werkruimte."
 
 #: src/views/card/components/DeleteCommentConfirmation.tsx:68
 #: src/views/card/components/DeleteCardConfirmation.tsx:78
+#: src/components/DeleteLabelConfirmation.tsx:42
 msgid "This action can't be undone."
 msgstr "Deze actie kan niet ongedaan worden gemaakt."
 
@@ -1531,6 +1558,10 @@ msgstr "Sjabloon gebruiken"
 msgid "User"
 msgstr "Gebruiker"
 
+#: src/views/members/components/InviteMemberForm.tsx:58
+msgid "User is already a member of this workspace"
+msgstr "Gebruiker is al lid van deze werkruimte"
+
 #: src/views/boards/components/TemplateBoards.tsx:37
 msgid "Video"
 msgstr "Video"

apps/web/src/views/members/components/InviteMemberForm.tsx

@@ -1,26 +1,43 @@
+import { zodResolver } from "@hookform/resolvers/zod";
 import { t } from "@lingui/core/macro";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { HiXMark } from "react-icons/hi2";
+import { z } from "zod";
 
 import type { InviteMemberInput } from "@kan/api/types";
 
 import Button from "~/components/Button";
 import Input from "~/components/Input";
+import Toggle from "~/components/Toggle";
 import { useModal } from "~/providers/modal";
+import { usePopup } from "~/providers/popup";
 import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
 
 export function InviteMemberForm() {
   const utils = api.useUtils();
+  const [isCreateAnotherEnabled, setIsCreateAnotherEnabled] = useState(false);
   const { closeModal } = useModal();
   const { workspace } = useWorkspace();
+  const { showPopup } = usePopup();
 
-  const { register, handleSubmit } = useForm<InviteMemberInput>({
+  const InviteMemberSchema = z.object({
+    email: z.string().email({ message: t`Invalid email address` }),
+    workspacePublicId: z.string(),
+  });
+
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors },
+  } = useForm<InviteMemberInput>({
     defaultValues: {
       email: "",
       workspacePublicId: workspace.publicId || "",
     },
+    resolver: zodResolver(InviteMemberSchema),
   });
 
   const refetchBoards = () => utils.board.all.refetch();
@@ -31,6 +48,24 @@ export function InviteMemberForm() {
       await utils.workspace.byId.refetch();
       await refetchBoards();
     },
+    onError: (error) => {
+      reset();
+      if (!isCreateAnotherEnabled) closeModal();
+
+      if (error.data?.code === "CONFLICT") {
+        showPopup({
+          header: t`Error inviting member`,
+          message: t`User is already a member of this workspace`,
+          icon: "error",
+        });
+      } else {
+        showPopup({
+          header: t`Error inviting member`,
+          message: t`Please try again later, or contact customer support.`,
+          icon: "error",
+        });
+      }
+    },
   });
 
   const onSubmit = (data: InviteMemberInput) => {
@@ -69,10 +104,16 @@ export function InviteMemberForm() {
               await handleSubmit(onSubmit)();
             }
           }}
+          errorMessage={errors.email?.message}
         />
       </div>
 
       <div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
+        <Toggle
+          label={t`Invite another`}
+          isChecked={isCreateAnotherEnabled}
+          onChange={() => setIsCreateAnotherEnabled(!isCreateAnotherEnabled)}
+        />
         <div>
           <Button
             type="submit"

packages/api/src/routers/member.ts

@@ -56,7 +56,7 @@ export const memberRouter = createTRPCRouter({
       if (isInvitedEmailAlreadyMember) {
         throw new TRPCError({
           message: `User with email ${input.email} is already a member of this workspace`,
-          code: "BAD_REQUEST",
+          code: "CONFLICT",
         });
       }
 
@@ -88,6 +88,12 @@ export const memberRouter = createTRPCRouter({
           callbackURL: `/boards?type=invite&memberPublicId=${invite.publicId}`,
         });
 
+        await memberRepo.softDelete(ctx.db, {
+          memberId: invite.id,
+          deletedAt: new Date(),
+          deletedBy: userId,
+        });
+
         throw new TRPCError({
           message: `Failed to send magic link invitation to user with email ${input.email}.`,
           code: "INTERNAL_SERVER_ERROR",