diff options
author | Stas Vilchik <stas.vilchik@sonarsource.com> | 2017-08-29 11:38:53 +0200 |
---|---|---|
committer | Stas Vilchik <stas.vilchik@sonarsource.com> | 2017-09-13 13:53:58 +0200 |
commit | 793e86fce66f356099792b7231c9a1d949ff875e (patch) | |
tree | 8bd08099539c3cb1ff159823ee1d1f74a5f2c979 /server/sonar-web/src/main/js/components/issue | |
parent | 736e89cc1629e1e52db00f67e4650f1b88695de9 (diff) | |
download | sonarqube-793e86fce66f356099792b7231c9a1d949ff875e.tar.gz sonarqube-793e86fce66f356099792b7231c9a1d949ff875e.zip |
update prettier
Diffstat (limited to 'server/sonar-web/src/main/js/components/issue')
14 files changed, 89 insertions, 79 deletions
diff --git a/server/sonar-web/src/main/js/components/issue/IssueView.js b/server/sonar-web/src/main/js/components/issue/IssueView.js index 5800390c44c..49de5e25b6c 100644 --- a/server/sonar-web/src/main/js/components/issue/IssueView.js +++ b/server/sonar-web/src/main/js/components/issue/IssueView.js @@ -102,29 +102,31 @@ export default class IssueView extends React.PureComponent { onChange={this.props.onChange} /> {issue.comments && - issue.comments.length > 0 && + issue.comments.length > 0 && ( <div className="issue-comments"> - {issue.comments.map(comment => + {issue.comments.map(comment => ( <IssueCommentLine comment={comment} key={comment.key} onEdit={this.editComment} onDelete={this.deleteComment} /> - )} - </div>} + ))} + </div> + )} <a className="issue-navigate js-issue-navigate"> <i className="issue-navigate-to-left icon-chevron-left" /> <i className="issue-navigate-to-right icon-chevron-right" /> </a> - {hasCheckbox && + {hasCheckbox && ( <a className="js-toggle issue-checkbox-container" href="#" onClick={this.handleCheck}> <i className={classNames('issue-checkbox', 'icon-checkbox', { 'icon-checkbox-checked': this.props.checked })} /> - </a>} + </a> + )} </div> ); } diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js index 03837602471..f36ac5d3504 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js @@ -136,13 +136,14 @@ export default class IssueActionsBar extends React.PureComponent { togglePopup={this.props.togglePopup} /> </li> - {issue.effort && + {issue.effort && ( <li className="issue-meta"> <span className="issue-meta-label"> {translateWithParameters('issue.x_effort', issue.effort)} </span> - </li>} - {canComment && + </li> + )} + {canComment && ( <IssueCommentAction commentPlaceholder={this.state.commentPlaceholder} currentPopup={this.props.currentPopup} @@ -150,7 +151,8 @@ export default class IssueActionsBar extends React.PureComponent { onChange={this.props.onChange} onFail={this.props.onFail} toggleComment={this.toggleComment} - />} + /> + )} </ul> </td> <td className="issue-table-meta-cell"> diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js index 249c9ae969d..ba6e67dda76 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js @@ -47,7 +47,7 @@ export default class IssueAssign extends React.PureComponent { const { issue } = this.props; return ( <span> - {issue.assignee && + {issue.assignee && ( <span className="text-top"> <Avatar className="little-spacer-right" @@ -55,7 +55,8 @@ export default class IssueAssign extends React.PureComponent { name={issue.assigneeName} size={16} /> - </span>} + </span> + )} <span className="issue-meta-label"> {issue.assignee ? issue.assigneeName : translate('unassigned')} </span> diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js index 4c11eb707e6..e0b1a93556b 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js @@ -69,9 +69,5 @@ export default function IssueChangelogDiff(props /*: { diff: ChangelogDiff } */) } message += ` (${translateWithParameters('issue.changelog.was', oldValue)})`; } - return ( - <p> - {message} - </p> - ); + return <p>{message}</p>; } diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js index b756e185da9..c427818c403 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js @@ -69,9 +69,7 @@ export default class IssueCommentAction extends React.PureComponent { <button className="button-link issue-action js-issue-comment" onClick={this.handleCommentClick}> - <span className="issue-meta-label"> - {translate('issue.comment.formlink')} - </span> + <span className="issue-meta-label">{translate('issue.comment.formlink')}</span> </button> </BubblePopupHelper> </li> diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js index aa6eeb9013f..f6c73044282 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js @@ -101,7 +101,7 @@ export default class IssueCommentLine extends React.PureComponent { <DateFromNow date={comment.createdAt} /> </div> <div className="issue-comment-actions"> - {comment.updatable && + {comment.updatable && ( <BubblePopupHelper className="bubble-popup-helper-inline" isOpen={this.state.openPopup === 'edit'} @@ -121,8 +121,9 @@ export default class IssueCommentLine extends React.PureComponent { className="js-issue-comment-edit button-link icon-edit icon-half-transparent" onClick={this.toggleEditPopup} /> - </BubblePopupHelper>} - {comment.updatable && + </BubblePopupHelper> + )} + {comment.updatable && ( <BubblePopupHelper className="bubble-popup-helper-inline" isOpen={this.state.openPopup === 'delete'} @@ -134,7 +135,8 @@ export default class IssueCommentLine extends React.PureComponent { className="js-issue-comment-delete button-link icon-delete icon-half-transparent" onClick={this.toggleDeletePopup} /> - </BubblePopupHelper>} + </BubblePopupHelper> + )} </div> </div> ); diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js index 82aa5852ef4..97bf195fdac 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js @@ -58,9 +58,7 @@ export default function IssueTitleBar(props /*: Props */) { formatMeasure(locationsCount) )} placement="left"> - <LocationIndex> - {locationsCount} - </LocationIndex> + <LocationIndex>{locationsCount}</LocationIndex> </Tooltip> ); @@ -91,20 +89,24 @@ export default function IssueTitleBar(props /*: Props */) { onFail={props.onFail} /> </li> - {issue.textRange != null && + {issue.textRange != null && ( <li className="issue-meta"> <span className="issue-meta-label" title={translate('line_number')}> L{issue.textRange.endLine} </span> - </li>} - {locationsCount > 0 && + </li> + )} + {locationsCount > 0 && ( <li className="issue-meta"> - {onIssuesPage - ? locationsBadge - : <Link onClick={stopPropagation} target="_blank" to={issueUrl}> - {locationsBadge} - </Link>} - </li>} + {onIssuesPage ? ( + locationsBadge + ) : ( + <Link onClick={stopPropagation} target="_blank" to={issueUrl}> + {locationsBadge} + </Link> + )} + </li> + )} <li className="issue-meta"> <Link className="js-issue-permalink link-no-underline" @@ -114,7 +116,7 @@ export default function IssueTitleBar(props /*: Props */) { <LinkIcon /> </Link> </li> - {hasSimilarIssuesFilter && + {hasSimilarIssuesFilter && ( <li className="issue-meta"> <SimilarIssuesFilter isOpen={props.currentPopup === 'similarIssues'} @@ -123,7 +125,8 @@ export default function IssueTitleBar(props /*: Props */) { onFail={props.onFail} onFilter={props.onFilter} /> - </li>} + </li> + )} </ul> </td> </tr> diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js index 007163c6666..02e2bce9e13 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js @@ -66,5 +66,10 @@ it('should count all code locations', () => { secondaryLocations: [{}, {}] }; const element = shallow(<IssueTitleBar issue={issueWithLocations} />); - expect(element.find('LocationIndex').children().text()).toBe('7'); + expect( + element + .find('LocationIndex') + .children() + .text() + ).toBe('7'); }); diff --git a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js index 01549d5dac7..ac9bfa546bb 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js @@ -93,13 +93,13 @@ export default class ChangelogPopup extends React.PureComponent { </td> </tr> - {this.state.changelogs.map((item, idx) => + {this.state.changelogs.map((item, idx) => ( <tr key={idx}> <td className="thin text-left text-top nowrap"> <DateTimeFormatter date={item.creationDate} /> </td> <td className="text-left text-top"> - {item.userName && + {item.userName && ( <p> <Avatar className="little-spacer-right" @@ -108,11 +108,12 @@ export default class ChangelogPopup extends React.PureComponent { size={16} /> {item.userName} - </p>} + </p> + )} {item.diffs.map(diff => <IssueChangelogDiff key={diff.key} diff={diff} />)} </td> </tr> - )} + ))} </tbody> </table> </div> diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js index 428efc6a6b9..aed14996166 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js @@ -33,9 +33,7 @@ export default function CommentDeletePopup(props /*: Props */) { return ( <BubblePopup position={props.popupPosition} customClass="bubble-popup-bottom-right"> <div className="text-right"> - <div className="spacer-bottom"> - {translate('issue.comment.delete_confirm_message')} - </div> + <div className="spacer-bottom">{translate('issue.comment.delete_confirm_message')}</div> <button className="button-red" onClick={props.onDelete}> {translate('delete')} </button> diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js index 074f3345ba5..9c6b6187c65 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js @@ -145,23 +145,24 @@ export default class SetAssigneePopup extends React.PureComponent { items={map(this.state.users, 'login')} currentItem={this.state.currentUser} onSelect={this.props.onSelect}> - {this.state.users.map(user => + {this.state.users.map(user => ( <SelectListItem key={user.login} item={user.login}> - {!!user.login && + {!!user.login && ( <Avatar className="spacer-right" email={user.email} hash={user.avatar} name={user.name} size={16} - />} + /> + )} <span className="vertical-middle" style={{ marginLeft: !user.login ? 24 : undefined }}> {user.name} </span> </SelectListItem> - )} + ))} </SelectList> </div> </BubblePopup> diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js index 033ea8e72a8..35c98b4a389 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js @@ -48,12 +48,12 @@ export default class SetSeverityPopup extends React.PureComponent { items={SEVERITY} currentItem={this.props.issue.severity} onSelect={this.props.onSelect}> - {SEVERITY.map(severity => + {SEVERITY.map(severity => ( <SelectListItem key={severity} item={severity}> <SeverityIcon className="little-spacer-right" severity={severity} /> {translate('severity', severity)} </SelectListItem> - )} + ))} </SelectList> </BubblePopup> ); diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js index e3c4d466f28..9085235dea4 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js @@ -48,12 +48,12 @@ export default class SetTypePopup extends React.PureComponent { items={TYPES} currentItem={this.props.issue.type} onSelect={this.props.onSelect}> - {TYPES.map(type => + {TYPES.map(type => ( <SelectListItem key={type} item={type}> <IssueTypeIcon className="little-spacer-right" query={type} /> {translate('issue.type', type)} </SelectListItem> - )} + ))} </SelectList> </BubblePopup> ); diff --git a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js index 4a2642f01ac..ca556766fc9 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js @@ -68,9 +68,7 @@ export default class SimilarIssuesPopup extends React.PureComponent { position={this.props.popupPosition} customClass="bubble-popup-menu bubble-popup-bottom-right"> <header className="menu-search"> - <h6> - {translate('issue.filter_similar_issues')} - </h6> + <h6>{translate('issue.filter_similar_issues')}</h6> </header> <SelectList currentItem={items[0]} items={items} onSelect={this.handleSelect}> @@ -88,48 +86,51 @@ export default class SimilarIssuesPopup extends React.PureComponent { </SelectListItem> <SelectListItem item="resolution"> - {issue.resolution != null - ? translate('issue.resolution', issue.resolution) - : translate('unresolved')} + {issue.resolution != null ? ( + translate('issue.resolution', issue.resolution) + ) : ( + translate('unresolved') + )} </SelectListItem> <SelectListItem item="assignee"> - {issue.assignee != null - ? <span> - {translate('assigned_to')} - <Avatar - className="little-spacer-left little-spacer-right" - hash={issue.assigneeAvatar} - name={issue.assigneeName} - size={16} - /> - {issue.assigneeName} - </span> - : translate('unassigned')} + {issue.assignee != null ? ( + <span> + {translate('assigned_to')} + <Avatar + className="little-spacer-left little-spacer-right" + hash={issue.assigneeAvatar} + name={issue.assigneeName} + size={16} + /> + {issue.assigneeName} + </span> + ) : ( + translate('unassigned') + )} </SelectListItem> - <SelectListItem item="rule"> - {limitComponentName(issue.ruleName)} - </SelectListItem> + <SelectListItem item="rule">{limitComponentName(issue.ruleName)}</SelectListItem> {issue.tags != null && - issue.tags.map(tag => + issue.tags.map(tag => ( <SelectListItem key={`tag###${tag}`} item={`tag###${tag}`}> <i className="icon-tags icon-half-transparent little-spacer-right" /> {tag} </SelectListItem> - )} + ))} <SelectListItem item="project"> <QualifierIcon className="little-spacer-right" qualifier="TRK" /> {issue.projectName} </SelectListItem> - {issue.subProject != null && + {issue.subProject != null && ( <SelectListItem item="module"> <QualifierIcon className="little-spacer-right" qualifier="BRC" /> {issue.subProjectName} - </SelectListItem>} + </SelectListItem> + )} <SelectListItem item="file"> <QualifierIcon className="little-spacer-right" qualifier={issue.componentQualifier} /> |