From e0dfa9519a5da32e5e6a7190c3627aa898257e4f Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Tue, 17 Dec 2024 15:42:36 +0100 Subject: [PATCH] Fix Dockerfile twenty to take twenty-shared into account --- packages/twenty-docker/twenty/Dockerfile | 5 ++++- .../activities/components/RichTextEditor.tsx | 13 ------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/twenty-docker/twenty/Dockerfile b/packages/twenty-docker/twenty/Dockerfile index b1d5d4dff..d17168392 100644 --- a/packages/twenty-docker/twenty/Dockerfile +++ b/packages/twenty-docker/twenty/Dockerfile @@ -11,6 +11,7 @@ COPY ./packages/twenty-emails/package.json /app/packages/twenty-emails/ COPY ./packages/twenty-server/package.json /app/packages/twenty-server/ COPY ./packages/twenty-server/patches /app/packages/twenty-server/patches COPY ./packages/twenty-ui/package.json /app/packages/twenty-ui/ +COPY ./packages/twenty-shared/package.json /app/packages/twenty-shared/ COPY ./packages/twenty-front/package.json /app/packages/twenty-front/ # Install all dependencies @@ -22,6 +23,7 @@ FROM common-deps as twenty-server-build # Copy sourcecode after installing dependences to accelerate subsequents builds COPY ./packages/twenty-emails /app/packages/twenty-emails +COPY ./packages/twenty-shared /app/packages/twenty-shared COPY ./packages/twenty-server /app/packages/twenty-server RUN npx nx run twenty-server:build @@ -31,7 +33,7 @@ RUN mv /app/packages/twenty-server/dist/package.json /app/packages/twenty-server RUN rm -rf /app/packages/twenty-server/dist RUN mv /app/packages/twenty-server/build /app/packages/twenty-server/dist -RUN yarn workspaces focus --production twenty-emails twenty-server +RUN yarn workspaces focus --production twenty-emails twenty-shared twenty-server # Build the front @@ -41,6 +43,7 @@ ARG REACT_APP_SERVER_BASE_URL COPY ./packages/twenty-front /app/packages/twenty-front COPY ./packages/twenty-ui /app/packages/twenty-ui +COPY ./packages/twenty-shared /app/packages/twenty-shared RUN npx nx build twenty-front diff --git a/packages/twenty-front/src/modules/activities/components/RichTextEditor.tsx b/packages/twenty-front/src/modules/activities/components/RichTextEditor.tsx index bff2bef3c..614b17992 100644 --- a/packages/twenty-front/src/modules/activities/components/RichTextEditor.tsx +++ b/packages/twenty-front/src/modules/activities/components/RichTextEditor.tsx @@ -8,7 +8,6 @@ import { useDebouncedCallback } from 'use-debounce'; import { v4 } from 'uuid'; import { useUpsertActivity } from '@/activities/hooks/useUpsertActivity'; -import { activityBodyFamilyState } from '@/activities/states/activityBodyFamilyState'; import { activityTitleHasBeenSetFamilyState } from '@/activities/states/activityTitleHasBeenSetFamilyState'; import { canCreateActivityState } from '@/activities/states/canCreateActivityState'; import { ActivityEditorHotkeyScope } from '@/activities/types/ActivityEditorHotkeyScope'; @@ -55,12 +54,6 @@ export const RichTextEditor = ({ }), ); - const [activityBody, setActivityBody] = useRecoilState( - activityBodyFamilyState({ - activityId: activityId, - }), - ); - const { objectMetadataItem: objectMetadataItemActivity } = useObjectMetadataItem({ objectNameSingular: activityObjectNameSingular, @@ -241,12 +234,6 @@ export const RichTextEditor = ({ const handleBodyChangeDebounced = useDebouncedCallback(handleBodyChange, 500); - // See https://github.com/twentyhq/twenty/issues/6724 for explanation - const setActivityBodyDebouncedToAvoidDragBug = useDebouncedCallback( - setActivityBody, - 100, - ); - const handleEditorChange = () => { const newStringifiedBody = JSON.stringify(editor.document) ?? '';