diff --git a/docs/en_US/release_notes_4_30.rst b/docs/en_US/release_notes_4_30.rst index 36a78c8ae..0efad07f2 100644 --- a/docs/en_US/release_notes_4_30.rst +++ b/docs/en_US/release_notes_4_30.rst @@ -39,5 +39,6 @@ Bug fixes | `Issue #6096 `_ - Updated deployment documentation, refer correctly to uWSGI where Gunicorn had been referenced. | `Issue #6120 `_ - Ensure that the user should be able to specify an older date for the account expiration of the role/user. | `Issue #6121 `_ - Fixed an issue where the database list in the new connection window is not visible. +| `Issue #6122 `_ - Added informative message when there is no difference found for schema diff. | `Issue #6128 `_ - Fixed an issue where sequences are not created. | `Issue #6140 `_ - Ensure that verbose logs should be visible for Utility(Backup, Maintenance) jobs. diff --git a/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js b/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js index 1808e80f3..bb81aa241 100644 --- a/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js +++ b/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js @@ -307,6 +307,18 @@ export default class SchemaDiffUI { return false; } + check_empty_diff() { + var self = this; + this.panel_obj.$container.find('#schema-diff-grid .slick-viewport .pg-panel-message').remove(); + if (self.dataView.getFilteredItems().length == 0) { + let msg = gettext('No difference found'); + // Make the height to 0px to avoid extra scroll bar, height will be calculated automatically. + this.panel_obj.$container.find('#schema-diff-grid .slick-viewport .grid-canvas')[0].style.height = '0px'; + this.panel_obj.$container.find('#schema-diff-grid .slick-viewport' + ).prepend('
'+ msg +'
'); + } + } + render_grid(data) { var self = this; @@ -315,6 +327,7 @@ export default class SchemaDiffUI { if (self.grid) { // Only render the data self.render_grid_data(data); + self.check_empty_diff(); return; } // Checkbox Column @@ -854,6 +867,7 @@ export default class SchemaDiffUI { if(!_.isUndefined(self.dataView) && !_.isNull(self.dataView)) { // Refresh the grid self.dataView.refresh(); + self.check_empty_diff(); } }