IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Port browser tree to React. Fixes #6129

Browse Source
This commit is contained in:
Khushboo Vashi
2021-09-27 16:44:26 +05:30
committed by Akshay Joshi
parent d983225683
commit 483e2ca8d0
99 changed files with 2339 additions and 1785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/pgadmin/tools/backup/static/js/backup.js
View File

@@ -199,7 +199,7 @@ define([
if (!_.isUndefined(m.get('type')) && m.get('type') === 'server') {
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined;
d = i ? t.itemData(i) : undefined;
return _.isUndefined(d) ? false : d.version >= 110000;
}
return true;
@@ -391,8 +391,7 @@ define([
visible: function() {
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
s = _.isUndefined(d) ? undefined : pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
s = _.isUndefined(i) ? undefined : t.getTreeNodeHierarchy(i)['server'];
return _.isUndefined(s) ? false : s.version >= 110000;
},
@@ -466,8 +465,7 @@ define([
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
s = _.isUndefined(d) ? undefined : pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
s = _.isUndefined(i) ? undefined : t.getTreeNodeHierarchy(i)['server'];
return _.isUndefined(s) ? false : s.version >= 110000;
},
@@ -518,8 +516,7 @@ define([
disabled: function(m) {
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
s = _.isUndefined(d) ? undefined : pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
s = _.isUndefined(i) ? undefined : t.getTreeNodeHierarchy(i)['server'];
if (!_.isUndefined(s) && s.version >= 120000)
return true;
@@ -632,7 +629,7 @@ define([
label: gettext('Backup...'),
icon: 'fa fa-save',
enable: supportedNodes.enabled.bind(
null, pgBrowser.treeMenu, menuUtils.backupSupportedNodes
null, pgBrowser.tree, menuUtils.backupSupportedNodes
),
data: {
data_disabled: gettext('Please select any database or schema or table from the browser tree to take Backup.'),
@@ -650,7 +647,7 @@ define([
label: gettext('Backup...'),
icon: 'fa fa-save',
enable: supportedNodes.enabled.bind(
null, pgBrowser.treeMenu, menuUtils.backupSupportedNodes
null, pgBrowser.tree, menuUtils.backupSupportedNodes
),
});
}

3
web/pgadmin/tools/backup/static/js/backup_dialog.js
View File

@@ -55,18 +55,15 @@ export class BackupDialog extends Dialog {
);
return;
}
const typeOfDialog = BackupDialog.typeOfDialog(params);
if (!that.canExecuteOnCurrentDatabase(aciTreeItem)) {
return;
}
const dialog = that.createOrGetDialog(
BackupDialog.dialogTitle(typeOfDialog),
typeOfDialog
);
dialog(true).resizeTo(width, height);
}).catch(function() {
that.alertify.alert(

15
web/pgadmin/tools/backup/static/js/backup_dialog_wrapper.js
View File

@@ -7,7 +7,6 @@
//
//////////////////////////////////////////////////////////////
import {getTreeNodeHierarchyFromElement} from '../../../../static/js/tree/pgadmin_tree_node';
import axios from 'axios/index';
import gettext from '../../../../static/js/gettext';
import url_for from '../../../../static/js/url_for';
@@ -105,7 +104,7 @@ export class BackupDialogWrapper extends DialogWrapper {
this.main(title);
}
const treeInfo = getTreeNodeHierarchyFromElement(this.pgBrowser, selectedTreeNode);
const treeInfo = this.pgBrowser.tree.getTreeNodeHierarchy(selectedTreeNode);
const dialog = this.createDialog(node, treeInfo, this.typeOfDialog, $container);
this.addAlertifyClassToBackupNodeChildNodes();
dialog.render();
@@ -162,10 +161,7 @@ export class BackupDialogWrapper extends DialogWrapper {
'sid': serverIdentifier,
});
const treeInfo = getTreeNodeHierarchyFromElement(
this.pgBrowser,
selectedTreeNode
);
const treeInfo = this.pgBrowser.tree.getTreeNodeHierarchy(selectedTreeNode);
this.setExtraParameters(selectedTreeNode, treeInfo);
let backupDate = this.view.model.toJSON();
@@ -222,7 +218,7 @@ export class BackupDialogWrapper extends DialogWrapper {
}
getSelectedNode() {
const tree = this.pgBrowser.treeMenu;
const tree = this.pgBrowser.tree;
const selectedNode = tree.selected();
if (selectedNode) {
return tree.findNodeByDomElement(selectedNode);
@@ -260,10 +256,7 @@ export class BackupDialogWrapper extends DialogWrapper {
}
retrieveServerIdentifier(node, selectedTreeNode) {
const treeInfo = getTreeNodeHierarchyFromElement(
this.pgBrowser,
selectedTreeNode
);
const treeInfo = this.pgBrowser.tree.getTreeNodeHierarchy(selectedTreeNode);
return treeInfo.server._id;
}