Merge pull request axonivy#825 from axonivy/embedd-project-explorer-in-explorer-view-container

XIVY-17060 move project explorer to explorer view container > master

Author: ivy-lgi

extension/package.json

@@ -391,13 +391,6 @@
       }
     ],
     "viewsContainers": {
-      "activitybar": [
-        {
-          "id": "ivy-view-container",
-          "title": "Axon Ivy Designer",
-          "icon": "./assets/ivy-logo.svg"
-        }
-      ],
       "panel": [
         {
           "id": "ivy-browser-container",
@@ -416,10 +409,11 @@
           "when": "ivy:hasIvyProjects"
         }
       ],
-      "ivy-view-container": [
+      "explorer": [
         {
           "id": "ivyProjects",
-          "name": "Axon Ivy Projects"
+          "name": "Axon Ivy Projects",
+          "icon": "./assets/ivy-logo.svg"
         }
       ]
     },

playwright/tests/cms-editor.spec.ts

@@ -43,7 +43,7 @@ test('Reuse and reveal existing panel', async ({ page }) => {
   await explorer.doubleClickNode('pom.xml');
   await editor.isInactive();
   const projectExplorer = new ProjectExplorerView(page);
-  await projectExplorer.focus();
+  await projectExplorer.openView();
   await projectExplorer.selectNode('playwrightTestWorkspace');
   await projectExplorer.selectNode('cms');
   await editor.isViewVisible();

playwright/tests/page-objects/explorer-view.ts

@@ -22,10 +22,6 @@ export abstract class ExplorerView extends View {
     await expect(this.tabLocator).toBeHidden();
   }
 
-  async focus() {
-    throw new Error('Method not implemented.');
-  }
-
   async openView() {
     if (!(await this.page.locator(`${this.data.tabSelector}.expanded`).isVisible())) {
       await this.tabLocator.click();
@@ -78,10 +74,6 @@ export class FileExplorer extends ExplorerView {
     super('Explorer', page);
   }
 
-  override async focus() {
-    await this.executeCommand('File: Focus on Files Explorer');
-  }
-
   async addFolder(name: string) {
     await this.executeCommand('File: New Folder');
     await this.typeText(name);
@@ -135,8 +127,4 @@ export class ProjectExplorerView extends ExplorerView {
   constructor(page: Page) {
     super('Axon Ivy Projects', page);
   }
-
-  override async focus() {
-    await this.executeCommand('Axon Ivy Designer: Focus on Axon Ivy Projects View');
-  }
 }

playwright/tests/project-explorer.spec.ts

@@ -8,7 +8,7 @@ test.describe('Project Explorer', () => {
   test.use({ workspace: multiProjectWorkspacePath });
   test('Projects are visible', async ({ page }) => {
     const explorer = new ProjectExplorerView(page);
-    await explorer.focus();
+    await explorer.openView();
 
     await explorer.hasNode('ivy-project-1');
     await explorer.hasNode('ivy-project-2');
@@ -22,7 +22,7 @@ test.describe('CMS entry', () => {
   test('Open', async ({ page }) => {
     const explorer = new ProjectExplorerView(page);
     await explorer.hasDeployProjectStatusMessage();
-    await explorer.focus();
+    await explorer.openView();
 
     await explorer.selectNode('playwrightTestWorkspace');
     await explorer.selectNode('cms');
@@ -39,20 +39,20 @@ test.describe('CMS entry', () => {
     await editor.executeCommand('Axon Ivy: Open CMS Editor');
     await editor.isViewVisible();
 
-    await projectExplorer.focus();
+    await projectExplorer.openView();
     await projectExplorer.isSelected('cms');
 
     await projectExplorer.selectNode('playwrightTestWorkspace');
     await projectExplorer.hasNoNode('cms');
-    await fileExplorer.focus();
-    await projectExplorer.focus();
+    await projectExplorer.closeView();
+    await projectExplorer.openView();
     await projectExplorer.isSelected('cms');
 
     await projectExplorer.selectNode('playwrightTestWorkspace');
     await projectExplorer.hasNoNode('cms');
-    await fileExplorer.focus();
+    await projectExplorer.closeView();
     await fileExplorer.doubleClickNode('pom.xml');
-    await projectExplorer.focus();
+    await projectExplorer.openView();
     await editor.isInactive();
     await projectExplorer.hasNoNode('cms');
     await editor.tabLocator.click();
@@ -64,7 +64,7 @@ test.describe('CMS entry', () => {
     test('New Resource', async ({ page }) => {
       const explorer = new ProjectExplorerView(page);
       await explorer.hasDeployProjectStatusMessage();
-      await explorer.focus();
+      await explorer.openView();
       await explorer.selectNode('playwrightTestWorkspace');
       await explorer.selectInContextMenuOfNode('cms', 'New', 'New Business Process');
       await explorer.provideUserInput('TestProcess');