Thiago/et 757 2

webui/react/src/e2e/models/components/ModelCreateModal.ts

@@ -39,3 +39,44 @@ export class ModelCreateModal extends Modal {
     selector: '[id="tags_0"]',
   });
 }
+import { BaseComponent } from 'playwright-page-model-base/BaseComponent';
+
+import { Modal } from 'e2e/models/common/hew/Modal';
+
+/**
+ * Represents the ModelCreateModal component in src/components/ModelCreateModal.tsx
+ */
+export class ModelCreateModal extends Modal {
+  readonly name = new BaseComponent({
+    parent: this,
+    selector: '[id="modelName"]',
+  });
+  readonly description = new BaseComponent({
+    parent: this,
+    selector: '[id="modelDescription"]',
+  });
+  readonly addMoreDetails = new BaseComponent({
+    parent: this,
+    selector: '[class^="Link_base"]',
+  });
+  readonly addMetadatButton = new BaseComponent({
+    parent: this,
+    selector: '[test-id="add-metadata"]',
+  });
+  readonly addTagButton = new BaseComponent({
+    parent: this,
+    selector: '[test-id="add-tag"]',
+  });
+  readonly metadataKey = new BaseComponent({
+    parent: this,
+    selector: '[id="metadata_0_key"]',
+  });
+  readonly metadataValue = new BaseComponent({
+    parent: this,
+    selector: '[id="metadata_0_value"]',
+  });
+  readonly tag = new BaseComponent({
+    parent: this,
+    selector: '[id="tags_0"]',
+  });
+}

webui/react/src/e2e/models/components/Table/InteractiveTable.ts

@@ -42,4 +42,6 @@ export class InteractiveTable<
 
   readonly table: Table<RowType, HeadRowType>;
   readonly skeleton = new SkeletonTable({ parent: this });
+
+  // TODO: add getRowByColumnValue (maybe base on the DataGrid model)
 }

webui/react/src/e2e/models/pages/WorkspaceDetails/WorkspaceProjects.ts

@@ -4,6 +4,7 @@ import { BaseReactFragment } from 'playwright-page-model-base/BaseReactFragment'
 import { Select } from 'e2e/models/common/hew/Select';
 import { Toggle } from 'e2e/models/common/hew/Toggle';
 import { GridListRadioGroup } from 'e2e/models/components/GridListRadioGroup';
+import { ProjectActionDropdown } from 'e2e/models/components/ProjectActionDropdown';
 import { ProjectCard } from 'e2e/models/components/ProjectCard';
 import { ProjectCreateModal } from 'e2e/models/components/ProjectCreateModal';
 import { ProjectDeleteModal } from 'e2e/models/components/ProjectDeleteModal';
@@ -15,13 +16,72 @@ class ProjectHeadRow extends HeadRow {
     parent: this,
     selector: '[data-testid="Name"]',
   });
+  readonly description = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="Description"]',
+  });
+  readonly numExperiments = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="NumExperiments"]',
+  });
+  readonly lastUpdated = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="LastUpdated"]',
+  });
+  readonly userId = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="UserId"]',
+  });
+  readonly archived = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="Archived"]',
+  });
+  readonly state = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="State"]',
+  });
+  readonly action = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="Action"]',
+  });
 }
 
 class ProjectRow extends Row {
   readonly name = new BaseComponent({
     parent: this,
     selector: '[data-testid="name"]',
   });
+  readonly description = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="description"]',
+  });
+  readonly numExperiments = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="numExperiments"]',
+  });
+  readonly lastUpdated = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="lastUpdated"]',
+  });
+  readonly userId = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="userId"]',
+  });
+  readonly archived = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="archived"]',
+  });
+  readonly state = new BaseComponent({
+    parent: this,
+    selector: '[data-testid="state"]',
+  });
+  readonly action = new ProjectActionDropdown({
+    clickThisComponentToOpen: new BaseComponent({
+      parent: this,
+      selector: '[data-testid="actionMenu"]',
+    }),
+    root: this.root,
+  });
 }
 
 /**

webui/react/src/e2e/tests/projects.spec.ts

@@ -5,9 +5,9 @@ import { ProjectDetails } from 'e2e/models/pages/ProjectDetails';
 import { WorkspaceDetails } from 'e2e/models/pages/WorkspaceDetails';
 import { WorkspaceProjects } from 'e2e/models/pages/WorkspaceDetails/WorkspaceProjects';
 import { randId, safeName } from 'e2e/utils/naming';
-import { V1Project } from 'services/api-ts-sdk';
+import { V1PostProjectResponse, V1Project, V1Workspace } from 'services/api-ts-sdk';
 
-const getCurrentProjectNames = async (workspaceProjects: WorkspaceProjects) => {
+const getCurrentProjectCardNames = async (workspaceProjects: WorkspaceProjects) => {
   await workspaceProjects.projectCards.pwLocator.nth(0).waitFor();
 
   const cardTitles = await workspaceProjects.projectCards.title.pwLocator.all();
@@ -33,7 +33,7 @@ test.describe('Project UI CRUD', () => {
     }
   });
 
-  test('Create a Project', async ({ authedPage, newWorkspace }) => {
+  test.skip('Create a Project', async ({ authedPage, newWorkspace }) => {
     const projectName = safeName('test-project');
     const workspaceDetails = new WorkspaceDetails(authedPage);
     const projectDetails = new ProjectDetails(authedPage);
@@ -61,7 +61,7 @@ test.describe('Project UI CRUD', () => {
     });
   });
 
-  test('Archive and Unarchive Project', async ({
+  test.skip('Archive and Unarchive Project', async ({
     authedPage,
     newWorkspace,
     backgroundApiProject,
@@ -94,7 +94,7 @@ test.describe('Project UI CRUD', () => {
     });
   });
 
-  test('Move a Project', async ({
+  test.skip('Move a Project', async ({
     authedPage,
     newWorkspace,
     backgroundApiWorkspace,
@@ -188,7 +188,7 @@ test.describe('Project List', () => {
     const workspaceDetails = new WorkspaceDetails(authedPage);
     const workspaceProjects = workspaceDetails.workspaceProjects;
 
-    const namesAfterNewest = await getCurrentProjectNames(workspaceProjects);
+    const namesAfterNewest = await getCurrentProjectCardNames(workspaceProjects);
     const idSortedProjectNames = _.orderBy(projects, 'id', 'desc').map((p) => p.name);
     expect(idSortedProjectNames).toEqual(
       namesAfterNewest.filter((n) => {
@@ -198,7 +198,7 @@ test.describe('Project List', () => {
 
     await workspaceProjects.sortSelect.selectMenuOption('Alphabetical');
 
-    const namesAfterAlphabetical = await getCurrentProjectNames(workspaceProjects);
+    const namesAfterAlphabetical = await getCurrentProjectCardNames(workspaceProjects);
     const nameSortedProjectNames = _.orderBy(projects, 'name', 'asc').map((p) => p.name);
     expect(nameSortedProjectNames).toEqual(
       namesAfterAlphabetical.filter((n) => {
@@ -223,17 +223,17 @@ test.describe('Project List', () => {
 
     await authedPage.reload();
 
-    const namesAfterAll = await getCurrentProjectNames(workspaceProjects);
+    const namesAfterAll = await getCurrentProjectCardNames(workspaceProjects);
     expect(namesAfterAll).toContain(otherUserProjectName);
     expect(namesAfterAll).toContain(currentUserProjectName);
 
     await workspaceProjects.whoseSelect.selectMenuOption("Others' Projects");
-    const namesAfterOthers = await getCurrentProjectNames(workspaceProjects);
+    const namesAfterOthers = await getCurrentProjectCardNames(workspaceProjects);
     expect(namesAfterOthers).toContain(otherUserProjectName);
     expect(namesAfterOthers).not.toContain(currentUserProjectName);
 
     await workspaceProjects.whoseSelect.selectMenuOption('My Projects');
-    const namesAfterMy = await getCurrentProjectNames(workspaceProjects);
+    const namesAfterMy = await getCurrentProjectCardNames(workspaceProjects);
     expect(namesAfterMy).toContain(currentUserProjectName);
     expect(namesAfterMy).not.toContain(otherUserProjectName);
 
@@ -255,4 +255,71 @@ test.describe('Project List', () => {
     await firstRow.pwLocator.waitFor({ state: 'hidden' });
     await firstCard.pwLocator.waitFor();
   });
+
+  test.describe('List View', () => {
+    let newProject: V1PostProjectResponse;
+    let destinationWorkspace: V1Workspace;
+
+    test.beforeAll(async ({ newWorkspace, backgroundApiProject, backgroundApiWorkspace }) => {
+      newProject = await backgroundApiProject.createProject(
+        newWorkspace.response.workspace.id,
+        backgroundApiProject.new(),
+      );
+      destinationWorkspace = (
+        await backgroundApiWorkspace.createWorkspace(backgroundApiWorkspace.new())
+      ).workspace;
+    });
+    test.beforeEach(async ({ authedPage }) => {
+      const workspaceDetails = new WorkspaceDetails(authedPage);
+
+      const workspaceProjects = workspaceDetails.workspaceProjects;
+
+      await workspaceProjects.gridListRadioGroup.list.pwLocator.click();
+    });
+    test.afterAll(async ({ backgroundApiWorkspace }) => {
+      await backgroundApiWorkspace.deleteWorkspace(destinationWorkspace.id);
+    });
+
+    test('move a project to a different workspace', async ({ authedPage }) => {
+      const workspaceDetails = new WorkspaceDetails(authedPage);
+      const workspaceProjects = workspaceDetails.workspaceProjects;
+
+      const projectsTable = workspaceProjects.table.table;
+
+      let newProjectRow = (
+        await projectsTable.filterRows(
+          async (row) => (await row.name.pwLocator.textContent()) === newProject.project.name,
+        )
+      )[0];
+
+      expect(await newProjectRow.name.pwLocator.innerText()).toBe(newProject.project.name);
+
+      const moveMenuItem = newProjectRow.action;
+
+      await moveMenuItem.open();
+      await moveMenuItem.move.pwLocator.click();
+      await workspaceProjects.moveModal.destinationWorkspace.pwLocator.fill(
+        destinationWorkspace.name,
+      );
+      await workspaceProjects.moveModal.destinationWorkspace.pwLocator.press('Enter');
+      await workspaceProjects.moveModal.footer.submit.pwLocator.click();
+
+      await workspaceProjects.moveModal.pwLocator.waitFor({ state: 'hidden' });
+      await newProjectRow.pwLocator.waitFor({ state: 'hidden' });
+
+      newProjectRow = (
+        await projectsTable.filterRows(
+          async (row) => (await row.name.pwLocator.textContent()) === newProject.project.name,
+        )
+      )[0];
+
+      await expect(newProjectRow).toBeUndefined();
+
+      await workspaceDetails.gotoWorkspace(destinationWorkspace.id);
+
+      const projectCard = workspaceProjects.cardByName(newProject.project.name);
+
+      await expect(projectCard.pwLocator).toBeVisible();
+    });
+  });
 });