#29 Change structure of userOpenOrders

tinybike · Jul 18, 2016 · 4b10d9c · 4b10d9c
1 parent b4f159d
commit 4b10d9c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 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
@@ -14,6 +14,7 @@ const OpenOrders = (p) => (
 				return (
 					<OpenOrdersGroup
 						key={outcome.id}
+						id={outcome.id}
 						name={outcome.name}
 						userOpenOrders={outcome.userOpenOrders}
 					/>

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.userOpenOrders.toggleGroupOpen()}>
+		<Clickable component="h3" onClick={(event) => p.userOpenOrders.updateSelectedOpenOrdersGroup(p.id)}>
 			{p.name}
 		</Clickable>
 
-		<Collapse isOpen={p.userOpenOrders.isMarketOpenOrdersOpen}>
+		<Collapse isOpen={p.id === p.userOpenOrders.selectedUserOpenOrdersGroup}>
 			<table>
 				<tbody>
 					<tr>

diff --git a/src/selectors/markets.js b/src/selectors/markets.js
@@ -309,7 +309,7 @@ function makeMarkets(numMarkets = 25) {
 				};
 
 				outcome.userOpenOrders = {
-					isMarketOpenOrdersOpen: false,
+					selectedUserOpenOrdersGroup: null,
 					bidsCount: 2,
 					asksCount: 1,
 					items: [
@@ -344,8 +344,8 @@ function makeMarkets(numMarkets = 25) {
 							owner: '0x45a153fdd97836c2b349a5f53970dc44b0ef1efa'
 						}
 					],
-					toggleGroupOpen: () => {
-						outcome.userOpenOrders.isMarketOpenOrdersOpen = !outcome.userOpenOrders.isMarketOpenOrdersOpen;
+					updateSelectedOpenOrdersGroup: () => {
+						outcome.userOpenOrders.selectedUserOpenOrdersGroup = !outcome.userOpenOrders.selectedUserOpenOrdersGroup;
 						require('../selectors').update({});
 					},
 					cancelOrder: (orderId) => {

diff --git a/test/assertions/market.js b/test/assertions/market.js
@@ -348,15 +348,17 @@ export default function(market) {
 							});
 						});
 
-						describe('isMarketOpenOrdersOpen', () => {
-							it('should be boolean', () => {
-								assert.isBoolean(userOpenOrders.isMarketOpenOrdersOpen);
+						describe('selectedUserOpenOrdersGroup', () => {
+							it('should be null or string', () => {
+								const isNull = userOpenOrders.selectedUserOpenOrdersGroup === null;
+								const isString = typeof userOpenOrders.selectedUserOpenOrdersGroup === "string";
+								assert(isNull || isString, 'selectedUserOpenOrdersGroup is not null or string');
 							});
 						});
 
-						describe('toggleGroupOpen', () => {
+						describe('updateSelectedOpenOrdersGroup', () => {
 							it('should be function', () => {
-								assert.isFunction(userOpenOrders.toggleGroupOpen);
+								assert.isFunction(userOpenOrders.updateSelectedOpenOrdersGroup);
 							});
 						});