Mutator grouping fixes

auxoncorp · May 12, 2024 · 154014a · 154014a
1 parent c9458fc
commit 154014a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/vscode/src/mutators.ts b/vscode/src/mutators.ts
@@ -87,13 +87,16 @@ export class MutatorsTreeDataProvider implements vscode.TreeDataProvider<Mutator
             vscode.commands.registerCommand("auxon.mutators.createMutation", (itemData) => {
                 this.createMutation(itemData);
             }),
+            this.wss.onDidChangeActiveWorkspace(() => this.refresh()),
             this.wss.onDidChangeUsedSegments(() => this.refresh())
         );
 
         this.refresh();
     }
 
     refresh(): void {
+        this.workspaceMutatorGroupingAttrs = this.wss.mutatorGroupingAttrs;
+
         vscode.commands.executeCommand(
             "setContext",
             "auxon.mutators.unavailable",

diff --git a/vscode/src/workspaceState.ts b/vscode/src/workspaceState.ts
@@ -23,7 +23,8 @@ export class WorkspaceAndSegmentState {
         public activeWorkspaceName: string,
         public activeWorkspaceVersionId: string,
         public usedSegmentConfig: cliConfig.ContextSegment,
-        public activeSegments: ActiveSegments
+        public activeSegments: ActiveSegments,
+        public mutatorGroupingAttrs: string[],
     ) {}
 
     static async create(apiClient: api.Client): Promise<WorkspaceAndSegmentState> {
@@ -96,6 +97,7 @@ export class WorkspaceAndSegmentState {
                 }
             }
         }
+
         if (resetToLatestWorkspace) {
             vscode.window.showWarningMessage(`Active segment is for a different workspace; reverting to latest.`);
             await _useLatestSegment();
@@ -106,12 +108,16 @@ export class WorkspaceAndSegmentState {
             };
         }
 
+        let ws_def = await apiClient.workspace(activeWorkspaceVersionId).definition();
+        let mutatorGroupingAttrs = ws_def.mutator_grouping_attrs;
+
         return new WorkspaceAndSegmentState(
             apiClient,
             activeWorkspaceName,
             activeWorkspaceVersionId,
             usedSegmentConfig,
-            activeSegments
+            activeSegments,
+            mutatorGroupingAttrs
         );
     }