From 6046e20908bf1492f7b4676c60aaad8e8d217d2d Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Thu, 20 Jun 2019 13:40:12 +0200
Subject: [PATCH] express functionality of component by name

---
 .../src/main/js/ProtocolInformation.js        |  2 +-
 .../ui-components/src/buttons/ButtonGroup.js  | 29 +++++++++++++------
 .../src/buttons/ButtonGrouped.js              | 29 -------------------
 .../ui-components/src/buttons/index.js        |  1 -
 .../repos/changesets/ChangesetButtonGroup.js  |  2 +-
 .../branches/components/BranchButtonGroup.js  |  2 +-
 .../containers/AdvancedPermissionsDialog.js   |  6 ++--
 .../components/content/FileButtonGroup.js     |  2 +-
 8 files changed, 27 insertions(+), 46 deletions(-)
 delete mode 100644 scm-ui-components/packages/ui-components/src/buttons/ButtonGrouped.js

diff --git a/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js b/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js
index e4a1c451d3..54585871c9 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js
@@ -95,7 +95,7 @@ class ProtocolInformation extends React.Component<Props, State> {
 
     return (
      <div className={classes.protocols}>
-       <ButtonGroup className={classes.switcher}>
+       <ButtonGroup connected={true} className={classes.switcher}>
          {protocols.map(this.renderProtocolButton)}
        </ButtonGroup>
        { cloneInformation }
diff --git a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js
index fb48a3ba4f..1afbf97e28 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js
@@ -1,7 +1,9 @@
 // @flow
 import * as React from "react";
+import classNames from "classnames";
 
 type Props = {
+  connected?: boolean,
   addons?: boolean,
   className?: string,
   children: React.Node
@@ -14,17 +16,26 @@ class ButtonGroup extends React.Component<Props> {
   };
 
   render() {
-    const { addons, className, children } = this.props;
-    let styleClasses = "buttons";
-    if (addons) {
-      styleClasses += " has-addons";
-    }
-    if (className) {
-      styleClasses += " " + className;
+    const {connected, addons, className, children} = this.props;
+
+    if (!connected) {
+      var childWrapper = [];
+      React.Children.forEach(children, child => {
+        if (child) {
+          childWrapper.push(<p className="control">{child}</p>);
+        }
+      });
+
+      return (
+        <div className={classNames("field", "is-grouped", className)}>
+          {childWrapper}
+        </div>
+      );
     }
+
     return (
-      <div className={styleClasses}>
-        { children }
+      <div className={classNames("buttons", addons ? "has-addons" : "", className)}>
+        {children}
       </div>
     );
   }
diff --git a/scm-ui-components/packages/ui-components/src/buttons/ButtonGrouped.js b/scm-ui-components/packages/ui-components/src/buttons/ButtonGrouped.js
deleted file mode 100644
index 2ddf8a9316..0000000000
--- a/scm-ui-components/packages/ui-components/src/buttons/ButtonGrouped.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// @flow
-import * as React from "react";
-import classNames from "classnames";
-
-type Props = {
-  className?: string,
-  children: React.Node
-};
-
-class ButtonGrouped extends React.Component<Props> {
-  render() {
-    const { className, children } = this.props;
-
-    var childWrapper = [];
-    React.Children.forEach(children, child => {
-      if (child) {
-        childWrapper.push(<p className="control">{child}</p>);
-      }
-    });
-
-    return (
-      <div className={classNames("field", "is-grouped", className)}>
-        {childWrapper}
-      </div>
-    );
-  }
-}
-
-export default ButtonGrouped;
diff --git a/scm-ui-components/packages/ui-components/src/buttons/index.js b/scm-ui-components/packages/ui-components/src/buttons/index.js
index 3a70167002..014d92958d 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/index.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/index.js
@@ -8,7 +8,6 @@ export { default as EditButton } from "./EditButton.js";
 export { default as SubmitButton } from "./SubmitButton.js";
 export { default as DownloadButton } from "./DownloadButton.js";
 export { default as ButtonGroup } from "./ButtonGroup.js";
-export { default as ButtonGrouped } from "./ButtonGrouped.js";
 export {
   default as RemoveEntryOfTableButton
 } from "./RemoveEntryOfTableButton.js";
diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
index ba7320b152..240d52a168 100644
--- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
+++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
@@ -22,7 +22,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
     const sourcesLink = createSourcesLink(repository, changeset);
 
     return (
-      <ButtonGroup className="is-pulled-right">
+      <ButtonGroup connected={true} className="is-pulled-right">
         <Button link={changesetLink} className="reduced-mobile">
           <span className="icon">
             <i className="fas fa-exchange-alt" />
diff --git a/scm-ui/src/repos/branches/components/BranchButtonGroup.js b/scm-ui/src/repos/branches/components/BranchButtonGroup.js
index 37b2818070..3b694767c4 100644
--- a/scm-ui/src/repos/branches/components/BranchButtonGroup.js
+++ b/scm-ui/src/repos/branches/components/BranchButtonGroup.js
@@ -24,7 +24,7 @@ class BranchButtonGroup extends React.Component<Props> {
     }/sources/${encodeURIComponent(branch.name)}/`;
 
     return (
-      <ButtonGroup>
+      <ButtonGroup connected={true}>
         <Button link={changesetLink} className="reduced-mobile">
           <span className="icon">
             <i className="fas fa-exchange-alt" />
diff --git a/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js b/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
index 70b6442626..5ca48d6134 100644
--- a/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
+++ b/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import {
-  ButtonGrouped,
+  ButtonGroup,
   Button,
   SubmitButton,
   Modal
@@ -60,13 +60,13 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
 
     const footer = (
       <form onSubmit={this.onSubmit}>
-        <ButtonGrouped>
+        <ButtonGroup connected={false}>
           {submitButton}
           <Button
             label={t("permission.advanced.dialog.abort")}
             action={onClose}
           />
-        </ButtonGrouped>
+        </ButtonGroup>
       </form>
     );
 
diff --git a/scm-ui/src/repos/sources/components/content/FileButtonGroup.js b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js
index 06f4d0ad01..38e404e4d6 100644
--- a/scm-ui/src/repos/sources/components/content/FileButtonGroup.js
+++ b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js
@@ -26,7 +26,7 @@ class FileButtonGroup extends React.Component<Props> {
     const { t, historyIsSelected } = this.props;
 
     return (
-      <ButtonGroup>
+      <ButtonGroup connected={true}>
         <Button
           action={this.showSources}
           className="reduced-mobile"