admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Feat/activity optimistic activities (#4009)

Browse Source 
* Fix naming

* Fixed cache.evict bug for relation target deletion

* Fixed cascade delete activity targets

* Working version

* Fix

* fix

* WIP

* Fixed optimistic effect target inline cell

* Removed openCreateActivityDrawer v1

* Ok for timeline

* Removed console.log

* Fix update record optimistic effect

* Refactored activity queries into useActivities for everything

* Fixed bugs

* Cleaned

* Fix lint

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2024-02-20 14:20:45 +01:00
committed by GitHub
parent 6fb0099eb3
commit 36a6558289
68 changed files with 1435 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/modules/activities/notes/components/NoteCard.tsx
View File

@ -94,7 +94,7 @@ export const NoteCard = ({
<FieldContext.Provider value={fieldContext as GenericFieldContextType}>
<StyledCard isSingleNote={isSingleNote}>
<StyledCardDetailsContainer
onClick={() => openActivityRightDrawer(note.id)}
onClick={() => openActivityRightDrawer(note)}
>
<StyledNoteTitle>{note.title ?? 'Task Title'}</StyledNoteTitle>
<StyledCardContent>{body}</StyledCardContent>

2
packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx
View File

@ -29,7 +29,7 @@ const StyledTitleBar = styled.h3`
width: 100%;
`;
const StyledTitle = styled.h3`
const StyledTitle = styled.span`
color: ${({ theme }) => theme.font.color.primary};
font-weight: ${({ theme }) => theme.font.weight.semiBold};
`;

6
packages/twenty-front/src/modules/activities/notes/components/Notes.tsx
View File

@ -27,10 +27,14 @@ export const Notes = ({
}: {
targetableObject: ActivityTargetableObject;
}) => {
const { notes } = useNotes(targetableObject);
const { notes, initialized } = useNotes(targetableObject);
const openCreateActivity = useOpenCreateActivityDrawer();
if (!initialized) {
return <></>;
}
if (notes?.length === 0) {
return (
<AnimatedPlaceholderEmptyContainer>

34
packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts
View File

@ -1,35 +1,21 @@
import { useActivityTargetsForTargetableObject } from '@/activities/hooks/useActivityTargetsForTargetableObject';
import { useActivities } from '@/activities/hooks/useActivities';
import { FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY } from '@/activities/timeline/constants/FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY';
import { Note } from '@/activities/types/Note';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { OrderByField } from '@/object-metadata/types/OrderByField';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { ActivityTargetableObject } from '../../types/ActivityTargetableEntity';
export const useNotes = (targetableObject: ActivityTargetableObject) => {
const { activityTargets } = useActivityTargetsForTargetableObject({
targetableObject,
});
const filter = {
id: {
in: activityTargets?.map((activityTarget) => activityTarget.activityId),
const { activities, initialized, loading } = useActivities({
activitiesFilters: {
type: { eq: 'Note' },
},
type: { eq: 'Note' },
};
const orderBy = {
createdAt: 'AscNullsFirst',
} as OrderByField;
const { records: notes } = useFindManyRecords({
skip: !activityTargets?.length,
objectNameSingular: CoreObjectNameSingular.Activity,
filter,
orderBy,
activitiesOrderByVariables: FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY,
targetableObjects: [targetableObject],
});
return {
notes: notes as Note[],
notes: activities as Note[],
initialized,
loading,
};
};