Updates the cancel button

Signed-off-by: BOUTIER Charly <charly.boutier@rte-france.com>
gridsuite · Jan 19, 2024 · 19db011 · 19db011
1 parent 6bf09cf
commit 19db011
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 48 deletions.
diff --git a/src/components/app-wrapper.js b/src/components/app-wrapper.js
@@ -85,14 +85,6 @@ let lightTheme = createTheme({
     },
 });
 
-lightTheme = createTheme(lightTheme, {
-    palette: {
-        customButton: {
-            main: lightTheme.palette.text.primary,
-        },
-    },
-});
-
 let darkTheme = createTheme({
     palette: {
         mode: 'dark',
@@ -132,14 +124,6 @@ let darkTheme = createTheme({
     },
 });
 
-darkTheme = createTheme(darkTheme, {
-    palette: {
-        customButton: {
-            main: darkTheme.palette.text.primary,
-        },
-    },
-});
-
 const getMuiTheme = (theme) => {
     if (theme === LIGHT_THEME) {
         return lightTheme;

diff --git a/src/components/dialogs/access-rights-dialog.js b/src/components/dialogs/access-rights-dialog.js
@@ -111,7 +111,7 @@ const AccessRightsDialog = ({
                 )}
             </DialogContent>
             <DialogActions>
-                <CancelButton color={'customButton'} onClick={handleClose} />
+                <CancelButton onClick={handleClose} />
                 <Button onClick={handleClick} variant="outlined">
                     <FormattedMessage id="edit" />
                 </Button>

diff --git a/src/components/dialogs/commons/custom-mui-dialog/custom-mui-dialog.tsx b/src/components/dialogs/commons/custom-mui-dialog/custom-mui-dialog.tsx
@@ -93,10 +93,7 @@ const CustomMuiDialog: FunctionComponent<ICustomMuiDialog> = ({
                 </DialogTitle>
                 <DialogContent>{children}</DialogContent>
                 <DialogActions>
-                    <CancelButton
-                        color={'customButton'}
-                        onClick={handleCancel}
-                    />
+                    <CancelButton onClick={handleCancel} />
                     <SubmitButton
                         variant="outlined"
                         disabled={disabledSave}

diff --git a/src/components/dialogs/create-directory-dialog.js b/src/components/dialogs/create-directory-dialog.js
@@ -102,7 +102,7 @@ export const CreateDirectoryDialog = ({
                 {error !== '' && <Alert severity="error">{error}</Alert>}
             </DialogContent>
             <DialogActions>
-                <CancelButton color={'customButton'} onClick={handleClose} />
+                <CancelButton onClick={handleClose} />
                 <Button
                     disabled={!canCreate()}
                     onClick={handleClick}

diff --git a/src/components/dialogs/csv-import-filter-creation-dialog.js b/src/components/dialogs/csv-import-filter-creation-dialog.js
@@ -182,10 +182,7 @@ const CsvImportFilterCreationDialog = ({
                         </DialogContentText>
                     </DialogContent>
                     <DialogActions>
-                        <CancelButton
-                            color={'customButton'}
-                            onClick={handleCancelDialog}
-                        />
+                        <CancelButton onClick={handleCancelDialog} />
                         <Button
                             onClick={() => handleReplacePopupConfirmation()}
                         >

diff --git a/src/components/dialogs/delete-dialog.js b/src/components/dialogs/delete-dialog.js
@@ -210,15 +210,11 @@ const DeleteDialog = ({
                 {error !== '' && <Alert severity="error">{error}</Alert>}
             </DialogContent>
             <DialogActions>
-                <CancelButton
-                    onClick={handleClose}
-                    variant="outlined"
-                    disabled={loadingState}
-                />
+                <CancelButton onClick={handleClose} disabled={loadingState} />
                 <Button
                     onClick={handleClick}
+                    variant="outlined"
                     disabled={loadingState}
-                    color={'customButton'}
                 >
                     {(loadingState && <CircularProgress size={24} />) || (
                         <FormattedMessage id="delete" />

diff --git a/src/components/dialogs/directory-selector.js b/src/components/dialogs/directory-selector.js
@@ -138,7 +138,6 @@ const DirectorySelector = (props) => {
             data={data}
             onlyLeaves={false}
             sortMethod={sortAlphabetically}
-            cancelButtonProps={{ color: 'customButton' }}
             {...props}
         />
     );

diff --git a/src/components/dialogs/rename-dialog.js b/src/components/dialogs/rename-dialog.js
@@ -92,7 +92,7 @@ const RenameDialog = ({
                 {error && <Alert severity="error">{error}</Alert>}
             </DialogContent>
             <DialogActions>
-                <CancelButton color={'customButton'} onClick={handleClose} />
+                <CancelButton onClick={handleClose} />
                 <Button
                     onClick={handleClick}
                     disabled={!canRename()}

diff --git a/src/components/dialogs/replace-with-script-dialog.js b/src/components/dialogs/replace-with-script-dialog.js
@@ -49,8 +49,8 @@ const ReplaceWithScriptDialog = ({ id, open, onClose, onClick, title }) => {
                 </DialogContentText>
             </DialogContent>
             <DialogActions>
-                <CancelButton onClick={handleClose} variant="outlined" />
-                <Button onClick={handleClick} color={'customButton'}>
+                <CancelButton onClick={handleClose} />
+                <Button onClick={handleClick} variant="outlined">
                     <FormattedMessage id="validate" />
                 </Button>
             </DialogActions>

diff --git a/src/components/utils/popup-confirmation-dialog.js b/src/components/utils/popup-confirmation-dialog.js
@@ -28,10 +28,7 @@ const PopupConfirmationDialog = ({
                 </DialogContentText>
             </DialogContent>
             <DialogActions>
-                <CancelButton
-                    color={'customButton'}
-                    onClick={() => setOpenConfirmationPopup(false)}
-                />
+                <CancelButton onClick={() => setOpenConfirmationPopup(false)} />
                 <Button onClick={handlePopupConfirmation} variant="outlined">
                     <FormattedMessage id="validate" />
                 </Button>

diff --git a/src/components/utils/rhf-inputs/ag-grid-table-rhf/csv-uploader/csv-uploader.js b/src/components/utils/rhf-inputs/ag-grid-table-rhf/csv-uploader/csv-uploader.js
@@ -157,10 +157,7 @@ const CsvUploader = ({
                     </DialogContentText>
                 </DialogContent>
                 <DialogActions>
-                    <CancelButton
-                        color={'customButton'}
-                        onClick={handleCancelDialog}
-                    />
+                    <CancelButton onClick={handleCancelDialog} />
                     <Button onClick={() => handleReplacePopupConfirmation()}>
                         <FormattedMessage id="replace" />
                     </Button>
@@ -235,10 +232,7 @@ const CsvUploader = ({
                     </div>
                 </DialogContent>
                 <DialogActions>
-                    <CancelButton
-                        color={'customButton'}
-                        onClick={handleClose}
-                    />
+                    <CancelButton onClick={handleClose} />
                     <Button
                         variant="outlined"
                         onClick={() => handleOpenCSVConfirmationDataDialog()}