Fix tasks (#5199)
## Query depth deprecation I'm deprecating depth parameter in our graphql query / cache tooling. They were obsolete since we introduce the possibility to provide RecordGqlFields ## Refactor combinedFindManyRecordHook The hook can now take an array of operationSignatures ## Fix tasks issues Fix optimistic rendering issue. Note that we still haven't handle optimisticEffect on creation properly
This commit is contained in:
@ -79,7 +79,7 @@ const mocks: MockedResponse[] = [
|
||||
}
|
||||
`,
|
||||
variables: {
|
||||
filter: { activityTargetId: { eq: '123' } },
|
||||
filter: { companyId: { eq: '123' } },
|
||||
limit: undefined,
|
||||
orderBy: undefined,
|
||||
},
|
||||
@ -180,7 +180,6 @@ describe('useActivities', () => {
|
||||
activitiesFilters: {},
|
||||
activitiesOrderByVariables: {},
|
||||
skip: false,
|
||||
skipActivityTargets: false,
|
||||
}),
|
||||
{ wrapper: Wrapper },
|
||||
);
|
||||
@ -188,8 +187,6 @@ describe('useActivities', () => {
|
||||
expect(result.current).toEqual({
|
||||
activities: [],
|
||||
loading: false,
|
||||
initialized: true,
|
||||
noActivities: true,
|
||||
});
|
||||
});
|
||||
|
||||
@ -202,12 +199,11 @@ describe('useActivities', () => {
|
||||
|
||||
const activities = useActivities({
|
||||
targetableObjects: [
|
||||
{ targetObjectNameSingular: 'activityTarget', id: '123' },
|
||||
{ targetObjectNameSingular: 'company', id: '123' },
|
||||
],
|
||||
activitiesFilters: {},
|
||||
activitiesOrderByVariables: {},
|
||||
skip: false,
|
||||
skipActivityTargets: false,
|
||||
});
|
||||
return { activities, setCurrentWorkspaceMember };
|
||||
},
|
||||
@ -218,18 +214,9 @@ describe('useActivities', () => {
|
||||
result.current.setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
|
||||
});
|
||||
|
||||
expect(result.current.activities.loading).toBe(true);
|
||||
|
||||
// Wait for activityTargets to complete fetching
|
||||
await waitFor(() => !result.current.activities.loading);
|
||||
|
||||
expect(result.current.activities.loading).toBe(false);
|
||||
|
||||
// Wait for request to fetch activities to be made
|
||||
await waitFor(() => result.current.activities.loading);
|
||||
|
||||
// Wait for activities to complete fetching
|
||||
await waitFor(() => !result.current.activities.loading);
|
||||
await waitFor(() => {
|
||||
expect(result.current.activities.loading).toBe(false);
|
||||
});
|
||||
|
||||
const { activities } = result.current;
|
||||
|
||||
|
||||
@ -10,8 +10,8 @@ import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadat
|
||||
import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
|
||||
import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
|
||||
import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
|
||||
import { JestObjectMetadataItemSetter } from '~/testing/jest/JestObjectMetadataItemSetter';
|
||||
import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';
|
||||
|
||||
const mockObjectMetadataItems = getObjectMetadataItemsMock();
|
||||
|
||||
const cache = new InMemoryCache();
|
||||
@ -85,7 +85,6 @@ cache.writeFragment({
|
||||
id
|
||||
createdAt
|
||||
updatedAt
|
||||
targetObjectNameSingular
|
||||
personId
|
||||
companyId
|
||||
company {
|
||||
@ -114,9 +113,11 @@ cache.writeFragment({
|
||||
const Wrapper = ({ children }: { children: ReactNode }) => (
|
||||
<RecoilRoot>
|
||||
<MockedProvider cache={cache}>
|
||||
<SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
|
||||
{children}
|
||||
</SnackBarProviderScope>
|
||||
<JestObjectMetadataItemSetter>
|
||||
<SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
|
||||
{children}
|
||||
</SnackBarProviderScope>
|
||||
</JestObjectMetadataItemSetter>
|
||||
</MockedProvider>
|
||||
</RecoilRoot>
|
||||
);
|
||||
|
||||
@ -82,7 +82,10 @@ describe('useCreateActivityInDB', () => {
|
||||
});
|
||||
|
||||
await act(async () => {
|
||||
await result.current.createActivityInDB(mockedActivity);
|
||||
await result.current.createActivityInDB({
|
||||
...mockedActivity,
|
||||
__typename: 'Activity',
|
||||
});
|
||||
});
|
||||
|
||||
expect(mocks[0].result).toHaveBeenCalled();
|
||||
|
||||
Reference in New Issue
Block a user