@@ -580,14 +580,17 @@ export function ensureVersionIndexIsFetched (
580
580
feed: Feed,
581
581
oneBasedIndex: number
582
582
) {
583
- return function (dispatch: dispatchFn, getState: getStateFn) {
584
- const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
583
+ return async function (dispatch: dispatchFn, getState: getStateFn) {
585
584
console.log('Requesting version ', oneBasedIndex)
585
+ if (!oneBasedIndex || oneBasedIndex < 1) return null
586
+
587
+ const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
586
588
if (!requestedVersion) {
587
589
if (feed.feedVersionSummaries) {
588
590
// If the requested version has not been fetched yet, async fetch it.
589
591
const versionId = feed.feedVersionSummaries[oneBasedIndex - 1].id
590
- return dispatch(fetchFeedVersion(versionId))
592
+ const { payload } = await dispatch(fetchFeedVersion(versionId))
593
+ return payload
591
594
}
592
595
}
593
596
return requestedVersion
@@ -602,7 +605,7 @@ export function setVersionIndex (
602
605
) {
603
606
return async function (dispatch: dispatchFn, getState: getStateFn) {
604
607
if (feed.feedVersionSummaries) {
605
- const { payload: newActiveVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
608
+ const newActiveVersion = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
606
609
dispatch(setActiveVersion(newActiveVersion))
607
610
if (push) {
608
611
browserHistory.push(` $ { isPublic ? '/ public ' : ''} / feed / ${feed . id } / version / ${oneBasedIndex } `)
@@ -623,7 +626,7 @@ export function setComparedVersion (
623
626
oneBasedIndex: number
624
627
) {
625
628
return async function (dispatch: dispatchFn, getState: getStateFn) {
626
- const { payload: newComparedVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
629
+ const newComparedVersion = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
627
630
// Dispatch action to set value in reducer.
628
631
dispatch(settingComparedVersion(newComparedVersion))
629
632
if (newComparedVersion) {
0 commit comments