Remove palette manager from Workspace V2 toolState producer flow while preserving global palette state - PR_26124_013-remove-palette-manager-producer

Author: DavidQ

tests/playwright.zip

@@ -21,8 +21,7 @@ <h1>Workspace V2 Tool State Producer</h1>
         <h2>Producer</h2>
         <label for="workspaceV2ToolSelect">Tool</label>
         <select id="workspaceV2ToolSelect">
-          <option value="asset-manager-v2">Asset Manager V2</option>
-          <option value="palette-manager-v2" selected>Palette Manager V2</option>
+          <option value="asset-manager-v2" selected>Asset Manager V2</option>
           <option value="svg-asset-studio-v2">SVG Asset Studio V2</option>
           <option value="tilemap-studio-v2">Tilemap Studio V2</option>
           <option value="vector-map-editor-v2">Vector Map Editor V2</option>
@@ -43,7 +42,7 @@ <h2>Tools</h2>
         <h2>Import / Export Tool State JSON</h2>
         <p>Workspace mode actions (navWorkspace): import/export a portable Workspace V2 tool state manifest.</p>
         <label for="workspaceV2ImportJson">Workspace Tool State JSON</label>
-        <textarea id="workspaceV2ImportJson" rows="12" spellcheck="false" placeholder='{"documentKind":"workspace-manifest","schema":"html-js-gaming.project","version":1,"id":"workspace-v2-example","name":"Workspace V2 Example","tools":{"palette-browser":{"schema":"html-js-gaming.palette","version":1,"name":"Workspace Active Palette","swatches":[]},"workspace-v2":{"schema":"html-js-gaming.workspace-v2-tool-state/1","game":{"id":"workspace-v2-game","name":"Workspace V2 Game"},"defaultToolId":"palette-manager-v2","activeToolId":"palette-manager-v2","activeHostContextId":"palette-manager-v2-0000000000000-aaaa1111","activeToolState":{"toolId":"palette-manager-v2","version":"v2","payloadJson":{"paletteDocument":{"name":"Default Palette","swatches":[]}}},"savedToolStates":{}}}}'></textarea>
+        <textarea id="workspaceV2ImportJson" rows="12" spellcheck="false" placeholder='{"documentKind":"workspace-manifest","schema":"html-js-gaming.project","version":1,"id":"workspace-v2-example","name":"Workspace V2 Example","tools":{"palette-browser":{"schema":"html-js-gaming.palette","version":1,"name":"Workspace Active Palette","swatches":[]},"workspace-v2":{"schema":"html-js-gaming.workspace-v2-tool-state/1","game":{"id":"workspace-v2-game","name":"Workspace V2 Game"},"defaultToolId":"asset-manager-v2","activeToolId":"asset-manager-v2","activeHostContextId":"asset-manager-v2-0000000000000-aaaa1111","activeToolState":{"toolId":"asset-manager-v2","version":"v2","payloadJson":{"assetCatalog":{"name":"Workspace Assets","entries":[]}}},"savedToolStates":{}}}}'></textarea>
         <label for="workspaceV2ImportFile">Import File</label>
         <input id="workspaceV2ImportFile" type="file" accept="application/json,.json" />
         <div>

tools/workspace-v2.zip

@@ -1,4 +1,11 @@
 class WorkspaceV2ToolStateProducer {
+  static TOOL_STATE_PRODUCER_TOOL_IDS = Object.freeze([
+    "asset-manager-v2",
+    "svg-asset-studio-v2",
+    "tilemap-studio-v2",
+    "vector-map-editor-v2"
+  ]);
+
   constructor() {
     document.title = "Workspace V2";
     document.body.dataset.toolId = "workspace-v2";
@@ -223,7 +230,8 @@ class WorkspaceV2ToolStateProducer {
   }
 
   selectedToolId() {
-    return typeof this.toolSelect.value === "string" ? this.toolSelect.value.trim() : "";
+    const selectedToolId = typeof this.toolSelect.value === "string" ? this.toolSelect.value.trim() : "";
+    return this.isToolStateProducerToolId(selectedToolId) ? selectedToolId : "";
   }
 
   selectedToolStateName() {
@@ -376,6 +384,17 @@ class WorkspaceV2ToolStateProducer {
     if (!this.toolSelect) {
       return;
     }
+    Array.from(this.toolSelect.options).forEach((option) => {
+      if (option.value === "palette-manager-v2") {
+        option.remove();
+      }
+    });
+    const validToolIds = new Set(WorkspaceV2ToolStateProducer.TOOL_STATE_PRODUCER_TOOL_IDS);
+    Array.from(this.toolSelect.options).forEach((option) => {
+      if (!validToolIds.has(option.value)) {
+        option.remove();
+      }
+    });
   }
 
   removeDiagnosticsPanelUi() {
@@ -395,7 +414,7 @@ class WorkspaceV2ToolStateProducer {
     if (!this.toolSelect) {
       return;
     }
-    const defaultToolId = "palette-manager-v2";
+    const defaultToolId = "asset-manager-v2";
     const hasDefaultOption = Array.from(this.toolSelect.options).some((option) => option.value === defaultToolId);
     if (hasDefaultOption) {
       this.toolSelect.value = defaultToolId;
@@ -406,6 +425,26 @@ class WorkspaceV2ToolStateProducer {
     }
   }
 
+  isToolStateProducerToolId(toolId) {
+    return (
+      typeof toolId === "string" &&
+      WorkspaceV2ToolStateProducer.TOOL_STATE_PRODUCER_TOOL_IDS.includes(toolId.trim())
+    );
+  }
+
+  firstToolStateProducerToolId() {
+    if (!this.toolSelect) {
+      return "";
+    }
+    const availableOptionValues = Array.from(this.toolSelect.options)
+      .map((option) => option.value)
+      .filter((value) => this.isToolStateProducerToolId(value));
+    if (availableOptionValues.includes("asset-manager-v2")) {
+      return "asset-manager-v2";
+    }
+    return availableOptionValues.length > 0 ? availableOptionValues[0] : "";
+  }
+
   registerScrollTextColorRule() {
     let textLightActive = false;
     let scheduled = false;
@@ -625,11 +664,6 @@ class WorkspaceV2ToolStateProducer {
     if (!this.toolSelect) {
       return;
     }
-    Array.from(this.toolSelect.options).forEach((option) => {
-      if (option.value === "palette-manager-v2") {
-        option.disabled = false;
-      }
-    });
     this.loadFixtureButton.disabled = false;
     this.launchButton.disabled = false;
   }
@@ -670,20 +704,23 @@ class WorkspaceV2ToolStateProducer {
       return;
     }
     const selectedToolId = this.selectedToolId();
-    if (!selectedToolId) {
-      this.statusNode.textContent = "Workspace V2 initialization blocked: default tool is missing.";
+    const fallbackToolId = this.firstToolStateProducerToolId();
+    const toolId = selectedToolId || fallbackToolId;
+    if (!toolId) {
+      this.statusNode.textContent = "Workspace V2 initialization blocked: no toolState-capable producer tool is available.";
       return;
     }
-    const initialPayload = this.createProducerPayloadForTool(selectedToolId);
+    this.toolSelect.value = toolId;
+    const initialPayload = this.createProducerPayloadForTool(toolId);
     this.setCurrentToolStatePayload(initialPayload, "workspace-v2-init");
-    const hostContextId = this.createHostContextToolStateId(selectedToolId);
+    const hostContextId = this.createHostContextToolStateId(toolId);
     const activation = this.activateWorkspaceToolState(hostContextId, initialPayload, "workspace-v2-init");
     if (!activation.ok) {
       this.statusNode.textContent = activation.message;
       return;
     }
     this.syncWorkspaceManifestTextarea();
-    this.statusNode.textContent = `Workspace V2 initialized.\nTool: ${selectedToolId}\nHostContextId: ${hostContextId}\nTool state is active for Save Tool State.`;
+    this.statusNode.textContent = `Workspace V2 initialized.\nTool: ${toolId}\nHostContextId: ${hostContextId}\nTool state is active for Save Tool State.`;
   }
 
   hasActiveWorkspaceToolStateForSave() {
@@ -3352,7 +3389,7 @@ class WorkspaceV2ToolStateProducer {
   async loadSelectedToolState() {
     const toolId = this.selectedToolId();
     if (!toolId) {
-      this.statusNode.textContent = "Select a V2 tool before loading a fixture.";
+      this.statusNode.textContent = "Select a toolState-capable V2 tool before loading tool state.";
       return;
     }
     try {
@@ -3500,10 +3537,11 @@ class WorkspaceV2ToolStateProducer {
       manifestTools[toolId] = this.cloneToolStateValue(this.workspaceImportedToolEntries[toolId]);
     });
     manifestTools["palette-browser"] = this.cloneToolStateValue(activePaletteResolution.paletteBrowserPayload);
+    const exportDefaultToolId = this.firstToolStateProducerToolId() || activeToolId;
     manifestTools["workspace-v2"] = {
       schema: "html-js-gaming.workspace-v2-tool-state/1",
       game: workspaceGame,
-      defaultToolId: "palette-manager-v2",
+      defaultToolId: exportDefaultToolId,
       activeToolId,
       activeHostContextId,
       activeToolState: this.cloneToolStateValue(activePayload),
@@ -3981,7 +4019,7 @@ class WorkspaceV2ToolStateProducer {
   createToolStateAndLaunch() {
     const toolId = this.selectedToolId();
     if (!toolId) {
-      this.statusNode.textContent = "Select a V2 tool before launch.";
+      this.statusNode.textContent = "Select a toolState-capable V2 tool before opening tool state.";
       return;
     }
     if (!this.isValidToolStatePayload(this.currentToolStatePayload)) {