From 9dd6aeea5e0d6feb061ae3084f7609242592d644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarik=20G=C3=BCrsoy?= Date: Tue, 7 Nov 2023 09:06:09 +0100 Subject: [PATCH] Diff path line break MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A line break has been added to the diff path, so that it always displays the full path and filename Co-authored-by: Eduard Heimbuch Pushed-by: Tarik Gürsoy Pushed-by: Konstantin Schaper Pushed-by: Eduard Heimbuch Co-authored-by: Tarik Gürsoy --- gradle/changelog/linebreak_diff.yaml | 2 + .../src/__resources__/Diff.simple.ts | 6 +- .../src/__snapshots__/storyshots.test.ts.snap | 268 +++++++++--------- .../src/repos/diff/LazyDiffFile.tsx | 9 +- 4 files changed, 146 insertions(+), 139 deletions(-) create mode 100644 gradle/changelog/linebreak_diff.yaml diff --git a/gradle/changelog/linebreak_diff.yaml b/gradle/changelog/linebreak_diff.yaml new file mode 100644 index 0000000000..87097af987 --- /dev/null +++ b/gradle/changelog/linebreak_diff.yaml @@ -0,0 +1,2 @@ +- type: changed + description: Break paths in diff diff --git a/scm-ui/ui-components/src/__resources__/Diff.simple.ts b/scm-ui/ui-components/src/__resources__/Diff.simple.ts index db667d2423..88dc21b0cd 100644 --- a/scm-ui/ui-components/src/__resources__/Diff.simple.ts +++ b/scm-ui/ui-components/src/__resources__/Diff.simple.ts @@ -22,10 +22,10 @@ * SOFTWARE. */ -export default `diff --git a/src/main/java/com/cloudogu/scm/review/events/EventListener.java b/src/main/java/com/cloudogu/scm/review/events/EventListener.java +export default `diff --git a/src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java b/src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java index f889f9c..95e3b10 100644 ---- a/src/main/java/com/cloudogu/scm/review/events/EventListener.java -+++ b/src/main/java/com/cloudogu/scm/review/events/EventListener.java +--- a/src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java ++++ b/src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java @@ -1,20 +1,12 @@ package com.cloudogu.scm.review.events; diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap index c73715e8ee..3127877463 100644 --- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap +++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap @@ -22832,7 +22832,7 @@ exports[`Storyshots Repositories/Diff Binaries 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -23047,7 +23047,7 @@ exports[`Storyshots Repositories/Diff Binaries 1`] = ` title="conflict.png" >

conflict.png

@@ -23090,7 +23090,7 @@ exports[`Storyshots Repositories/Diff Changing Content 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -24679,7 +24679,7 @@ exports[`Storyshots Repositories/Diff Changing Content 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -25203,7 +25203,7 @@ exports[`Storyshots Repositories/Diff Changing Content 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -25727,7 +25727,7 @@ exports[`Storyshots Repositories/Diff Changing Content 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -26941,7 +26941,7 @@ exports[`Storyshots Repositories/Diff Changing Content 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -27495,7 +27495,7 @@ exports[`Storyshots Repositories/Diff Collapsed 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -27733,7 +27733,7 @@ exports[`Storyshots Repositories/Diff Collapsed 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -27842,7 +27842,7 @@ exports[`Storyshots Repositories/Diff Collapsed 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -27951,7 +27951,7 @@ exports[`Storyshots Repositories/Diff Collapsed 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -28060,7 +28060,7 @@ exports[`Storyshots Repositories/Diff Collapsed 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -28158,7 +28158,7 @@ exports[`Storyshots Repositories/Diff CollapsingWithFunction 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -29107,7 +29107,7 @@ exports[`Storyshots Repositories/Diff CollapsingWithFunction 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -29559,7 +29559,7 @@ exports[`Storyshots Repositories/Diff CollapsingWithFunction 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -30011,7 +30011,7 @@ exports[`Storyshots Repositories/Diff CollapsingWithFunction 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -30084,7 +30084,7 @@ exports[`Storyshots Repositories/Diff CollapsingWithFunction 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -30227,7 +30227,7 @@ exports[`Storyshots Repositories/Diff Expandable 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -31816,7 +31816,7 @@ exports[`Storyshots Repositories/Diff Expandable 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -32340,7 +32340,7 @@ exports[`Storyshots Repositories/Diff Expandable 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -32864,7 +32864,7 @@ exports[`Storyshots Repositories/Diff Expandable 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -34078,7 +34078,7 @@ exports[`Storyshots Repositories/Diff Expandable 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -34631,7 +34631,7 @@ exports[`Storyshots Repositories/Diff External state management 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -36220,7 +36220,7 @@ exports[`Storyshots Repositories/Diff External state management 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -36744,7 +36744,7 @@ exports[`Storyshots Repositories/Diff External state management 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -37268,7 +37268,7 @@ exports[`Storyshots Repositories/Diff External state management 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -38482,7 +38482,7 @@ exports[`Storyshots Repositories/Diff External state management 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -39035,7 +39035,7 @@ exports[`Storyshots Repositories/Diff File Annotation 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

Custom File annotation for - src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -40498,7 +40498,7 @@ exports[`Storyshots Repositories/Diff File Annotation 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -40954,7 +40954,7 @@ exports[`Storyshots Repositories/Diff File Annotation 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -41410,7 +41410,7 @@ exports[`Storyshots Repositories/Diff File Annotation 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -42473,7 +42473,7 @@ exports[`Storyshots Repositories/Diff File Annotation 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -42993,7 +42993,7 @@ exports[`Storyshots Repositories/Diff File Controls 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -44478,7 +44478,7 @@ exports[`Storyshots Repositories/Diff File Controls 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -44945,7 +44945,7 @@ exports[`Storyshots Repositories/Diff File Controls 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -45412,7 +45412,7 @@ exports[`Storyshots Repositories/Diff File Controls 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -46486,7 +46486,7 @@ exports[`Storyshots Repositories/Diff File Controls 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -47037,7 +47037,7 @@ exports[`Storyshots Repositories/Diff Highlight line on hover 1`] = ` onKeyPress={[Function]} />

src/main/java/com/cloudogu/scm/review/pullrequest/service/DefaultPullRequestService.java

@@ -47880,7 +47880,7 @@ exports[`Storyshots Repositories/Diff Hunk gutter hover icon 1`] = ` onKeyPress={[Function]} />

src/main/java/com/cloudogu/scm/review/pullrequest/service/DefaultPullRequestService.java

@@ -48723,7 +48723,7 @@ exports[`Storyshots Repositories/Diff Hunks 1`] = ` onKeyPress={[Function]} />

src/main/java/com/cloudogu/scm/review/pullrequest/service/DefaultPullRequestService.java

@@ -49561,7 +49561,7 @@ exports[`Storyshots Repositories/Diff Images 1`] = ` title="test.png" >

test.png

@@ -49598,7 +49598,7 @@ exports[`Storyshots Repositories/Diff Images 1`] = ` title="test.png" >

test.png

@@ -49635,7 +49635,7 @@ exports[`Storyshots Repositories/Diff Images 1`] = ` title="test.png" >

test.png

@@ -49672,7 +49672,7 @@ exports[`Storyshots Repositories/Diff Images 1`] = ` title="newFileName.png > test.png" >

newFileName.png @@ -49717,7 +49717,7 @@ exports[`Storyshots Repositories/Diff Images 1`] = ` title="newFileName.png > test.png" >

newFileName.png @@ -49756,7 +49756,7 @@ exports[`Storyshots Repositories/Diff Line Annotation 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -51235,7 +51235,7 @@ exports[`Storyshots Repositories/Diff Line Annotation 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -51687,7 +51687,7 @@ exports[`Storyshots Repositories/Diff Line Annotation 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -52139,7 +52139,7 @@ exports[`Storyshots Repositories/Diff Line Annotation 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -53198,7 +53198,7 @@ exports[`Storyshots Repositories/Diff Line Annotation 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -53726,7 +53726,7 @@ exports[`Storyshots Repositories/Diff OnClick 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -55283,7 +55283,7 @@ exports[`Storyshots Repositories/Diff OnClick 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -55765,7 +55765,7 @@ exports[`Storyshots Repositories/Diff OnClick 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -56247,7 +56247,7 @@ exports[`Storyshots Repositories/Diff OnClick 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -57382,7 +57382,7 @@ exports[`Storyshots Repositories/Diff OnClick 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -57934,7 +57934,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -59572,7 +59572,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -60076,7 +60076,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -60580,7 +60580,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -61808,7 +61808,7 @@ exports[`Storyshots Repositories/Diff Side-By-Side 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -62417,7 +62417,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting (Markdown) 1`] = ` onKeyPress={[Function]} />

CHANGELOG.md

@@ -62758,7 +62758,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -64213,7 +64213,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -64665,7 +64665,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -65117,7 +65117,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -66176,7 +66176,7 @@ exports[`Storyshots Repositories/Diff SyntaxHighlighting 1`] = ` onKeyPress={[Function]} />

Main.java

@@ -66692,7 +66692,7 @@ exports[`Storyshots Repositories/Diff WithLinkToFile 1`] = `

- src/main/java/com/cloudogu/scm/review/events/EventListener.java + src/main/java/com/cloudogu/scm/review/importantevents/EventListener.java

src/main/js/ChangeNotification.tsx

@@ -68281,7 +68281,7 @@ exports[`Storyshots Repositories/Diff WithLinkToFile 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/de/plugins.json

@@ -68805,7 +68805,7 @@ exports[`Storyshots Repositories/Diff WithLinkToFile 1`] = ` onKeyPress={[Function]} />

src/main/resources/locales/en/plugins.json

@@ -69329,7 +69329,7 @@ exports[`Storyshots Repositories/Diff WithLinkToFile 1`] = ` onKeyPress={[Function]} />

src/test/java/com/cloudogu/scm/review/events/ClientTest.java

@@ -70543,7 +70543,7 @@ exports[`Storyshots Repositories/Diff WithLinkToFile 1`] = ` onKeyPress={[Function]} />

Main.java

diff --git a/scm-ui/ui-components/src/repos/diff/LazyDiffFile.tsx b/scm-ui/ui-components/src/repos/diff/LazyDiffFile.tsx index ee75e6cdaf..cf160eb2ac 100644 --- a/scm-ui/ui-components/src/repos/diff/LazyDiffFile.tsx +++ b/scm-ui/ui-components/src/repos/diff/LazyDiffFile.tsx @@ -41,9 +41,14 @@ import DiffFileHunk from "./DiffFileHunk"; import { DiffFileProps } from "./types"; import { useContentType } from "@scm-manager/ui-api"; import BinaryDiffFileContent, { canDisplayBinaryFile } from "./BinaryDiffFileContent"; +import styled from "styled-components"; type Props = DiffFileProps; +const Filepath = styled.h4` + word-break: break-all; +`; + const DiffFile: FC = ({ file: fileProp, isCollapsed: isCollapsedProp, @@ -266,9 +271,9 @@ const DiffFile: FC = ({ id={getAnchorId(file)} > {canRenderContent ? collapseIcon : null} -

+ -

+