Use URL origin in place of editor key for 'playground:post'

dfinity · Sep 7, 2023 · 8ad68e8 · 8ad68e8
1 parent 2d82c25
commit 8ad68e8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -77,11 +77,15 @@ async function fetchFromUrlParams(
   const tag = urlParams.get("tag");
   const editorKey = urlParams.get("post");
   if (editorKey) {
-    await dispatch({
-      type: "setOrigin",
-      payload: { origin: `playground:post:${editorKey}` },
-    });
-    return setupEditorIntegration(editorKey, dispatch, worker);
+    const result = await setupEditorIntegration(editorKey, dispatch, worker);
+    if (result) {
+      const { origin, files } = result;
+      await dispatch({
+        type: "setOrigin",
+        payload: { origin: `playground:post:${origin}` },
+      });
+      return files;
+    }
   }
   if (git) {
     const repo = {
@@ -91,7 +95,7 @@ async function fetchFromUrlParams(
     };
     await dispatch({
       type: "setOrigin",
-      payload: { origin: `playground:git:${git}` },
+      payload: { origin: "playground:git" },
     });
     return await worker.fetchGithub(repo);
   }
@@ -143,7 +147,7 @@ async function fetchFromUrlParams(
       }
       await dispatch({
         type: "setOrigin",
-        payload: { origin: `playground:tag:${tag}` },
+        payload: { origin: "playground:tag" },
       });
       return files;
     }

diff --git a/src/integrations/editorIntegration.ts b/src/integrations/editorIntegration.ts
@@ -18,6 +18,11 @@ type EditorIntegrationResponse = {
   acknowledge: number;
 };
 
+export interface EditorIntegrationResult {
+  origin: string;
+  files: Record<string, string>;
+}
+
 export const INTEGRATION_HOOKS: Partial<EditorIntegrationHooks> = {};
 
 // Cached return value to ensure at most one initialization
@@ -35,7 +40,7 @@ export async function setupEditorIntegration(
   editorKey: string,
   dispatch: (WorkplaceReducerAction) => void,
   worker // MocWorker
-): Promise<Record<string, string> | undefined> {
+): Promise<EditorIntegrationResult | undefined> {
   if (previousResult) {
     return previousResult;
   }
@@ -111,7 +116,10 @@ export async function setupEditorIntegration(
 
   // Load a default empty project
   previousResult = {
-    "Main.mo": "",
+    origin,
+    files: {
+      "Main.mo": "",
+    },
   };
   return previousResult;
 }