Upgrade Apollo Client to v4 and refactor error handling (#18584)
## Summary This PR upgrades Apollo Client from v3.10.0 to v4 and refactors error handling patterns across the codebase to use a new centralized `useSnackBarOnQueryError` hook. ## Key Changes - **Dependency Update**: Upgraded `@apollo/client` from `^3.10.0` to `^3.11.0` in root package.json - **New Hook**: Added `useSnackBarOnQueryError` hook for centralized Apollo query error handling with snack bar notifications - **Error Handling Refactor**: Updated 100+ files to use the new error handling pattern: - Removed direct `ApolloError` imports where no longer needed - Replaced manual error handling logic with `useSnackBarOnQueryError` hook - Simplified error handling in hooks and components across multiple modules - **GraphQL Codegen**: Updated codegen configuration files to work with Apollo Client v3.11.0 - **Type Definitions**: Added TypeScript declaration file for `apollo-upload-client` module - **Test Updates**: Updated test files to reflect new error handling patterns ## Notable Implementation Details - The new `useSnackBarOnQueryError` hook provides a consistent way to handle Apollo query errors with automatic snack bar notifications - Changes span across multiple feature areas: auth, object records, settings, workflows, billing, and more - All changes maintain backward compatibility while improving code maintainability and reducing duplication - Jest configuration updated to work with the new Apollo Client version https://claude.ai/code/session_019WGZ6Rd7sEHuBg9sTrXRqJ --------- Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
+6
-8
@@ -4,9 +4,10 @@ import { useUpdateAgentLabel } from '@/workflow/workflow-steps/hooks/useUpdateAg
|
||||
const mockUpdateAgent = jest.fn();
|
||||
const mockUseFindOneAgentQuery = jest.fn();
|
||||
|
||||
jest.mock('~/generated-metadata/graphql', () => ({
|
||||
useFindOneAgentQuery: jest.fn(),
|
||||
useUpdateOneAgentMutation: () => [mockUpdateAgent],
|
||||
jest.mock('@apollo/client/react', () => ({
|
||||
...jest.requireActual('@apollo/client/react'),
|
||||
useQuery: (...args: unknown[]) => mockUseFindOneAgentQuery(...args),
|
||||
useMutation: () => [mockUpdateAgent],
|
||||
}));
|
||||
|
||||
describe('useUpdateAgentLabel', () => {
|
||||
@@ -15,15 +16,12 @@ describe('useUpdateAgentLabel', () => {
|
||||
mockUseFindOneAgentQuery.mockReturnValue({
|
||||
data: undefined,
|
||||
});
|
||||
(
|
||||
require('~/generated-metadata/graphql').useFindOneAgentQuery as jest.Mock
|
||||
).mockImplementation(mockUseFindOneAgentQuery);
|
||||
});
|
||||
|
||||
it('should skip query when agentId is undefined', () => {
|
||||
renderHook(() => useUpdateAgentLabel(undefined));
|
||||
|
||||
expect(mockUseFindOneAgentQuery).toHaveBeenCalledWith({
|
||||
expect(mockUseFindOneAgentQuery).toHaveBeenCalledWith(expect.anything(), {
|
||||
variables: { id: '' },
|
||||
skip: true,
|
||||
});
|
||||
@@ -43,7 +41,7 @@ describe('useUpdateAgentLabel', () => {
|
||||
|
||||
renderHook(() => useUpdateAgentLabel('agent-123'));
|
||||
|
||||
expect(mockUseFindOneAgentQuery).toHaveBeenCalledWith({
|
||||
expect(mockUseFindOneAgentQuery).toHaveBeenCalledWith(expect.anything(), {
|
||||
variables: { id: 'agent-123' },
|
||||
skip: false,
|
||||
});
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
|
||||
import { useMutation } from '@apollo/client';
|
||||
import { useMutation } from '@apollo/client/react';
|
||||
import {
|
||||
type CreateWorkflowVersionEdgeMutation,
|
||||
type CreateWorkflowVersionEdgeMutationVariables,
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
|
||||
import { CREATE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/createWorkflowVersionStep';
|
||||
import { useMutation } from '@apollo/client';
|
||||
import { useMutation } from '@apollo/client/react';
|
||||
import {
|
||||
type CreateWorkflowVersionStepInput,
|
||||
type CreateWorkflowVersionStepMutation,
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
|
||||
import { useMutation } from '@apollo/client';
|
||||
import { useMutation } from '@apollo/client/react';
|
||||
import {
|
||||
type CreateWorkflowVersionEdgeInput,
|
||||
type DeleteWorkflowVersionEdgeMutation,
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ import { CoreObjectNameSingular } from 'twenty-shared/types';
|
||||
import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
|
||||
import { DELETE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/deleteWorkflowVersionStep';
|
||||
import { useUpdateWorkflowVersionCache } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionCache';
|
||||
import { useMutation } from '@apollo/client';
|
||||
import { useMutation } from '@apollo/client/react';
|
||||
import {
|
||||
type DeleteWorkflowVersionStepInput,
|
||||
type DeleteWorkflowVersionStepMutation,
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSe
|
||||
import { DUPLICATE_WORKFLOW_VERSION_STEP } from '@/workflow/graphql/mutations/duplicateWorkflowVersionStep';
|
||||
import { flowComponentState } from '@/workflow/states/flowComponentState';
|
||||
import { useUpdateWorkflowVersionCache } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionCache';
|
||||
import { useMutation } from '@apollo/client';
|
||||
import { useMutation } from '@apollo/client/react';
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import {
|
||||
type DuplicateWorkflowVersionStepInput,
|
||||
|
||||
+5
-4
@@ -1,16 +1,17 @@
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import { useQuery, useMutation } from '@apollo/client/react';
|
||||
import {
|
||||
useFindOneAgentQuery,
|
||||
useUpdateOneAgentMutation,
|
||||
FindOneAgentDocument,
|
||||
UpdateOneAgentDocument,
|
||||
} from '~/generated-metadata/graphql';
|
||||
|
||||
export const useUpdateAgentLabel = (agentId: string | undefined) => {
|
||||
const { data: agentData } = useFindOneAgentQuery({
|
||||
const { data: agentData } = useQuery(FindOneAgentDocument, {
|
||||
variables: { id: agentId || '' },
|
||||
skip: !isDefined(agentId),
|
||||
});
|
||||
|
||||
const [updateAgent] = useUpdateOneAgentMutation();
|
||||
const [updateAgent] = useMutation(UpdateOneAgentDocument);
|
||||
|
||||
const agent = agentData?.findOneAgent;
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordF
|
||||
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
|
||||
import { UPDATE_WORKFLOW_RUN_STEP } from '@/workflow/graphql/mutations/updateWorkflowRunStep';
|
||||
import { type WorkflowStep, type WorkflowRun } from '@/workflow/types/Workflow';
|
||||
import { useMutation } from '@apollo/client';
|
||||
import { useMutation } from '@apollo/client/react';
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import {
|
||||
type UpdateWorkflowRunStepInput,
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import {
|
||||
type WorkflowVersion,
|
||||
type WorkflowStep,
|
||||
} from '@/workflow/types/Workflow';
|
||||
import { useMutation } from '@apollo/client';
|
||||
import { useMutation } from '@apollo/client/react';
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import {
|
||||
type UpdateWorkflowVersionStepInput,
|
||||
|
||||
Reference in New Issue
Block a user