diff --git a/apps/roam/package.json b/apps/roam/package.json index 338faa947..c2ef03d69 100644 --- a/apps/roam/package.json +++ b/apps/roam/package.json @@ -1,6 +1,6 @@ { "name": "roam", - "version": "0.14.2", + "version": "0.14.3", "description": "Discourse Graph Plugin for roamresearch.com", "scripts": { "postinstall": "patch-package", diff --git a/apps/roam/src/components/canvas/Tldraw.tsx b/apps/roam/src/components/canvas/Tldraw.tsx index 30c6ced24..5badf8d40 100644 --- a/apps/roam/src/components/canvas/Tldraw.tsx +++ b/apps/roam/src/components/canvas/Tldraw.tsx @@ -689,7 +689,7 @@ const TldrawCanvas = ({ title }: Props) => { const lastInsertRef = useRef(); const containerRef = useRef(null); const [maximized, setMaximized] = useState(false); - const { store, instanceId, userId } = useRoamStore({ + const { store, instanceId, userId, isAlreadyUpgraded } = useRoamStore({ config: customTldrawConfig, title, }); @@ -873,6 +873,17 @@ const TldrawCanvas = ({ title }: Props) => { {isLoading ? ( <> + ) : isAlreadyUpgraded || !store ? ( +
+
+

Canvas Upgraded

+

+ This canvas is using the latest version. +
+ Please upgrade your Discourse Graph extension to view this canvas. +

+
+
) : ( ; const rjsqb = props["roamjs-query-builder"] as Record; const data = rjsqb?.tldraw as Parameters[0]; - return { data, instanceId, userId }; + + const isAlreadyUpgraded = !!rjsqb?.legacyTldraw; + + return { data, instanceId, userId, isAlreadyUpgraded }; }, [tree, pageUid]); const store = useMemo(() => { + if (initialData.isAlreadyUpgraded) return null; const _store = config.createStore({ initialData: initialData.data, instanceId: initialData.instanceId, @@ -186,6 +191,7 @@ export const useRoamStore = ({ }; useEffect(() => { + if (initialData.isAlreadyUpgraded || !store) return; const pullWatchProps: Parameters = [ "[:edit/user :block/props :block/string {:block/children ...}]", `[:block/uid "${pageUid}"]`, @@ -220,5 +226,6 @@ export const useRoamStore = ({ store, instanceId: initialData.instanceId, userId: initialData.userId, + isAlreadyUpgraded: initialData.isAlreadyUpgraded, }; }; diff --git a/package-lock.json b/package-lock.json index e6cf1d533..b52d56931 100644 --- a/package-lock.json +++ b/package-lock.json @@ -506,7 +506,7 @@ "license": "0BSD" }, "apps/roam": { - "version": "0.14.2", + "version": "0.14.3", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": {