From 78e31f690aab7a37c212524eababc1610ee5604f Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 10 Feb 2020 15:33:32 +0100 Subject: [PATCH] Use icon only button for diff file controls --- CHANGELOG.md | 1 + .../src/__snapshots__/storyshots.test.ts.snap | 2072 +++++++---------- .../ui-components/src/repos/Diff.stories.tsx | 11 +- scm-ui/ui-components/src/repos/DiffButton.tsx | 31 + scm-ui/ui-components/src/repos/DiffFile.tsx | 8 +- scm-ui/ui-components/src/repos/index.ts | 1 + 6 files changed, 861 insertions(+), 1263 deletions(-) create mode 100644 scm-ui/ui-components/src/repos/DiffButton.tsx diff --git a/CHANGELOG.md b/CHANGELOG.md index 91c606239d..a4f080c9e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Option to use a function for default collapse state in diffs ### Changed +- Use icon only buttons for diff file controls - Upgrade [Legman](https://github.com/sdorra/legman) to v1.6.2 in order to fix execution on Java versions > 8 - Upgrade [Lombok](https://projectlombok.org/) to version 1.18.10 in order to fix build on Java versions > 8 - Upgrade [Mockito](https://site.mockito.org/) to version 2.28.2 in order to fix tests on Java versions > 8 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 0ce3f8dd2a..27ba6d833c 100644 --- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap +++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap @@ -485,16 +485,16 @@ exports[`Storyshots DateFromNow Default 1`] = ` exports[`Storyshots Diff Binaries 1`] = ` Array [
@@ -502,18 +502,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
@@ -704,26 +696,26 @@ Array [
,
conflict.png add @@ -755,16 +747,16 @@ Array [ exports[`Storyshots Diff Collapsed 1`] = ` Array [
@@ -772,18 +764,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -815,16 +799,16 @@ Array [
,
@@ -832,18 +816,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -875,16 +851,16 @@ Array [
,
@@ -892,18 +868,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -935,16 +903,16 @@ Array [
,
@@ -952,18 +920,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -995,16 +955,16 @@ Array [
,
@@ -1012,18 +972,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -1055,16 +1007,16 @@ Array [
,
@@ -1072,18 +1024,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> Main.java modify
- + +
@@ -1120,16 +1064,16 @@ Array [ exports[`Storyshots Diff CollapsingWithFunction 1`] = ` Array [
@@ -1137,18 +1081,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -1180,16 +1116,16 @@ Array [
,
@@ -1197,18 +1133,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -1452,7 +1380,7 @@ Array [ colSpan={3} >
@@ -2035,16 +1963,16 @@ Array [
,
@@ -2052,18 +1980,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -2486,16 +2406,16 @@ Array [
,
@@ -2503,18 +2423,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -2937,16 +2849,16 @@ Array [
,
@@ -2954,18 +2866,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -2997,16 +2901,16 @@ Array [
,
@@ -3014,18 +2918,18 @@ Array [ className="fas fa-angle-right has-text-inherit" /> Main.java modify
- + +
@@ -3062,16 +2958,16 @@ Array [ exports[`Storyshots Diff Default 1`] = ` Array [
@@ -3079,18 +2975,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -3640,16 +3528,16 @@ Array [
,
@@ -3657,18 +3545,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -3912,7 +3792,7 @@ Array [ colSpan={3} >
@@ -4495,16 +4375,16 @@ Array [
,
@@ -4512,18 +4392,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -4946,16 +4818,16 @@ Array [
,
@@ -4963,18 +4835,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -5397,16 +5261,16 @@ Array [
,
@@ -5414,18 +5278,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -5986,7 +5842,7 @@ Array [ colSpan={3} >
@@ -6200,7 +6056,7 @@ Array [ colSpan={3} >
@@ -6455,16 +6311,16 @@ Array [
,
@@ -6472,18 +6328,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
@@ -6986,16 +6834,16 @@ Array [ exports[`Storyshots Diff File Annotation 1`] = ` Array [
@@ -7003,18 +6851,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -7568,16 +7408,16 @@ Array [
,
@@ -7585,18 +7425,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -7844,7 +7676,7 @@ Array [ colSpan={3} >
@@ -8427,16 +8259,16 @@ Array [
,
@@ -8444,18 +8276,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -8882,16 +8706,16 @@ Array [
,
@@ -8899,18 +8723,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -9337,16 +9153,16 @@ Array [
,
@@ -9354,18 +9170,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -9930,7 +9738,7 @@ Array [ colSpan={3} >
@@ -10144,7 +9952,7 @@ Array [ colSpan={3} >
@@ -10399,16 +10207,16 @@ Array [
,
@@ -10416,18 +10224,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
@@ -10934,16 +10734,16 @@ Array [ exports[`Storyshots Diff File Controls 1`] = ` Array [
@@ -10951,18 +10751,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
- + +
@@ -11524,16 +11317,16 @@ Array [
,
@@ -11541,18 +11334,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
- + +
@@ -11808,7 +11594,7 @@ Array [ colSpan={3} >
@@ -12391,16 +12177,16 @@ Array [
,
@@ -12408,18 +12194,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
- + +
@@ -12854,16 +12633,16 @@ Array [
,
@@ -12871,18 +12650,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
- + +
@@ -13317,16 +13089,16 @@ Array [
,
@@ -13334,18 +13106,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
- + +
@@ -13918,7 +13683,7 @@ Array [ colSpan={3} >
@@ -14132,7 +13897,7 @@ Array [ colSpan={3} >
@@ -14387,16 +14152,16 @@ Array [
,
@@ -14404,18 +14169,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
- + +
@@ -14929,16 +14687,16 @@ Array [ exports[`Storyshots Diff Hunks 1`] = `
@@ -14946,18 +14704,18 @@ exports[`Storyshots Diff Hunks 1`] = ` className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/pullrequest/service/DefaultPullRequestService.java modify
- + +
@@ -15224,7 +14974,7 @@ exports[`Storyshots Diff Hunks 1`] = ` colSpan={3} >
@@ -15415,7 +15165,7 @@ exports[`Storyshots Diff Hunks 1`] = ` colSpan={3} >
@@ -15766,16 +15516,16 @@ exports[`Storyshots Diff Hunks 1`] = ` exports[`Storyshots Diff Line Annotation 1`] = ` Array [
@@ -15783,18 +15533,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -16356,16 +16098,16 @@ Array [
,
@@ -16373,18 +16115,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -16640,7 +16374,7 @@ Array [ colSpan={3} >
@@ -17223,16 +16957,16 @@ Array [
,
@@ -17240,18 +16974,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -17674,16 +17400,16 @@ Array [
,
@@ -17691,18 +17417,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -18125,16 +17843,16 @@ Array [
,
@@ -18142,18 +17860,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -18714,7 +18424,7 @@ Array [ colSpan={3} >
@@ -18928,7 +18638,7 @@ Array [ colSpan={3} >
@@ -19183,16 +18893,16 @@ Array [
,
@@ -19200,18 +18910,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
@@ -19726,16 +19428,16 @@ Array [ exports[`Storyshots Diff OnClick 1`] = ` Array [
@@ -19743,18 +19445,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -20344,16 +20038,16 @@ Array [
,
@@ -20361,18 +20055,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -20630,7 +20316,7 @@ Array [ colSpan={3} >
@@ -21261,16 +20947,16 @@ Array [
,
@@ -21278,18 +20964,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -21742,16 +21420,16 @@ Array [
,
@@ -21759,18 +21437,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -22223,16 +21893,16 @@ Array [
,
@@ -22240,18 +21910,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -22852,7 +22514,7 @@ Array [ colSpan={3} >
@@ -23082,7 +22744,7 @@ Array [ colSpan={3} >
@@ -23357,16 +23019,16 @@ Array [
,
@@ -23374,18 +23036,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
@@ -23924,16 +23578,16 @@ Array [ exports[`Storyshots Diff Side-By-Side 1`] = ` Array [
@@ -23941,18 +23595,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -24595,16 +24241,16 @@ Array [
,
@@ -24612,18 +24258,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -24911,7 +24549,7 @@ Array [ colSpan={4} >
@@ -25540,16 +25178,16 @@ Array [
,
@@ -25557,18 +25195,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -26043,16 +25673,16 @@ Array [
,
@@ -26060,18 +25690,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -26546,16 +26168,16 @@ Array [
,
@@ -26563,18 +26185,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -27246,7 +26860,7 @@ Array [ colSpan={4} >
@@ -27488,7 +27102,7 @@ Array [ colSpan={4} >
@@ -27773,16 +27387,16 @@ Array [
,
@@ -27790,18 +27404,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
@@ -28377,16 +27983,16 @@ Array [ exports[`Storyshots Diff SyntaxHighlighting 1`] = ` Array [
@@ -28394,18 +28000,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/java/com/cloudogu/scm/review/events/EventListener.java modify
- + +
@@ -28955,16 +28553,16 @@ Array [
,
@@ -28972,18 +28570,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/js/ChangeNotification.tsx modify
- + +
@@ -29227,7 +28817,7 @@ Array [ colSpan={3} >
@@ -29810,16 +29400,16 @@ Array [
,
@@ -29827,18 +29417,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/de/plugins.json modify
- + +
@@ -30261,16 +29843,16 @@ Array [
,
@@ -30278,18 +29860,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/main/resources/locales/en/plugins.json modify
- + +
@@ -30712,16 +30286,16 @@ Array [
,
@@ -30729,18 +30303,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> src/test/java/com/cloudogu/scm/review/events/ClientTest.java modify
- + +
@@ -31301,7 +30867,7 @@ Array [ colSpan={3} >
@@ -31515,7 +31081,7 @@ Array [ colSpan={3} >
@@ -31770,16 +31336,16 @@ Array [
,
@@ -31787,18 +31353,18 @@ Array [ className="fas fa-angle-down has-text-inherit" /> Main.java modify
- + +
@@ -32300,7 +31858,7 @@ Array [ exports[`Storyshots Forms|Checkbox Default 1`] = `