Skip to content
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

Jump to bottom

feat(content-sidebar): Add data-target-id to menu items #3610

Merged
merged 9 commits into from
Aug 21, 2024
Merged

feat(content-sidebar): Add data-target-id to menu items #3610

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
856db88
feat(content-sidebar): Add data-target-id to MenuItem
jmalinna Aug 12, 2024
70656d8
feat(content-sidebar): Update data target ids
jmalinna Aug 13, 2024
2c2bbb6
feat(content-sidebar): Update snapshot
jmalinna Aug 13, 2024
19a64c2
feat(content-sidebar): Add data target ids to the modal elements
jmalinna Aug 13, 2024
036f2d9
feat(content-sidebar): Update ids to camel case
jmalinna Aug 19, 2024
f79cd5f
Merge branch 'master' into jmalinina-add-datatargetid-in-content-sidebar
jmalinna Aug 19, 2024
b68785d
feat(content-sidebar): Update Task Form ids
jmalinna Aug 20, 2024
7f69064
Merge branch 'master' into jmalinina-add-datatargetid-in-content-sidebar
jmalinna Aug 20, 2024
3754ec9
Merge branch 'master' into jmalinina-add-datatargetid-in-content-sidebar
jmalinna Aug 21, 2024
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
12 changes: 10 additions & 2 deletions src/elements/content-sidebar/AddTaskMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ const AddTaskMenu = (props: Props) => (
</MenuToggle>
</Button>
<Menu className="bcs-AddTaskMenu">
<MenuItem className="bcs-AddTaskMenu-menuItem" onClick={() => props.onMenuItemClick(TASK_TYPE_GENERAL)}>
<MenuItem
className="bcs-AddTaskMenu-menuItem"
data-target-id="MenuItem-generalTask"
jmalinna marked this conversation as resolved.
Show resolved Hide resolved
onClick={() => props.onMenuItemClick(TASK_TYPE_GENERAL)}
>
<div className="bcs-AddTaskMenu-icon">
<IconTaskGeneral width={30} height={30} />
</div>
Expand All @@ -41,7 +45,11 @@ const AddTaskMenu = (props: Props) => (
</div>
</div>
</MenuItem>
<MenuItem className="bcs-AddTaskMenu-menuItem" onClick={() => props.onMenuItemClick(TASK_TYPE_APPROVAL)}>
<MenuItem
className="bcs-AddTaskMenu-menuItem"
data-target-id="MenuItem-approvalTask"
onClick={() => props.onMenuItemClick(TASK_TYPE_APPROVAL)}
>
<div className="bcs-AddTaskMenu-icon">
<IconTaskApproval width={30} height={30} />
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/elements/content-sidebar/__tests__/__snapshots__/AddTaskMenu.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ exports[`elements/content-sidebar/AddTaskMenu render should render a default com
>
<MenuItem
className="bcs-AddTaskMenu-menuItem"
data-target-id="MenuItem-generalTask"
onClick={[Function]}
>
<div
Expand Down Expand Up @@ -58,6 +59,7 @@ exports[`elements/content-sidebar/AddTaskMenu render should render a default com
</MenuItem>
<MenuItem
className="bcs-AddTaskMenu-menuItem"
data-target-id="MenuItem-approvalTask"
onClick={[Function]}
>
<div
Expand Down
9 changes: 8 additions & 1 deletion src/elements/content-sidebar/activity-feed/task-form/TaskForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,10 @@ class TaskForm extends React.Component<Props, State> {
className={pillSelectorOverlayClasses}
error={this.getErrorByFieldname('taskAssignees')}
disabled={isForbiddenErrorOnEdit}
inputProps={{ 'data-testid': 'task-form-assignee-input' }}
inputProps={{
'data-testid': 'task-form-assignee-input',
'data-target-id': 'CreateTaskModal-selectAssigneesInput',
jmalinna marked this conversation as resolved.
Show resolved Hide resolved
}}
isRequired
label={<FormattedMessage {...messages.tasksAddTaskFormSelectAssigneesLabel} />}
name="taskAssignees"
Expand Down Expand Up @@ -443,6 +446,7 @@ class TaskForm extends React.Component<Props, State> {
<TextArea
className="bcs-task-name-input"
data-testid="task-form-name-input"
data-target-id="CreateTaskModal-messageInput"
disabled={isDisabled || isForbiddenErrorOnEdit}
error={this.getErrorByFieldname('taskName')}
isRequired
Expand All @@ -460,6 +464,7 @@ class TaskForm extends React.Component<Props, State> {
inputProps={{
[INTERACTION_TARGET]: ACTIVITY_TARGETS.TASK_DATE_PICKER,
'data-testid': 'task-form-date-input',
'data-target-id': 'CreateTaskModal-dateInput',
}}
isAccessible
isDisabled={isForbiddenErrorOnEdit}
Expand All @@ -477,6 +482,7 @@ class TaskForm extends React.Component<Props, State> {
className="bcs-task-input-cancel-btn"
data-resin-target={ACTIVITY_TARGETS.APPROVAL_FORM_CANCEL}
data-testid="task-form-cancel-button"
data-target-id="CreateTaskModal-cancelButton"
onClick={this.handleCancelClick}
isDisabled={isLoading}
type="button"
Expand All @@ -488,6 +494,7 @@ class TaskForm extends React.Component<Props, State> {
className="bcs-task-input-submit-btn"
data-resin-target={ACTIVITY_TARGETS.APPROVAL_FORM_POST}
data-testid="task-form-submit-button"
data-target-id="CreateTaskModal-submitButton"
isDisabled={isForbiddenErrorOnEdit}
isLoading={isLoading}
{...this.addResinInfo()}
Expand Down
Loading