From c1fb6bab532cb4e803e1b54e5bacd08e959f241e Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 16 Jan 2019 16:25:18 +0100 Subject: [PATCH 1/7] Changed handling of changeset description extension point --- .../src/repos/changesets/ChangesetRow.js | 19 ++++++--- .../components/changesets/ChangesetDetails.js | 41 +++++++++++-------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js index ef9de9bfe5..d74e3631d1 100644 --- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js +++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js @@ -3,15 +3,16 @@ import React from "react"; import type { Changeset, Repository, Tag } from "@scm-manager/ui-types"; import classNames from "classnames"; -import {Interpolate, translate} from "react-i18next"; +import { Interpolate, translate } from "react-i18next"; import ChangesetId from "./ChangesetId"; import injectSheet from "react-jss"; -import {DateFromNow} from "../.."; +import { DateFromNow } from "../.."; import ChangesetAuthor from "./ChangesetAuthor"; import ChangesetTag from "./ChangesetTag"; -import {parseDescription} from "./changesets"; -import {AvatarWrapper, AvatarImage} from "../../avatar"; +import { parseDescription } from "./changesets"; +import { AvatarWrapper, AvatarImage } from "../../avatar"; +import { ExtensionPoint } from "@scm-manager/ui-extensions"; const styles = { pointer: { @@ -64,7 +65,15 @@ class ChangesetRow extends React.Component {

- {description.title} + + + {description.title} + +
{ return (

-

{description.title}

+

+ + {description.title} + +

@@ -67,22 +75,23 @@ class ChangesetDetails extends React.Component {

{this.renderTags()}
- -

- {description.message.split("\n").map((item, key) => { - return ( - + +

+ {description.message.split("\n").map((item, key) => { + return ( + + {item} -
-
- ); - })} -

-
+ +
+ + ); + })} +

From 4875ef963968b92a4f1b74509bedb870004b3901 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Fri, 18 Jan 2019 11:25:59 +0100 Subject: [PATCH 2/7] Use recent ui-extensions version b/c of a required bugfix --- scm-plugins/scm-git-plugin/package.json | 2 +- scm-plugins/scm-git-plugin/yarn.lock | 7 ++++--- scm-plugins/scm-hg-plugin/package.json | 2 +- scm-plugins/scm-hg-plugin/yarn.lock | 7 ++++--- scm-plugins/scm-svn-plugin/package.json | 2 +- scm-plugins/scm-svn-plugin/yarn.lock | 7 ++++--- scm-ui-components/packages/ui-components/package.json | 2 +- scm-ui-components/packages/ui-components/yarn.lock | 6 +++--- scm-ui/package.json | 2 +- scm-ui/yarn.lock | 7 ++++--- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 3145b6a338..1805f0665b 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -9,7 +9,7 @@ "flow": "flow check" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-git-plugin/yarn.lock b/scm-plugins/scm-git-plugin/yarn.lock index 234ed65102..64c47a247d 100644 --- a/scm-plugins/scm-git-plugin/yarn.lock +++ b/scm-plugins/scm-git-plugin/yarn.lock @@ -747,9 +747,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 0638a464de..849d8a92cb 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -6,7 +6,7 @@ "build": "ui-bundler plugin" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-hg-plugin/yarn.lock b/scm-plugins/scm-hg-plugin/yarn.lock index 0666ef408d..b47e6e6e32 100644 --- a/scm-plugins/scm-hg-plugin/yarn.lock +++ b/scm-plugins/scm-hg-plugin/yarn.lock @@ -681,9 +681,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index e51f3b9bfd..e5cddc0bba 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -6,7 +6,7 @@ "build": "ui-bundler plugin" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-svn-plugin/yarn.lock b/scm-plugins/scm-svn-plugin/yarn.lock index 0666ef408d..b47e6e6e32 100644 --- a/scm-plugins/scm-svn-plugin/yarn.lock +++ b/scm-plugins/scm-svn-plugin/yarn.lock @@ -681,9 +681,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json index 06e007e871..bb8e5c738e 100644 --- a/scm-ui-components/packages/ui-components/package.json +++ b/scm-ui-components/packages/ui-components/package.json @@ -26,7 +26,7 @@ "react-router-enzyme-context": "^1.2.0" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1", + "@scm-manager/ui-extensions": "^0.1.2", "@scm-manager/ui-types": "2.0.0-SNAPSHOT", "classnames": "^2.2.6", "moment": "^2.22.2", diff --git a/scm-ui-components/packages/ui-components/yarn.lock b/scm-ui-components/packages/ui-components/yarn.lock index 062bb75ab1..2fd20f2870 100644 --- a/scm-ui-components/packages/ui-components/yarn.lock +++ b/scm-ui-components/packages/ui-components/yarn.lock @@ -727,9 +727,9 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-ui/package.json b/scm-ui/package.json index 2f68b75317..bf4e272fb0 100644 --- a/scm-ui/package.json +++ b/scm-ui/package.json @@ -7,7 +7,7 @@ "dependencies": { "@babel/polyfill": "^7.0.0", "@fortawesome/fontawesome-free": "^5.3.1", - "@scm-manager/ui-extensions": "^0.1.1", + "@scm-manager/ui-extensions": "^0.1.2", "bulma": "^0.7.1", "bulma-tooltip": "^2.0.2", "classnames": "^2.2.5", diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock index 3ddf27be96..5c656ab243 100644 --- a/scm-ui/yarn.lock +++ b/scm-ui/yarn.lock @@ -738,9 +738,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" From d790c38be5fb9942b643797be5087a972101ed77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Thu, 24 Jan 2019 13:31:42 +0100 Subject: [PATCH 3/7] fix error --- .../repos/components/list/RepositoryEntry.js | 14 ++----------- scm-ui/styles/scm.scss | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/scm-ui/src/repos/components/list/RepositoryEntry.js b/scm-ui/src/repos/components/list/RepositoryEntry.js index 122128db3a..28a6fe1ad3 100644 --- a/scm-ui/src/repos/components/list/RepositoryEntry.js +++ b/scm-ui/src/repos/components/list/RepositoryEntry.js @@ -9,16 +9,6 @@ import classNames from "classnames"; import RepositoryAvatar from "./RepositoryAvatar"; const styles = { - overlayFullColumn: { - position: "absolute", - height: "calc(120px - 0.5rem)", - width: "calc(100% - 1.5rem)" - }, - overlayHalfColumn: { - position: "absolute", - height: "calc(120px - 1.5rem)", - width: "calc(50% - 3rem)" - }, inner: { position: "relative", pointerEvents: "none", @@ -86,8 +76,8 @@ class RepositoryEntry extends React.Component { const repositoryLink = this.createLink(repository); const halfColumn = fullColumnWidth ? "is-full" : "is-half"; const overlayLinkClass = fullColumnWidth - ? classes.overlayFullColumn - : classes.overlayHalfColumn; + ? "overlay-full-column" + : "overlay-half-column"; return (
Date: Thu, 24 Jan 2019 12:53:21 +0000 Subject: [PATCH 4/7] Close branch bugfix/makeReposClickableInMobileView From 9670232ad27f1a452ca7cb60a8df5db1230fecc0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 25 Jan 2019 12:35:16 +0100 Subject: [PATCH 5/7] extension point for changeset description should be only rendered once --- .../ui-components/src/repos/changesets/ChangesetRow.js | 2 +- scm-ui/src/repos/components/changesets/ChangesetDetails.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js index d74e3631d1..7609bc2171 100644 --- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js +++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js @@ -69,7 +69,7 @@ class ChangesetRow extends React.Component { {description.title} diff --git a/scm-ui/src/repos/components/changesets/ChangesetDetails.js b/scm-ui/src/repos/components/changesets/ChangesetDetails.js index 034ee36263..217b236122 100644 --- a/scm-ui/src/repos/components/changesets/ChangesetDetails.js +++ b/scm-ui/src/repos/components/changesets/ChangesetDetails.js @@ -50,7 +50,7 @@ class ChangesetDetails extends React.Component { {description.title} @@ -83,7 +83,7 @@ class ChangesetDetails extends React.Component { {item} From f9d0a316c56a17f3542d690298d320dc9b57f3ee Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 25 Jan 2019 12:35:33 +0100 Subject: [PATCH 6/7] close branch feature/bugfix_issuetracker From 8566c294da84f3e12de48e6b2b18a01aa8d9cbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 25 Jan 2019 13:34:09 +0100 Subject: [PATCH 7/7] Fix permission check for permission link --- .../scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java index f15f7c4b00..19929b63ba 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java @@ -41,6 +41,8 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper