[Marketplace] Owner permission should be transferable #2188

imports/plugins/core/accounts/client/components/accountsDashboard.js

@@ -33,6 +33,14 @@ class AccountsDashboard extends Component {
     this.setState({ selectedGroup: group });
   };
 
+  handleMethodLoad = () => {
+    this.setState({ loading: true });
+  };
+
+  handleMethodDone = () => {
+    this.setState({ loading: false });
+  };
+
   renderGroupDetail = () => {
     const { groups, accounts } = this.state;
     return (
@@ -47,11 +55,23 @@ class AccountsDashboard extends Component {
 
   renderGroupsTable(groups) {
     if (Array.isArray(groups)) {
-      return groups.map((group, index) => {
-        return (
-          <Components.GroupsTable key={index} group={group} onGroupSelect={this.handleGroupSelect} {...this.props} />
-        );
-      });
+      return (
+        <div className="group-container">
+          {this.state.loading && <Components.Loading />}
+          {groups.map((group, index) => {
+            return (
+              <Components.GroupsTable
+                key={index}
+                group={group}
+                onMethodLoad={this.handleMethodLoad}
+                onMethodDone={this.handleMethodDone}
+                onGroupSelect={this.handleGroupSelect}
+                {...this.props}
+              />
+            );
+          })}
+        </div>
+      );
     }
 
     return null;

imports/plugins/core/accounts/client/components/adminInviteForm.js

@@ -14,9 +14,10 @@ class AdminInviteForm extends Component {
   constructor(props) {
     super(props);
     const { defaultInviteGroup, groups } = props;
+    const groupsInvitable = groups.filter((grp) => grp.slug !== "owner");
 
     this.state = {
-      groups,
+      groups: groupsInvitable,
       defaultInviteGroup,
       name: "",
       email: "",
@@ -30,7 +31,8 @@ class AdminInviteForm extends Component {
 
   componentWillReceiveProps(nextProps) {
     const { groups, defaultInviteGroup } = nextProps;
-    this.setState({ groups, defaultInviteGroup });
+    const groupsInvitable = groups.filter((grp) => grp.slug !== "owner");
+    this.setState({ groups: groupsInvitable, defaultInviteGroup });
   }
 
   onChange(event) {
@@ -99,15 +101,27 @@ class AdminInviteForm extends Component {
     if (!buttonGroup._id) {
       return null;
     }
-    const buttonElement = (
+    const buttonElement = (opt) => (
       <Components.Button bezelStyle="solid" label={buttonGroup.name && _.startCase(buttonGroup.name)} >
-        &nbsp;<i className="fa fa-chevron-down" />
+        &nbsp;
+        {opt && opt.length && // add icon only if there's a list of options
+          <i className="fa fa-chevron-down" />
+        }
       </Components.Button>
     );
+
+    // current selected option and "owner" should not show in list options
+    const dropOptions = this.state.groups.filter((grp) => grp._id !== buttonGroup._id);
+    if (!dropOptions.length) { return buttonElement(); } // do not use dropdown if only one option
+
     return (
-      <Components.DropDownMenu buttonElement={buttonElement} attachment="bottom center" onChange={this.handleGroupSelect}>
-        {this.state.groups
-          .filter((grp) => grp._id !== buttonGroup._id)
+      <Components.DropDownMenu
+        buttonElement={buttonElement(dropOptions)}
+        onChange={this.handleGroupSelect}
+        attachment="bottom right"
+        targetAttachment="top right"
+      >
+        {dropOptions
           .map((grp, index) => (
             <Components.MenuItem
               key={index}
@@ -120,7 +134,6 @@ class AdminInviteForm extends Component {
     );
   }
 
-
   renderForm() {
     return (
       <div className="panel panel-default admin-invite-form">
@@ -156,6 +169,7 @@ class AdminInviteForm extends Component {
               <div className="form-btns add-admin justify">
                 <Components.Button
                   status="primary"
+                  buttonType="submit"
                   onClick={this.handleSubmit}
                   bezelStyle="solid"
                   i18nKeyLabel="accountsUI.info.sendInvitation"

imports/plugins/core/accounts/client/components/groupForm.js

@@ -72,6 +72,7 @@ class GroupForm extends Component {
             <div className="justify">
               <Components.Button
                 status="primary"
+                buttonType="submit"
                 onClick={this.handleSubmit}
                 bezelStyle="solid"
                 i18nKeyLabel={this.props.i18nKeyLabel}

imports/plugins/core/accounts/client/components/groupsTableCell.js

@@ -1,10 +1,12 @@
+import { Meteor } from "meteor/meteor";
 import React from "react";
 import _ from "lodash";
 import PropTypes from "prop-types";
 import { Components, registerComponent } from "@reactioncommerce/reaction-components";
+import { Reaction } from "/client/api";
 import { getGravatar } from "../helpers/accountsHelper";
 
-const GroupsTableCell = ({ account, columnName, group, groups, handleRemoveUserFromGroup, handleUserGroupChange }) => {
+const GroupsTableCell = ({ account, columnName, group, groups, handleRemoveUserFromGroup, handleUserGroupChange, ...props }) => {
   const email = _.get(account, "emails[0].address");
 
   if (columnName === "name") {
@@ -37,40 +39,62 @@ const GroupsTableCell = ({ account, columnName, group, groups, handleRemoveUserF
   }
 
   if (columnName === "dropdown") {
+    const groupName = <p>{_.startCase(groups[0].name)}</p>;
+    const ownerGroup = groups.find((grp) => grp.slug === "owner") || {};
+    const hasOwnerAccess = Reaction.hasPermission("owner", Meteor.userId(), Reaction.getShopId());
+
     if (groups.length === 1) {
-      return (
-        <p>{_.startCase(groups[0].name)}</p>
-      );
+      return groupName;
+    }
+
+    if (group.slug === "owner") {
+      return groupName;
     }
-    const dropDownButton = (
+
+    const { onMethodDone, onMethodLoad } = props;
+    const dropDownButton = (opt) => ( // eslint-disable-line
       <div className="group-dropdown">
-        <Components.Button label={group.name && _.startCase(group.name)}>
-          &nbsp;<i className="fa fa-chevron-down" />
+        <Components.Button bezelStyle="solid" label={group.name && _.startCase(group.name)}>
+          &nbsp;
+          {opt && opt.length > 1 && // add icon only if there's more than the current group
+            <i className="fa fa-chevron-down" />
+          }
         </Components.Button>
       </div>
     );
 
+    // Permission check. Remove owner option, if user is not current owner
+    const dropOptions = groups.filter(grp => (grp.slug === "owner" && !hasOwnerAccess) ? false : true) || [];
+    if (dropOptions.length < 2) { return dropDownButton(); } // do not use dropdown if only one option
+
     return (
-      <Components.DropDownMenu
-        buttonElement={dropDownButton}
-        attachment="bottom center"
-        onChange={handleUserGroupChange(account)}
-      >
-        {groups
-          .filter((grp) => grp._id !== group._id)
-          .map((grp, index) => (
-            <Components.MenuItem
-              key={index}
-              label={_.startCase(grp.name)}
-              selectLabel={_.startCase(grp.name)}
-              value={grp._id}
-            />
-          ))}
-      </Components.DropDownMenu>
+      <div className="group-dropdown">
+        <Components.DropDownMenu
+          className="dropdown-item"
+          buttonElement={dropDownButton(groups)}
+          attachment="bottom right"
+          targetAttachment="top right"
+          onChange={handleUserGroupChange({ account, ownerGrpId: ownerGroup._id, onMethodDone, onMethodLoad })}
+        >
+          {dropOptions
+            .filter(grp => grp._id !== group._id)
+            .map((grp, index) => (
+              <Components.MenuItem
+                key={index}
+                label={_.startCase(grp.name)}
+                selectLabel={_.startCase(grp.name)}
+                value={grp._id}
+              />
+            ))}
+        </Components.DropDownMenu>
+      </div>
     );
   }
 
   if (columnName === "button") {
+    if (group.slug === "owner") {
+      return null;
+    }
     return (
       <div className="group-table-button">
         <Components.Button
@@ -93,7 +117,9 @@ GroupsTableCell.propTypes = {
   group: PropTypes.object, // current group in interation
   groups: PropTypes.array, // all available groups
   handleRemoveUserFromGroup: PropTypes.func,
-  handleUserGroupChange: PropTypes.func
+  handleUserGroupChange: PropTypes.func,
+  onMethodDone: PropTypes.func,
+  onMethodLoad: PropTypes.func
 };
 
 registerComponent("GroupsTableCell", GroupsTableCell);

imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js

@@ -1,20 +1,55 @@
 import { compose, withProps } from "recompose";
+import Alert from "sweetalert2";
 import { registerComponent, composeWithTracker } from "@reactioncommerce/reaction-components";
 import { Meteor } from "meteor/meteor";
 import { Accounts, Groups } from "/lib/collections";
 import { Reaction, i18next } from "/client/api";
 import AccountsDashboard from "../components/accountsDashboard";
 
 const handlers = {
-  handleUserGroupChange(account) {
+  handleUserGroupChange({ account, ownerGrpId, onMethodLoad, onMethodDone }) {
     return (event, groupId) => {
+      if (onMethodLoad) { onMethodLoad(); }
+
+      if (groupId === ownerGrpId) {
+        return alertConfirm()
+          .then(() => {
+            return updateMethodCall(groupId);
+          })
+          .catch(() => {
+            if (onMethodDone) { onMethodDone(); }
+          });
+      }
+
+      return updateMethodCall(groupId);
+    };
+
+    function updateMethodCall(groupId) {
       Meteor.call("group/addUser", account._id, groupId, (err) => {
         if (err) {
-          return Alerts.toast(i18next.t("admin.groups.addUserError", { err: err.message }), "error");
+          Alerts.toast(i18next.t("admin.groups.addUserError", { err: err.message }), "error");
         }
-        return Alerts.toast(i18next.t("admin.groups.addUserSuccess"), "success");
+        if (!err) {
+          Alerts.toast(i18next.t("admin.groups.addUserSuccess"), "success");
+        }
+        if (onMethodDone) { onMethodDone(); }
       });
-    };
+    }
+
+    function alertConfirm() {
+      let changeOwnerWarn = "changeShopOwnerWarn";
+      if (Reaction.getShopId() === Reaction.getPrimaryShopId()) {
+        changeOwnerWarn = "changeMktOwnerWarn";
+      }
+      return Alert({
+        title: i18next.t("admin.settings.changeOwner"),
+        text: i18next.t(`admin.settings.${changeOwnerWarn}`),
+        type: "warning",
+        showCancelButton: true,
+        cancelButtonText: i18next.t("admin.settings.cancel"),
+        confirmButtonText: i18next.t("admin.settings.continue")
+      });
+    }
   },
 
   handleRemoveUserFromGroup(account, groupId) {
@@ -30,6 +65,7 @@ const handlers = {
 };
 
 const composer = (props, onData) => {
+  const shopId = Reaction.getShopId();
   const adminUserSub = Meteor.subscribe("Accounts", null);
   const grpSub = Meteor.subscribe("Groups");
 
@@ -39,14 +75,14 @@ const composer = (props, onData) => {
       shopId: Reaction.getShopId()
     }).fetch();
     const adminQuery = {
-      [`roles.${Reaction.getShopId()}`]: {
+      [`roles.${shopId}`]: {
         $in: ["dashboard"]
       }
     };
 
     const adminUsers = Meteor.users.find(adminQuery, { fields: { _id: 1 } }).fetch();
     const ids = adminUsers.map((user) => user._id);
-    const accounts = Accounts.find({ _id: { $in: ids }, shopId: Reaction.getShopId() }).fetch();
+    const accounts = Accounts.find({ _id: { $in: ids } }).fetch();
 
     onData(null, { accounts, groups });
   }

imports/plugins/core/accounts/server/i18n/en.json

@@ -10,6 +10,11 @@
           "accountsDescription": "Account Settings"
         },
         "settings": {
+          "continue": "Continue",
+          "cancel": "Cancel",
+          "changeOwner": "Change Owner",
+          "changeShopOwnerWarn": "You are about to change the Shop owner. The current owner will be replaced",
+          "changeMktOwnerWarn": "You are about to change the Marketplace owner. The current owner will be replaced",
           "accountsSettingsLabel": "Accounts",
           "accountsSettingsTitle": "Accounts",
           "accountsSettingsDescription": "Account Settings"

imports/plugins/included/default-theme/client/styles/dashboard/accounts.less

@@ -67,6 +67,15 @@
     }
     border-left: 1px solid #ccc;
   }
+  .group-container {
+    position: relative;
+    .spinner-container {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      z-index: 9999;
+    }
+  }
 }
 
 .accounts-group-table {

lib/collections/schemas/cart.js

@@ -1,5 +1,5 @@
 import { SimpleSchema } from "meteor/aldeed:simple-schema";
-import { shopIdAutoValue } from "./helpers";
+import { shopIdAutoValueForCart } from "./helpers";
 import { Payment } from "./payments";
 import { Product, ProductVariant } from "./products";
 import { Shipment, ShippingParcel } from "./shipping";
@@ -19,7 +19,7 @@ export const CartItem = new SimpleSchema({
   },
   shopId: {
     type: String,
-    autoValue: shopIdAutoValue,
+    autoValue: shopIdAutoValueForCart,
     index: 1,
     label: "Cart Item shopId",
     optional: true
@@ -87,7 +87,7 @@ export const Cart = new SimpleSchema({
   },
   shopId: {
     type: String,
-    autoValue: shopIdAutoValue,
+    autoValue: shopIdAutoValueForCart,
     index: 1,
     label: "Cart ShopId"
   },

lib/collections/schemas/helpers.js

@@ -9,6 +9,22 @@ import { Reaction } from "/lib/api";
  * @return {String} returns current shopId
  */
 export function shopIdAutoValue() {
+  // we should always have a shopId
+  if (this.isSet && Meteor.isServer) {
+    return this.value;
+  } else if (Meteor.isServer && !this.isUpdate || Meteor.isClient && this.isInsert) {
+    return Reaction.getShopId();
+  }
+  return this.unset();
+}
+
+/**
+ * shopIdAutoValueForCart
+ * @summary copy of shopIdAutoValue with modification for Cart
+ * @example autoValue: shopIdAutoValue
+ * @return {String} shopId
+ */
+export function shopIdAutoValueForCart() {
   // we should always have a shopId
   if (this.isSet && Meteor.isServer) {
     return this.value;