[Patch agent] Handle project removal in SelectWorkspaceDialog

Fixed: 404490222
Change-Id: I776dab5b609c1095fedc3e9f615107ab4d6e938b
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6371432
Reviewed-by: Nikolay Vitkov <[email protected]>
Commit-Queue: Wolfgang Beyer <[email protected]>
Auto-Submit: Wolfgang Beyer <[email protected]>

Author: wolfib

front_end/panels/ai_assistance/SelectWorkspaceDialog.test.ts

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import * as Persistence from '../../models/persistence/persistence.js';
-import type * as Workspace from '../../models/workspace/workspace.js';
+import * as Workspace from '../../models/workspace/workspace.js';
 import {createTestFilesystem} from '../../testing/AiAssistanceHelpers.js';
 import {dispatchKeyDownEvent} from '../../testing/DOMHelpers.js';
 import {describeWithEnvironment} from '../../testing/EnvironmentHelpers.js';
@@ -13,6 +13,13 @@ import * as UI from '../../ui/legacy/legacy.js';
 import * as AiAssistance from './ai_assistance.js';
 
 describeWithEnvironment('SelectWorkspaceDialog', () => {
+  afterEach(() => {
+    const workspace = Workspace.Workspace.WorkspaceImpl.instance();
+    for (const project of workspace.projects()) {
+      workspace.removeProject(project);
+    }
+  });
+
   function createComponent(): {
     view: ViewFunctionStub<typeof AiAssistance.SelectWorkspaceDialog>,
     component: AiAssistance.SelectWorkspaceDialog,
@@ -91,4 +98,24 @@ describeWithEnvironment('SelectWorkspaceDialog', () => {
     assert.strictEqual(input.projects[2].name, 'test3');
     assert.strictEqual(input.selectedIndex, 2);
   });
+
+  it('handles project removal', async () => {
+    const addProjectSpy =
+        sinon.spy(Persistence.IsolatedFileSystemManager.IsolatedFileSystemManager.instance(), 'addFileSystem');
+    const {view, project} = createComponent();
+
+    view.input.onProjectSelected(1);
+    let input = await view.nextInput;
+    assert.strictEqual(view.callCount, 2);
+    assert.lengthOf(input.projects, 2);
+    assert.strictEqual(input.selectedIndex, 1);
+
+    input.onAddFolderButtonClick();
+    assert.isTrue(addProjectSpy.calledOnce);
+
+    Workspace.Workspace.WorkspaceImpl.instance().removeProject(project);
+    input = await view.nextInput;
+    assert.lengthOf(input.projects, 1);
+    assert.strictEqual(input.selectedIndex, 0);
+  });
 });

front_end/panels/ai_assistance/SelectWorkspaceDialog.ts

@@ -150,12 +150,14 @@ export class SelectWorkspaceDialog extends UI.Widget.VBox {
     const document = UI.InspectorView.InspectorView.instance().element.ownerDocument;
     document.addEventListener('keydown', this.#boundOnKeyDown, true);
     this.#workspace.addEventListener(Workspace.Workspace.Events.ProjectAdded, this.#onProjectAdded, this);
+    this.#workspace.addEventListener(Workspace.Workspace.Events.ProjectRemoved, this.#onProjectRemoved, this);
   }
 
   override willHide(): void {
     const document = UI.InspectorView.InspectorView.instance().element.ownerDocument;
     document.removeEventListener('keydown', this.#boundOnKeyDown, true);
     this.#workspace.removeEventListener(Workspace.Workspace.Events.ProjectAdded, this.#onProjectAdded, this);
+    this.#workspace.removeEventListener(Workspace.Workspace.Events.ProjectRemoved, this.#onProjectRemoved, this);
   }
 
   #onKeyDown(event: KeyboardEvent): void {
@@ -217,6 +219,25 @@ export class SelectWorkspaceDialog extends UI.Widget.VBox {
     this.requestUpdate();
   }
 
+  #onProjectRemoved(): void {
+    const selectedProject = (this.#selectedIndex >= 0 && this.#selectedIndex < this.#projects.length) ?
+        this.#projects[this.#selectedIndex] :
+        null;
+    this.#projects = this.#getProjects();
+    if (selectedProject) {
+      const projectIndex = this.#projects.indexOf(selectedProject);
+      // If the previously selected project still exists, select it again.
+      // If the previously selected project has been removed, select the project which is now in its
+      // position. If the previously selected and now removed project was in last position, select
+      // the project which is now in last position.
+      this.#selectedIndex =
+          projectIndex === -1 ? Math.min(this.#projects.length - 1, this.#selectedIndex) : projectIndex;
+    } else {
+      this.#selectedIndex = 0;
+    }
+    this.requestUpdate();
+  }
+
   static show(
       onProjectSelected: (project: Workspace.Workspace.Project) => void,
       currentProject?: Workspace.Workspace.Project): void {