diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss
index f70207be9..b2392adf2 100644
--- a/web/pgadmin/static/scss/_alertify.overrides.scss
+++ b/web/pgadmin/static/scss/_alertify.overrides.scss
@@ -301,12 +301,3 @@
outline: none !important;
}
}
-
-.wizard-header {
- .ml-auto {
- button {
- @extend .btn-secondary;
- outline: none !important;
- }
- }
-}
diff --git a/web/pgadmin/tools/backup/static/js/backup.js b/web/pgadmin/tools/backup/static/js/backup.js
index 70befb58e..afe0c50a9 100644
--- a/web/pgadmin/tools/backup/static/js/backup.js
+++ b/web/pgadmin/tools/backup/static/js/backup.js
@@ -174,14 +174,14 @@ define([
var extraData = this.setExtraParameters(typeOfDialog);
this.showBackupDialog(schema, treeItem, j, data, panel, typeOfDialog, serverIdentifier, extraData);
},
- saveCallBack: function(data, dialog) {
+ saveCallBack: function(data) {
if(data.errormsg) {
Notify.alert(
gettext('Error'),
gettext(data.errormsg)
);
} else {
- pgBrowser.Events.trigger('pgadmin-bgprocess:created', dialog);
+ pgBrowser.Events.trigger('pgadmin-bgprocess:created');
}
},
url_for_utility_exists(id, params){
diff --git a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
index b253c067c..2706432be 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
+++ b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
@@ -21,7 +21,6 @@ import { InputSQL, FormFooterMessage, MESSAGE_TYPE } from '../../../../static/js
import getApiInstance from '../../../../static/js/api_instance';
import SchemaView from '../../../../static/js/SchemaView';
import clsx from 'clsx';
-import Alertify from 'pgadmin.alertifyjs';
import PropTypes from 'prop-types';
import PrivilegeSchema from './privilege_schema.ui';
import Notify from '../../../../static/js/helpers/Notifier';
@@ -59,7 +58,7 @@ const useStyles = makeStyles(() =>
}),
);
-export default function GrantWizard({ sid, did, nodeInfo, nodeData }) {
+export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
const classes = useStyles();
var columns = [
{
@@ -224,7 +223,7 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData }) {
api.post(_url, post_data)
.then(() => {
setLoaderText('');
- Alertify.grantWizardDialog().close();
+ onClose();
})
.catch((error) => {
setLoaderText('');
@@ -361,6 +360,7 @@ GrantWizard.propTypes = {
did: PropTypes.number,
nodeInfo: PropTypes.object,
nodeData: PropTypes.object,
+ onClose: PropTypes.func
};
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 5830db4be..8b2e00fdb 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -14,15 +14,11 @@ import GrantWizard from './GrantWizard';
// Grant Wizard
define([
- 'sources/gettext', 'jquery', 'underscore',
- 'pgadmin.alertifyjs', 'pgadmin.browser',
+ 'sources/gettext', 'pgadmin.browser',
'tools/grant_wizard/static/js/menu_utils',
'sources/nodes/supported_database_node',
- 'backgrid.select.all',
- 'backgrid.filter', 'pgadmin.browser.server.privilege',
- 'pgadmin.browser.wizard',
], function(
- gettext, $, _, Alertify, pgBrowser, menuUtils, supportedNodes
+ gettext, pgBrowser, menuUtils, supportedNodes
) {
// if module is already initialized, refer to that.
@@ -79,83 +75,27 @@ define([
// Callback to draw Wizard Dialog
start_grant_wizard: function() {
+ let t = pgBrowser.tree,
+ i = t.selected(),
+ d = this.d = i ? t.itemData(i) : undefined,
+ info = this.info = pgBrowser.tree.getTreeNodeHierarchy(i);
- // Declare Wizard dialog
- if (!Alertify.grantWizardDialog) {
- Alertify.dialog('grantWizardDialog', function factory() {
+ // Register dialog panel
+ pgBrowser.Node.registerUtilityPanel();
+ let panel = pgBrowser.Node.addUtilityPanel(pgBrowser.stdW.lg, pgBrowser.stdH.lg),
+ j = panel.$container.find('.obj_properties').first();
+ panel.title(gettext('Grant Wizard'));
- // Generate wizard main container
- var $container = $('');
- return {
- main: function () {
- /*This is intentional (SonarQube)*/
- },
- setup: function () {
- return {
- // Set options for dialog
- options: {
- frameless: true,
- resizable: true,
- autoReset: false,
- maximizable: true,
- closable: true,
- closableByDimmer: false,
- modal: true,
- pinnable: false,
- },
- };
- },
- build: function () {
- this.elements.content.appendChild($container.get(0));
- Alertify.pgDialogBuild.apply(this);
- var t = pgBrowser.tree,
- i = t.selected(),
- d = this.d = i ? t.itemData(i) : undefined,
- info = this.info = pgBrowser.tree.getTreeNodeHierarchy(i);
+ let sid = info.server._id,
+ did = info.database._id;
- var sid = info.server._id,
- did = info.database._id;
-
- setTimeout(function () {
- if (document.getElementById('grantWizardDlg')) {
- ReactDOM.render(
-
-
- ,
- document.getElementById('grantWizardDlg'));
- 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';
- }
- }, 10);
-
- },
- prepare: function () {
- $container.empty().append('');
- },
- hooks: {
- // Triggered when the dialog is closed
- onclose: function () {
- // Clear the view and remove the react component.
- return setTimeout((function () {
- ReactDOM.unmountComponentAtNode(document.getElementById('grantWizardDlg'));
- return Alertify.grantWizardDialog().destroy();
- }), 500);
- },
- }
- };
- });
- }
- // Call Grant Wizard Dialog and set dimensions for wizard
- Alertify.grantWizardDialog('').set({
- onmaximize:function(){
- Alertify.grantWizardDialog().elements.modal.style.maxHeight='initial';
- },
- onrestore:function(){
- Alertify.grantWizardDialog().elements.modal.style.maxHeight=0;
- },
- }).resizeTo(pgBrowser.stdW.lg, pgBrowser.stdH.lg);
+ ReactDOM.render(
+
+ {
+ panel.close();
+ }}/>
+ , j[0]);
},
};
diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js
index 977d78df5..4cfebf480 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.js
@@ -75,7 +75,7 @@ define([
);
},
- importExportCallBack: function(data, dialog) {
+ importExportCallBack: function(data) {
if(data.errormsg) {
Notify.alert(
gettext('Error'),
@@ -83,7 +83,7 @@ define([
);
} else {
Notify.success(gettext('Import/Export job created.'));
- pgBrowser.Events.trigger('pgadmin-bgprocess:created', dialog);
+ pgBrowser.Events.trigger('pgadmin-bgprocess:created');
}
},
diff --git a/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx b/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx
index bc86944fc..89c3fba30 100644
--- a/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx
+++ b/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx
@@ -21,7 +21,7 @@ import Loader from 'sources/components/Loader';
import ImportExportSelectionSchema from './import_export_selection.ui';
import CheckBoxTree from '../../../../static/js/components/CheckBoxTree';
import getApiInstance from '../../../../static/js/api_instance';
-import Alertify from 'pgadmin.alertifyjs';
+import PropTypes from 'prop-types';
import { commonTableStyles } from '../../../../static/js/Theme';
import clsx from 'clsx';
import Notify from '../../../../static/js/helpers/Notifier';
@@ -53,7 +53,7 @@ const useStyles = makeStyles(() =>
}),
);
-export default function ImportExportServers() {
+export default function ImportExportServers({onClose}) {
const classes = useStyles();
const tableClasses = commonTableStyles();
@@ -109,7 +109,7 @@ export default function ImportExportServers() {
});
}
- Alertify.importExportWizardDialog().close();
+ onClose();
};
const disableNextCheck = (stepId) => {
@@ -265,3 +265,6 @@ export default function ImportExportServers() {
);
}
+ImportExportServers.propTypes = {
+ onClose: PropTypes.func
+};
\ No newline at end of file
diff --git a/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js b/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js
index b436b79cf..b367c593a 100644
--- a/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js
+++ b/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js
@@ -10,10 +10,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import gettext from 'sources/gettext';
-import Alertify from 'pgadmin.alertifyjs';
import Theme from 'sources/Theme';
import ImportExportServers from './ImportExportServers';
-import $ from 'jquery';
+import pgBrowser from 'top/browser/static/js/browser';
export default class ImportExportServersModule {
static instance;
@@ -52,73 +51,18 @@ export default class ImportExportServersModule {
// This is a callback function to show import/export servers when user click on menu item.
showImportExportServers() {
- // Declare Wizard dialog
- if (!Alertify.importExportWizardDialog) {
- Alertify.dialog('importExportWizardDialog', function factory() {
+ // Register dialog panel
+ pgBrowser.Node.registerUtilityPanel();
+ let panel = pgBrowser.Node.addUtilityPanel(880, 550),
+ j = panel.$container.find('.obj_properties').first();
+ panel.title(gettext('Import/Export Servers'));
- // Generate wizard main container
- var $container = $('
');
- return {
- main: function () {
- /*This is intentional (SonarQube)*/
- },
- setup: function () {
- return {
- // Set options for dialog
- options: {
- frameless: true,
- resizable: true,
- autoReset: false,
- maximizable: true,
- closable: true,
- closableByDimmer: false,
- modal: true,
- pinnable: false,
- },
- };
- },
- build: function () {
- this.elements.content.appendChild($container.get(0));
- Alertify.pgDialogBuild.apply(this);
-
- setTimeout(function () {
- if (document.getElementById('importExportServersDlg')) {
- ReactDOM.render(
-
-
- ,
- document.getElementById('importExportServersDlg'));
- Alertify.importExportWizardDialog().elements.modal.style.maxHeight=0;
- Alertify.importExportWizardDialog().elements.modal.style.maxWidth='none';
- Alertify.importExportWizardDialog().elements.modal.style.overflow='visible';
- Alertify.importExportWizardDialog().elements.dimmer.style.display='none';
- }
- }, 10);
-
- },
- prepare: function () {
- $container.empty().append('
');
- },
- hooks: {
- // Triggered when the dialog is closed
- onclose: function () {
- // Clear the view and remove the react component.
- return setTimeout((function () {
- ReactDOM.unmountComponentAtNode(document.getElementById('importExportServersDlg'));
- return Alertify.importExportWizardDialog().destroy();
- }), 500);
- },
- }
- };
- });
- }
- Alertify.importExportWizardDialog('').set({
- onmaximize:function(){
- Alertify.importExportWizardDialog().elements.modal.style.maxHeight='initial';
- },
- onrestore:function(){
- Alertify.importExportWizardDialog().elements.modal.style.maxHeight=0;
- },
- }).resizeTo(880, 550);
+ ReactDOM.render(
+
+ {
+ panel.close();
+ }}/>
+ , j[0]);
}
}
diff --git a/web/pgadmin/tools/maintenance/static/js/maintenance.js b/web/pgadmin/tools/maintenance/static/js/maintenance.js
index 4fcda6b33..cbf9388e0 100644
--- a/web/pgadmin/tools/maintenance/static/js/maintenance.js
+++ b/web/pgadmin/tools/maintenance/static/js/maintenance.js
@@ -85,7 +85,7 @@ define([
}
);
},
- saveCallBack: function(data, dialog) {
+ saveCallBack: function(data) {
if(data.errormsg) {
Notify.alert(
gettext('Error'),
@@ -93,7 +93,7 @@ define([
);
} else {
Notify.success(data.data.info);
- pgBrowser.Events.trigger('pgadmin-bgprocess:created', dialog);
+ pgBrowser.Events.trigger('pgadmin-bgprocess:created');
}
},
setExtraParameters(treeInfo) {
diff --git a/web/pgadmin/tools/restore/static/js/restore.js b/web/pgadmin/tools/restore/static/js/restore.js
index 2504469e3..3ad192cf5 100644
--- a/web/pgadmin/tools/restore/static/js/restore.js
+++ b/web/pgadmin/tools/restore/static/js/restore.js
@@ -90,14 +90,14 @@ define('tools.restore', [
pgBrowser
);
},
- saveCallBack: function(data, dialog) {
+ saveCallBack: function(data) {
if(data.errormsg) {
Notify.alert(
gettext('Error'),
gettext(data.errormsg)
);
} else {
- pgBrowser.Events.trigger('pgadmin-bgprocess:created', dialog);
+ pgBrowser.Events.trigger('pgadmin-bgprocess:created');
}
},
setExtraParameters: function(treeInfo, nodeData) {
diff --git a/web/webpack.shim.js b/web/webpack.shim.js
index 14cc6ef91..d901421e8 100644
--- a/web/webpack.shim.js
+++ b/web/webpack.shim.js
@@ -202,7 +202,6 @@ var webpackShimConfig = {
'pgadmin.browser.server.privilege': path.join(__dirname, './pgadmin/browser/server_groups/servers/static/js/privilege'),
'pgadmin.browser.server.variable': path.join(__dirname, './pgadmin/browser/server_groups/servers/static/js/variable'),
'pgadmin.browser.utils': '/browser/js/utils',
- 'pgadmin.browser.wizard': path.join(__dirname, './pgadmin/browser/static/js/wizard'),
'pgadmin.dashboard': path.join(__dirname, './pgadmin/dashboard/static/js/Dashboard'),
'pgadmin.help': path.join(__dirname, './pgadmin/help/static/js/help'),
'pgadmin.misc.explain': path.join(__dirname, './pgadmin/misc/static/explain/js/explain'),
@@ -308,7 +307,7 @@ var webpackShimConfig = {
// Define list of pgAdmin common libraries to bundle them separately
// into commons JS from app.bundle.js
pgLibs: [
- 'pgadmin.browser.wizard', 'pgadmin.browser.error', 'pgadmin.browser.server.privilege',
+ 'pgadmin.browser.error', 'pgadmin.browser.server.privilege',
'pgadmin.browser.server.variable', 'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
'pgadmin.browser.datamodel', 'pgadmin.browser.menu', 'pgadmin.browser.panel', 'pgadmin',
'pgadmin.browser.frame', 'slick.pgadmin.editors', 'slick.pgadmin.formatters',
