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

Fixed issue of error message not getting displayed when filename is empty for backup, restore, and import/export. Fixes #3814.

Browse Source
This commit is contained in:
Satish V 2020-07-06 19:04:26 +05:30 committed by Akshay Joshi
parent 45a03dd663
commit 2ebf203412
7 changed files with 91 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_24.rst
View File

@ -20,6 +20,7 @@ Housekeeping
Bug fixes
*********
| `Issue #3814 <https://redmine.postgresql.org/issues/3814>`_ - Fixed issue of error message not getting displayed when filename is empty for backup, restore, and import/export.
| `Issue #3851 <https://redmine.postgresql.org/issues/3851>`_ - Add proper indentation to the code while generating functions, procedures, and trigger functions.
| `Issue #4235 <https://redmine.postgresql.org/issues/4235>`_ - Fixed tab indent issue on a selection of lines is deleting the content when 'use spaces == true' in the preferences.
| `Issue #5287 <https://redmine.postgresql.org/issues/5287>`_ - Fixed dark theme-related CSS and modify the color codes.

6
web/pgadmin/static/scss/_alert.scss
View File

@ -87,6 +87,12 @@
}
}
}
.alertify_tools_dialog_properties .pg-prop-status-bar {
position: absolute;
right: 0;
left: 0;
bottom: 0;
}
.pg-prop-status-bar {
padding: 5px;

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

@ -106,11 +106,22 @@ export class BackupDialogWrapper extends DialogWrapper {
const dialog = this.createDialog(node, treeInfo, this.typeOfDialog, $container);
this.addAlertifyClassToBackupNodeChildNodes();
dialog.render();
const statusBar = this.jquery(
'<div class=\'pg-prop-status-bar pg-prop-status-bar-absolute pg-el-xs-12 d-none\'>' +
' <div class="error-in-footer"> ' +
' <div class="d-flex px-2 py-1"> ' +
' <div class="pr-2"> ' +
' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
' </div> ' +
' <div class="alert-text" role="alert"></div> ' +
' </div> ' +
' </div> ' +
'</div>').appendTo($container);
this.elements.content.appendChild($container.get(0));
this.focusOnDialog(this);
this.setListenersForFilenameChanges();
this.setListenersForFilenameChanges(statusBar);
}
callback(event) {
@ -231,16 +242,27 @@ export class BackupDialogWrapper extends DialogWrapper {
return treeInfo.server._id;
}
setListenersForFilenameChanges() {
setListenersForFilenameChanges(statusBar) {
const self = this;
this.view.model.on('change', function () {
const ctx = this;
var errmsg;
const showError = function(errorField, errormsg) {
ctx.errorModel.set(errorField, errormsg);
statusBar.removeClass('d-none');
statusBar.find('.alert-text').html(errormsg);
};
if (!_.isUndefined(this.get('file')) && this.get('file') !== '') {
this.errorModel.clear();
statusBar.addClass('d-none');
self.enableBackupButton();
} else {
self.disableBackupButton();
this.errorModel.set('file', gettext('Please provide a filename'));
errmsg = gettext('Please provide a filename');
showError('file', errmsg);
}
});
}

34
web/pgadmin/tools/import_export/static/js/import_export.js
View File

@ -624,37 +624,63 @@ define([
);
view.render();
const statusBar = $(
'<div class=\'pg-prop-status-bar pg-prop-status-bar-absolute pg-el-xs-12 d-none\'>' +
' <div class="error-in-footer"> ' +
' <div class="d-flex px-2 py-1"> ' +
' <div class="pr-2"> ' +
' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
' </div> ' +
' <div class="alert-text" role="alert"></div> ' +
' </div> ' +
' </div> ' +
'</div>').appendTo($container);
this.elements.content.appendChild($container.get(0));
// Listen to model & if filename is provided then enable OK button
// For the 'Quote', 'escape' and 'delimiter' only one character is allowed to enter
this.view.model.on('change', function() {
const ctx = this;
var errmsg;
const showError = function(errorField, errormsg) {
ctx.errorModel.set(errorField, errormsg);
statusBar.removeClass('d-none');
statusBar.find('.alert-text').html(errormsg);
};
if (!_.isUndefined(this.get('filename')) && this.get('filename') !== '') {
this.errorModel.clear();
statusBar.addClass('d-none');
if (!_.isUndefined(this.get('delimiter')) && !_.isNull(this.get('delimiter'))) {
this.errorModel.clear();
statusBar.addClass('d-none');
if (!_.isUndefined(this.get('quote')) && this.get('quote') !== '' &&
this.get('quote').length == 1) {
this.errorModel.clear();
statusBar.addClass('d-none');
if (!_.isUndefined(this.get('escape')) && this.get('escape') !== '' &&
this.get('escape').length == 1) {
this.errorModel.clear();
statusBar.addClass('d-none');
self.__internal.buttons[1].element.disabled = false;
} else {
self.__internal.buttons[1].element.disabled = true;
this.errorModel.set('escape', gettext('Escape should contain only one character'));
errmsg = gettext('Escape should contain only one character');
showError('escape', errmsg);
}
} else {
self.__internal.buttons[1].element.disabled = true;
this.errorModel.set('quote', gettext('Quote should contain only one character'));
errmsg = gettext('Quote should contain only one character');
showError('quote', errmsg);
}
} else {
self.__internal.buttons[1].element.disabled = true;
this.errorModel.set('delimiter', gettext('Delimiter should contain only one character'));
errmsg = gettext('Delimiter should contain only one character');
showError('delimiter', errmsg);
}
} else {
self.__internal.buttons[1].element.disabled = true;
this.errorModel.set('filename', gettext('Please provide filename'));
errmsg = gettext('Please provide filename');
showError('filename', errmsg);
}
});

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

@ -98,11 +98,22 @@ export class RestoreDialogWrapper extends DialogWrapper {
const dialog = this.createDialog(node, treeInfo, $container);
this.addAlertifyClassToRestoreNodeChildNodes();
dialog.render();
const statusBar = this.jquery(
'<div class=\'pg-prop-status-bar pg-prop-status-bar-absolute pg-el-xs-12 d-none\'>' +
' <div class="error-in-footer"> ' +
' <div class="d-flex px-2 py-1"> ' +
' <div class="pr-2"> ' +
' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
' </div> ' +
' <div class="alert-text" role="alert"></div> ' +
' </div> ' +
' </div> ' +
'</div>').appendTo($container);
this.elements.content.appendChild($container.get(0));
this.focusOnDialog(this);
this.setListenersForFilenameChanges();
this.setListenersForFilenameChanges(statusBar);
}
callback(event) {
@ -218,16 +229,27 @@ export class RestoreDialogWrapper extends DialogWrapper {
return treeInfo.server._id;
}
setListenersForFilenameChanges() {
setListenersForFilenameChanges(statusBar) {
const self = this;
this.view.model.on('change', function () {
const ctx = this;
var errmsg;
const showError = function(errorField, errormsg) {
ctx.errorModel.set(errorField, errormsg);
statusBar.removeClass('d-none');
statusBar.find('.alert-text').html(errormsg);
};
if (!_.isUndefined(this.get('file')) && this.get('file') !== '') {
this.errorModel.clear();
statusBar.addClass('d-none');
self.enableRestoreButton();
} else {
self.disableRestoreButton();
this.errorModel.set('file', gettext('Please provide a filename'));
errmsg = gettext('Please provide a filename');
showError('file', errmsg);
}
});
}

2
web/regression/javascript/backup/backup_dialog_wrapper_spec.js
View File

@ -94,6 +94,8 @@ describe('BackupDialogWrapper', () => {
return backupJQueryContainerSpy;
} else if (selector === backupNode.elements.body.childNodes[0]) {
return backupNodeChildNodeSpy;
} else {
return jasmine.createSpyObj('obj', ['appendTo']);
}
});
alertifySpy = jasmine.createSpyObj('alertify', ['alert', 'dialog']);

2
web/regression/javascript/restore/restore_dialog_wrapper_spec.js
View File

@ -87,6 +87,8 @@ describe('RestoreDialogWrapper', () => {
return restoreJQueryContainerSpy;
} else if (selector === restoreNode.elements.body.childNodes[0]) {
return restoreNodeChildNodeSpy;
} else {
return jasmine.createSpyObj('obj', ['appendTo']);
}
});
});