Fix for dropping the project name if you update the gesture data (#406)

* Add name argument to generateProject

Author: microbit-grace

src/components/CodeViewGridItem.tsx

@@ -21,7 +21,8 @@ const CodeViewGridItem = ({
   const model = useStore((s) => s.model);
   const gestures = useStore((s) => s.gestures);
   const project = useMemo(
-    () => generateProject({ data: gestures }, model, gesture),
+    // Project name is left empty as it is not used or displayed.
+    () => generateProject("", { data: gestures }, model, gesture),
     [gesture, gestures, model]
   );
   const width = useMemo(

src/makecode/__snapshots__/utils.test.ts.snap

@@ -5295,7 +5295,7 @@ namespace ml {
 ml.onStart(ml.event.Wave, function () {basic.showIcon(IconNames.Rabbit)})
 ml.onStart(ml.event.Clap, function () {basic.showIcon(IconNames.EighthNote)})
 ",
-    "pxt.json": "{"name":"Untitled","description":"","dependencies":{"core":"*","microphone":"*","radio":"*","machine-learning":"github:microbit-foundation/pxt-microbit-ml#v1.0.0"},"files":["main.ts","main.blocks","autogenerated.ts","dataset.json","pxt.json","README.md"],"preferredEditor":"blocksprj"}",
+    "pxt.json": "{"name":"A project name","description":"","dependencies":{"core":"*","microphone":"*","radio":"*","machine-learning":"github:microbit-foundation/pxt-microbit-ml#v1.0.0"},"files":["main.ts","main.blocks","autogenerated.ts","dataset.json","pxt.json","README.md"],"preferredEditor":"blocksprj"}",
   },
 }
 `;

src/makecode/utils.test.ts

@@ -44,13 +44,22 @@ beforeAll(async () => {
 describe("test project generation", () => {
   it("generates a project", () => {
     assert(!trainingResult.error);
-    const result = generateProject(data, trainingResult.model);
+    const result = generateProject(
+      "A project name",
+      data,
+      trainingResult.model
+    );
     expect(result).toMatchSnapshot();
   });
 
   it("generates a project to render the default gesture for the 'still' event", () => {
     assert(!trainingResult.error);
-    const result = generateProject(data, trainingResult.model, data.data[0]);
+    const result = generateProject(
+      "Untitled",
+      data,
+      trainingResult.model,
+      data.data[0]
+    );
     expect(result).toMatchSnapshot();
   });
 });
@@ -71,7 +80,7 @@ describe("test project update", () => {
       "github:microbit-foundation/pxt-microbit-ml#v0.4.2"
     );
 
-    const newProject = generateProject(data, trainingResult.model);
+    const newProject = generateProject("Untitled", data, trainingResult.model);
     expect(newProject.text?.[filenames.autogenerated]).not.toEqual(
       projectToUpdate.text?.[filenames.autogenerated]
     );
@@ -80,7 +89,7 @@ describe("test project update", () => {
       ...projectToUpdate,
       text: {
         ...projectToUpdate.text,
-        ...generateProject(data, trainingResult.model).text,
+        ...generateProject("Untitled", data, trainingResult.model).text,
       },
     };
     const updatedEditedProject = {

src/makecode/utils.ts

@@ -34,6 +34,7 @@ export const pxt = {
 };
 
 export const generateProject = (
+  name: string,
   gestureState: DatasetEditorJsonFormat,
   model: LayersModel | undefined,
   gestureToRenderAsBlock?: GestureData
@@ -42,7 +43,7 @@ export const generateProject = (
   const useableGestures = model ? gestures : [];
   return {
     text: {
-      [filenames.pxtJson]: JSON.stringify(pxt),
+      [filenames.pxtJson]: JSON.stringify({ ...pxt, name }),
       [filenames.readme]: "",
       [filenames.mainTs]: getMainScript(
         useableGestures,

src/store.ts

@@ -61,7 +61,7 @@ const createUntitledProject = (): Project => ({
     saveId: null,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any,
-  ...generateProject({ data: [] }, undefined),
+  ...generateProject("Untitled", { data: [] }, undefined),
 });
 
 const updateProject = (
@@ -77,7 +77,11 @@ const updateProject = (
       ...project.text,
       ...(projectEdited
         ? generateCustomFiles(gestureData, model, project)
-        : generateProject(gestureData, model).text),
+        : generateProject(
+            project.header?.name ?? "Untitled",
+            gestureData,
+            model
+          ).text),
     },
   };
   return {
@@ -529,7 +533,7 @@ const createMlStore = (logging: Logging) => {
               ...previousProject,
               text: {
                 ...previousProject.text,
-                ...generateProject({ data: gestures }, model).text,
+                ...generateProject("Untitled", { data: gestures }, model).text,
               },
             };
             set(