Merge pull request #3949 from weseek/feat/GW-6496-toast-error

Feat/gw 6496 toast error

src/client/js/components/Admin/Users/UserInviteModal.jsx

@@ -9,6 +9,7 @@ import {
   Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 
+import * as toastr from 'toastr';
 import { toastSuccess, toastError, toastWarning } from '../../../util/apiNotification';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
@@ -55,9 +56,15 @@ class UserInviteModal extends React.Component {
         msg = `Existing email<br>${msg}`;
         toastWarning(msg);
         break;
-      // TODO: GW-6496
       case 'error':
-        toastError(msg);
+        toastr.error(msg, 'Error', {
+          closeButton: true,
+          progressBar: true,
+          newestOnTop: false,
+          showDuration: '100',
+          hideDuration: '100',
+          timeOut: '0',
+        });
         break;
     }
   }
@@ -224,7 +231,16 @@ class UserInviteModal extends React.Component {
       if (emailList.existingEmailList.length > 0) {
         this.showToasterByEmailList(emailList.existingEmailList, 'warning');
       }
-      // TODO: GW-6496
+      if (emailList.failedEmailList.length > 0) {
+        const failedEmailList = emailList.failedEmailList.map((failed, index) => {
+          let response = `email: ${failed.email}<br>・reason: ${failed.reason}`;
+          if (index !== emailList.failedEmailList.length - 1) {
+            response += '<br>';
+          }
+          return response;
+        });
+        this.showToasterByEmailList(failedEmailList, 'error');
+      }
     }
     catch (err) {
       toastError(err);

src/server/routes/apiv3/users.js

@@ -397,19 +397,19 @@ module.exports = (crowi) => {
 
     // Delete duplicate email addresses
     const emailList = Array.from(new Set(req.body.shapedEmailList));
-    const failedEmailList = [];
+    let failedEmailList = [];
 
     // Create users
     const createUser = await User.createUsersByEmailList(emailList);
     if (createUser.failedToCreateUserEmailList.length > 0) {
-      failedEmailList.push(createUser.failedToCreateUserEmailList);
+      failedEmailList = failedEmailList.concat(createUser.failedToCreateUserEmailList);
     }
 
     // Send email
     if (req.body.sendEmail) {
       const sendEmail = await sendEmailByUserList(createUser.createdUserList);
       if (sendEmail.failedToSendEmailList.length > 0) {
-        failedEmailList.push(sendEmail.failedToSendEmailList);
+        failedEmailList = failedEmailList.concat(sendEmail.failedToSendEmailList);
       }
     }