Untested

Author: microbit-matt-hillsdon

src/hooks/project-hooks.tsx

@@ -22,6 +22,7 @@ import {
 import { useIntl } from "react-intl";
 import { useNavigate } from "react-router";
 import { useLogging } from "../logging/logging-hooks";
+import { createUntitledProject } from "../makecode/utils";
 import {
   HexData,
   isDatasetUserFileFormat,
@@ -58,12 +59,13 @@ interface ProjectContext {
   openEditor(): Promise<void>;
   project: MakeCodeProject;
   projectEdited: boolean;
-  resetProject: () => void;
+  newProject(projectNameOverride?: string): void;
+  resetProject(): void;
   importProject: (
     project: MakeCodeProject,
-    projectNameOverride: string
+    projectNameOverride?: string
   ) => void;
-  loadFile: (file: File, type: LoadType) => void;
+  loadFile(file: File, type: LoadType): void;
   /**
    * Called to request a save.
    *
@@ -365,7 +367,7 @@ export const ProjectProvider = ({
   const importProject = useCallback(
     async (
       project: MakeCodeProject,
-      projectNameOverride: string
+      projectNameOverride?: string
     ): Promise<void> => {
       const hasTimedOut = await checkIfEditorStartUpTimedOut(
         editorReadyPromise.promise
@@ -377,7 +379,9 @@ export const ProjectProvider = ({
       try {
         // This triggers the code in editorChanged to update actions etc.
         await driverRef.current!.importProject({
-          project: renameProject(project, projectNameOverride),
+          project: projectNameOverride
+            ? renameProject(project, projectNameOverride)
+            : project,
         });
       } catch (e) {
         setPostImportDialogState(PostImportDialogState.Error);
@@ -392,6 +396,22 @@ export const ProjectProvider = ({
     ]
   );
 
+  const newProject = useCallback(
+    (projectName?: string) => {
+      // BUG:
+      // MakeCode will have initialized with whatever is already in state
+      // at this point. We don't tell MakeCode about our new project here.
+      //
+      // MakeCode's visibility listener will cause it to reload the
+      // project it already has open (after a workspacesync),
+      // then we'll conisder that to be a new project and
+
+      const untitledProject = createUntitledProject();
+      return importProject(untitledProject, projectName);
+    },
+    [importProject]
+  );
+
   const setSave = useStore((s) => s.setSave);
   const save = useStore((s) => s.save);
   const settings = useStore((s) => s.settings);
@@ -492,6 +512,7 @@ export const ProjectProvider = ({
 
   const value = useMemo(
     () => ({
+      newProject,
       loadFile,
       importProject,
       openEditor,
@@ -511,6 +532,7 @@ export const ProjectProvider = ({
       },
     }),
     [
+      newProject,
       loadFile,
       importProject,
       openEditor,

src/makecode/utils.ts

@@ -12,7 +12,7 @@ import { DatasetEditorJsonFormat } from "../model";
 import { getMainScript } from "./generate-main-scripts";
 import { getAutogeneratedTs, getDatasetJson } from "./generate-custom-scripts";
 import { MakeCodeProject } from "@microbit/makecode-embed/react";
-import { DataWindow } from "../store";
+import { currentDataWindow, DataWindow } from "../store";
 import { untitledProjectName } from "../project-name";
 
 export const filenames = {
@@ -145,3 +145,35 @@ export const hasMakeCodeMlExtension = (project: MakeCodeProject) => {
   }
   return extensionName in (pxtJson["dependencies"] as object);
 };
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+export const createUntitledProject = (): MakeCodeProject => ({
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  header: {
+    target: "microbit",
+    targetVersion: "7.1.2",
+    name: untitledProjectName,
+    meta: {},
+    editor: "blocksprj",
+    pubId: "",
+    pubCurrent: false,
+    _rev: null,
+    id: "45a3216b-e997-456c-bd4b-6550ddb81c4e",
+    recentUse: 1726493314,
+    modificationTime: 1726493314,
+    cloudUserId: null,
+    cloudCurrent: false,
+    cloudVersion: null,
+    cloudLastSyncTime: 0,
+    isDeleted: false,
+    githubCurrent: false,
+    saveId: null,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } as any,
+  ...generateProject(
+    untitledProjectName,
+    { data: [] },
+    undefined,
+    currentDataWindow
+  ),
+});

src/pages/NewPage.tsx

@@ -29,14 +29,14 @@ import NewPageChoice from "../components/NewPageChoice";
 import { useLogging } from "../logging/logging-hooks";
 import { useStore } from "../store";
 import { createDataSamplesPageUrl } from "../urls";
-import { useProjectName } from "../hooks/project-hooks";
+import { useProject, useProjectName } from "../hooks/project-hooks";
 
 const NewPage = () => {
   const existingSessionTimestamp = useStore((s) => s.timestamp);
   const projectName = useProjectName();
-  const newSession = useStore((s) => s.newSession);
   const navigate = useNavigate();
   const logging = useLogging();
+  const { newProject } = useProject();
 
   const handleOpenLastSession = useCallback(() => {
     logging.event({
@@ -54,9 +54,9 @@ const NewPage = () => {
     logging.event({
       type: "session-open-new",
     });
-    newSession();
+    newProject();
     navigate(createDataSamplesPageUrl());
-  }, [logging, newSession, navigate]);
+  }, [logging, newProject, navigate]);
 
   const intl = useIntl();
   const lastSessionTitle = intl.formatMessage({

src/store.ts

@@ -14,7 +14,11 @@ import { deployment } from "./deployment";
 import { flags } from "./flags";
 import { createPromise, PromiseInfo } from "./hooks/use-promise-ref";
 import { Logging } from "./logging/logging";
-import { generateCustomFiles, generateProject } from "./makecode/utils";
+import {
+  createUntitledProject,
+  generateCustomFiles,
+  generateProject,
+} from "./makecode/utils";
 import { Confidences, predict, trainModel } from "./ml";
 import { mlSettings } from "./mlConfig";
 import {
@@ -78,37 +82,6 @@ interface PredictionResult {
   detected: Action | undefined;
 }
 
-const createUntitledProject = (): MakeCodeProject => ({
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  header: {
-    target: "microbit",
-    targetVersion: "7.1.2",
-    name: untitledProjectName,
-    meta: {},
-    editor: "blocksprj",
-    pubId: "",
-    pubCurrent: false,
-    _rev: null,
-    id: "45a3216b-e997-456c-bd4b-6550ddb81c4e",
-    recentUse: 1726493314,
-    modificationTime: 1726493314,
-    cloudUserId: null,
-    cloudCurrent: false,
-    cloudVersion: null,
-    cloudLastSyncTime: 0,
-    isDeleted: false,
-    githubCurrent: false,
-    saveId: null,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } as any,
-  ...generateProject(
-    untitledProjectName,
-    { data: [] },
-    undefined,
-    currentDataWindow
-  ),
-});
-
 const updateProject = (
   project: MakeCodeProject,
   projectEdited: boolean,
@@ -219,7 +192,6 @@ export interface Actions {
   setEditorOpen(open: boolean): void;
   recordingStarted(): void;
   recordingStopped(): void;
-  newSession(projectName?: string): void;
   trainModelFlowStart: (callback?: () => void) => Promise<void>;
   closeTrainModelDialogs: () => void;
   trainModel(): Promise<boolean>;
@@ -380,25 +352,6 @@ const createMlStore = (logging: Logging) => {
             );
           },
 
-          newSession(projectName?: string) {
-            const untitledProject = createUntitledProject();
-            set(
-              {
-                actions: [],
-                dataWindow: currentDataWindow,
-                model: undefined,
-                project: projectName
-                  ? renameProject(untitledProject, projectName)
-                  : untitledProject,
-                projectEdited: false,
-                appEditNeedsFlushToEditor: true,
-                timestamp: Date.now(),
-              },
-              false,
-              "newSession"
-            );
-          },
-
           setEditorOpen(open: boolean) {
             set(
               ({ download }) => ({