From 0fb213ee4eb45969bae7bce5cdec26a37f1142a3 Mon Sep 17 00:00:00 2001 From: swve Date: Fri, 14 Jun 2024 00:35:57 +0100 Subject: [PATCH] fix: Error when you try to edit a course from a button --- .../activity/[activityuuid]/edit/page.tsx | 1 + .../web/components/Contexts/CourseContext.tsx | 2 +- .../DraggableElements/ActivityElement.tsx | 4 +++- .../Objects/Editor/EditorWrapper.tsx | 6 ++--- apps/web/package.json | 2 +- apps/web/pnpm-lock.yaml | 22 +++++++++---------- apps/web/services/config/config.ts | 2 ++ 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/apps/web/app/editor/course/[courseid]/activity/[activityuuid]/edit/page.tsx b/apps/web/app/editor/course/[courseid]/activity/[activityuuid]/edit/page.tsx index 72183f3a..4dca9687 100644 --- a/apps/web/app/editor/course/[courseid]/activity/[activityuuid]/edit/page.tsx +++ b/apps/web/app/editor/course/[courseid]/activity/[activityuuid]/edit/page.tsx @@ -49,6 +49,7 @@ const EditActivity = async (params: any) => { { revalidate: 0, tags: ['activities'] }, access_token ? access_token : null ) + const org = await getOrganizationContextInfoWithId(courseInfo.org_id, { revalidate: 180, tags: ['organizations'], diff --git a/apps/web/components/Contexts/CourseContext.tsx b/apps/web/components/Contexts/CourseContext.tsx index bc615cc3..f407cd00 100644 --- a/apps/web/components/Contexts/CourseContext.tsx +++ b/apps/web/components/Contexts/CourseContext.tsx @@ -34,7 +34,7 @@ export function CourseProvider({ children, courseuuid }: any) { }, [courseStructureData]); if (error) return
Failed to load course structure
; - if (!courseStructureData) return ; + if (!courseStructureData) return ''; if (courseStructureData) { return ( diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx b/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx index a079aa01..a76c72e7 100644 --- a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx +++ b/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx @@ -142,8 +142,9 @@ function ActivityElement(props: ActivitiyElementProps) { '' )}/edit` } + prefetch className=" hover:cursor-pointer p-1 px-3 bg-sky-700 rounded-md items-center" - rel="noopener noreferrer" + target='_blank' // hotfix for an editor prosemirror bug >
Edit Page @@ -162,6 +163,7 @@ function ActivityElement(props: ActivitiyElementProps) { '' )}` } + prefetch className=" hover:cursor-pointer p-1 px-3 bg-gray-200 rounded-md font-bold text-xs flex items-center space-x-1" rel="noopener noreferrer" > diff --git a/apps/web/components/Objects/Editor/EditorWrapper.tsx b/apps/web/components/Objects/Editor/EditorWrapper.tsx index aa0c2364..6353a297 100644 --- a/apps/web/components/Objects/Editor/EditorWrapper.tsx +++ b/apps/web/components/Objects/Editor/EditorWrapper.tsx @@ -25,7 +25,7 @@ interface EditorWrapperProps { function EditorWrapper(props: EditorWrapperProps): JSX.Element { const session = useLHSession() as any - const access_token = session?.data?.tokens?.access_token; + const access_token = session?.data?.tokens?.access_token; // Define provider in the state const [provider, setProvider] = React.useState(null); const [thisPageColor, setThisPageColor] = useState(randomColor({ luminosity: 'light' }) as string) @@ -51,7 +51,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element { }, 10); }; - + // Store the Y document in the browser new IndexeddbPersistence(props.activity.activity_uuid, doc) @@ -80,7 +80,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element { } }); - toast.promise(updateActivity(activity, activity.activity_uuid,access_token), { + toast.promise(updateActivity(activity, activity.activity_uuid, access_token), { loading: 'Saving...', success: Activity saved!, error: Could not save., diff --git a/apps/web/package.json b/apps/web/package.json index a265be62..f32535f1 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -60,7 +60,7 @@ "tailwind-scrollbar": "^3.1.0", "uuid": "^9.0.1", "y-indexeddb": "^9.0.12", - "y-prosemirror": "^1.2.6", + "y-prosemirror": "^1.2.8", "y-webrtc": "^10.3.0", "yjs": "^13.6.16" }, diff --git a/apps/web/pnpm-lock.yaml b/apps/web/pnpm-lock.yaml index 81df49ee..b01b013f 100644 --- a/apps/web/pnpm-lock.yaml +++ b/apps/web/pnpm-lock.yaml @@ -43,10 +43,10 @@ importers: version: 2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(@tiptap/extension-code-block@2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(@tiptap/pm@2.4.0))(@tiptap/pm@2.4.0) '@tiptap/extension-collaboration': specifier: ^2.4.0 - version: 2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(@tiptap/pm@2.4.0)(y-prosemirror@1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16)) + version: 2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(@tiptap/pm@2.4.0)(y-prosemirror@1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16)) '@tiptap/extension-collaboration-cursor': specifier: ^2.4.0 - version: 2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(y-prosemirror@1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16)) + version: 2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(y-prosemirror@1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16)) '@tiptap/extension-youtube': specifier: ^2.4.0 version: 2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0)) @@ -156,8 +156,8 @@ importers: specifier: ^9.0.12 version: 9.0.12(yjs@13.6.16) y-prosemirror: - specifier: ^1.2.6 - version: 1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16) + specifier: ^1.2.8 + version: 1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16) y-webrtc: specifier: ^10.3.0 version: 10.3.0(yjs@13.6.16) @@ -2904,8 +2904,8 @@ packages: peerDependencies: yjs: ^13.0.0 - y-prosemirror@1.2.6: - resolution: {integrity: sha512-rGz8kX4v/uFJrLaqZvsezY1JGN/zTDSPMO76zRbNcpE63OEiw2PBCEQi9ZlfbEwgCMoeJLUT+otNyO/Oj73TGQ==} + y-prosemirror@1.2.8: + resolution: {integrity: sha512-xNDOEe9ViBXck0qwcTvzGgj832ecoz8GQSppoh6PwUokbXoEBDbAH76Qs15HOiatjZkSODHRGdpYlLBBkJPiGA==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} peerDependencies: prosemirror-model: ^1.7.1 @@ -3549,16 +3549,16 @@ snapshots: dependencies: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) - '@tiptap/extension-collaboration-cursor@2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(y-prosemirror@1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16))': + '@tiptap/extension-collaboration-cursor@2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(y-prosemirror@1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16))': dependencies: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) - y-prosemirror: 1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16) + y-prosemirror: 1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16) - '@tiptap/extension-collaboration@2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(@tiptap/pm@2.4.0)(y-prosemirror@1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16))': + '@tiptap/extension-collaboration@2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))(@tiptap/pm@2.4.0)(y-prosemirror@1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16))': dependencies: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) '@tiptap/pm': 2.4.0 - y-prosemirror: 1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16) + y-prosemirror: 1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16) '@tiptap/extension-document@2.4.0(@tiptap/core@2.4.0(@tiptap/pm@2.4.0))': dependencies: @@ -5903,7 +5903,7 @@ snapshots: lib0: 0.2.94 yjs: 13.6.16 - y-prosemirror@1.2.6(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16): + y-prosemirror@1.2.8(prosemirror-model@1.21.1)(prosemirror-state@1.4.3)(prosemirror-view@1.33.7)(y-protocols@1.0.6(yjs@13.6.16))(yjs@13.6.16): dependencies: lib0: 0.2.94 prosemirror-model: 1.21.1 diff --git a/apps/web/services/config/config.ts b/apps/web/services/config/config.ts index c9ec36d0..b7ac9d56 100644 --- a/apps/web/services/config/config.ts +++ b/apps/web/services/config/config.ts @@ -51,3 +51,5 @@ export const getDefaultOrg = () => { export const getCollaborationServerUrl = () => { return `${LEARNHOUSE_COLLABORATION_WS_URL}` } + +