Skip to content

Commit a890e98

Browse files
committed
XIVY-17060 move project explorer to explorer view container
1 parent db480e6 commit a890e98

File tree

4 files changed

+12
-30
lines changed

4 files changed

+12
-30
lines changed

extension/package.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,6 @@
391391
}
392392
],
393393
"viewsContainers": {
394-
"activitybar": [
395-
{
396-
"id": "ivy-view-container",
397-
"title": "Axon Ivy Designer",
398-
"icon": "./assets/ivy-logo.svg"
399-
}
400-
],
401394
"panel": [
402395
{
403396
"id": "ivy-browser-container",
@@ -416,10 +409,11 @@
416409
"when": "ivy:hasIvyProjects"
417410
}
418411
],
419-
"ivy-view-container": [
412+
"explorer": [
420413
{
421414
"id": "ivyProjects",
422-
"name": "Axon Ivy Projects"
415+
"name": "Axon Ivy Projects",
416+
"icon": "./assets/ivy-logo.svg"
423417
}
424418
]
425419
},

playwright/tests/cms-editor.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ test('Reuse and reveal existing panel', async ({ page }) => {
4343
await explorer.doubleClickNode('pom.xml');
4444
await editor.isInactive();
4545
const projectExplorer = new ProjectExplorerView(page);
46-
await projectExplorer.focus();
46+
await projectExplorer.openView();
4747
await projectExplorer.selectNode('playwrightTestWorkspace');
4848
await projectExplorer.selectNode('cms');
4949
await editor.isViewVisible();

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ export abstract class ExplorerView extends View {
2222
await expect(this.tabLocator).toBeHidden();
2323
}
2424

25-
async focus() {
26-
throw new Error('Method not implemented.');
27-
}
28-
2925
async openView() {
3026
if (!(await this.page.locator(`${this.data.tabSelector}.expanded`).isVisible())) {
3127
await this.tabLocator.click();
@@ -78,10 +74,6 @@ export class FileExplorer extends ExplorerView {
7874
super('Explorer', page);
7975
}
8076

81-
override async focus() {
82-
await this.executeCommand('File: Focus on Files Explorer');
83-
}
84-
8577
async addFolder(name: string) {
8678
await this.executeCommand('File: New Folder');
8779
await this.typeText(name);
@@ -135,8 +127,4 @@ export class ProjectExplorerView extends ExplorerView {
135127
constructor(page: Page) {
136128
super('Axon Ivy Projects', page);
137129
}
138-
139-
override async focus() {
140-
await this.executeCommand('Axon Ivy Designer: Focus on Axon Ivy Projects View');
141-
}
142130
}

playwright/tests/project-explorer.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ test.describe('Project Explorer', () => {
88
test.use({ workspace: multiProjectWorkspacePath });
99
test('Projects are visible', async ({ page }) => {
1010
const explorer = new ProjectExplorerView(page);
11-
await explorer.focus();
11+
await explorer.openView();
1212

1313
await explorer.hasNode('ivy-project-1');
1414
await explorer.hasNode('ivy-project-2');
@@ -22,7 +22,7 @@ test.describe('CMS entry', () => {
2222
test('Open', async ({ page }) => {
2323
const explorer = new ProjectExplorerView(page);
2424
await explorer.hasDeployProjectStatusMessage();
25-
await explorer.focus();
25+
await explorer.openView();
2626

2727
await explorer.selectNode('playwrightTestWorkspace');
2828
await explorer.selectNode('cms');
@@ -39,20 +39,20 @@ test.describe('CMS entry', () => {
3939
await editor.executeCommand('Axon Ivy: Open CMS Editor');
4040
await editor.isViewVisible();
4141

42-
await projectExplorer.focus();
42+
await projectExplorer.openView();
4343
await projectExplorer.isSelected('cms');
4444

4545
await projectExplorer.selectNode('playwrightTestWorkspace');
4646
await projectExplorer.hasNoNode('cms');
47-
await fileExplorer.focus();
48-
await projectExplorer.focus();
47+
await projectExplorer.closeView();
48+
await projectExplorer.openView();
4949
await projectExplorer.isSelected('cms');
5050

5151
await projectExplorer.selectNode('playwrightTestWorkspace');
5252
await projectExplorer.hasNoNode('cms');
53-
await fileExplorer.focus();
53+
await projectExplorer.closeView();
5454
await fileExplorer.doubleClickNode('pom.xml');
55-
await projectExplorer.focus();
55+
await projectExplorer.openView();
5656
await editor.isInactive();
5757
await projectExplorer.hasNoNode('cms');
5858
await editor.tabLocator.click();
@@ -64,7 +64,7 @@ test.describe('CMS entry', () => {
6464
test('New Resource', async ({ page }) => {
6565
const explorer = new ProjectExplorerView(page);
6666
await explorer.hasDeployProjectStatusMessage();
67-
await explorer.focus();
67+
await explorer.openView();
6868
await explorer.selectNode('playwrightTestWorkspace');
6969
await explorer.selectInContextMenuOfNode('cms', 'New', 'New Business Process');
7070
await explorer.provideUserInput('TestProcess');

0 commit comments

Comments
 (0)