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:
@ -27,14 +27,10 @@ export const Notes = ({
|
||||
}: {
|
||||
targetableObject: ActivityTargetableObject;
|
||||
}) => {
|
||||
const { notes, initialized } = useNotes(targetableObject);
|
||||
const { notes } = useNotes(targetableObject);
|
||||
|
||||
const openCreateActivity = useOpenCreateActivityDrawer();
|
||||
|
||||
if (!initialized) {
|
||||
return <></>;
|
||||
}
|
||||
|
||||
if (notes?.length === 0) {
|
||||
return (
|
||||
<AnimatedPlaceholderEmptyContainer>
|
||||
|
||||
@ -6,7 +6,6 @@ import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableE
|
||||
jest.mock('@/activities/hooks/useActivities', () => ({
|
||||
useActivities: jest.fn(() => ({
|
||||
activities: [{ id: '1', content: 'Example Note' }],
|
||||
initialized: true,
|
||||
loading: false,
|
||||
})),
|
||||
}));
|
||||
@ -29,7 +28,7 @@ jest.mock('recoil', () => {
|
||||
});
|
||||
|
||||
describe('useNotes', () => {
|
||||
it('should return notes, initialized, and loading as expected', () => {
|
||||
it('should return notes, and loading as expected', () => {
|
||||
const mockTargetableObject: ActivityTargetableObject = {
|
||||
id: '1',
|
||||
targetObjectNameSingular: 'Example Target',
|
||||
@ -39,7 +38,6 @@ describe('useNotes', () => {
|
||||
expect(result.current.notes).toEqual([
|
||||
{ id: '1', content: 'Example Note' },
|
||||
]);
|
||||
expect(result.current.initialized).toBe(true);
|
||||
expect(result.current.loading).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
@ -5,7 +5,7 @@ import { useActivities } from '@/activities/hooks/useActivities';
|
||||
import { currentNotesQueryVariablesState } from '@/activities/notes/states/currentNotesQueryVariablesState';
|
||||
import { FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY } from '@/activities/timeline/constants/FindManyTimelineActivitiesOrderBy';
|
||||
import { Note } from '@/activities/types/Note';
|
||||
import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
|
||||
import { RecordGqlOperationVariables } from '@/object-record/graphql/types/RecordGqlOperationVariables';
|
||||
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
|
||||
|
||||
import { ActivityTargetableObject } from '../../types/ActivityTargetableEntity';
|
||||
@ -18,11 +18,11 @@ export const useNotes = (targetableObject: ActivityTargetableObject) => {
|
||||
type: { eq: 'Note' },
|
||||
},
|
||||
orderBy: FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY,
|
||||
}) as ObjectRecordQueryVariables,
|
||||
}) as RecordGqlOperationVariables,
|
||||
[],
|
||||
);
|
||||
|
||||
const { activities, initialized, loading } = useActivities({
|
||||
const { activities, loading } = useActivities({
|
||||
activitiesFilters: notesQueryVariables.filter ?? {},
|
||||
activitiesOrderByVariables: notesQueryVariables.orderBy ?? {},
|
||||
targetableObjects: [targetableObject],
|
||||
@ -44,7 +44,6 @@ export const useNotes = (targetableObject: ActivityTargetableObject) => {
|
||||
|
||||
return {
|
||||
notes: activities as Note[],
|
||||
initialized,
|
||||
loading,
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
import { atom } from 'recoil';
|
||||
|
||||
import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
|
||||
import { RecordGqlOperationVariables } from '@/object-record/graphql/types/RecordGqlOperationVariables';
|
||||
|
||||
export const currentNotesQueryVariablesState =
|
||||
atom<ObjectRecordQueryVariables | null>({
|
||||
atom<RecordGqlOperationVariables | null>({
|
||||
default: null,
|
||||
key: 'currentNotesQueryVariablesState',
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user