twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-12-18 09:02:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix right drawer bug (#584)

Browse Source
This commit is contained in:
Charles Bochet 2023-07-10 21:46:20 -07:00 committed by GitHub
parent ebf5f67f63
commit e1161e96a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/modules/comments/components/comment-thread/CommentThreadComments.tsx
View File

@ -4,7 +4,7 @@ import { useRecoilValue } from 'recoil';
import { v4 } from 'uuid';
import { currentUserState } from '@/auth/states/currentUserState';
import { GET_COMMENT_THREADS_BY_TARGETS } from '@/comments/services';
import { GET_COMMENT_THREAD } from '@/comments/services';
import { CommentForDrawer } from '@/comments/types/CommentForDrawer';
import { AutosizeTextInput } from '@/ui/components/inputs/AutosizeTextInput';
import { isNonEmptyString } from '@/utils/type-guards/isNonEmptyString';
@ -69,7 +69,7 @@ export function CommentThreadComments({ commentThread }: OwnProps) {
commentText: commentText,
createdAt: new Date().toISOString(),
},
refetchQueries: [getOperationName(GET_COMMENT_THREADS_BY_TARGETS) ?? ''],
refetchQueries: [getOperationName(GET_COMMENT_THREAD) ?? ''],
});
}

4
front/src/modules/comments/hooks/useOpenCommentThreadRightDrawer.ts
View File

@ -1,5 +1,7 @@
import { useRecoilState } from 'recoil';
import { useSetHotkeysScope } from '@/hotkeys/hooks/useSetHotkeysScope';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
import { useOpenRightDrawer } from '../../ui/layout/right-drawer/hooks/useOpenRightDrawer';
@ -10,8 +12,10 @@ export function useOpenCommentThreadRightDrawer() {
const [, setViewableCommentThreadId] = useRecoilState(
viewableCommentThreadIdState,
);
const setHotkeysScope = useSetHotkeysScope();
return function openCommentThreadRightDrawer(commentThreadId: string) {
setHotkeysScope(InternalHotkeysScope.RightDrawer, { goto: false });
setViewableCommentThreadId(commentThreadId);
openRightDrawer(RightDrawerPages.EditCommentThread);
};

4
front/src/modules/comments/hooks/useOpenCreateCommentDrawerForSelectedRowIds.ts
View File

@ -4,6 +4,8 @@ import { v4 } from 'uuid';
import { currentUserState } from '@/auth/states/currentUserState';
import { GET_COMPANIES } from '@/companies/services';
import { useSetHotkeysScope } from '@/hotkeys/hooks/useSetHotkeysScope';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { GET_PEOPLE } from '@/people/services';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
import { selectedRowIdsState } from '@/ui/tables/states/selectedRowIdsState';
@ -28,6 +30,7 @@ export function useOpenCreateCommentThreadDrawerForSelectedRowIds() {
const [, setViewableCommentThreadId] = useRecoilState(
viewableCommentThreadIdState,
);
const setHotkeysScope = useSetHotkeysScope();
const [, setCommentableEntityArray] = useRecoilState(
commentableEntityArrayState,
@ -64,6 +67,7 @@ export function useOpenCreateCommentThreadDrawerForSelectedRowIds() {
getOperationName(GET_COMMENT_THREADS_BY_TARGETS) ?? '',
],
onCompleted(data) {
setHotkeysScope(InternalHotkeysScope.RightDrawer, { goto: false });
setViewableCommentThreadId(data.createOneCommentThread.id);
setCommentableEntityArray(commentableEntityArray);
openRightDrawer(RightDrawerPages.CreateCommentThread);

4
front/src/modules/comments/hooks/useOpenCreateCommentThreadDrawer.ts
View File

@ -4,6 +4,8 @@ import { v4 } from 'uuid';
import { currentUserState } from '@/auth/states/currentUserState';
import { GET_COMPANIES } from '@/companies/services';
import { useSetHotkeysScope } from '@/hotkeys/hooks/useSetHotkeysScope';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { GET_PEOPLE } from '@/people/services';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
import { useCreateCommentThreadMutation } from '~/generated/graphql';
@ -21,6 +23,7 @@ export function useOpenCreateCommentThreadDrawer() {
const openRightDrawer = useOpenRightDrawer();
const [createCommentThreadMutation] = useCreateCommentThreadMutation();
const currentUser = useRecoilValue(currentUserState);
const setHotkeysScope = useSetHotkeysScope();
const [, setCommentableEntityArray] = useRecoilState(
commentableEntityArrayState,
@ -51,6 +54,7 @@ export function useOpenCreateCommentThreadDrawer() {
getOperationName(GET_COMMENT_THREADS_BY_TARGETS) ?? '',
],
onCompleted(data) {
setHotkeysScope(InternalHotkeysScope.RightDrawer, { goto: false });
setViewableCommentThreadId(data.createOneCommentThread.id);
setCommentableEntityArray([entity]);
openRightDrawer(RightDrawerPages.CreateCommentThread);

4
front/src/modules/comments/hooks/useOpenTimelineRightDrawer.ts
View File

@ -1,5 +1,7 @@
import { useRecoilState } from 'recoil';
import { useSetHotkeysScope } from '@/hotkeys/hooks/useSetHotkeysScope';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
import { useOpenRightDrawer } from '../../ui/layout/right-drawer/hooks/useOpenRightDrawer';
@ -11,10 +13,12 @@ export function useOpenTimelineRightDrawer() {
const [, setCommentableEntityArray] = useRecoilState(
commentableEntityArrayState,
);
const setHotkeysScope = useSetHotkeysScope();
return function openTimelineRightDrawer(
commentableEntityArray: CommentableEntity[],
) {
setHotkeysScope(InternalHotkeysScope.RightDrawer, { goto: false });
setCommentableEntityArray(commentableEntityArray);
openRightDrawer(RightDrawerPages.Timeline);
};