@@ -580,14 +580,17 @@ export function ensureVersionIndexIsFetched (
580580 feed: Feed,
581581 oneBasedIndex: number
582582) {
583- return function (dispatch: dispatchFn, getState: getStateFn) {
584- const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
583+ return async function (dispatch: dispatchFn, getState: getStateFn) {
585584 console.log('Requesting version ', oneBasedIndex)
585+ if (!oneBasedIndex || oneBasedIndex < 1) return null
586+
587+ const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
586588 if (!requestedVersion) {
587589 if (feed.feedVersionSummaries) {
588590 // If the requested version has not been fetched yet, async fetch it.
589591 const versionId = feed.feedVersionSummaries[oneBasedIndex - 1].id
590- return dispatch(fetchFeedVersion(versionId))
592+ const { payload } = await dispatch(fetchFeedVersion(versionId))
593+ return payload
591594 }
592595 }
593596 return requestedVersion
@@ -602,7 +605,7 @@ export function setVersionIndex (
602605) {
603606 return async function (dispatch: dispatchFn, getState: getStateFn) {
604607 if (feed.feedVersionSummaries) {
605- const { payload: newActiveVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
608+ const newActiveVersion = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
606609 dispatch(setActiveVersion(newActiveVersion))
607610 if (push) {
608611 browserHistory.push(` $ { isPublic ? '/ public ' : ''} / feed / ${feed . id } / version / ${oneBasedIndex } `)
@@ -623,7 +626,7 @@ export function setComparedVersion (
623626 oneBasedIndex: number
624627) {
625628 return async function (dispatch: dispatchFn, getState: getStateFn) {
626- const { payload: newComparedVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
629+ const newComparedVersion = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
627630 // Dispatch action to set value in reducer.
628631 dispatch(settingComparedVersion(newComparedVersion))
629632 if (newComparedVersion) {
0 commit comments