Fix for transaction within transaction

majo44 · May 21, 2017 · 34fee0b · 34fee0b
1 parent e0eea85
commit 34fee0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/actions.ts b/lib/actions.ts
@@ -29,7 +29,6 @@ export function startTransactionAction(name: string, transactionId: number, pare
     };
 }
 
-
 export const COMMIT_TRANSACTION_ACTION_TYPE = 'CommitTransactionAction';
 export interface CommitTransactionAction extends ActionInTransaction {
     type: typeof COMMIT_TRANSACTION_ACTION_TYPE;

diff --git a/lib/reducer.ts b/lib/reducer.ts
@@ -67,13 +67,17 @@ function reduceStartTransactionAction(state: StateWithTransactions, action: Star
     // and we have to remove cycle
     delete beforeState.$$transactions;
 
+    let transaction: Transaction = {
+        id: transactionId,
+        name: action.payload.transactionName,
+        beforeState
+    };
+    if (action.meta.parentTransactionId) {
+        transaction.parentId = action.meta.parentTransactionId;
+    }
     // and return state with updated list of transactions
     return setTransactionsOnState(Object.assign({}, state),
-        updateTransaction(transactions,  {
-            id: transactionId,
-            name: action.payload.transactionName,
-            beforeState
-        }));
+        updateTransaction(transactions, transaction));
 }
 
 function reduceRejectTransactionAction(state: StateWithTransactions, action: TransactionActions): any {

diff --git a/test/e2e/example1.spec.ts b/test/e2e/example1.spec.ts
@@ -128,7 +128,7 @@ describe('e2e example1', () => {
                     dispatch(searchExecutedAction(query));
                     dispatch(searchSuccessAction(
                         await service(query)));
-                    transaction('searchTransaction', dispatch, async (): Promise<void> => {
+                    await transaction('searchTransaction', dispatch, async (): Promise<void> => {
                         dispatch((subdispatch: Dispatch<any>, getState: () => MyState) => {
                             let beforeState = (<any>getState()).$$transactions[Zone.current.get(TRANSACTION_ID_ZONE_KEY)].beforeState;
                             expect(beforeState).eql({ search: { query: 'aa', results: [ 'aa' ] } });