Skip to content

e2e(FR-759): fix create test code #3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Apr 4, 2025
Merged

e2e(FR-759): fix create test code #3442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions e2e/test-util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,36 +127,30 @@ export async function createVFolderAndVerify(
folderName: string,
usageMode: 'general' | 'model' = 'general',
type: 'user' | 'project' = 'user',
permission: 'rw' | 'ro' | 'wd' = 'rw',
permission: 'rw' | 'ro' = 'rw',
) {
const permissionMap = {
rw: 'Read & Write',
ro: 'Read only',
wd: 'Delete',
};
await navigateTo(page, 'data');

await page.getByRole('button', { name: 'plus Add' }).click();
await page.getByRole('button', { name: 'Create Folder' }).nth(1).click();
await page.getByRole('textbox', { name: 'Folder name' }).fill(folderName);

// select parsed parameters in create modal form
await page.getByRole('radio', { name: usageMode }).click();
await page.getByRole('radio', { name: type }).click();
await page.getByRole('radio', { name: permissionMap[permission] }).click();
await page.getByTestId(`${usageMode}-usage-mode`).click();
await page.getByTestId(`${type}-type`).click();
await page.getByTestId(`${permission}-permission`).click();

await page.getByRole('button', { name: 'Create', exact: true }).click();
await page.reload();
const nameInput = page
.locator('#general-folder-storage vaadin-grid-cell-content')
.filter({ hasText: 'Name' })
.locator('vaadin-text-field')
.nth(1)
.locator('input');
await nameInput.click();
await nameInput.fill(folderName);
await page.getByTestId('vfolder-filter').locator('div').nth(2).click();
await page.getByRole('option', { name: 'Name' }).locator('div').click();
await page.locator('#rc_select_8').fill(folderName);
await page.getByRole('button', { name: 'search' }).click();
await page.getByRole('link', { name: folderName }).click();
await expect(
page.locator('vaadin-grid-cell-content').filter({ hasText: folderName }),
page
.getByRole('cell', { name: `VFolder Identicon ${folderName}` })
.filter({ hasText: folderName }),
).toBeVisible();
await nameInput.fill('');
}

export async function deleteVFolderAndVerify(page: Page, folderName: string) {
Expand Down
2 changes: 1 addition & 1 deletion react/src/components/BAIPropertyFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ const BAIPropertyFilter: React.FC<BAIPropertyFilterProps> = ({
};

return (
<Flex direction="column" gap={'xs'} align="start">
<Flex direction="column" gap={'xs'} align="start" {...containerProps}>
<Space.Compact>
<Select
popupMatchSelectWidth={false}
Expand Down
24 changes: 18 additions & 6 deletions react/src/components/FolderCreateModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,13 @@ const FolderCreateModal: React.FC<FolderCreateModalProps> = ({

<Form.Item label={t('data.UsageMode')} name={'usage_mode'}>
<Radio.Group>
<Radio value={'general'}>General</Radio>
<Radio value={'general'} data-testid="general-usage-mode">
General
</Radio>
{baiClient._config.enableModelFolders ? (
<Radio value={'model'}>Model</Radio>
<Radio value={'model'} data-testid="model-usage-mode">
Model
</Radio>
) : null}
</Radio.Group>
</Form.Item>
Expand All @@ -276,11 +280,15 @@ const FolderCreateModal: React.FC<FolderCreateModalProps> = ({
* so we need both checks for proper access control
*/}
{_.includes(allowedTypes, 'user') ? (
<Radio value={'user'}>User</Radio>
<Radio value={'user'} data-testid="user-type">
User
</Radio>
) : null}
{(userRole === 'admin' || userRole === 'superadmin') &&
_.includes(allowedTypes, 'group') ? (
<Radio value={'project'}>Project</Radio>
<Radio value={'project'} data-testid="project-type">
Project
</Radio>
) : null}
</Radio.Group>
</Form.Item>
Expand All @@ -305,8 +313,12 @@ const FolderCreateModal: React.FC<FolderCreateModalProps> = ({

<Form.Item label={t('data.Permission')} name={'permission'}>
<Radio.Group>
<Radio value={'rw'}>Read & Write</Radio>
<Radio value={'ro'}>Read Only</Radio>
<Radio value={'rw'} data-testid="rw-permission">
Read & Write
</Radio>
<Radio value={'ro'} data-testid="ro-permission">
Read Only
</Radio>
</Radio.Group>
</Form.Item>

Expand Down
1 change: 1 addition & 0 deletions react/src/pages/VFolderNodeListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ const VFolderNodeListPage: React.FC<VFolderNodeListPageProps> = ({
])}
/>
<BAIPropertyFilter
data-testid="vfolder-filter"
filterProperties={[
{
key: 'name',
Expand Down