refactor: reorganize VM configuration and workspace settings #865

tomsmith8 · 2025-09-29T11:36:24Z

Move Project Info, Repository, and Infrastructure sections from VM Config to Settings page
Add tabbed interface in Settings: General, Repository, Graph DB
Implement proper API key UI with write-only functionality and key icon toggle
Simplify VM Configuration page to focus only on environment, services, and files
Remove GitSee animation and related code from stakgraph page
Update validation logic to handle optional fields in stakgraph store
Maintain backward compatibility with existing API endpoints

- Move Project Info, Repository, and Infrastructure sections from VM Config to Settings page - Add tabbed interface in Settings: General, Repository, Graph DB - Implement proper API key UI with write-only functionality and key icon toggle - Simplify VM Configuration page to focus only on environment, services, and files - Remove GitSee animation and related code from stakgraph page - Update validation logic to handle optional fields in stakgraph store - Maintain backward compatibility with existing API endpoints

tomsmith8 · 2025-09-29T11:37:37Z

#851

src/components/WorkspaceSettings.tsx

- Move Project Info, Repository, and Infrastructure sections from VM Config to Settings page - Add tabbed interface in Settings: General, Repository, Graph DB - Implement proper API key UI with write-only functionality and key icon toggle - Simplify VM Configuration page to focus only on environment, services, and files - Remove GitSee animation and related code from stakgraph page - Update validation logic to handle optional fields in stakgraph store - Maintain backward compatibility with existing API endpoints

Fixes stale closure bug where swarmApiKey could be overwritten with empty string when stakgraphData reloads. Adds swarmApiKey to dependency array per React exhaustive-deps rule.

vercel · 2025-09-30T08:13:06Z

src/components/WorkspaceSettings.tsx

+                disabled={isSubmitting || stakgraphLoading ||
+                  (swarmUrl === stakgraphData.swarmUrl &&
+                   swarmSecretAlias === stakgraphData.swarmSecretAlias &&
+                   swarmApiKey === stakgraphData.swarmApiKey)}


Suggested change

swarmApiKey === stakgraphData.swarmApiKey)}

!apiKeyTouched)}

The save button disabled logic incorrectly compares the local API key with server data that should never contain the API key.

View Details

Analysis

Save button disabled logic incorrectly compares write-only API key in WorkspaceSettings

What fails: Infrastructure save button in WorkspaceSettings.tsx:499 compares swarmApiKey === stakgraphData.swarmApiKey but stakgraphData.swarmApiKey is always undefined since the API key is write-only for security

How to reproduce:

Navigate to workspace settings → Infrastructure tab

Load page without making any changes - save button should be disabled but appears enabled

Enter any API key - save button remains enabled even when other fields match server data

Result: Button disabled condition swarmApiKey === stakgraphData.swarmApiKey always evaluates to false (comparing string vs undefined), so button never properly disables

Expected: Save button should only be enabled when actual changes are made. API key changes should be tracked via existing apiKeyTouched state instead of comparing against server data

Fix: Replace swarmApiKey === stakgraphData.swarmApiKey with !apiKeyTouched in disabled condition to properly track API key modifications without exposing sensitive data

- Moved webhook button and handler from Pool Status page to Settings Repository tab - Webhook management now logically grouped with repository configuration - Removed webhook-related imports and handler from stakgraph page - Added handleEnsureWebhooks to WorkspaceSettings component - Webhook button appears in Repository tab when repositoryUrl exists and webhookEnsured is false

vercel · 2025-09-30T08:30:52Z

src/components/WorkspaceSettings.tsx

+      const payload = {
+        name: stakgraphData.name || workspace.name, // Use workspace name as fallback
+        description: stakgraphData.description || workspace.description || "",
+        repositoryUrl: repositoryUrl.trim(),
+        // Preserve existing swarm settings
+        swarmUrl: stakgraphData.swarmUrl || "",
+        swarmSecretAlias: stakgraphData.swarmSecretAlias || "",
+        swarmApiKey: stakgraphData.swarmApiKey || "",
+        // Preserve VM settings
+        poolName: stakgraphData.poolName || "",
+        poolCpu: stakgraphData.poolCpu || "2",
+        poolMemory: stakgraphData.poolMemory || "4Gi",
+        environmentVariables: stakgraphData.environmentVariables || [],
+        services: stakgraphData.services || [],
+        containerFiles: stakgraphData.containerFiles || {},
+      };


The API validation schema requires all fields (name, repositoryUrl, swarmUrl, swarmSecretAlias) to be non-empty, but the save functions send payloads with empty strings for optional fields, causing validation failures.

View Details

📝 Patch Details

diff --git a/src/app/api/workspaces/[slug]/stakgraph/route.ts b/src/app/api/workspaces/[slug]/stakgraph/route.ts index 1c4c575..9f2548f 100644 --- a/src/app/api/workspaces/[slug]/stakgraph/route.ts +++ b/src/app/api/workspaces/[slug]/stakgraph/route.ts @@ -25,9 +25,9 @@ const encryptionService: EncryptionService = EncryptionService.getInstance(); // Validation schema for stakgraph settings const stakgraphSettingsSchema = z.object({ name: z.string().min(1, "Name is required"), - repositoryUrl: z.string().url("Invalid repository URL"), - swarmUrl: z.string().url("Invalid swarm URL"), - swarmSecretAlias: z.string().min(1, "Swarm API key is required"), + repositoryUrl: z.union([z.literal(""), z.string().url("Invalid repository URL")]), + swarmUrl: z.union([z.literal(""), z.string().url("Invalid swarm URL")]), + swarmSecretAlias: z.union([z.literal(""), z.string().min(1, "Swarm API key is required")]), swarmApiKey: z.string().optional(), poolName: z.string().min(1, "Pool name is required"), poolCpu: z.string().optional(),

Analysis

API validation schema mismatch causing 400 errors on partial workspace configurations

What fails: stakgraphSettingsSchema in /api/workspaces/[slug]/stakgraph rejects payloads with empty strings for repositoryUrl, swarmUrl, and swarmSecretAlias fields, but WorkspaceSettings.tsx saveRepository() and saveInfrastructure() functions send these fields as empty strings when undefined

How to reproduce:

Navigate to workspace settings with new tabbed interface

Try to save repository settings without configuring swarm settings

Try to save infrastructure settings without configuring repository URL

API returns 400 validation error: "Invalid repository URL", "Invalid swarm URL", or "Swarm API key is required"

Result: Users cannot save partial configurations. saveRepository() fails when swarmUrl="" and swarmSecretAlias="", saveInfrastructure() fails when repositoryUrl=""

Expected: Optional fields should accept empty strings and only validate when non-empty, per Zod union pattern for optional URLs

Root cause: Schema uses z.string().url() and z.string().min(1) which reject empty strings, but frontend sends || "" fallbacks for optional fields

Rassl · 2025-09-30T10:13:45Z

src/stores/useStakgraphStore.ts

-      if (!state.formData.repositoryUrl.trim()) {
-        newErrors.repositoryUrl = "Repository URL is required";
-      } else if (!isValidUrl(state.formData.repositoryUrl.trim())) {
+      // Repository and Swarm settings are now in Settings page


Instead of keeping legacy code, can't we just get rid of old data? we have just couple working workspaces on production.

Rassl · 2025-09-30T10:14:40Z

src/components/WorkspaceSettings.tsx

I think we need refactor this, 500+ line component is not something we should have

- Fix save button disabled logic to use apiKeyTouched state - Update API validation schema to accept empty strings for optional fields - Remove legacy validation from useStakgraphStore - Refactor WorkspaceSettings component from 529 to 92 lines by extracting tab components - Add defaultBranch field support throughout stack - Fix githubInstallationId field reference in swarm select query

tomsmith8 requested a review from Rassl September 29, 2025 11:37

tomsmith8 force-pushed the reorganize-vm-settings branch from 8f10ef0 to 7a1c0df Compare September 29, 2025 11:37

vercel bot reviewed Sep 29, 2025

View reviewed changes

src/components/WorkspaceSettings.tsx Outdated Show resolved Hide resolved

tomsmith8 added 2 commits September 30, 2025 09:00

Merge branch 'pr-865' into reorganize-vm-settings

2abac68

tomsmith8 force-pushed the reorganize-vm-settings branch from 7a1c0df to 2abac68 Compare September 30, 2025 08:01

fix: add swarmApiKey to useEffect dependency array

8de12a8

Fixes stale closure bug where swarmApiKey could be overwritten with empty string when stakgraphData reloads. Adds swarmApiKey to dependency array per React exhaustive-deps rule.

vercel bot reviewed Sep 30, 2025

View reviewed changes

tomsmith8 added 2 commits September 30, 2025 09:16

fix: add githubInstallationId to swarm select fields

804ed50

vercel bot reviewed Sep 30, 2025

View reviewed changes

Rassl reviewed Sep 30, 2025

View reviewed changes

tomsmith8 force-pushed the reorganize-vm-settings branch from 8bd83a0 to 6807bd8 Compare October 4, 2025 09:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor: reorganize VM configuration and workspace settings #865

refactor: reorganize VM configuration and workspace settings #865

Uh oh!

tomsmith8 commented Sep 29, 2025

Uh oh!

tomsmith8 commented Sep 29, 2025

Uh oh!

Uh oh!

vercel bot Sep 30, 2025

Uh oh!

vercel bot Sep 30, 2025

Uh oh!

Rassl Sep 30, 2025

Uh oh!

Rassl Sep 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

refactor: reorganize VM configuration and workspace settings #865

Are you sure you want to change the base?

refactor: reorganize VM configuration and workspace settings #865

Uh oh!

Conversation

tomsmith8 commented Sep 29, 2025

Uh oh!

tomsmith8 commented Sep 29, 2025

Uh oh!

Uh oh!

vercel bot Sep 30, 2025

Choose a reason for hiding this comment

Analysis

Save button disabled logic incorrectly compares write-only API key in WorkspaceSettings

Uh oh!

vercel bot Sep 30, 2025

Choose a reason for hiding this comment

Analysis

API validation schema mismatch causing 400 errors on partial workspace configurations

Uh oh!

Rassl Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

Rassl Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants