From baa91b7f1df954f5744b8e84b64debefcdc7b60b Mon Sep 17 00:00:00 2001 From: John Kim Date: Mon, 30 Sep 2024 10:29:25 -0400 Subject: [PATCH] this.body --- .../models/components/AddUsersToGroupsModal.ts | 2 +- .../models/components/ChangeUserStatusModal.ts | 2 +- .../e2e/models/components/CreateUserModal.ts | 14 +++++++------- .../e2e/models/components/ModelCreateModal.ts | 4 ++-- .../e2e/models/components/SetUserRolesModal.ts | 2 +- .../models/components/WorkspaceCreateModal.ts | 18 +++++++++--------- .../models/components/WorkspaceDeleteModal.ts | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/webui/react/src/e2e/models/components/AddUsersToGroupsModal.ts b/webui/react/src/e2e/models/components/AddUsersToGroupsModal.ts index 473eaca21e2..6124190f549 100644 --- a/webui/react/src/e2e/models/components/AddUsersToGroupsModal.ts +++ b/webui/react/src/e2e/models/components/AddUsersToGroupsModal.ts @@ -7,7 +7,7 @@ import { Modal } from 'e2e/models/common/hew/Modal'; */ export class AddUsersToGroupsModal extends Modal { readonly groups = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="groups"]', }); } diff --git a/webui/react/src/e2e/models/components/ChangeUserStatusModal.ts b/webui/react/src/e2e/models/components/ChangeUserStatusModal.ts index 6509873c9bd..cda9b52c3ec 100644 --- a/webui/react/src/e2e/models/components/ChangeUserStatusModal.ts +++ b/webui/react/src/e2e/models/components/ChangeUserStatusModal.ts @@ -6,7 +6,7 @@ import { Select } from 'e2e/models/common/hew/Select'; */ export class ChangeUserStatusModal extends Modal { readonly status = new StatusSelect({ - parent: this.body, + parent: this, selector: '[data-testid="status"]', }); } diff --git a/webui/react/src/e2e/models/components/CreateUserModal.ts b/webui/react/src/e2e/models/components/CreateUserModal.ts index 6817d00b49d..08344f02a61 100644 --- a/webui/react/src/e2e/models/components/CreateUserModal.ts +++ b/webui/react/src/e2e/models/components/CreateUserModal.ts @@ -7,31 +7,31 @@ import { Modal } from 'e2e/models/common/hew/Modal'; */ export class CreateUserModal extends Modal { readonly username = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="username"]', }); readonly displayName = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="displayName"]', }); readonly adminToggle = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="isAdmin"] button', }); readonly remoteToggle = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="isRemote"] button', }); readonly password = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="password"]', }); readonly confirmPassword = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="confirmPassword"]', }); readonly roleSelect = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="roles"]', }); } diff --git a/webui/react/src/e2e/models/components/ModelCreateModal.ts b/webui/react/src/e2e/models/components/ModelCreateModal.ts index ff12f194a38..b81aa4a0dc4 100644 --- a/webui/react/src/e2e/models/components/ModelCreateModal.ts +++ b/webui/react/src/e2e/models/components/ModelCreateModal.ts @@ -7,11 +7,11 @@ import { Modal } from 'e2e/models/common/hew/Modal'; */ export class ModelCreateModal extends Modal { readonly name = new BaseComponent({ - parent: this.body, + parent: this, selector: '[id="modelName"]', }); readonly description = new BaseComponent({ - parent: this.body, + parent: this, selector: '[id="modelDescription"]', }); readonly addMoreDetails = new BaseComponent({ diff --git a/webui/react/src/e2e/models/components/SetUserRolesModal.ts b/webui/react/src/e2e/models/components/SetUserRolesModal.ts index af5143a3007..71abeb170b4 100644 --- a/webui/react/src/e2e/models/components/SetUserRolesModal.ts +++ b/webui/react/src/e2e/models/components/SetUserRolesModal.ts @@ -7,7 +7,7 @@ import { Modal } from 'e2e/models/common/hew/Modal'; */ export class SetUserRolesModal extends Modal { readonly roles = new BaseComponent({ - parent: this.body, + parent: this, selector: '[data-testid="roles"]', }); } diff --git a/webui/react/src/e2e/models/components/WorkspaceCreateModal.ts b/webui/react/src/e2e/models/components/WorkspaceCreateModal.ts index 2cb5a29b0da..898602e6430 100644 --- a/webui/react/src/e2e/models/components/WorkspaceCreateModal.ts +++ b/webui/react/src/e2e/models/components/WorkspaceCreateModal.ts @@ -8,43 +8,43 @@ import { Toggle } from 'e2e/models/common/hew/Toggle'; */ export class WorkspaceCreateModal extends Modal { readonly workspaceName = new BaseComponent({ - parent: this.body, + parent: this, selector: 'input[id="workspaceName"]', }); readonly useAgentUser = new Toggle({ - parent: this.body, + parent: this, selector: '[data-testid="useAgentUser"]', }); readonly agentUid = new BaseComponent({ - parent: this.body, + parent: this, selector: 'input[id="agentUid"]', }); readonly agentUser = new BaseComponent({ - parent: this.body, + parent: this, selector: 'input[id="agentUser"]', }); readonly useAgentGroup = new Toggle({ - parent: this.body, + parent: this, selector: '[data-testid="useAgentGroup"]', }); readonly agentGid = new BaseComponent({ - parent: this.body, + parent: this, selector: 'input[id="agentGid"]', }); readonly agentGroup = new BaseComponent({ - parent: this.body, + parent: this, selector: 'input[id="agentGroup"]', }); readonly useCheckpointStorage = new Toggle({ - parent: this.body, + parent: this, selector: '[data-testid="useCheckpointStorage"]', }); // We need more work on this to handle input well most likely since the code editor is complex readonly checkpointCodeEditor = new BaseComponent({ - parent: this.body, + parent: this, selector: 'div.cm-editor', }); } diff --git a/webui/react/src/e2e/models/components/WorkspaceDeleteModal.ts b/webui/react/src/e2e/models/components/WorkspaceDeleteModal.ts index 0d8d1069be0..b38b93491a4 100644 --- a/webui/react/src/e2e/models/components/WorkspaceDeleteModal.ts +++ b/webui/react/src/e2e/models/components/WorkspaceDeleteModal.ts @@ -7,7 +7,7 @@ import { Modal } from 'e2e/models/common/hew/Modal'; */ export class WorkspaceDeleteModal extends Modal { readonly nameConfirmation = new BaseComponent({ - parent: this.body, + parent: this, selector: 'input[id="workspaceName"]', }); }