project: serialize id and uuid to config properly

Author: josephjclark

packages/project/src/Workspace.ts

@@ -54,7 +54,7 @@ export class Workspace {
           const stateFilePath = path.join(projectsPath, file);
           const data = fs.readFileSync(stateFilePath, 'utf-8');
           const project = fromAppState(data, { format: 'yaml' });
-          this.projectPaths.set(project.name, stateFilePath);
+          this.projectPaths.set(project.id, stateFilePath);
           return project;
         })
         .filter((s) => s);
@@ -85,8 +85,10 @@ export class Workspace {
   }
 
   getActiveProject() {
-    // TODO should use id, not name
-    return this.projects.find((p) => p.id === this.activeProject?.id);
+    return (
+      this.projects.find((p) => p.id === this.activeProject?.id) ??
+      this.projects.find((p) => p.openfn?.uuid === this.activeProject?.id)
+    );
   }
 
   // TODO this needs to return default values

packages/project/src/util/config.ts

@@ -81,6 +81,7 @@ export const buildConfig = (config: WorkspaceConfig = {}) => ({
 export const extractConfig = (source: Project) => {
   const project = {
     ...(source.openfn || {}),
+    id: source.id,
   };
   const workspace = {
     ...source.config,

packages/project/test/serialize/to-fs.test.ts

@@ -187,6 +187,7 @@ test('extractWorkflow: single simple workflow with custom root', (t) => {
 test('toFs: extract a project with 1 workflow and 1 step', (t) => {
   const project = new Project(
     {
+      name: 'My Project',
       workflows: [
         {
           id: 'my-workflow',
@@ -219,7 +220,9 @@ test('toFs: extract a project with 1 workflow and 1 step', (t) => {
       formats: { openfn: 'json', project: 'yaml', workflow: 'json' },
       dirs: { projects: '.projects', workflows: 'workflows' },
     },
-    project: {},
+    project: {
+      id: 'my-project',
+    },
   });
 
   const workflow = JSON.parse(files['workflows/my-workflow/my-workflow.json']);

packages/project/test/util/config.test.ts

@@ -167,6 +167,7 @@ test('generate openfn.yaml', (t) => {
       result.content,
       `project:
   uuid: 1234
+  id: my-project
 workspace:
   formats:
     openfn: yaml