FIX When exiting compare mode, the version shown is the last selected…

… version to compare from
silverstripe · Aug 16, 2018 · 81e9c0c · 81e9c0c
1 parent 9ca076d
commit 81e9c0c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/state/historyviewer/HistoryViewerReducer.js b/client/src/state/historyviewer/HistoryViewerReducer.js
@@ -81,6 +81,7 @@ export default function historyViewerReducer(state = initialState, { type, paylo
 
       return {
         ...state,
+        currentVersion: versionFrom,
         compare: { versionFrom, versionTo },
       };
     }
@@ -99,6 +100,7 @@ export default function historyViewerReducer(state = initialState, { type, paylo
 
       return {
         ...state,
+        currentVersion: versionFrom,
         compare: { versionFrom, versionTo },
       };
     }

diff --git a/client/src/state/historyviewer/tests/HistoryViewerReducer-test.js b/client/src/state/historyviewer/tests/HistoryViewerReducer-test.js
@@ -169,18 +169,34 @@ describe('HistoryViewerReducer', () => {
       expect(result.compare.versionFrom.Version).toBe(80);
       expect(result.compare.versionTo).toBe(false);
     });
+
+    it('sets the currentVersion to the compareFrom version', () => {
+      state = {
+        ...state,
+        compare: {
+          versionFrom: {
+            Version: 50,
+          },
+        },
+      };
+
+      const result = historyViewerReducer(state, {
+        type: 'HISTORY_VIEWER.SET_COMPARE_FROM',
+        payload: {
+          version: { Version: 60 },
+        },
+      });
+
+      expect(result.currentVersion.Version).toBe(60);
+    });
   });
 
   describe('SET_COMPARE_TO', () => {
     it('sets the compareTo version', () => {
       const result = historyViewerReducer(state, {
         type: 'HISTORY_VIEWER.SET_COMPARE_TO',
         payload: {
-          version:
-            {
-              Version:
-                85
-            }
+          version: { Version: 85 }
         },
       });
 
@@ -213,4 +229,24 @@ describe('HistoryViewerReducer', () => {
       expect(result.compare.versionTo.Version).toBe(50);
     });
   });
+
+  it('sets the currentVersion to the compareFrom version', () => {
+    state = {
+      ...state,
+      compare: {
+        versionFrom: {
+          Version: 50,
+        },
+      },
+    };
+
+    const result = historyViewerReducer(state, {
+      type: 'HISTORY_VIEWER.SET_COMPARE_FROM',
+      payload: {
+        version: { Version: 60 },
+      },
+    });
+
+    expect(result.currentVersion.Version).toBe(60);
+  });
 });