From 02b83146bee791d3fbc34aa4e419c5090d8f9661 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Tue, 21 Dec 2021 18:00:07 +0530
Subject: [PATCH] 1) Added spacing for message and loading spinner. 2) Rename
 the GrantWizard Dialog. 3) Return the activeStep from disableNextStep
 function.

---
 web/pgadmin/static/js/components/Loader.jsx   |  5 ++++-
 .../static/js/helpers/wizard/Wizard.jsx       |  2 +-
 .../static/js/helpers/wizard/WizardStep.jsx   |  2 --
 .../grant_wizard/static/js/GrantWizard.jsx    |  2 +-
 .../grant_wizard/static/js/grant_wizard.js    | 20 +++++++++----------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/web/pgadmin/static/js/components/Loader.jsx b/web/pgadmin/static/js/components/Loader.jsx
index 191b93d87..a4f7a3c05 100644
--- a/web/pgadmin/static/js/components/Loader.jsx
+++ b/web/pgadmin/static/js/components/Loader.jsx
@@ -34,6 +34,9 @@ const useStyles = makeStyles((theme)=>({
   },
   loader: {
     color: theme.otherVars.loader.color,
+  },
+  message: {
+    marginLeft: '0.5rem',
   }
 }));
 
@@ -46,7 +49,7 @@ export default function Loader({message}) {
     <Box className={classes.root}>
       <Box className={classes.loaderRoot}>
         <CircularProgress className={classes.loader} />
-        <Typography>{message}</Typography>
+        <Typography className={classes.message}>{message}</Typography>
       </Box>
     </Box>
   );
diff --git a/web/pgadmin/static/js/helpers/wizard/Wizard.jsx b/web/pgadmin/static/js/helpers/wizard/Wizard.jsx
index a25ce6064..774c42304 100644
--- a/web/pgadmin/static/js/helpers/wizard/Wizard.jsx
+++ b/web/pgadmin/static/js/helpers/wizard/Wizard.jsx
@@ -136,7 +136,7 @@ function Wizard({ stepList, onStepChange, onSave, className, ...props }) {
 
   React.useEffect(() => {
     if (props.disableNextStep) {
-      setdisableNext(props.disableNextStep());
+      setdisableNext(props.disableNextStep(activeStep));
     }
   });
 
diff --git a/web/pgadmin/static/js/helpers/wizard/WizardStep.jsx b/web/pgadmin/static/js/helpers/wizard/WizardStep.jsx
index e5c1ab59c..d98f2b247 100644
--- a/web/pgadmin/static/js/helpers/wizard/WizardStep.jsx
+++ b/web/pgadmin/static/js/helpers/wizard/WizardStep.jsx
@@ -17,9 +17,7 @@ const useStyles = makeStyles(() =>
     stepPanel: {
       height: '100%',
       width: '100%',
-      // paddingLeft: '2em',
       minHeight: '100px',
-      // paddingTop: '1em',
       paddingBottom: '1em',
       paddingRight: '1em',
       overflow: 'auto',
diff --git a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
index 8ca1c6e5d..86b1f1237 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
+++ b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
@@ -135,7 +135,7 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData }) {
       isVisible: false
     }
   ];
-  var steps = ['Object Selection', 'Privilege Selection', 'Review Selection'];
+  var steps = ['Object Selection', 'Privilege Selection', 'Review'];
   const [selectedObject, setSelectedObject] = React.useState([]);
   const [selectedAcl, setSelectedAcl] = React.useState({});
   const [msqlData, setSQL] = React.useState('');
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index 468918a9e..d5944f412 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -81,8 +81,8 @@ define([
     start_grant_wizard: function() {
 
       // Declare Wizard dialog
-      if (!Alertify.wizardDialog) {
-        Alertify.dialog('wizardDialog', function factory() {
+      if (!Alertify.grantWizardDialog) {
+        Alertify.dialog('grantWizardDialog', function factory() {
 
           // Generate wizard main container
           var $container = $('<div class=\'wizard_dlg\' id=\'grantWizardDlg\'></div>');
@@ -122,10 +122,10 @@ define([
                       <GrantWizard sid={sid} did={did} nodeInfo={info} nodeData={d} />
                     </Theme>,
                     document.getElementById('grantWizardDlg'));
-                  Alertify.wizardDialog().elements.modal.style.maxHeight=0;
-                  Alertify.wizardDialog().elements.modal.style.maxWidth='none';
-                  Alertify.wizardDialog().elements.modal.style.overflow='visible';
-                  Alertify.wizardDialog().elements.dimmer.style.display='none';
+                  Alertify.grantWizardDialog().elements.modal.style.maxHeight=0;
+                  Alertify.grantWizardDialog().elements.modal.style.maxWidth='none';
+                  Alertify.grantWizardDialog().elements.modal.style.overflow='visible';
+                  Alertify.grantWizardDialog().elements.dimmer.style.display='none';
                 }
               }, 500);
 
@@ -139,7 +139,7 @@ define([
                 // Clear the view and remove the react component.
                 return setTimeout((function () {
                   ReactDOM.unmountComponentAtNode(document.getElementById('grantWizardDlg'));
-                  return Alertify.wizardDialog().destroy();
+                  return Alertify.grantWizardDialog().destroy();
                 }), 500);
               },
             }
@@ -147,12 +147,12 @@ define([
         });
       }
       // Call Grant Wizard Dialog and set dimensions for wizard
-      Alertify.wizardDialog('').set({
+      Alertify.grantWizardDialog('').set({
         onmaximize:function(){
-          Alertify.wizardDialog().elements.modal.style.maxHeight='initial';
+          Alertify.grantWizardDialog().elements.modal.style.maxHeight='initial';
         },
         onrestore:function(){
-          Alertify.wizardDialog().elements.modal.style.maxHeight=0;
+          Alertify.grantWizardDialog().elements.modal.style.maxHeight=0;
         },
       }).resizeTo(pgBrowser.stdW.lg, pgBrowser.stdH.lg);
     },