Fixes and refactoring

Author: AaronPlave

e2e-tests/utilities/api.ts

@@ -8,6 +8,7 @@
  */
 
 import type { Browser, BrowserContext, Page } from '@playwright/test';
+import dotenv from 'dotenv';
 import fs from 'fs';
 import nodePath from 'path';
 import { adjectives, animals, colors, uniqueNamesGenerator } from 'unique-names-generator';
@@ -45,23 +46,8 @@ import { SchedulingConditions } from '../fixtures/SchedulingConditions.js';
 import { SchedulingGoals } from '../fixtures/SchedulingGoals.js';
 import { View } from '../fixtures/View.js';
 
-// Load .env file if it exists (Node.js doesn't load it automatically)
-const envPath = nodePath.resolve(process.cwd(), '.env');
-if (fs.existsSync(envPath)) {
-  for (const line of fs.readFileSync(envPath, 'utf-8').split('\n')) {
-    const trimmed = line.trim();
-    if (trimmed && !trimmed.startsWith('#')) {
-      const eqIndex = trimmed.indexOf('=');
-      if (eqIndex > 0) {
-        const key = trimmed.slice(0, eqIndex);
-        const value = trimmed.slice(eqIndex + 1).replace(/^['"]|['"]$/g, '');
-        if (!process.env[key]) {
-          process.env[key] = value;
-        }
-      }
-    }
-  }
-}
+// Load .env file if it exists (won't override existing env vars)
+dotenv.config();
 
 // Default URLs from environment variables, with fallbacks for local development
 const DEFAULT_HASURA_URL = process.env.PUBLIC_HASURA_CLIENT_URL ?? 'http://localhost:8080/v1/graphql';

package.json

@@ -123,6 +123,7 @@
     "@vitest/ui": "^1.4.0",
     "autoprefixer": "^10.4.20",
     "cloc": "2.0.0-cloc",
+    "dotenv": "^17.3.1",
     "esbuild": "^0.24.0",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^9.1.0",

scripts/deseed.ts

@@ -11,8 +11,8 @@
 
 import { AerieApi } from '../e2e-tests/utilities/api.js';
 
-// Pattern to identify seeded items: name contains " (" indicating unique suffix
-const isSeedItem = (name: string): boolean => name.includes(' (') && name.includes(')');
+// Pattern to identify seeded items: name ends with " (animal-suffix)" from unique-names-generator
+const isSeedItem = (name: string): boolean => /\(\w+\)$/.test(name);
 
 // External type name prefixes from seed script (actual names have _suffix appended)
 const SEED_EXTERNAL_SOURCE_TYPE_PREFIX = 'BananaSupplySource_';
@@ -160,7 +160,7 @@ async function deseed() {
 
   // Delete in reverse order of creation to respect foreign keys
 
-  // 15. Delete plans (they reference models)
+  // 1. Delete plans (they reference models)
   if (seededPlans.length > 0) {
     console.log('Deleting plans...');
     for (const plan of seededPlans) {
@@ -174,7 +174,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 1. Delete models
+  // 2. Delete models
   if (seededModels.length > 0) {
     console.log('Deleting models...');
     for (const model of seededModels) {
@@ -188,7 +188,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 2. Delete external sources first (they contain events and reference derivation groups)
+  // 3. Delete external sources (they contain events and reference derivation groups)
   if (seededExternalSources.length > 0) {
     console.log('Deleting external sources...');
     // Group sources by derivation group for deletion
@@ -211,7 +211,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 3. Delete derivation groups
+  // 4. Delete derivation groups
   if (seededDerivationGroups.length > 0) {
     console.log('Deleting derivation groups...');
     try {
@@ -226,7 +226,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 4. Delete external event types (after events are deleted with sources)
+  // 5. Delete external event types (after events are deleted with sources)
   if (seededEventTypes.length > 0) {
     console.log('Deleting external event types...');
     try {
@@ -241,7 +241,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 5. Delete external source types (after derivation groups are deleted)
+  // 6. Delete external source types (after derivation groups are deleted)
   if (seededSourceTypes.length > 0) {
     console.log('Deleting external source types...');
     try {
@@ -256,7 +256,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 6. Delete action definitions (they reference workspaces)
+  // 7. Delete action definitions (they reference workspaces)
   if (seededActionDefinitions.length > 0) {
     console.log('Deleting action definitions...');
     for (const action of seededActionDefinitions) {
@@ -270,7 +270,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 7. Delete extensions (no foreign key dependencies)
+  // 8. Delete extensions (no foreign key dependencies)
   if (seededExtensions.length > 0) {
     console.log('Deleting extensions...');
     for (const ext of seededExtensions) {
@@ -284,7 +284,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 8. Delete workspaces (they reference parcels)
+  // 9. Delete workspaces (they reference parcels)
   if (seededWorkspaces.length > 0) {
     console.log('Deleting workspaces...');
     for (const workspace of seededWorkspaces) {
@@ -298,7 +298,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 9. Delete expansion sets (they reference expansion rules)
+  // 10. Delete expansion sets (they reference expansion rules)
   if (seededExpansionSets.length > 0) {
     console.log('Deleting expansion sets...');
     for (const set of seededExpansionSets) {
@@ -312,7 +312,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 10. Delete expansion rules (they reference parcels)
+  // 11. Delete expansion rules (they reference parcels)
   if (seededExpansionRules.length > 0) {
     console.log('Deleting expansion rules...');
     for (const rule of seededExpansionRules) {
@@ -326,7 +326,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 11. Delete parcels (they reference dictionaries and expansion rules reference them)
+  // 12. Delete parcels (they reference dictionaries and expansion rules reference them)
   if (seededParcels.length > 0) {
     console.log('Deleting parcels...');
     for (const parcel of seededParcels) {
@@ -340,7 +340,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 12. Delete dictionaries (after parcels since parcels reference them)
+  // 13. Delete dictionaries (after parcels since parcels reference them)
   if (seededCommandDicts.length > 0) {
     console.log('Deleting command dictionaries...');
     for (const dict of seededCommandDicts) {
@@ -386,7 +386,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 13. Delete sequence adaptations
+  // 14. Delete sequence adaptations
   if (seededAdaptations.length > 0) {
     console.log('Deleting sequence adaptations...');
     for (const adaptation of seededAdaptations) {
@@ -400,7 +400,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 14. Delete views
+  // 15. Delete views
   if (seededViews.length > 0) {
     console.log('Deleting views...');
     for (const view of seededViews) {
@@ -414,7 +414,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 15. Delete scheduling conditions
+  // 16. Delete scheduling conditions
   if (seededConditions.length > 0) {
     console.log('Deleting scheduling conditions...');
     for (const condition of seededConditions) {
@@ -428,7 +428,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 16. Delete scheduling goals
+  // 17. Delete scheduling goals
   if (seededGoals.length > 0) {
     console.log('Deleting scheduling goals...');
     for (const goal of seededGoals) {
@@ -442,7 +442,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 17. Delete constraints
+  // 18. Delete constraints
   if (seededConstraints.length > 0) {
     console.log('Deleting constraints...');
     for (const constraint of seededConstraints) {
@@ -456,7 +456,7 @@ async function deseed() {
     console.log('');
   }
 
-  // 18. Delete tags
+  // 19. Delete tags
   if (seededTags.length > 0) {
     console.log('Deleting tags...');
     for (const tag of seededTags) {

scripts/seed.ts

@@ -29,14 +29,14 @@
 
 import fs from 'fs';
 import { animals, uniqueNamesGenerator } from 'unique-names-generator';
+import { AerieApi } from '../e2e-tests/utilities/api.js';
 import { ConstraintDefinitionType } from '../src/enums/constraint.js';
 import { SchedulingDefinitionType } from '../src/enums/scheduling.js';
 import type { ActivityDirectiveInsertInput } from '../src/types/activity.js';
 import type { SchedulingConditionInsertInput } from '../src/types/scheduling.js';
 import { ResourceType } from '../src/types/simulation.js';
 import { getIntervalFromDoyRange, getUnixEpochTime } from '../src/utilities/time.js';
 import { generateDefaultView } from '../src/utilities/view.js';
-import { AerieApi } from '../e2e-tests/utilities/api.js';
 
 // Generate unique suffix for this seed run
 const uniqueSuffix = uniqueNamesGenerator({ dictionaries: [animals], separator: '-' });
@@ -189,14 +189,14 @@ const PLANS: PlanConfig[] = [
     name: 'Monthly Production',
     startTime: '2024-001T00:00:00',
   },
-  // {
-  //   // Quarter-long mission (10K activities)
-  //   activityMix: { BiteBanana: 2500, GrowBanana: 2000, PeelBanana: 2500, PickBanana: 3000 },
-  //   description: 'Full quarterly mission with comprehensive operations',
-  //   endTime: '2024-091T00:00:00',
-  //   name: 'Q1 Mission',
-  //   startTime: '2024-001T00:00:00',
-  // },
+  {
+    // Quarter-long mission (10K activities)
+    activityMix: { BiteBanana: 2500, GrowBanana: 2000, PeelBanana: 2500, PickBanana: 3000 },
+    description: 'Full quarterly mission with comprehensive operations',
+    endTime: '2024-091T00:00:00',
+    name: 'Q1 Mission',
+    startTime: '2024-001T00:00:00',
+  },
 ];
 
 // Constraint definitions (EDSL format)
@@ -693,6 +693,9 @@ async function seed() {
     .replace('mission_name="GENERIC"', `mission_name="${missionName}"`);
   const commandDictResult = await api.createDictionary(commandDictXml);
   const commandDictId = commandDictResult.command?.id;
+  if (commandDictId == null) {
+    throw new Error('Command dictionary creation failed: no command ID returned');
+  }
   console.log(`  - Created command dictionary (ID: ${commandDictId}, mission: ${missionName})`);
 
   // Read and upload channel dictionary with customized mission name
@@ -724,7 +727,7 @@ async function seed() {
   const parcelName = `Seed Parcel (${uniqueSuffix})`;
   const parcel = await api.createParcel({
     channel_dictionary_id: channelDictId ?? null,
-    command_dictionary_id: commandDictId!,
+    command_dictionary_id: commandDictId,
     name: parcelName,
     sequence_adaptation_id: null, // Adaptations are linked separately
   });
@@ -840,7 +843,7 @@ async function seed() {
   // Reusable content
   const sequenceContent = `@ID "seed_sequence"\n\nC FSW_CMD_0 "ON" true 0.5\nC FSW_CMD_1 1.0 10 "2024-001T00:00:00" 100 "0000"\n`;
   const textContent = `Seed Workspace Notes\n====================\n\nCreated by seed script. Suffix: ${uniqueSuffix}\n`;
-  const jsonContent = `{ seeded_json: ${uniqueSuffix} }`;
+  const jsonContent = JSON.stringify({ seeded_json: uniqueSuffix }, null, 2);
   const binaryContent = new Uint8Array(256).map(() => Math.floor(Math.random() * 256));
   // Minimal valid JPEG (1x1 pixel)
   // prettier-ignore
@@ -870,7 +873,7 @@ async function seed() {
     { content: textContent, path: 'seed_notes.txt' },
     { content: binaryContent, path: 'seed_data.bin' },
     { content: jpegContent, path: 'seed_image.jpg' },
-    { content: jsonContent, path: 'seed_image.json' },
+    { content: jsonContent, path: 'seed_data.json' },
     { path: 'seed_folder' }, // folder
     { content: sequenceContent, path: 'seed_folder/folder_sequence.seq' },
     { content: binaryContent, path: 'seed_folder/folder_data.bin' },
@@ -903,7 +906,7 @@ async function seed() {
   let largeWorkspaceItemCount = 0;
 
   for (const project of projects) {
-    // Create project folder
+    // Create project folder (must exist before children)
     await api.createWorkspaceItem(largeWorkspaceId, `project_${project}`);
     largeWorkspaceItemCount++;
 
@@ -913,30 +916,37 @@ async function seed() {
       await api.createWorkspaceItem(largeWorkspaceId, modulePath);
       largeWorkspaceItemCount++;
 
-      // Create regular files in module
+      // Create regular files in module in parallel
+      const filePromises: Promise<void>[] = [];
       for (let f = 1; f <= 15; f++) {
         const ext = fileTypes[(f - 1) % fileTypes.length];
         const filePath = `${modulePath}/file_${f.toString().padStart(3, '0')}${ext}`;
         const content = fileMap[ext];
-        await api.createWorkspaceItem(largeWorkspaceId, filePath, content);
+        filePromises.push(api.createWorkspaceItem(largeWorkspaceId, filePath, content));
         largeWorkspaceItemCount++;
       }
+      await Promise.all(filePromises);
 
       // Add deep nesting for every other module (up to 7 levels deep)
       if (m % 2 === 1) {
         const depths = ['level_1', 'level_2', 'level_3', 'level_4', 'level_5'];
         let currentPath = modulePath;
         for (const depth of depths) {
           currentPath = `${currentPath}/${depth}`;
+          // Create nested folder (must exist before children)
           await api.createWorkspaceItem(largeWorkspaceId, currentPath);
           largeWorkspaceItemCount++;
-          // Add a few files at each level
+          // Create files at this level in parallel
+          const nestedFilePromises: Promise<void>[] = [];
           for (let f = 1; f <= 3; f++) {
             const ext = fileTypes[(f - 1) % fileTypes.length];
             const content = fileMap[ext];
-            await api.createWorkspaceItem(largeWorkspaceId, `${currentPath}/nested_${f}${ext}`, content);
+            nestedFilePromises.push(
+              api.createWorkspaceItem(largeWorkspaceId, `${currentPath}/nested_${f}${ext}`, content),
+            );
             largeWorkspaceItemCount++;
           }
+          await Promise.all(nestedFilePromises);
         }
       }
     }

src/components/timeline/Row.svelte

@@ -524,6 +524,7 @@
           link => link.plan_id === plan?.id && !($derivationGroupVisibilityMap[link.derivation_group_name] ?? true),
         )
         .map(link => link.derivation_group_name);
+
       // Apply filter for hiding derivation groups
       let externalEventsFilteredByDG = externalEvents.filter(ee => {
         let derivationGroup =