From ef0a7e8dec055928331527b5d9598387873ab085 Mon Sep 17 00:00:00 2001 From: stanislavh Date: Wed, 31 Jan 2024 14:12:03 +0100 Subject: [PATCH] SONAR-21551 Do not show comment section for deprecated actions when changing issue status --- .../src/main/js/api/mocks/IssuesServiceMock.ts | 1 + .../main/js/apps/issues/__tests__/IssueApp-it.tsx | 13 +++++-------- .../src/main/js/components/issue/helpers.ts | 7 +------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts b/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts index a451cf43a1f..0e4cbbd4338 100644 --- a/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts +++ b/server/sonar-web/src/main/js/api/mocks/IssuesServiceMock.ts @@ -509,6 +509,7 @@ export default class IssuesServiceMock { [IssueTransition.Accept]: IssueStatus.Accepted, [IssueTransition.Confirm]: IssueStatus.Confirmed, [IssueTransition.UnConfirm]: IssueStatus.Open, + [IssueTransition.Reopen]: IssueStatus.Open, [IssueTransition.Resolve]: IssueStatus.Fixed, [IssueTransition.WontFix]: IssueStatus.Accepted, [IssueTransition.FalsePositive]: IssueStatus.FalsePositive, diff --git a/server/sonar-web/src/main/js/apps/issues/__tests__/IssueApp-it.tsx b/server/sonar-web/src/main/js/apps/issues/__tests__/IssueApp-it.tsx index ad7246fa8b2..d1135cda01e 100644 --- a/server/sonar-web/src/main/js/apps/issues/__tests__/IssueApp-it.tsx +++ b/server/sonar-web/src/main/js/apps/issues/__tests__/IssueApp-it.tsx @@ -169,7 +169,7 @@ describe('issue app', () => { expect(listItem.getByText('issue.transition.accept')).toBeInTheDocument(); expect(listItem.getByText('issue.transition.confirm')).toBeInTheDocument(); - await user.click(listItem.getByText('issue.transition.confirm')); + await user.click(listItem.getByText('issue.transition.accept')); expect(listItem.getByRole('textbox')).toBeInTheDocument(); @@ -178,19 +178,16 @@ describe('issue app', () => { expect( listItem.getByLabelText( - 'issue.transition.status_x_click_to_change.issue.issue_status.CONFIRMED', + 'issue.transition.status_x_click_to_change.issue.issue_status.ACCEPTED', ), ).toBeInTheDocument(); // Change status again - await user.click(listItem.getByText('issue.issue_status.CONFIRMED')); - await user.click(listItem.getByText('issue.transition.accept')); - await user.click(listItem.getByText('resolve')); + await user.click(listItem.getByText('issue.issue_status.ACCEPTED')); + await user.click(listItem.getByText('issue.transition.reopen')); expect( - listItem.getByLabelText( - 'issue.transition.status_x_click_to_change.issue.issue_status.ACCEPTED', - ), + listItem.getByLabelText('issue.transition.status_x_click_to_change.issue.issue_status.OPEN'), ).toBeInTheDocument(); expect( diff --git a/server/sonar-web/src/main/js/components/issue/helpers.ts b/server/sonar-web/src/main/js/components/issue/helpers.ts index 87042690d9b..ff521134cc8 100644 --- a/server/sonar-web/src/main/js/components/issue/helpers.ts +++ b/server/sonar-web/src/main/js/components/issue/helpers.ts @@ -28,10 +28,5 @@ export function isTransitionHidden(transition: IssueTransition) { } export function transitionRequiresComment(transition: IssueTransition) { - return [ - IssueTransition.Accept, - IssueTransition.Confirm, - IssueTransition.FalsePositive, - IssueTransition.Resolve, - ].includes(transition); + return [IssueTransition.Accept, IssueTransition.FalsePositive].includes(transition); } -- 2.39.5