From ba971beea3cbb79bd654236a2607e6de2084512c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Fri, 1 Feb 2019 10:43:11 +0100
Subject: [PATCH] do not forward close button but close function as button is
 always the same

---
 .../packages/ui-components/src/modals/ConfirmAlert.js  |  9 +--------
 .../packages/ui-components/src/modals/Modal.js         | 10 +++++++---
 .../containers/AdvancedPermissionsDialog.js            |  5 +----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/modals/ConfirmAlert.js b/scm-ui-components/packages/ui-components/src/modals/ConfirmAlert.js
index e9ecffefd9..13d5bae5f8 100644
--- a/scm-ui-components/packages/ui-components/src/modals/ConfirmAlert.js
+++ b/scm-ui-components/packages/ui-components/src/modals/ConfirmAlert.js
@@ -29,13 +29,6 @@ class ConfirmAlert extends React.Component<Props> {
   render() {
     const { title, message, buttons } = this.props;
 
-    const closeButton = (
-      <button
-      className="delete"
-      aria-label="close"
-      onClick={() => this.close()}
-      />
-    );
     const body= (
       <>
         {message}
@@ -54,7 +47,7 @@ class ConfirmAlert extends React.Component<Props> {
 
 
     return (
-      <Modal title={title} closeButton={closeButton} body={body} active={true}/>
+      <Modal title={title} closeFunction={() => this.close()} body={body} active={true}/>
     );
   }
 }
diff --git a/scm-ui-components/packages/ui-components/src/modals/Modal.js b/scm-ui-components/packages/ui-components/src/modals/Modal.js
index cf1b011102..febcbcd79d 100644
--- a/scm-ui-components/packages/ui-components/src/modals/Modal.js
+++ b/scm-ui-components/packages/ui-components/src/modals/Modal.js
@@ -5,7 +5,7 @@ import injectSheet from "react-jss";
 
 type Props = {
   title: string,
-  closeButton: any,
+  closeFunction: () => void,
   body: any,
   active: boolean,
   classes: any
@@ -24,7 +24,7 @@ const styles = {
 class Modal extends React.Component<Props> {
 
   render() {
-    const { title, closeButton, body, active, classes } = this.props;
+    const { title, closeFunction, body, active, classes } = this.props;
 
     const isActive = active ? "is-active" : null;
 
@@ -40,7 +40,11 @@ class Modal extends React.Component<Props> {
             <p className="modal-card-title">
               {title}
             </p>
-            {closeButton}
+            <button
+              className="delete"
+              aria-label="close"
+              onClick={closeFunction}
+            />
           </header>
           <section className="modal-card-body">
             {body}
diff --git a/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js b/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
index 5d53605484..643e2150e5 100644
--- a/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
+++ b/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
@@ -50,9 +50,6 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
       <SubmitButton label={t("permission.advanced.dialog.submit")} />
     ) : null;
 
-    const closeButton = (
-      <button className="delete" aria-label="close" onClick={() => onClose()} />
-    );
 
     const body = (
       <>
@@ -70,7 +67,7 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
     return (
       <Modal
         title={t("permission.advanced.dialog.title")}
-        closeButton={closeButton}
+        closeFunction={() => onClose()}
         body={body}
         active={true}
       />