From 3d516101a446e04d09ad34f2fd00b76216ad2fb2 Mon Sep 17 00:00:00 2001
From: Pradip Parkale <pradip.parkale@enterprisedb.com>
Date: Tue, 21 Apr 2020 13:09:15 +0530
Subject: [PATCH] Fixed an issue wherein grant wizard the last object is not
 selectable. Fixes #4545

---
 docs/en_US/release_notes_4_21.rst                             | 1 +
 web/pgadmin/static/js/backgrid.pgadmin.js                     | 1 +
 web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js      | 2 +-
 web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/en_US/release_notes_4_21.rst b/docs/en_US/release_notes_4_21.rst
index 61fd2542b..8cab9665c 100644
--- a/docs/en_US/release_notes_4_21.rst
+++ b/docs/en_US/release_notes_4_21.rst
@@ -37,6 +37,7 @@ Bug fixes
 | `Issue #4440 <https://redmine.postgresql.org/issues/4440>`_ -  Ensure the DROP statements in reverse engineered SQL are properly quoted for all objects.
 | `Issue #4445 <https://redmine.postgresql.org/issues/4445>`_ -  Ensure all object names in the title line of the reverse-engineered SQL are not quoted.
 | `Issue #4512 <https://redmine.postgresql.org/issues/4512>`_ -  Fixed calendar opening issue on the exception tab inside the schedules tab of pgAgent.
+| `Issue #4545 <https://redmine.postgresql.org/issues/4545>`_ -  Fixed an issue wherein grant wizard the last object is not selectable.
 | `Issue #4573 <https://redmine.postgresql.org/issues/4573>`_ -  Ensure that if the delimiter is set other than comma then download the file as '.txt' file.
 | `Issue #4684 <https://redmine.postgresql.org/issues/4684>`_ -  Fixed encoding issue while saving data in encoded charset other than 'utf-8'.
 | `Issue #4709 <https://redmine.postgresql.org/issues/4709>`_ -  Added schema-qualified dictionary names in FTS configuration to avoid confusion of duplicate names.
diff --git a/web/pgadmin/static/js/backgrid.pgadmin.js b/web/pgadmin/static/js/backgrid.pgadmin.js
index 84009a152..f503048aa 100644
--- a/web/pgadmin/static/js/backgrid.pgadmin.js
+++ b/web/pgadmin/static/js/backgrid.pgadmin.js
@@ -1986,6 +1986,7 @@ define([
       this.$customSearchBox = $el;
       this.$customSearchBox.attr('type','search');
       this.$customSearchBox.on('keydown', this.search.bind(this));
+      this.$customSearchBox.on('mousedown', this.search.bind(this));
       return this;
     },
 
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 9031bc49c..dff68eaa1 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -500,6 +500,7 @@ define([
 
               coll.sort();
               this.dbObjectFilter = this.DbObjectFilter(coll);
+              coll.fullCollection = this.dbObjectFilter.shadowCollection;
 
               /**
                 privArray holds objects selected which further helps
@@ -513,7 +514,6 @@ define([
               */
               coll.on('backgrid:selected', function(model, selected) {
                 model.set('selected', selected);
-
                 var object_type = model.get('object_type');
                 switch (object_type) {
                 case 'Function':
diff --git a/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss b/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
index 5975d607d..185a2f694 100644
--- a/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
+++ b/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
@@ -12,7 +12,7 @@
 }
 
 .db_objects_grid {
-  height: 100%;
+  height: calc(100% - 15px);
 }
 
 .db_objects_filter {
@@ -49,7 +49,7 @@
   overflow: auto;
   width: 100%;
   /* 100% minus thead height */
-  height: calc(100% - 28px);
+  height: calc(100% - 40px);
 }
 
 .object_type_table tbody tr {