set current version id on mount

mozilla · Jul 24, 2019 · 9e7b293 · 9e7b293
1 parent 46529ec
commit 9e7b293
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 21 deletions.
diff --git a/src/pages/Browse/index.spec.tsx b/src/pages/Browse/index.spec.tsx
@@ -91,6 +91,7 @@ describe(__filename, () => {
   const _loadVersionAndFile = ({
     store = configureStore(),
     version = fakeVersion,
+    setCurrentVersionId = true,
   }) => {
     store.dispatch(versionsActions.loadVersionInfo({ version }));
     store.dispatch(
@@ -99,6 +100,12 @@ describe(__filename, () => {
         version,
       }),
     );
+
+    if (setCurrentVersionId) {
+      store.dispatch(
+        versionsActions.setCurrentVersionId({ versionId: version.id }),
+      );
+    }
   };
 
   const setUpVersionFileUpdate = ({
@@ -173,6 +180,19 @@ describe(__filename, () => {
     expect(_fetchVersion).toHaveBeenCalledWith({ addonId, versionId });
   });
 
+  it('dispatches setCurrentVersionId on mount if the currentVersionId is unset', () => {
+    const version = fakeVersion;
+    const store = configureStore();
+    _loadVersionAndFile({ store, version, setCurrentVersionId: false });
+    const dispatch = spyOn(store, 'dispatch');
+
+    render({ store });
+
+    expect(dispatch).toHaveBeenCalledWith(
+      versionsActions.setCurrentVersionId({ versionId: version.id }),
+    );
+  });
+
   it('renders a VersionFileViewer', () => {
     const version = {
       ...fakeVersion,

diff --git a/src/pages/Browse/index.tsx b/src/pages/Browse/index.tsx
@@ -17,6 +17,7 @@ import {
   getVersionInfo,
   isFileLoading,
   viewVersionFile,
+  actions as versionsActions,
 } from '../../reducers/versions';
 import {
   getLocalizedString,
@@ -47,6 +48,7 @@ type PropsFromState = {
   file: VersionFile | null | void;
   fileIsLoading: boolean;
   version: Version | void | null;
+  currentVersionId: number | null | undefined | false;
 };
 
 export type Props = RouteComponentProps<PropsFromRouter> &
@@ -75,6 +77,7 @@ export class BrowseBase extends React.Component<Props> {
     const {
       _fetchVersion,
       _fetchVersionFile,
+      currentVersionId,
       dispatch,
       file,
       fileIsLoading,
@@ -103,6 +106,11 @@ export class BrowseBase extends React.Component<Props> {
       return;
     }
 
+    if (version && !currentVersionId) {
+      dispatch(versionsActions.setCurrentVersionId({ versionId: version.id }));
+      return;
+    }
+
     if (version.selectedPath && !fileIsLoading && file === undefined) {
       dispatch(
         _fetchVersionFile({
@@ -189,6 +197,9 @@ const mapStateToProps = (
   const { match } = ownProps;
   const versionId = parseInt(match.params.versionId, 10);
   const version = getVersionInfo(state.versions, versionId);
+  const currentVersionId = version
+    ? state.versions.currentVersionId
+    : undefined;
 
   return {
     apiState: state.api,
@@ -199,6 +210,7 @@ const mapStateToProps = (
       ? isFileLoading(state.versions, versionId, version.selectedPath)
       : false,
     version,
+    currentVersionId,
   };
 };
 

diff --git a/src/pages/Compare/index.spec.tsx b/src/pages/Compare/index.spec.tsx
@@ -114,6 +114,7 @@ describe(__filename, () => {
     headVersionId = 3,
     store = configureStore(),
     version = fakeVersionWithDiff,
+    setCurrentVersionId = true,
   }) => {
     store.dispatch(
       versionsActions.loadVersionInfo({
@@ -144,6 +145,11 @@ describe(__filename, () => {
         version,
       }),
     );
+    if (setCurrentVersionId) {
+      store.dispatch(
+        versionsActions.setCurrentVersionId({ versionId: headVersionId }),
+      );
+    }
   };
 
   const loadDiffAndRender = ({
@@ -379,6 +385,10 @@ describe(__filename, () => {
       }),
     );
 
+    store.dispatch(
+      versionsActions.setCurrentVersionId({ versionId: version.id }),
+    );
+
     const dispatch = spyOn(store, 'dispatch');
     const fakeThunk = createFakeThunk();
     const _fetchVersionFile = fakeThunk.createThunk;
@@ -397,36 +407,45 @@ describe(__filename, () => {
     });
   });
 
-  it('does not dispatch fetchVersionFile() when a file is loading', () => {
+  it('dispatches an action to set current version id if currentVersionId is unset', () => {
     const addonId = 9999;
     const baseVersionId = 1;
     const headVersionId = baseVersionId + 1;
     const version = { ...fakeVersionWithDiff, id: headVersionId };
     const store = configureStore();
+    _loadDiff({
+      addonId,
+      baseVersionId,
+      headVersionId,
+      store,
+      version,
+      setCurrentVersionId: false,
+    });
+    const dispatch = spyOn(store, 'dispatch');
 
-    store.dispatch(
-      versionsActions.loadVersionInfo({
-        version,
-        comparedToVersionId: baseVersionId,
-      }),
-    );
-
-    store.dispatch(
-      versionsActions.loadDiff({
-        addonId,
-        baseVersionId,
-        headVersionId,
-        version,
-      }),
-    );
+    render({
+      ...getRouteParams({ addonId, baseVersionId, headVersionId }),
+      store,
+    });
 
-    store.dispatch(
-      versionsActions.beginFetchVersionFile({
-        path: version.file.selected_file,
-        versionId: version.id,
-      }),
+    expect(dispatch).toHaveBeenCalledWith(
+      versionsActions.setCurrentVersionId({ versionId: headVersionId }),
     );
+  });
 
+  it('does not dispatch fetchVersionFile() when a file is loading', () => {
+    const addonId = 9999;
+    const baseVersionId = 1;
+    const headVersionId = baseVersionId + 1;
+    const version = { ...fakeVersionWithDiff, id: headVersionId };
+    const store = configureStore();
+    _loadDiff({
+      addonId,
+      baseVersionId,
+      headVersionId,
+      store,
+      version,
+    });
     const dispatch = spyOn(store, 'dispatch');
 
     render({

diff --git a/src/pages/Compare/index.tsx b/src/pages/Compare/index.tsx
@@ -20,6 +20,7 @@ import {
   getVersionFile,
   getVersionInfo,
   viewVersionFile,
+  actions as versionsActions,
 } from '../../reducers/versions';
 import {
   createCodeLineAnchorGetter,
@@ -49,6 +50,7 @@ type PropsFromState = {
   version: Version | void | null;
   versionFile: VersionFile | void | null;
   versionFileIsLoading: boolean;
+  currentVersionId: number | null | undefined | false;
 };
 
 type Props = RouteComponentProps<PropsFromRouter> &
@@ -76,6 +78,7 @@ export class CompareBase extends React.Component<Props> {
       _fetchDiff,
       _fetchVersionFile,
       compareInfo,
+      currentVersionId,
       dispatch,
       history,
       match,
@@ -112,6 +115,12 @@ export class CompareBase extends React.Component<Props> {
           path: path || undefined,
         }),
       );
+      return;
+    }
+
+    if (version && !currentVersionId) {
+      dispatch(versionsActions.setCurrentVersionId({ versionId: version.id }));
+      return;
     }
 
     if (version && !versionFileIsLoading && versionFile === undefined) {
@@ -235,6 +244,10 @@ export const mapStateToProps = (
     comparedToVersionId: baseVersionId,
   });
 
+  const currentVersionId = version
+    ? state.versions.currentVersionId
+    : undefined;
+
   let versionFile;
   if (version) {
     versionFile = getVersionFile(
@@ -247,6 +260,7 @@ export const mapStateToProps = (
   return {
     addonId,
     compareInfo,
+    currentVersionId,
     path,
     version,
     versionFile,