editIssueComment,
getIssueChangelog,
getIssueFlowSnippets,
- searchIssues,
searchIssueTags,
+ searchIssues,
setIssueAssignee,
setIssueSeverity,
setIssueTags,
}
handleBulkChangeIssues = (issueKeys: string[], query: RequestData) => {
- //For now we only check for issue severity change.
+ //For now we only check for issue type change.
this.list
.filter((i) => issueKeys.includes(i.issue.key))
.forEach((data) => {
- data.issue.severity = query.set_severity;
+ data.issue.type = query.set_type;
});
return this.reply({});
};
// Check that we bulk change the selected issue
const issueBoxFixThat = within(screen.getByRole('region', { name: 'Fix that' }));
+ expect(
+ issueBoxFixThat.getByRole('button', {
+ name: 'issue.type.type_x_click_to_change.issue.type.CODE_SMELL',
+ })
+ ).toBeInTheDocument();
+
await user.click(
screen.getByRole('checkbox', { name: 'issues.action_select.label.Fix that' })
);
await user.keyboard('New Comment');
expect(screen.getByRole('button', { name: 'apply' })).toBeDisabled();
- await selectEvent.select(screen.getByRole('combobox', { name: 'issue.set_severity' }), [
- 'severity.BLOCKER',
+ await selectEvent.select(screen.getByRole('combobox', { name: 'issue.set_type' }), [
+ 'issue.type.BUG',
]);
await user.click(screen.getByRole('button', { name: 'apply' }));
expect(
issueBoxFixThat.getByRole('button', {
- name: 'issue.severity.severity_x_click_to_change.severity.BLOCKER',
+ name: 'issue.type.type_x_click_to_change.issue.type.BUG',
})
).toBeInTheDocument();
});
// Get a specific issue list item
const listItem = within(await screen.findByRole('region', { name: 'Fix that' }));
+ // Change issue type
+ await user.click(
+ listItem.getByRole('button', {
+ name: `issue.type.type_x_click_to_change.issue.type.CODE_SMELL`,
+ })
+ );
+ expect(listItem.getByText('issue.type.BUG')).toBeInTheDocument();
+ expect(listItem.getByText('issue.type.VULNERABILITY')).toBeInTheDocument();
+
+ await user.click(listItem.getByText('issue.type.VULNERABILITY'));
+ expect(
+ listItem.getByRole('button', {
+ name: `issue.type.type_x_click_to_change.issue.type.VULNERABILITY`,
+ })
+ ).toBeInTheDocument();
+
// Change issue severity
expect(listItem.getByText('severity.MAJOR')).toBeInTheDocument();
LabelValueSelectOption,
SearchSelect,
} from '../../../components/controls/Select';
+import IssueTypeIcon from '../../../components/icons/IssueTypeIcon';
import SeverityHelper from '../../../components/shared/SeverityHelper';
import { Alert } from '../../../components/ui/Alert';
import DeferredSpinner from '../../../components/ui/DeferredSpinner';
import { SEVERITIES } from '../../../helpers/constants';
import { throwGlobalError } from '../../../helpers/error';
import { translate, translateWithParameters } from '../../../helpers/l10n';
-import { Component, Dict, Issue, Paging } from '../../../types/types';
+import { Component, Dict, Issue, IssueType, Paging } from '../../../types/types';
import { CurrentUser } from '../../../types/users';
import AssigneeSelect, { AssigneeOption } from './AssigneeSelect';
removeTags?: Array<{ label: string; value: string }>;
severity?: string;
transition?: string;
+ type?: string;
}
interface State extends FormFields {
assignee = 'assignee',
removeTags = 'removeTags',
severity = 'severity',
+ type = 'type',
}
export const MAX_PAGE_SIZE = 500;
+function typeFieldTypeRenderer(option: LabelValueSelectOption) {
+ return (
+ <div className="display-flex-center">
+ <IssueTypeIcon query={option.value} />
+ <span className="little-spacer-left">{option.label}</span>
+ </div>
+ );
+}
+
+function TypeFieldOptionComponent(props: OptionProps<LabelValueSelectOption, false>) {
+ return <components.Option {...props}>{typeFieldTypeRenderer(props.data)}</components.Option>;
+}
+
+function TypeFieldSingleValueComponent(props: SingleValueProps<LabelValueSelectOption, false>) {
+ return (
+ <components.SingleValue {...props}>{typeFieldTypeRenderer(props.data)}</components.SingleValue>
+ );
+}
+
function SeverityFieldOptionComponent(props: OptionProps<LabelValueSelectOption, false>) {
return (
<components.Option {...props}>
remove_tags: this.state.removeTags && this.state.removeTags.map((t) => t.value).join(),
sendNotifications: this.state.notifications,
set_severity: this.state.severity,
+ set_type: this.state.type,
},
(x) => x !== undefined
);
}
canSubmit = () => {
- const { addTags, assignee, removeTags, severity, transition } = this.state;
+ const { addTags, assignee, removeTags, severity, transition, type } = this.state;
return Boolean(
(addTags && addTags.length > 0) ||
(removeTags && removeTags.length > 0) ||
assignee ||
severity ||
- transition
+ transition ||
+ type
);
};
return this.renderField(field, 'issue.assign.formlink', affected, input);
};
+ renderTypeField = () => {
+ const affected = this.state.issues.filter(hasAction('set_type')).length;
+ const field = InputField.type;
+
+ if (affected === 0) {
+ return null;
+ }
+
+ const types: IssueType[] = ['BUG', 'VULNERABILITY', 'CODE_SMELL'];
+ const options: LabelValueSelectOption[] = types.map((type) => ({
+ label: translate('issue.type', type),
+ value: type,
+ }));
+
+ const input = (
+ <Select
+ className="input-super-large"
+ inputId={`issues-bulk-change-${field}`}
+ isClearable={true}
+ isSearchable={false}
+ components={{
+ Option: TypeFieldOptionComponent,
+ SingleValue: TypeFieldSingleValueComponent,
+ }}
+ onChange={this.handleSelectFieldChange('type')}
+ options={options}
+ />
+ );
+
+ return this.renderField(field, 'issue.set_type', affected, input);
+ };
+
renderSeverityField = () => {
const affected = this.state.issues.filter(hasAction('set_severity')).length;
const field = InputField.severity;
)}
{this.renderAssigneeField()}
+ {this.renderTypeField()}
{this.renderSeverityField()}
{this.renderTagsField(InputField.addTags, 'issue.add_tags', true)}
{this.renderTagsField(InputField.removeTags, 'issue.remove_tags', false)}
import { SEVERITIES } from '../../../../helpers/constants';
import { mockIssue, mockLoggedInUser } from '../../../../helpers/testMocks';
import { renderComponent } from '../../../../helpers/testReactTestingUtils';
+import { IssueType } from '../../../../types/issues';
import { Issue } from '../../../../types/types';
import BulkChangeModal, { MAX_PAGE_SIZE } from '../BulkChangeModal';
expect(await screen.findByText('issue_bulk_change.max_issues_reached')).toBeInTheDocument();
});
-it.each([['severity', 'set_severity']])('should render select for %s', async (_field, action) => {
+it.each([
+ ['type', 'set_type'],
+ ['severity', 'set_severity'],
+])('should render select for %s', async (_field, action) => {
renderBulkChangeModal([mockIssue(false, { actions: [action] })]);
expect(await screen.findByText('issue.' + action)).toBeInTheDocument();
'tag2',
]);
+ // Select a type
+ await selectEvent.select(screen.getByRole('combobox', { name: 'issue.set_type' }), [
+ `issue.type.CODE_SMELL`,
+ ]);
+
// Select a severity
await selectEvent.select(screen.getByRole('combobox', { name: 'issue.set_severity' }), [
`severity.${SEVERITIES[0]}`,
set_severity: 'BLOCKER',
add_tags: 'tag1,tag2',
do_transition: 'Transition2',
+ set_type: IssueType.CodeSmell,
sendNotifications: true,
});
});
const user = userEvent.setup();
renderSourceViewer();
+ //Open Issue type
+ await user.click(
+ await screen.findByRole('button', { name: 'issue.type.type_x_click_to_change.issue.type.BUG' })
+ );
+ expect(ui.codeSmellTypeButton.get()).toBeInTheDocument();
+
// Open severity
await user.click(
await screen.findByRole('button', {
display: flex;
}
-.issue-meta.disabled {
- color: var(--gray60);
-}
-
.issue-meta + .issue-meta {
margin-left: var(--gridSize);
}
});
describe('updating', () => {
+ it('should allow updating the type', async () => {
+ const { ui } = getPageObject();
+ const issue = mockRawIssue(false, {
+ type: IssueType.Bug,
+ actions: [IssueActions.SetType],
+ });
+ issuesHandler.setIssueList([{ issue, snippets: {} }]);
+ renderIssue({ issue: mockIssue(false, { ...pick(issue, 'actions', 'key', 'type') }) });
+
+ await ui.updateType(IssueType.Bug, IssueType.CodeSmell);
+ expect(ui.updateTypeBtn(IssueType.CodeSmell).get()).toBeInTheDocument();
+ });
+
it('should allow updating the severity', async () => {
const { ui } = getPageObject();
const issue = mockRawIssue(false, {
IssueType as IssueTypeEnum,
} from '../../../types/issues';
import { Issue, RawQuery } from '../../../types/types';
-import IssueTypeIcon from '../../icons/IssueTypeIcon';
import { updateIssue } from '../actions';
import IssueAssign from './IssueAssign';
import IssueCommentAction from './IssueCommentAction';
import IssueSeverity from './IssueSeverity';
import IssueTags from './IssueTags';
import IssueTransition from './IssueTransition';
+import IssueType from './IssueType';
interface Props {
issue: Issue;
const canAssign = issue.actions.includes(IssueActions.Assign);
const canComment = issue.actions.includes(IssueActions.Comment);
const canSetSeverity = issue.actions.includes(IssueActions.SetSeverity);
+ const canSetType = issue.actions.includes(IssueActions.SetType);
const canSetTags = issue.actions.includes(IssueActions.SetTags);
const hasTransitions = issue.transitions.length > 0;
return (
<div className={classNames(className, 'issue-actions')}>
<div className="issue-meta-list">
- <div className="issue-meta display-flex-center disabled">
- <IssueTypeIcon className="little-spacer-right" query={issue.type} />
- {translate('issue.type', issue.type)}
+ <div className="issue-meta">
+ <IssueType
+ canSetType={canSetType}
+ isOpen={this.props.currentPopup === 'set-type' && canSetType}
+ issue={issue}
+ setIssueProperty={this.setIssueProperty}
+ togglePopup={this.props.togglePopup}
+ />
</div>
<div className="issue-meta">
<IssueSeverity
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2023 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import * as React from 'react';
+import { setIssueType } from '../../../api/issues';
+import { colors } from '../../../app/theme';
+import { ButtonLink } from '../../../components/controls/buttons';
+import Toggler from '../../../components/controls/Toggler';
+import DropdownIcon from '../../../components/icons/DropdownIcon';
+import IssueTypeIcon from '../../../components/icons/IssueTypeIcon';
+import { translate, translateWithParameters } from '../../../helpers/l10n';
+import { IssueResponse } from '../../../types/issues';
+import { Issue, RawQuery } from '../../../types/types';
+import SetTypePopup from '../popups/SetTypePopup';
+
+interface Props {
+ canSetType: boolean;
+ isOpen: boolean;
+ issue: Pick<Issue, 'type'>;
+ setIssueProperty: (
+ property: keyof Issue,
+ popup: string,
+ apiCall: (query: RawQuery) => Promise<IssueResponse>,
+ value: string
+ ) => void;
+ togglePopup: (popup: string, show?: boolean) => void;
+}
+
+export default class IssueType extends React.PureComponent<Props> {
+ toggleSetType = (open?: boolean) => {
+ this.props.togglePopup('set-type', open);
+ };
+
+ setType = (type: string) => {
+ this.props.setIssueProperty('type', 'set-type', setIssueType, type);
+ };
+
+ handleClose = () => {
+ this.toggleSetType(false);
+ };
+
+ render() {
+ const { issue } = this.props;
+ if (this.props.canSetType) {
+ return (
+ <div className="dropdown">
+ <Toggler
+ onRequestClose={this.handleClose}
+ open={this.props.isOpen && this.props.canSetType}
+ overlay={<SetTypePopup issue={issue} onSelect={this.setType} />}
+ >
+ <ButtonLink
+ aria-label={translateWithParameters(
+ 'issue.type.type_x_click_to_change',
+ translate('issue.type', issue.type)
+ )}
+ aria-expanded={this.props.isOpen}
+ className="issue-action issue-action-with-options js-issue-set-type"
+ onClick={this.toggleSetType}
+ >
+ <IssueTypeIcon
+ className="little-spacer-right"
+ fill={colors.baseFontColor}
+ query={issue.type}
+ />
+ {translate('issue.type', issue.type)}
+ <DropdownIcon className="little-spacer-left" />
+ </ButtonLink>
+ </Toggler>
+ </div>
+ );
+ }
+
+ return (
+ <span>
+ <IssueTypeIcon className="little-spacer-right" query={issue.type} />
+ {translate('issue.type', issue.type)}
+ </span>
+ );
+ }
+}
}
export enum IssueActions {
+ SetType = 'set_type',
SetTags = 'set_tags',
SetSeverity = 'set_severity',
Comment = 'comment',
projects / sonarqube.git / commitdiff