From c80ea7ae89c356a662616972f50fc1c29f47e0a1 Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Wed, 29 Sep 2021 19:56:30 +0530
Subject: [PATCH] =?UTF-8?q?1)=20Fixed=20accessibility=20issues=20for=20Tri?=
 =?UTF-8?q?gger=20functions.=20Fixes=20#6803=202)=20Fixed=20incorrect=20pr?=
 =?UTF-8?q?ivileges=20value=20in=C2=A0Materialize=C2=A0View.=20Fixes=20#67?=
 =?UTF-8?q?81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../databases/schemas/tables/triggers/static/js/trigger.ui.js | 4 ++--
 .../browser/server_groups/servers/static/js/vacuum.ui.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
index bc42b1f1d..676226169 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
@@ -339,7 +339,7 @@ export default class TriggerSchema extends BaseUISchema {
       }
     },{
       id: 'tfunction', label: gettext('Trigger function'),
-      type: 'select', disabled: obj.inSchemaWithModelCheck,
+      type: 'select', readonly: obj.inSchemaWithModelCheck,
       mode: ['create','edit', 'properties'], group: gettext('Definition'),
       control: 'node-ajax-options', url: 'get_triggerfunctions', url_jump_after_node: 'schema',
       options: obj.fieldOptions.triggerFunction,
@@ -348,7 +348,7 @@ export default class TriggerSchema extends BaseUISchema {
       id: 'tgargs', label: gettext('Arguments'), cell: 'text',
       group: gettext('Definition'),
       type: 'text',mode: ['create','edit', 'properties'], deps: ['tfunction'],
-      disabled: (state) => {
+      readonly: (state) => {
         // We will disable it when EDB PPAS and trigger function is
         // set to Inline EDB-SPL
         var tfunction = state.tfunction,
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/vacuum.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/vacuum.ui.js
index bfe6ea13d..f18a41a9d 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/vacuum.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/vacuum.ui.js
@@ -122,7 +122,7 @@ export default class VacuumSettingsSchema extends BaseUISchema {
       disabled: function(state) {
         // We need to check additional condition to toggle enable/disable
         // for table auto-vacuum
-        if(obj.inCatalog && state.hastoasttable) {
+        if(obj.inCatalog && (obj.top.isNew() || state.hastoasttable)) {
           return false;
         }
         return true;