Logic for new Environment.base field

Author: gschier

package-lock.json

@@ -19,6 +19,6 @@
     "workspaces-run": "^1.0.2"
   },
   "dependencies": {
-    "@yaakapp/api": "^0.5.0"
+    "@yaakapp/api": "^0.5.1"
   }
 }

package.json

@@ -101,7 +101,7 @@ function importEnvironment(e: any, workspaceId: string): ExportResources['enviro
     createdAt: e.created ? new Date(e.created).toISOString().replace('Z', '') : undefined,
     updatedAt: e.updated ? new Date(e.updated).toISOString().replace('Z', '') : undefined,
     workspaceId: convertId(workspaceId),
-    environmentId: e.parentId === workspaceId ? null : convertId(e.parentId),
+    base: e.parentId === workspaceId,
     model: 'environment',
     name: e.name,
     variables: Object.entries(e.data).map(([name, value]) => ({

plugins/importer-insomnia/src/index.ts

@@ -3,7 +3,7 @@
     "environments": [
       {
         "createdAt": "2025-01-13T15:15:43.767",
-        "environmentId": null,
+        "base": true,
         "id": "GENERATE_ID::env_16c0dec5b77c414ae0e419b8f10c3701300c5900",
         "model": "environment",
         "name": "Base Environment",
@@ -18,7 +18,7 @@
       },
       {
         "createdAt": "2025-01-13T15:15:58.515",
-        "environmentId": "GENERATE_ID::env_16c0dec5b77c414ae0e419b8f10c3701300c5900",
+        "base": false,
         "id": "GENERATE_ID::env_799ae3d723ef44af91b4817e5d057e6d",
         "model": "environment",
         "name": "Production",
@@ -33,7 +33,7 @@
       },
       {
         "createdAt": "2025-01-13T15:16:14.707",
-        "environmentId": "GENERATE_ID::env_16c0dec5b77c414ae0e419b8f10c3701300c5900",
+        "base": false,
         "id": "GENERATE_ID::env_030fbfdbb274426ebd78e2e6518f8553",
         "model": "environment",
         "name": "Staging",

plugins/importer-insomnia/tests/fixtures/basic.output.json

@@ -46,7 +46,7 @@ export function migrateImport(contents: string) {
       parsed.resources.environments = parsed.resources.environments ?? [];
       parsed.resources.environments.push(baseEnvironment);
 
-      // Delete variables key from workspace
+      // Delete variables key from the workspace
       delete workspace.variables;
 
       // Add environmentId to relevant environments
@@ -58,6 +58,14 @@ export function migrateImport(contents: string) {
     }
   }
 
+  // Migrate v3 to v4
+  for (const environment of parsed.resources.environments ?? []) {
+    if ('environmentId' in environment) {
+      environment.base = environment.environmentId == null;
+      delete environment.environmentId;
+    }
+  }
+
   return { resources: parsed.resources }; // Should already be in the correct format
 }
 

plugins/importer-yaak/src/index.ts

@@ -53,7 +53,7 @@ describe('importer-yaak', () => {
           }],
           environments: [{
             id: 'e_1',
-            environmentId: 'GENERATE_ID::base_env_w_1',
+            base: false,
             workspaceId: 'w_1',
             name: 'Production',
             variables: [{ name: 'E1', value: 'E1!' }],