#29 Remove cancel all actions from assertions and openOrders:

- rename some fields
tinybike · Jul 15, 2016 · 3c613ed · 3c613ed
1 parent 3c23ae2
commit 3c613ed
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 69 deletions.
diff --git a/build/components.jsx b/build/components.jsx
diff --git a/src/modules/market/components/open-orders.jsx b/src/modules/market/components/open-orders.jsx
@@ -7,15 +7,15 @@ const OpenOrders = (p) => (
 		<h2>Open orders</h2>
 		{
 			p.outcomes.map(outcome => {
-				if (outcome.openOrders.items.length === 0) {
-					return (<div>No open orders</div>);
+				if (outcome.userOpenOrders.items.length === 0) {
+					return null;
 				}
 
 				return (
 					<OpenOrdersGroup
 						key={outcome.id}
 						name={outcome.name}
-						openOrders={outcome.openOrders}
+						userOpenOrders={outcome.userOpenOrders}
 					/>
 				);
 			})

diff --git a/src/modules/open-orders/components/open-order.jsx b/src/modules/open-orders/components/open-order.jsx
@@ -29,7 +29,7 @@ const OpenOrder = (p) => (
 				className="button cancel-order-action"
 				disabled={p.isCancelling}
 				title="Cancel order"
-				onClick={(event) => { p.onCancelOrder(p.id); }}
+				onClick={(event) => { p.cancelOrder(p.id); }}
 			>x</button>
 
 		</td>

diff --git a/src/modules/open-orders/components/open-orders-group.jsx b/src/modules/open-orders/components/open-orders-group.jsx
@@ -11,11 +11,11 @@ import OpenOrder from '../../open-orders/components/open-order';
 
 const OpenOrdersGroup = (p) => (
 	<div>
-		<Clickable component="h3" onClick={(event) => p.openOrders.toggleGroupOpen()}>
+		<Clickable component="h3" onClick={(event) => p.userOpenOrders.toggleGroupOpen()}>
 			{p.name}
 		</Clickable>
 
-		<Collapse isOpen={p.openOrders.isMarketOpenOrdersOpen}>
+		<Collapse isOpen={p.userOpenOrders.isMarketOpenOrdersOpen}>
 			<table>
 				<tbody>
 					<tr>
@@ -27,11 +27,11 @@ const OpenOrdersGroup = (p) => (
 						<th>&nbsp;</th>
 					</tr>
 					{
-						p.openOrders.items.map(openOrder => (
+						p.userOpenOrders.items.map(openOrder => (
 							<OpenOrder
 								key={openOrder.id}
 								{...openOrder}
-								onCancelOrder={p.openOrders.onCancelOrder}
+								cancelOrder={p.userOpenOrders.cancelOrder}
 							/>
 							)
 						)
@@ -43,7 +43,7 @@ const OpenOrdersGroup = (p) => (
 );
 
 OpenOrdersGroup.propTypes = {
-	openOrders: React.PropTypes.object,
+	userOpenOrders: React.PropTypes.object,
 	name: React.PropTypes.string
 };
 

diff --git a/src/selectors/markets.js b/src/selectors/markets.js
@@ -55,8 +55,6 @@ function makeMarkets(numMarkets = 25) {
 		// outcomes
 		m.outcomes = makeOutcomes();
 
-		m.openOrdersOutcomes = m.outcomes.slice();
-
 		// reportable outcomes
 		m.reportableOutcomes = m.outcomes.slice();
 		m.reportableOutcomes.push({ id: '1.5', name: 'indeterminate' });
@@ -310,7 +308,7 @@ function makeMarkets(numMarkets = 25) {
 					orderBook
 				};
 
-				outcome.openOrders = {
+				outcome.userOpenOrders = {
 					isMarketOpenOrdersOpen: false,
 					bidsCount: 2,
 					asksCount: 1,
@@ -347,29 +345,20 @@ function makeMarkets(numMarkets = 25) {
 						}
 					],
 					toggleGroupOpen: () => {
-						outcome.openOrders.isMarketOpenOrdersOpen = !outcome.openOrders.isMarketOpenOrdersOpen;
+						outcome.userOpenOrders.isMarketOpenOrdersOpen = !outcome.userOpenOrders.isMarketOpenOrdersOpen;
 						require('../selectors').update({});
 					},
-					onCancelOrder: (orderId) => {
+					cancelOrder: (orderId) => {
 						console.log('cancelling order %o', orderId);
 						setTimeout(() => {
-							outcome.openOrders.items.find(openOrder => openOrder.id === orderId).isCancelling = true;
+							outcome.userOpenOrders.items.find(openOrder => openOrder.id === orderId).isCancelling = true;
 							require('../selectors').update({});
 							setTimeout(() => {
-								const index = outcome.openOrders.items.findIndex(openOrder => openOrder.id === orderId);
-								outcome.openOrders.items.splice(index, 1);
+								const index = outcome.userOpenOrders.items.findIndex(openOrder => openOrder.id === orderId);
+								outcome.userOpenOrders.items.splice(index, 1);
 								require('../selectors').update({});
 							}, 2000);
 						}, 1);
-					},
-					onCancelAllOrders: () => {
-						console.log('todo: onCancelAllOrders in outcome %o', outcome.id);
-					},
-					onCancelAllBids: () => {
-						console.log('todo: onCancelAllBids in outcome %o', outcome.id);
-					},
-					onCancelAllAsks: () => {
-						console.log('todo: onCancelAllAsks in outcome %o', outcome.id);
 					}
 				};
 

diff --git a/test/assertions/market.js b/test/assertions/market.js
@@ -332,67 +332,37 @@ export default function(market) {
 						});
 					});
 
-					describe('openOrders', () => {
-						const openOrders = outcome.openOrders;
+					describe('userOpenOrders', () => {
+						const userOpenOrders = outcome.userOpenOrders;
 						it('should exist', () => {
-							assert.isDefined(openOrders);
+							assert.isDefined(userOpenOrders);
 						});
 
 						it('should be object', () => {
-							assert.isObject(openOrders);
+							assert.isObject(userOpenOrders);
 						});
 
 						describe('items', () => {
 							it('should be array', () => {
-								assert.isArray(openOrders.items);
-							});
-						});
-
-						describe('asksCount', () => {
-							it('should be number', () => {
-								assert.isNumber(openOrders.asksCount);
-							});
-						});
-
-						describe('bidsCount', () => {
-							it('should be number', () => {
-								assert.isNumber(openOrders.bidsCount);
+								assert.isArray(userOpenOrders.items);
 							});
 						});
 
 						describe('isMarketOpenOrdersOpen', () => {
 							it('should be boolean', () => {
-								assert.isBoolean(openOrders.isMarketOpenOrdersOpen);
+								assert.isBoolean(userOpenOrders.isMarketOpenOrdersOpen);
 							});
 						});
 
 						describe('toggleGroupOpen', () => {
 							it('should be function', () => {
-								assert.isFunction(openOrders.toggleGroupOpen);
-							});
-						});
-
-						describe('onCancelOrder', () => {
-							it('should be function', () => {
-								assert.isFunction(openOrders.onCancelOrder);
-							});
-						});
-
-						describe('onCancelAllOrders', () => {
-							it('should be function', () => {
-								assert.isFunction(openOrders.onCancelAllOrders);
-							});
-						});
-
-						describe('onCancelAllBids', () => {
-							it('should be function', () => {
-								assert.isFunction(openOrders.onCancelAllBids);
+								assert.isFunction(userOpenOrders.toggleGroupOpen);
 							});
 						});
 
-						describe('onCancelAllAsks', () => {
+						describe('cancelOrder', () => {
 							it('should be function', () => {
-								assert.isFunction(openOrders.onCancelAllAsks);
+								assert.isFunction(userOpenOrders.cancelOrder);
 							});
 						});
 					});