fix response state transitions

graphql · May 24, 2018 · 53f8658 · 53f8658
1 parent eee112c
commit 53f8658
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/packages/graphql-playground-react/src/state/sessions/actions.ts b/packages/graphql-playground-react/src/state/sessions/actions.ts
@@ -119,7 +119,11 @@ export const {
     sessionId,
     response,
   }),
-  SET_RESPONSE: simpleAction('response'),
+  SET_RESPONSE: (workspaceId, sessionId, response) => ({
+    workspaceId,
+    sessionId,
+    response,
+  }),
   CLEAR_RESPONSES: simpleAction(),
 
   FETCH_SCHEMA: simpleAction(),

diff --git a/packages/graphql-playground-react/src/state/sessions/fetchingSagas.ts b/packages/graphql-playground-react/src/state/sessions/fetchingSagas.ts
@@ -23,6 +23,8 @@ import {
   setCurrentQueryStartTime,
   setCurrentQueryEndTime,
   setEndpointUnreachable,
+  clearResponses,
+  setResponse,
 } from './actions'
 import {
   getSelectedSession,
@@ -138,6 +140,7 @@ function* runQuerySaga(action) {
   })
   yield put(setCurrentQueryStartTime(new Date()))
 
+  let firstResponse = false
   const channel = eventChannel(emitter => {
     let closed = false
     if (subscriptionClient && operationIsSubscription) {
@@ -197,7 +200,15 @@ function* runQuerySaga(action) {
       if (errorMessage === 'Failed to fetch') {
         yield put(setEndpointUnreachable(session.endpoint))
       }
-      yield put(addResponse(selectedWorkspaceId, session.id, response))
+      if (operationIsSubscription) {
+        if (firstResponse) {
+          yield put(clearResponses())
+          firstResponse = false
+        }
+        yield put(addResponse(selectedWorkspaceId, session.id, response))
+      } else {
+        yield put(setResponse(selectedWorkspaceId, session.id, response))
+      }
       yield put(addHistoryItem(session))
     }
   } finally {

diff --git a/packages/graphql-playground-react/src/state/sessions/reducers.ts b/packages/graphql-playground-react/src/state/sessions/reducers.ts
@@ -251,7 +251,7 @@ const reducer = handleActions(
       )
     },
     SET_RESPONSE: (state, { payload: { response, sessionId } }) => {
-      return state.setIn(['sessions', sessionId, 'responses'], List(response))
+      return state.setIn(['sessions', sessionId, 'responses'], List([response]))
     },
     CLEAR_RESPONSES: state => {
       return state.setIn(