Skip to content

Commit

Permalink
#17065: fix the tags not rendering in selector after selection in edi…
Browse files Browse the repository at this point in the history 
…t tags task (#17107)

* fix the tags not rendering in selector after selection in edit tags taks

* added playwright test

* minor changes

* minor fix

* fix the tags not updating in edit and accept tag
  • Loading branch information
@Ashish8689
Ashish8689 authored Jul 22, 2024
1 parent 5140203 commit 986aaf4
Show file tree
Hide file tree
Showing 5 changed files with 435 additions and 33 deletions.
163 changes: 162 additions & 1 deletion openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import { UserClass } from '../../support/user/UserClass';
import { checkDescriptionInEditModal } from '../../utils/activityFeed';
import {
createNewPage,
descriptionBox,
performAdminLogin,
performUserLogin,
redirectToHomePage,
toastNotification,
visitUserProfilePage,
} from '../../utils/common';
import { updateDescription } from '../../utils/entity';
import { clickOnLogo } from '../../utils/sidebar';
import {
createDescriptionTask,
Expand Down Expand Up @@ -327,6 +329,7 @@ test.describe('Activity feed with Data Steward User', () => {
const { afterAction, apiContext } = await performAdminLogin(browser);

await entity.create(apiContext);
await entity2.create(apiContext);
await user1.create(apiContext);
await user2.create(apiContext);
await afterAction();
Expand All @@ -335,13 +338,14 @@ test.describe('Activity feed with Data Steward User', () => {
test.afterAll('Cleanup', async ({ browser }) => {
const { afterAction, apiContext } = await performAdminLogin(browser);
await entity.delete(apiContext);
await entity2.delete(apiContext);
await user1.delete(apiContext);
await user2.delete(apiContext);

await afterAction();
});

test('Create and Assign Task', async ({ browser }) => {
test('Create and Assign Task with Suggestions', async ({ browser }) => {
const { page: page1, afterAction: afterActionUser1 } =
await performUserLogin(browser, user1);
const { page: page2, afterAction: afterActionUser2 } =
Expand Down Expand Up @@ -473,4 +477,161 @@ test.describe('Activity feed with Data Steward User', () => {
await afterActionUser2();
});
});

test('Create and Assign Task without Suggestions', async ({ browser }) => {
const { page: page1, afterAction: afterActionUser1 } =
await performUserLogin(browser, user1);
const { page: page2, afterAction: afterActionUser2 } =
await performUserLogin(browser, user2);

const value: TaskDetails = {
term: entity2.entity.name,
assignee: user2.responseData.name,
};

await test.step('Create, Close and Assign Task to user 2', async () => {
await redirectToHomePage(page1);
await entity2.visitEntityPage(page1);

await updateDescription(page1, '');

// Create 2 task for the same entity, one to close and 2nd for the user2 action
await page1.getByTestId('request-description').click();

await createDescriptionTask(page1, value, false);

await page1.getByTestId('schema').click();

await page1.getByTestId('request-entity-tags').click();

// create tag task
await createTagTask(page1, value, false);

// Should only see the close, add and comment button
expect(
await page1.locator('[data-testid="comment-button"]').isDisabled()
).toBeTruthy();
expect(page1.locator('[data-testid="close-button"]')).toBeVisible();
expect(
page1.locator('[data-testid="edit-accept-task-dropdown"]')
).not.toBeVisible();
expect(
page1.locator('[data-testid="add-close-task-dropdown"]')
).not.toBeVisible();

await afterActionUser1();
});

await test.step(
'Accept Task By user 2 with adding suggestions',
async () => {
await redirectToHomePage(page2);

const taskResponse = page2.waitForResponse(
'/api/v1/feed?type=Task&filterType=OWNER&taskStatus=Open&userId=*'
);

await page2
.getByTestId('activity-feed-widget')
.getByText('Tasks')
.click();

await taskResponse;

await expect(
page2.locator(
'[data-testid="activity-feed-widget"] [data-testid="no-data-placeholder"]'
)
).not.toBeVisible();

const entityPageTaskTab = page2.waitForResponse(
'/api/v1/feed?*&type=Task'
);

const tagsTask = page2.getByTestId('redirect-task-button-link').first();
const tagsTaskContent = await tagsTask.innerText();

expect(tagsTaskContent).toContain('Request tags for');

await tagsTask.click();
await entityPageTaskTab;

expect(page2.getByTestId('noDiff-placeholder')).toBeVisible();

// Should see the add_close dropdown and comment button
expect(
await page2.locator('[data-testid="comment-button"]').isDisabled()
).toBeTruthy();
await expect(
page2.getByTestId('add-close-task-dropdown')
).toBeVisible();
await expect(
page2.locator('[data-testid="close-button"]')
).not.toBeVisible();
await expect(
page2.locator('[data-testid="edit-accept-task-dropdown"]')
).not.toBeVisible();

await page2.getByRole('button', { name: 'Add Tags' }).click();

await page2.waitForSelector('[role="dialog"].ant-modal');

const modalTitleContent = await page2
.locator('.ant-modal-header .ant-modal-title')
.innerText();

expect(modalTitleContent).toContain(
`Request tags for table ${value.term}`
);

// select the Tag
const suggestTags = page2.locator(
'[data-testid="tag-selector"] > .ant-select-selector .ant-select-selection-search-input'
);
await suggestTags.click();

const querySearchResponse = page2.waitForResponse(
`/api/v1/search/query?q=*${'PII.None'}*&index=tag_search_index&*`
);
await suggestTags.fill('PII.None');

await querySearchResponse;

// select value from dropdown
const dropdownValue = page2.getByTestId(`tag-PII.None`);
await dropdownValue.hover();
await dropdownValue.click();

await expect(page2.getByTestId('selected-tag-PII.None')).toBeVisible();

await page2.getByText('OK').click();

await toastNotification(page2, /Task resolved successfully/);

// Accept the description task

await expect(page2.getByText('No Suggestion')).toBeVisible();

await page2.getByRole('button', { name: 'Add Description' }).click();

await page2.waitForSelector('[role="dialog"].ant-modal');

const modalTitleDescriptionContent = await page2
.locator('.ant-modal-header .ant-modal-title')
.innerText();

expect(modalTitleDescriptionContent).toContain(
`Request description for table ${value.term}`
);

await page2.locator(descriptionBox).fill('New description');

await page2.getByText('OK').click();

await toastNotification(page2, /Task resolved successfully/);

await afterActionUser2();
}
);
});
});
44 changes: 25 additions & 19 deletions openmetadata-ui/src/main/resources/ui/playwright/utils/task.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ const tag = 'PII.None';
export const createDescriptionTask = async (
page: Page,
value: TaskDetails,
addDescription = true,
assigneeDisabled?: boolean
) => {
expect(await page.locator('#title').inputValue()).toBe(
`Update description for table ${
`${addDescription ? 'Update' : 'Request'} description for table ${
value.columnName
? `${value.term} columns/${value.columnName}`
: value.term
Expand Down Expand Up @@ -69,9 +70,11 @@ export const createDescriptionTask = async (
await page.click('body');
}

await page
.locator(descriptionBox)
.fill(value.description ?? 'Updated description');
if (addDescription) {
await page
.locator(descriptionBox)
.fill(value.description ?? 'Updated description');
}
await page.click('button[type="submit"]');

await toastNotification(page, /Task created successfully./);
Expand All @@ -80,6 +83,7 @@ export const createDescriptionTask = async (
export const createTagTask = async (
page: Page,
value: TaskDetails,
addTag = true,
assigneeDisabled?: boolean
) => {
expect(await page.locator('#title').inputValue()).toBe(
Expand Down Expand Up @@ -117,24 +121,26 @@ export const createTagTask = async (
await clickOutside(page);
}

// select tags
const suggestTags = page.locator(
'[data-testid="tag-selector"] > .ant-select-selector .ant-select-selection-search-input'
);
await suggestTags.click();
if (addTag) {
// select tags
const suggestTags = page.locator(
'[data-testid="tag-selector"] > .ant-select-selector .ant-select-selection-search-input'
);
await suggestTags.click();

const querySearchResponse = page.waitForResponse(
`/api/v1/search/query?q=*${value.tag ?? tag}*&index=tag_search_index&*`
);
await suggestTags.fill(value.tag ?? tag);
const querySearchResponse = page.waitForResponse(
`/api/v1/search/query?q=*${value.tag ?? tag}*&index=tag_search_index&*`
);
await suggestTags.fill(value.tag ?? tag);

await querySearchResponse;
await querySearchResponse;

// select value from dropdown
const dropdownValue = page.getByTestId(`tag-${value.tag ?? tag}`);
await dropdownValue.hover();
await dropdownValue.click();
await clickOutside(page);
// select value from dropdown
const dropdownValue = page.getByTestId(`tag-${value.tag ?? tag}`);
await dropdownValue.hover();
await dropdownValue.click();
await clickOutside(page);
}

await page.click('button[type="submit"]');

Expand Down
36 changes: 29 additions & 7 deletions ...etadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,17 +555,34 @@ export const TaskTab = ({
}
};

const handleNoSuggestionMenuItemClick: MenuProps['onClick'] = (info) => {
if (info.key === TaskActionMode.EDIT) {
setShowEditTaskModel(true);
} else {
onTaskReject();
}
setTaskAction(
noSuggestionTaskMenuOptions.find((action) => action.key === info.key) ??
noSuggestionTaskMenuOptions[0]
);
};

const onTaskDropdownClick = () => {
if (
taskAction.key === TaskActionMode.RESOLVE ||
taskAction.key === TaskActionMode.EDIT
) {
if (taskAction.key === TaskActionMode.RESOLVE) {
handleMenuItemClick({ key: taskAction.key } as MenuInfo);
} else {
onTaskReject();
}
};

const onNoSuggestionTaskDropdownClick = () => {
if (taskAction.key === TaskActionMode.EDIT) {
handleNoSuggestionMenuItemClick({ key: taskAction.key } as MenuInfo);
} else {
onTaskReject();
}
};

const renderCommentButton = useMemo(() => {
return (
<Button
Expand Down Expand Up @@ -690,10 +707,10 @@ export const TaskTab = ({
items: getFormattedMenuOptions(noSuggestionTaskMenuOptions),
selectable: true,
selectedKeys: [taskAction.key],
onClick: handleMenuItemClick,
onClick: handleNoSuggestionMenuItemClick,
}}
overlayClassName="task-action-dropdown"
onClick={onTaskDropdownClick}>
onClick={onNoSuggestionTaskDropdownClick}>
{taskAction.label}
</Dropdown.Button>
</div>
Expand Down Expand Up @@ -736,6 +753,8 @@ export const TaskTab = ({
testCaseResultFlow,
isTaskTestCaseResult,
renderCommentButton,
handleNoSuggestionMenuItemClick,
onNoSuggestionTaskDropdownClick,
]);

const initialFormValue = useMemo(() => {
Expand Down Expand Up @@ -1006,7 +1025,10 @@ export const TaskTab = ({
entity: t('label.task-lowercase'),
})} #${taskDetails?.id} ${taskThread.message}`}
width={768}
onCancel={() => setShowEditTaskModel(false)}
onCancel={() => {
form.resetFields();
setShowEditTaskModel(false);
}}
onOk={form.submit}>
<Form
form={form}
Expand Down
Loading

0 comments on commit 986aaf4

Please sign in to comment.