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

Fixed review comments:

Browse Source 
1. Split the restore options/backup options into 2 tabs
2. Restore icon changes
3. feature tests issues
4. restore help link broken
5. Comment section not visible

refs #7018
This commit is contained in:
Rahul Shirsat
2022-01-06 16:46:44 +05:30
committed by Akshay Joshi
parent f56b4030f1
commit 6528d086ba
9 changed files with 64 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/pgadmin/tools/restore/static/js/restore.js
View File

@@ -80,7 +80,7 @@ define('tools.restore', [
()=>getRestoreSectionSchema({selectedNodeType: itemNodeData._type}),
()=>getRestoreTypeObjSchema({selectedNodeType: itemNodeData._type}),
()=>getRestoreSaveOptSchema({nodeInfo: treeNodeInfo}),
()=>getRestoreQueryOptionSchema({nodeInfo: treeNodeInfo}),
()=>getRestoreQueryOptionSchema({selectedNodeType: itemNodeData._type, nodeInfo: treeNodeInfo}),
()=>getRestoreDisableOptionSchema({nodeInfo: treeNodeInfo}),
()=>getRestoreMiscellaneousSchema({nodeInfo: treeNodeInfo}),
{
@@ -115,6 +115,7 @@ define('tools.restore', [
if('function' in treeInfo) {
extraData['functions'] = [nodeData._label];
}
extraData['save_btn_icon'] = 'upload';
return extraData;
},
url_for_utility_exists: function(id){
@@ -146,7 +147,7 @@ define('tools.restore', [
return;
}
pgBrowser.Node.registerUtilityPanel();
var panel = pgBrowser.Node.addUtilityPanel(),
var panel = pgBrowser.Node.addUtilityPanel(pgBrowser.stdW.md),
j = panel.$container.find('.obj_properties').first();
var schema = that.getUISchema(treeItem);
@@ -159,7 +160,7 @@ define('tools.restore', [
}),
extraData = that.setExtraParameters(treeNodeInfo, data);
var sqlHelpUrl = 'restore.html',
var sqlHelpUrl = 'backup.html',
helpUrl = url_for('help.static', {
'filename': 'restore_dialog.html',
});

28
web/pgadmin/tools/restore/static/js/restore.ui.js
View File

@@ -100,6 +100,9 @@ export class RestoreTypeObjSchema extends BaseUISchema {
group: gettext('Type of objects'),
deps: ['pre_data', 'data', 'post_data', 'only_schema'],
disabled: function(state) {
if(obj.selectedNodeType == 'table') {
state.only_data = true;
}
return (obj.selectedNodeType !== 'database' && obj.selectedNodeType !== 'schema') ||
(state.pre_data ||
state.data ||
@@ -114,6 +117,9 @@ export class RestoreTypeObjSchema extends BaseUISchema {
group: gettext('Type of objects'),
deps: ['pre_data', 'data', 'post_data', 'only_data'],
disabled: function(state) {
if(obj.selectedNodeType == 'index' || obj.selectedNodeType == 'function') {
state.only_schema = true;
}
return (obj.selectedNodeType !== 'database' && obj.selectedNodeType !== 'schema') ||
(state.pre_data ||
state.data ||
@@ -174,7 +180,7 @@ export class RestoreSaveOptSchema extends BaseUISchema {
disabled: false,
group: gettext('Do not save'),
visible: function() {
var serverInfo = obj.fieldOptions.nodeInfo;
var serverInfo = obj.fieldOptions.nodeInfo.server;
return !_.isUndefined(serverInfo) && serverInfo.version >= 110000 ? true : false;
},
}];
@@ -218,9 +224,11 @@ export class RestoreQueryOptionSchema extends BaseUISchema {
label: gettext('Clean before restore'),
type: 'switch',
group: gettext('Queries'),
disabled: function() {
return obj.selectedNodeType === 'function'
|| obj.selectedNodeType === 'trigger_function';
disabled: function(state) {
if(obj.selectedNodeType === 'function' || obj.selectedNodeType === 'trigger_function') {
state.clean = true;
return true;
}
},
}, {
id: 'single_transaction',
@@ -407,37 +415,37 @@ export default class RestoreSchema extends BaseUISchema {
}, {
type: 'nested-fieldset',
label: gettext('Sections'),
group: gettext('Restore options'),
group: gettext('Data/Objects'),
schema:obj.getSectionSchema(),
visible: true
}, {
type: 'nested-fieldset',
label: gettext('Type of objects'),
group: gettext('Restore options'),
group: gettext('Data/Objects'),
schema:obj.getRestoreTypeObjSchema(),
visible: true
}, {
type: 'nested-fieldset',
label: gettext('Do not save'),
group: gettext('Restore options'),
group: gettext('Data/Objects'),
schema:obj.getRestoreSaveOptSchema(),
visible: true
}, {
type: 'nested-fieldset',
label: gettext('Queries'),
group: gettext('Restore options'),
group: gettext('Options'),
schema:obj.getRestoreQueryOptionSchema(),
visible: true
}, {
type: 'nested-fieldset',
label: gettext('Disable'),
group: gettext('Restore options'),
group: gettext('Options'),
schema:obj.getRestoreDisableOptionSchema(),
visible: true
}, {
type: 'nested-fieldset',
label: gettext('Miscellaneous / Behavior'),
group: gettext('Restore options'),
group: gettext('Options'),
schema:obj.getRestoreMiscellaneousSchema(),
visible: true
}];