Google Apps: Rename property users -> googleAppsUsers (#603)

Automattic · Mar 4, 2016 · 86af523 · 86af523
1 parent 3df922a
commit 86af523
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/client/components/data/domain-management/email/index.jsx b/client/components/data/domain-management/email/index.jsx
@@ -45,7 +45,7 @@ function getStateFromStores( props ) {
 		selectedDomainName: props.selectedDomainName,
 		selectedSite: props.selectedSite,
 		user: user.get(),
-		users: props.users,
+		googleAppsUsers: props.googleAppsUsers,
 		loaded: props.loaded
 	};
 }
@@ -58,7 +58,9 @@ const EmailData = React.createClass( {
 		context: React.PropTypes.object.isRequired,
 		productsList: React.PropTypes.object.isRequired,
 		selectedDomainName: React.PropTypes.string,
-		sites: React.PropTypes.object.isRequired
+		sites: React.PropTypes.object.isRequired,
+		googleAppsUsers: React.PropTypes.array.isRequired,
+		loaded: React.PropTypes.bool.isRequired
 	},
 
 	mixins: [ observe( 'productsList' ) ],
@@ -85,7 +87,7 @@ const EmailData = React.createClass( {
 	render() {
 		return (
 			<StoreConnection
-				users={ this.props.users }
+				googleAppsUsers={ this.props.googleAppsUsers }
 				loaded={ this.props.loaded }
 				component={ this.props.component }
 				stores={ stores }
@@ -107,7 +109,7 @@ export default connect(
 			usersGetter = partial( getBySite, state, ownProps.sites.getSelectedSite().ID );
 		}
 		return {
-			users: usersGetter(),
+			googleAppsUsers: usersGetter(),
 			loaded: getLoaded( state )
 		}
 	},

diff --git a/client/my-sites/upgrades/domain-management/email/google-apps-users-card.jsx b/client/my-sites/upgrades/domain-management/email/google-apps-users-card.jsx
@@ -19,7 +19,7 @@ const GoogleAppsUsers = React.createClass( {
 
 	propTypes: {
 		domains: React.PropTypes.object.isRequired,
-		users: React.PropTypes.array.isRequired,
+		googleAppsUsers: React.PropTypes.array.isRequired,
 		selectedDomainName: React.PropTypes.string,
 		selectedSite: React.PropTypes.oneOfType( [
 			React.PropTypes.object,
@@ -47,7 +47,7 @@ const GoogleAppsUsers = React.createClass( {
 		return (
 			<div>
 				<SectionHeader
-					count={ this.props.users.length }
+					count={ this.props.googleAppsUsers.length }
 					label={ this.translate( 'Google Apps Users' ) }>
 					{ this.canAddUsers() && (
 						<a
@@ -60,7 +60,7 @@ const GoogleAppsUsers = React.createClass( {
 				</SectionHeader>
 				<CompactCard className="google-apps-users-card">
 					<ul className="google-apps-users-card__user-list">
-						{ this.props.users.map(
+						{ this.props.googleAppsUsers.map(
 							( user, index ) => (
 								<GoogleAppsUserItem
 									key={ index } user={ user }

diff --git a/client/my-sites/upgrades/domain-management/email/index.jsx b/client/my-sites/upgrades/domain-management/email/index.jsx
@@ -30,7 +30,7 @@ const Email = React.createClass( {
 			React.PropTypes.bool
 		] ).isRequired,
 		user: React.PropTypes.object.isRequired,
-		users: React.PropTypes.array.isRequired,
+		googleAppsUsers: React.PropTypes.array.isRequired,
 		loaded: React.PropTypes.bool.isRequired
 	},