Fix Apollo client routing for view operations in field metadata hooks (#13012)
closes https://github.com/twentyhq/twenty/issues/13010
This commit is contained in:
@ -1,10 +1,11 @@
|
|||||||
import { useApolloClient, useMutation } from '@apollo/client';
|
import { useMutation } from '@apollo/client';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
DeleteOneFieldMetadataItemMutation,
|
DeleteOneFieldMetadataItemMutation,
|
||||||
DeleteOneFieldMetadataItemMutationVariables,
|
DeleteOneFieldMetadataItemMutationVariables,
|
||||||
} from '~/generated-metadata/graphql';
|
} from '~/generated-metadata/graphql';
|
||||||
|
|
||||||
|
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
|
||||||
import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
|
import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
|
||||||
import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
|
import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
|
||||||
import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
|
import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
|
||||||
@ -25,7 +26,7 @@ export const useDeleteOneFieldMetadataItem = () => {
|
|||||||
setRecordIndexKanbanAggregateOperation,
|
setRecordIndexKanbanAggregateOperation,
|
||||||
] = useRecoilState(recordIndexKanbanAggregateOperationState);
|
] = useRecoilState(recordIndexKanbanAggregateOperationState);
|
||||||
|
|
||||||
const apolloClient = useApolloClient();
|
const apolloCoreClient = useApolloCoreClient();
|
||||||
|
|
||||||
const resetRecordIndexKanbanAggregateOperation = async (
|
const resetRecordIndexKanbanAggregateOperation = async (
|
||||||
idToDelete: DeleteOneFieldMetadataItemMutationVariables['idToDelete'],
|
idToDelete: DeleteOneFieldMetadataItemMutationVariables['idToDelete'],
|
||||||
@ -36,7 +37,7 @@ export const useDeleteOneFieldMetadataItem = () => {
|
|||||||
fieldMetadataId: null,
|
fieldMetadataId: null,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
await apolloClient.refetchQueries({
|
await apolloCoreClient.refetchQueries({
|
||||||
include: ['FindManyViews'],
|
include: ['FindManyViews'],
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import {
|
|||||||
import { UPDATE_ONE_FIELD_METADATA_ITEM } from '../graphql/mutations';
|
import { UPDATE_ONE_FIELD_METADATA_ITEM } from '../graphql/mutations';
|
||||||
|
|
||||||
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
|
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
|
||||||
|
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
|
||||||
import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
|
import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
|
||||||
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
||||||
import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
|
import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
|
||||||
@ -21,6 +22,7 @@ import { isDefined } from 'twenty-shared/utils';
|
|||||||
|
|
||||||
export const useUpdateOneFieldMetadataItem = () => {
|
export const useUpdateOneFieldMetadataItem = () => {
|
||||||
const apolloClient = useApolloClient();
|
const apolloClient = useApolloClient();
|
||||||
|
const apolloCoreClient = useApolloCoreClient();
|
||||||
const { refreshObjectMetadataItems } =
|
const { refreshObjectMetadataItems } =
|
||||||
useRefreshObjectMetadataItems('network-only');
|
useRefreshObjectMetadataItems('network-only');
|
||||||
|
|
||||||
@ -79,7 +81,7 @@ export const useUpdateOneFieldMetadataItem = () => {
|
|||||||
const { data } = await apolloClient.query({ query: GET_CURRENT_USER });
|
const { data } = await apolloClient.query({ query: GET_CURRENT_USER });
|
||||||
setCurrentWorkspace(data?.currentUser?.currentWorkspace);
|
setCurrentWorkspace(data?.currentUser?.currentWorkspace);
|
||||||
|
|
||||||
const { data: viewConnection } = await apolloClient.query<{
|
const { data: viewConnection } = await apolloCoreClient.query<{
|
||||||
views: RecordGqlConnection;
|
views: RecordGqlConnection;
|
||||||
}>({
|
}>({
|
||||||
query: findManyViewsQuery,
|
query: findManyViewsQuery,
|
||||||
|
|||||||
Reference in New Issue
Block a user