Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-06 08:37:13 +02:00
Code Issues Packages Projects Releases Activity

Merged in bugfix/hide_side_by_side_in_empty_diff (pull request #393)

Browse Source 
Hide 'side by side' button when there is no diff
This commit is contained in:
Eduard Heimbuch
2020-01-16 14:03:09 +00:00
parent 24049dcd87 3a18d346ef
commit f1aa469293
2 changed files with 16 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
View File

@@ -728,35 +728,6 @@ Array [
add
</span>
</div>
<div
className="sc-jTzLTM ljPywG level-right is-flex"
>
<div
className="field is-grouped"
>
<div
className="control"
>
<button
className="button is-default is-reduced-mobile"
onClick={[Function]}
type="button"
>
<span
className="icon is-medium"
>
<i
className="fas fa-columns has-text-inherit"
/>
</span>
<span>
diff.sideBySide
</span>
</button>
</div>
</div>
</div>
</div>
</div>
<div

28
scm-ui/ui-components/src/repos/DiffFile.tsx
View File

@@ -271,8 +271,22 @@ class DiffFile extends React.Component<Props, State> {
);
}
const collapseIcon = this.hasContent(file) ? <Icon name={icon} color="inherit" /> : null;
const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
const sideBySideToggle =
file.hunks && file.hunks.length > 0 ? (
<ButtonWrapper className={classNames("level-right", "is-flex")}>
<ButtonGroup>
<Button
action={this.toggleSideBySide}
icon={sideBySide ? "align-left" : "columns"}
label={t(sideBySide ? "diff.combined" : "diff.sideBySide")}
reducedMobile={true}
/>
{fileControls}
</ButtonGroup>
</ButtonWrapper>
) : null;
return (
<DiffFilePanel className={classNames("panel", "is-size-6")} collapsed={(file && file.isBinary) || collapsed}>
<div className="panel-heading">
@@ -288,17 +302,7 @@ class DiffFile extends React.Component<Props, State> {
</TitleWrapper>
{this.renderChangeTag(file)}
</FullWidthTitleHeader>
<ButtonWrapper className={classNames("level-right", "is-flex")}>
<ButtonGroup>
<Button
action={this.toggleSideBySide}
icon={sideBySide ? "align-left" : "columns"}
label={t(sideBySide ? "diff.combined" : "diff.sideBySide")}
reducedMobile={true}
/>
{fileControls}
</ButtonGroup>
</ButtonWrapper>
{sideBySideToggle}
</FlexWrapLevel>
</div>
{body}