Browse Source

SONAR-11067 Align status dots in Branches Admin page

tags/7.5
Stas Vilchik 5 years ago
parent
commit
adbae423e8

+ 1
- 1
server/sonar-web/src/main/js/apps/projectBranches/components/App.tsx View File

@@ -136,7 +136,7 @@ export default class App extends React.PureComponent<Props, State> {
<thead>
<tr>
<th>{translate('branch')}</th>
<th className="thin nowrap text-right">{translate('status')}</th>
<th className="thin nowrap">{translate('status')}</th>
<th className="thin nowrap text-right big-spacer-left">
{translate('branches.last_analysis_date')}
</th>

+ 2
- 2
server/sonar-web/src/main/js/apps/projectBranches/components/BranchRow.tsx View File

@@ -172,8 +172,8 @@ export default class BranchRow extends React.PureComponent<Props, State> {
<div className="outline-badge spacer-left">{translate('branches.main_branch')}</div>
)}
</td>
<td className="thin nowrap text-right">
<BranchStatus branchLike={branchLike} helpTooltipClassName="table-cell-doc" />
<td className="thin nowrap">
<BranchStatus branchLike={branchLike} />
</td>
<td className="thin nowrap text-right big-spacer-left">
{branchLike.analysisDate && <DateFromNow date={branchLike.analysisDate} />}

+ 1
- 1
server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/App-test.tsx.snap View File

@@ -62,7 +62,7 @@ exports[`renders sorted list of branches 1`] = `
branch
</th>
<th
className="thin nowrap text-right"
className="thin nowrap"
>
status
</th>

+ 3
- 6
server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchRow-test.tsx.snap View File

@@ -20,7 +20,7 @@ exports[`renders main branch 1`] = `
</div>
</td>
<td
className="thin nowrap text-right"
className="thin nowrap"
>
<BranchStatus
branchLike={
@@ -29,7 +29,6 @@ exports[`renders main branch 1`] = `
"name": "master",
}
}
helpTooltipClassName="table-cell-doc"
/>
</td>
<td
@@ -69,7 +68,7 @@ exports[`renders pull request 1`] = `
1234 – Feature PR
</td>
<td
className="thin nowrap text-right"
className="thin nowrap"
>
<BranchStatus
branchLike={
@@ -80,7 +79,6 @@ exports[`renders pull request 1`] = `
"title": "Feature PR",
}
}
helpTooltipClassName="table-cell-doc"
/>
</td>
<td
@@ -122,7 +120,7 @@ exports[`renders short-living branch 1`] = `
feature
</td>
<td
className="thin nowrap text-right"
className="thin nowrap"
>
<BranchStatus
branchLike={
@@ -134,7 +132,6 @@ exports[`renders short-living branch 1`] = `
"type": "SHORT",
}
}
helpTooltipClassName="table-cell-doc"
/>
</td>
<td

+ 2
- 4
server/sonar-web/src/main/js/components/common/BranchStatus.tsx View File

@@ -18,7 +18,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
import * as classNames from 'classnames';
import StatusIndicator from './StatusIndicator';
import Level from '../ui/Level';
import BugIcon from '../icons-components/BugIcon';
@@ -40,10 +39,9 @@ import './BranchStatus.css';
interface Props {
branchLike: T.BranchLike;
concise?: boolean;
helpTooltipClassName?: string;
}

export default function BranchStatus({ branchLike, concise = false, helpTooltipClassName }: Props) {
export default function BranchStatus({ branchLike, concise = false }: Props) {
if (isShortLivingBranch(branchLike) || isPullRequest(branchLike)) {
if (!branchLike.status) {
return null;
@@ -89,7 +87,7 @@ export default function BranchStatus({ branchLike, concise = false, helpTooltipC
</li>
{shouldDisplayHelper && (
<HelpTooltip
className={classNames('spacer-left', helpTooltipClassName)}
className="spacer-left"
overlay={translateWithParameters(
'branches.short_lived.quality_gate.description',
totalIssues

Loading…
Cancel
Save