Merge pull request #2937 from reactioncommerce/wanja-fix-issue-2928

Fix alerts for confirmation when inviting new user
reactioncommerce · Sep 28, 2017 · acd18ef · acd18ef
2 parents 727f30f + dd4f432
commit acd18ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/imports/plugins/core/accounts/client/components/adminInviteForm.js b/imports/plugins/core/accounts/client/components/adminInviteForm.js
@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 import _ from "lodash";
 import { Components, registerComponent } from "@reactioncommerce/reaction-components";
 import { default as ReactionAlerts } from "/imports/plugins/core/layout/client/templates/layout/alerts/inlineAlerts";
-import { Reaction } from "/client/api";
+import { Reaction, i18next } from "/client/api";
 import { getDefaultUserInviteGroup } from "../helpers/accountsHelper";
 
 class AdminInviteForm extends Component {
@@ -73,6 +73,8 @@ class AdminInviteForm extends Component {
           messageKey = "admin.groupsInvite.inviteOwnerError";
         } else if (error.reason === "cannot invite to group") {
           messageKey = "admin.groupsInvite.cannotInvite";
+        } else if (error.reason === "Need to set a username or email") {
+          messageKey = "admin.groupsInvite.NeedToSetUsernameOrEmail";
         } else {
           messageKey = "admin.groupsInvite.errorSendingInvite";
         }
@@ -81,11 +83,7 @@ class AdminInviteForm extends Component {
 
       if (result) {
         this.setState({ name: "", email: "" });
-        ReactionAlerts.add(
-          "Invite Successful",
-          "success",
-          Object.assign({}, alertOptions, { i18nKey: "accountsUI.info.invitationSent" })
-        );
+        Alerts.toast(i18next.t("accountsUI.info.invitationSent"), "success");
       }
     });
   }

diff --git a/imports/plugins/core/accounts/server/i18n/en.json b/imports/plugins/core/accounts/server/i18n/en.json
@@ -32,7 +32,8 @@
           "groupRequired": "A group is required to invite an admin",
           "cannotInvite": "You cannot invite to group",
           "unableToSendInvitationEmail": "Unable to send invitation email",
-          "errorSendingInvite": "An error occured while sending invite"
+          "errorSendingInvite": "An error occured while sending invite",
+          "NeedToSetUsernameOrEmail": "Need to set a username or email"
         }
       }
     }

diff --git a/imports/plugins/included/default-theme/client/styles/dashboard/accounts.less b/imports/plugins/included/default-theme/client/styles/dashboard/accounts.less
@@ -61,7 +61,7 @@
   }
   .col-md-3 {
     .alert-container {
-      position: absolute;
+      position: relative;
       top: 0;
       width: 100%;
     }

diff --git a/imports/plugins/included/marketplace/client/components/inviteOwner.js b/imports/plugins/included/marketplace/client/components/inviteOwner.js
@@ -1,6 +1,7 @@
 import { Meteor } from "meteor/meteor";
 import React, { Component } from "react";
 import { registerComponent, Components } from "@reactioncommerce/reaction-components";
+import { i18next } from "/client/api";
 import { default as ReactionAlerts } from "/imports/plugins/core/layout/client/templates/layout/alerts/inlineAlerts";
 
 class InviteOwner extends Component {
@@ -49,11 +50,7 @@ class InviteOwner extends Component {
 
       if (result) {
         this.setState({ name: "", email: "" });
-        ReactionAlerts.add(
-          null,
-          "success",
-          Object.assign({}, alertOptions, { i18nKey: "accountsUI.info.invitationSent" })
-        );
+        Alerts.toast(i18next.t("accountsUI.info.invitationSent"), "success");
       }
     });
   }