commit f0da755d2842c93ab1e17347d4247cbfb016bb9e
author Thomas Dräbing <thomas.draebing@sap.com> Thu Aug 12 13:13:48 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 12 13:13:48 2021 +0000
tree 20e2f349fe28530951fa005f5749cc316bb123e1
parent 02af254e9863ef9b280707de090c15ad160ffab5
parent 0cdfd5cecf1c2493f48dbbd930ac0817b9b79839

Merge "Fix disabling of plugin project config option in UI" into stable-3.2

polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js

diff --git a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js
index 8a01f93..dcabdfc 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js
+++ b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js
@@ -91,7 +91,7 @@
   }
 
   _computeDisabled(editable) {
-    return editable === 'false';
+    return !editable;
   }
 
   /**

polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.html

diff --git a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.html b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.html
index a2370d9..b124d9b 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.html
@@ -57,8 +57,10 @@
   });
 
   test('_computeDisabled', () => {
-    assert.isFalse(element._computeDisabled('true'));
-    assert.isTrue(element._computeDisabled('false'));
+    assert.isFalse(element._computeDisabled(true));
+    assert.isTrue(element._computeDisabled(undefined));
+    assert.isTrue(element._computeDisabled(null));
+    assert.isTrue(element._computeDisabled(false));
   });
 
   test('_handleChange', () => {
@@ -93,7 +95,7 @@
     test('ARRAY type option', () => {
       element.pluginData = {
         name: 'testName',
-        config: {plugin: {value: 'test', type: 'ARRAY'}},
+        config: {plugin: {value: 'test', type: 'ARRAY', editable: true}},
       };
       flushAsynchronousOperations();
 
@@ -108,7 +110,7 @@
     test('BOOLEAN type option', () => {
       element.pluginData = {
         name: 'testName',
-        config: {plugin: {value: 'true', type: 'BOOLEAN'}},
+        config: {plugin: {value: 'true', type: 'BOOLEAN', editable: true}},
       };
       flushAsynchronousOperations();
 
@@ -127,7 +129,7 @@
     test('INT/LONG/STRING type option', () => {
       element.pluginData = {
         name: 'testName',
-        config: {plugin: {value: 'test', type: 'STRING'}},
+        config: {plugin: {value: 'test', type: 'STRING', editable: true}},
       };
       flushAsynchronousOperations();
 
@@ -148,7 +150,9 @@
       const permitted_values = ['test', 'newTest'];
       element.pluginData = {
         name: 'testName',
-        config: {plugin: {value: 'test', type: 'LIST', permitted_values}},
+        config: {plugin:
+          {value: 'test', type: 'LIST', editable: true, permitted_values},
+        },
       };
       flushAsynchronousOperations();