Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions imports/api/user/findUserById/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* Creates a new customer
* @param {Strings}- email
* @param {Strings}- name
* @param {Strings}- password
*/

import { ValidatedMethod } from 'meteor/mdg:validated-method';
import { SimpleSchema } from 'meteor/aldeed:simple-schema';
import { LoggedInMixin } from 'meteor/tunifight:loggedin-mixin';
import { roles } from './../../../../lib/roles';

export const findUserById = new ValidatedMethod({
/* eslint-disable no-underscore-dangle */
name: 'user.findUserById',
mixins: [LoggedInMixin],
checkLoggedInError: {
error: 'notLogged',
message: "You need to be logged in to call to user 'findUserById'",
},
checkRoles: {
roles: [roles.maintainers],
rolesError: {
error: 'not-allowed',
message: "Only 'maintainers' can find users",
},
},
validate: new SimpleSchema({
id: { type: SimpleSchema.RegEx.Id },
}).validator(),

run({ id }) {
return Meteor.users.findOne({ _id: id });
},
});

export default findUserById;
26 changes: 24 additions & 2 deletions imports/ui/pages/OrdersPage/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import OrderTrackingId from './../../../api/order/bridges/orderTrackingId';
import { Loader } from './../../components/Loader/index';
import insertOrderCost from './../../../api/order/bridges/orderCost/methods/insertOrderCost/index';
import insertParcelDimensions from './../../../api/order/bridges/orderParcelDimensions/methods/insertParcelDimensions/index';
import findUserById from './../../../api/user/findUserById/index';

// Adjusted contrast to help with a11y
const darkerTableHeaders = {
Expand Down Expand Up @@ -55,6 +56,7 @@ export class OrdersPage extends Component {
modalOrderCostOpen: false,
modalOpen: false,
orderAddresses: {},
orderOwners: {},
packageHeight: '',
packageLength: '',
packageWeight: '',
Expand All @@ -77,6 +79,7 @@ export class OrdersPage extends Component {
componentWillReceiveProps(nextProps) {
if (this.props.orders !== nextProps.orders && nextProps.orders.length > 0) {
this.getOrderAddresses(nextProps.orders);
this.getOrderOwner(nextProps.orders);
}
}

Expand Down Expand Up @@ -119,7 +122,7 @@ export class OrdersPage extends Component {
},
);
});

this.getOrderOwner(order.id, order.userId);
const updateStatus = () =>
new Promise((resolve, reject) => {
Meteor.call('order.approve', this.state.orderId, error => {
Expand Down Expand Up @@ -218,6 +221,25 @@ export class OrdersPage extends Component {
} else return true;
}

getOrderOwner = orders => {
// Pull the order's owner from each order
orders.map(({ _id: orderId, userId }) => {
let email;
if (isMaintainer()) {
findUserById.call({ id: userId }, (error, resp) => {
if (!error && resp) {
email = resp.emails[0].address;
this.setState({ orderOwners: { [orderId]: email } });
}
});
} else {
// Just use the current user's email
email = Meteor.user().emails[0].address;
this.setState({ orderOwners: { [orderId]: email } });
}
});
};

render() {
return (
<Container>
Expand Down Expand Up @@ -271,7 +293,7 @@ export class OrdersPage extends Component {
{this.props.orders.filter(order => this.filterInactive(order)).map(order => (
<TableRow key={order._id}>
{/* Order Owner */}
<TableRowColumn>{Meteor.user(order.userId).emails[0].address}</TableRowColumn>
<TableRowColumn> {this.state.orderOwners[order._id]}</TableRowColumn>

{/* Tracking Link */}
<TableRowColumn>{this.renderOrderTrackingLink(order)}</TableRowColumn>
Expand Down
1 change: 1 addition & 0 deletions server/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import '../imports/api/public/api';
import '../imports/api/show/index';
import '../imports/api/show/methods/pullShow/index';
import '../imports/api/user/createUser/index';
import '../imports/api/user/findUserById/index';

import { roles } from './../lib/roles';

Expand Down