diff --git a/apps/condo/pages/_app.tsx b/apps/condo/pages/_app.tsx index 4e71a0768ce..6f21782adbb 100644 --- a/apps/condo/pages/_app.tsx +++ b/apps/condo/pages/_app.tsx @@ -538,16 +538,8 @@ const apolloCacheConfig: WithApolloProps['apolloCacheConfig'] = { }, } -const apolloClientConfig: WithApolloProps['apolloClientConfig'] = { - defaultOptions: { - watchQuery: { - fetchPolicy: 'no-cache', - }, - }, -} - export default ( - withApollo({ ssr: !IS_SSR_DISABLED, apolloCacheConfig, apolloClientConfig })( + withApollo({ ssr: !IS_SSR_DISABLED, apolloCacheConfig })( withAuth({ ssr: !IS_SSR_DISABLED, USER_QUERY })( withIntl({ ssr: !IS_SSR_DISABLED, messagesImporter, extractReqLocale, defaultLocale })( withOrganization({ diff --git a/packages/codegen/generate.hooks.ts b/packages/codegen/generate.hooks.ts index f923eb5f73d..87b5b23a36e 100644 --- a/packages/codegen/generate.hooks.ts +++ b/packages/codegen/generate.hooks.ts @@ -94,7 +94,7 @@ export function generateReactHooks< QueryVariables, > (gql: IGQLType): IGenerateHooksResult { function useCreate (initialValues: Partial, onComplete?: IOnCompleteType) { - const [rowAction] = useMutation(gql.CREATE_OBJ_MUTATION) + const [rowAction] = useMutation(gql.CREATE_OBJ_MUTATION, { fetchPolicy: 'no-cache' }) return useCallback(async (values: Partial) => { const sender = getClientSideSenderInfo() @@ -127,7 +127,7 @@ export function generateReactHooks< } function useCreateMany (initialValues: Partial, onComplete?: IOnCompleteType>) { - const [rowAction] = useMutation(gql.CREATE_OBJS_MUTATION) + const [rowAction] = useMutation(gql.CREATE_OBJS_MUTATION, { fetchPolicy: 'no-cache' }) return useCallback(async (values: Array>) => { const sender = getClientSideSenderInfo() @@ -162,7 +162,7 @@ export function generateReactHooks< } function useUpdate (initialValues: Partial, onComplete?: IOnCompleteType) { - const [rowAction] = useMutation(gql.UPDATE_OBJ_MUTATION) + const [rowAction] = useMutation(gql.UPDATE_OBJ_MUTATION, { fetchPolicy: 'no-cache' }) return useCallback(async (values: Partial, obj: IUUIDObject) => { const sender = getClientSideSenderInfo() @@ -196,7 +196,7 @@ export function generateReactHooks< } function useUpdateMany (initialValues: Partial, onComplete?: IOnCompleteType>) { - const [rowAction] = useMutation(gql.UPDATE_OBJS_MUTATION) + const [rowAction] = useMutation(gql.UPDATE_OBJS_MUTATION, { fetchPolicy: 'no-cache' }) return useCallback(async (values: Array<{ data: Partial } & IUUIDObject>) => { const sender = getClientSideSenderInfo() @@ -233,7 +233,7 @@ export function generateReactHooks< } function useSoftDelete (onComplete?: IOnCompleteType) { - const [rowAction] = useMutation(gql.UPDATE_OBJ_MUTATION) + const [rowAction] = useMutation(gql.UPDATE_OBJ_MUTATION, { fetchPolicy: 'no-cache' }) return useCallback(async (obj: IUUIDObject) => { const sender = getClientSideSenderInfo() @@ -266,7 +266,7 @@ export function generateReactHooks< } function useSoftDeleteMany (onComplete?: IOnCompleteType>) { - const [rowAction] = useMutation(gql.UPDATE_OBJS_MUTATION) + const [rowAction] = useMutation(gql.UPDATE_OBJS_MUTATION, { fetchPolicy: 'no-cache' }) return useCallback(async (objs: Array) => { const sender = getClientSideSenderInfo() @@ -309,6 +309,7 @@ export function generateReactHooks< variables, notifyOnNetworkStatusChange: true, ...options, + ...(typeof options === 'object' && 'fetchPolicy' in options ? null : { fetchPolicy: 'no-cache' }), }) const count = (data && data.meta) ? data.meta.count : null @@ -342,6 +343,7 @@ export function generateReactHooks< variables, notifyOnNetworkStatusChange: true, ...options, + ...(typeof options === 'object' && 'fetchPolicy' in options ? null : { fetchPolicy: 'no-cache' }), }) const objs: GQLObject[] = (data && data.objs) ? data.objs : []