Disable revalidate on CHAIN_API actions

spec/createRequestPromise.test.js

@@ -210,9 +210,10 @@ describe('createRequestPromise', () => {
  jest.clearAllMocks()
  })
 
- function createRequest({ revalidate } = {}){
+ function createRequest({ revalidate, revalidateDisabled } = {}){
  extractParams = jest.fn().mockReturnValue({ ...mockParams, revalidate})
  createRequestPromise({
+ revalidateDisabled,
  timeout,
  generateDefaultParams,
  createCallApiAction,
@@ -247,6 +248,19 @@ describe('createRequestPromise', () => {
  expect(axios).not.toHaveBeenCalled()
  })
 
+ it('always send request if revalidateDisabled = true', async () => {
+ const revalidateDisabled = true
+ const revalidate = 'never'
+ await createRequest({ revalidate, revalidateDisabled })
+ expect(axios).toHaveBeenCalled()
+
+ jest.clearAllMocks()
+ MockDate.set(currentime + (6 * 1000))
+
+ await createRequest({ revalidate })
+ expect(axios).toHaveBeenCalled()
+ })
+
  it('always send request if window does not exist', async () => {
  utils.window = null
  const revalidate = 'never'

spec/index.test.js

@@ -7,6 +7,8 @@ import createApiMiddleware, {
  CHAIN_API
 } from '../src'
 
+const createRequestPromise = require('../src/createRequestPromise')
+
 import * as utils from '../src/utils'
 
 jest.mock('../src/log', () => ({
@@ -527,4 +529,36 @@ describe('Middleware::Api', () => {
  expect(dispatchedAction[CHAIN_API][0]()).toEqual(action)
  })
  })
+
+ describe('revalidateDisabled behavior', () => {
+ beforeEach(() => {
+ jest.spyOn(createRequestPromise, 'default').mockReturnValue(jest.fn())
+ jest.clearAllMocks()
+ })
+ it('calls createRequestPromise with revalidateDisabled = true if action.isNativeCallApi = false', async () => {
+ const action = {
+ isNativeCallApi: false,
+ [CHAIN_API]: [
+ () => ({ [CALL_API]: {} })
+ ]
+ }
+ await apiMiddleware({ dispatch, getState })(next)(action)
+ expect(createRequestPromise.default.mock.calls[0][0].revalidateDisabled).toBe(true)
+ })
+ it('calls createRequestPromise with revalidateDisabled = false if action.isNativeCallApi = true', async () => {
+ const action = {
+ isNativeCallApi: true,
+ [CHAIN_API]: [
+ () => ({ [CALL_API]: {} })
+ ]
+ }
+ await apiMiddleware({ dispatch, getState })(next)(action)
+ expect(createRequestPromise.default.mock.calls[0][0].revalidateDisabled).toBe(false)
+ })
+ it('dispatches CHAIN_API with isNativeCallApi = true if action type is CALL_API', async () => {
+ const action = { [CALL_API]: {} }
+ await apiMiddleware({ dispatch, getState })(next)(action)
+ expect(dispatch.mock.calls[0][0]).toMatchObject({ isNativeCallApi: true })
+ })
+ })
 })

src/createRequestPromise.js

@@ -20,15 +20,16 @@ export default function ({
  dispatch,
  errorInterceptor,
  extractParams,
- maxReplayTimes
+ maxReplayTimes,
+ revalidateDisabled = false
 }) {
  return (prevBody) => {
  const apiAction = createCallApiAction(prevBody)
  const params = extractParams(apiAction[CALL_API])
  let replayTimes = 0
 
  const now = Math.floor(new Date().getTime() / 1000)
- if (!!params.revalidate && !!window) {
+ if (!!params.revalidate && !!window && !revalidateDisabled) {
  const revalidationKey = _getRevalidationKey(params)
  const lastRevalidateTime = lastRevalidateTimeMap[revalidationKey] || 0
  if (params.revalidate === 'never' && !!lastRevalidateTime) {

src/index.js

@@ -26,6 +26,7 @@ export default ({
  return ({ dispatch, getState }) => next => action => {
  if (action[CALL_API]) {
  return dispatch({
+ isNativeCallApi: true,
  [CHAIN_API]: [
  () => action
  ]
@@ -38,8 +39,8 @@ export default ({
 
  return new Promise((resolve, reject) => {
  const promiseCreators = action[CHAIN_API].map((createCallApiAction) => {
-
  return createRequestPromise({
+ revalidateDisabled: !action.isNativeCallApi,
  timeout,
  generateDefaultParams,
  createCallApiAction,