From 84e5820f4fa917a173cca6ce6921ab6cccfeb662 Mon Sep 17 00:00:00 2001
From: Leon <>
Date: Wed, 26 Jan 2022 14:51:57 +0200
Subject: [PATCH] changes

---
 .../Modals/AddUserModal/AddUserModal.tsx      |  2 +-
 .../UI/Modals/ConfirmationModal.tsx           | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
index e92900fd6..6bf8dd836 100644
--- a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
+++ b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
@@ -105,7 +105,7 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
             <input className={classes.textField + " searchNamespace"} placeholder="Search" value={searchValue}
                     onChange={(event) => setSearchValue(event.target.value)}/>
         </div>
-        <SelectList valuesListInput={workspaces} tableName={'Workspace'} multiSelect={false} searchValue={searchValue} setValues={workspaceChange} tabelClassName={''} ></SelectList>
+        <SelectList valuesListInput={workspaces} tableName={''} multiSelect={false} searchValue={searchValue} setValues={workspaceChange} tabelClassName={''} ></SelectList>
       </div>
     </ConfirmationModal>
     </>); 
diff --git a/ui/src/components/UI/Modals/ConfirmationModal.tsx b/ui/src/components/UI/Modals/ConfirmationModal.tsx
index 0e1425e76..75d3b640a 100644
--- a/ui/src/components/UI/Modals/ConfirmationModal.tsx
+++ b/ui/src/components/UI/Modals/ConfirmationModal.tsx
@@ -22,14 +22,26 @@ interface ConfirmationModalProps {
     img?: ReactElement;
     isLoading?: boolean;
     className?: any;
+    customActions? : ReactElement
 }
 
 const ConfirmationModal: React.FC<ConfirmationModalProps> = observer(({title, isOpen, onClose, onConfirm, confirmButtonText,
                                                                         closeButtonText, subContent, confirmDisabled = false, isWide,
                                                                         confirmButtonColor, titleColor, img, isLoading,children,
-                                                                        className}) => {
+                                                                        className, customActions}) => {
     const classes = useCommonStyles();
-    const confirmStyle = {width: 100, marginLeft: 20}                                                                  
+    const confirmStyle = {width: 100, marginLeft: 20}
+    
+    const defualtActions =                 <><Button disabled={isLoading} style={{width: 100}} className={classes.outlinedButton} size={"small"}
+                                                variant='outlined' onClick={onClose}>{closeButtonText ?? "CANCEL"}
+                                            </Button>
+                                            <Button style={confirmButtonColor ? {backgroundColor: confirmButtonColor,...confirmStyle} : {...confirmStyle}} 
+                                            className={classes.button} size={"small"}
+                                            onClick={onConfirm} 
+                                            disabled={confirmDisabled || isLoading} 
+                                            endIcon={isLoading && <img src={spinner} alt="spinner"/>}>{confirmButtonText ?? "YES"}
+                                            </Button></>
+    
     return (
         <CustomModal open={isOpen} onClose={onClose} disableBackdropClick={true} isWide={isWide} className={`${className} comfirmation-modal`}>
             <div className="confirmationHeader">
@@ -50,15 +62,7 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = observer(({title, is
             </div>
 
             <div className="confirmationActions">
-                <Button disabled={isLoading} style={{width: 100}} className={classes.outlinedButton} size={"small"}
-                            variant='outlined' onClick={onClose}>{closeButtonText ?? "CANCEL"}
-                </Button>
-                <Button style={confirmButtonColor ? {backgroundColor: confirmButtonColor,...confirmStyle} : {...confirmStyle}} 
-                    className={classes.button} size={"small"}
-                    onClick={onConfirm} 
-                    disabled={confirmDisabled || isLoading} 
-                    endIcon={isLoading && <img src={spinner} alt="spinner"/>}>{confirmButtonText ?? "YES"}
-                </Button>
+                {customActions}
             </div>
         </CustomModal>
     )