From df789688067f0019c62e761d2f9d309cd10b3b82 Mon Sep 17 00:00:00 2001
From: Danu Widatama <widatama@gmail.com>
Date: Mon, 11 Nov 2024 18:45:27 +0700
Subject: [PATCH 1/2] [remote-config] Move enable/disable to dropdown

---
 .../public/javascripts/countly.views.js       | 17 ++++++++-------
 .../frontend/public/templates/parameters.html | 21 +++++++------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/plugins/remote-config/frontend/public/javascripts/countly.views.js b/plugins/remote-config/frontend/public/javascripts/countly.views.js
index f4716092fc5..ded3fefd01c 100644
--- a/plugins/remote-config/frontend/public/javascripts/countly.views.js
+++ b/plugins/remote-config/frontend/public/javascripts/countly.views.js
@@ -810,19 +810,22 @@
                     refresh();
                 });
             },
-            startParameter: function(rowObj) {
-                this.toggleParameterState(rowObj, "Running");
-            },
-            stopParameter: function(rowObj) {
-                this.toggleParameterState(rowObj, "Stopped");
-            },
             handleCommand: function(command, scope, row) {
                 var self = this;
                 switch (command) {
+
+                case 'disable':
+                    self.toggleParameterState(row, "Stopped");
+                    break;
+
                 case "edit":
                     self.openDrawer("parameters", row);
                     break;
 
+                case 'enable':
+                    this.toggleParameterState(row, "Running");
+                    break;
+
                 case "remove":
                     CountlyHelpers.confirm(this.i18n("remote-config.confirm-parameter-delete", "<b>" + row.parameter_key + "</b>"), "popStyleGreen", function(result) {
                         if (!result) {
@@ -1033,4 +1036,4 @@
         this.renderWhenReady(mainView);
     });
     app.addMenu("improve", {code: "remote-config", permission: FEATURE_NAME, pluginName: "remote-config", url: "#/remote-config", text: "sidebar.remote-config", icon: '<div class="logo"><i class="material-icons" style="transform:rotate(90deg)"> call_split </i></div>', priority: 30});
-})();
\ No newline at end of file
+})();
diff --git a/plugins/remote-config/frontend/public/templates/parameters.html b/plugins/remote-config/frontend/public/templates/parameters.html
index efcbeb3a2ee..691aebef96a 100644
--- a/plugins/remote-config/frontend/public/templates/parameters.html
+++ b/plugins/remote-config/frontend/public/templates/parameters.html
@@ -87,6 +87,12 @@
               v-tooltip.left="rowScope.row.editable ? '' : i18n('remote-config.parameter.action-tooltip-content')"
               :disabledButton="rowScope.row.editable ? false : true"
               @command="handleCommand($event, scope, rowScope.row)">
+              <template v-if="hasUpdateRight && rowScope.row.editable">
+                <el-dropdown-item v-if="rowScope.row.status==='Stopped' || rowScope.row.status==='Expired'"
+                  command="enable" :data-test-id="'datatable-remote-config-button-enable-' + rowScope.$index">{{i18n('remote-config.enable')}}</el-dropdown-item>
+                <el-dropdown-item v-else
+                  command="disable" :data-test-id="'datatable-remote-config-button-disable-' + rowScope.$index">{{i18n('remote-config.disable')}}</el-dropdown-item>
+              </template>
               <el-dropdown-item v-if="hasUpdateRight && rowScope.row.editable"
                 command="edit" :data-test-id="'datatable-remote-config-button-edit-' + rowScope.$index">{{i18n('common.edit')}}</el-dropdown-item>
               <el-dropdown-item v-if="hasDeleteRight && rowScope.row.editable"
@@ -94,21 +100,8 @@
             </cly-more-options>
           </template>
         </el-table-column>
-        <el-table-column v-if="hasUpdateRight" min-width="110">
-          <template v-slot="rowScope">
-            <div v-if="rowScope.row.hover && rowScope.row.editable">
-              <el-button  v-if="rowScope.row.status==='Stopped' || rowScope.row.status==='Expired'"
-                @click.stop="startParameter(rowScope.row)" size="small"
-                icon="el-icon-remove" :data-test-id="'datatable-remote-config-button-enable-' + rowScope.$index">{{i18n('remote-config.enable')}}
-              </el-button>
-              <el-button :data-test-id="'datatable-remote-config-button-disable-' + rowScope.$index" v-else @click.stop="stopParameter(rowScope.row)" size="small"
-                icon="el-icon-remove">{{i18n('remote-config.disable')}}
-              </el-button>
-            </div>
-          </template>
-        </el-table-column>
       </template>
     </cly-datatable-n>
   </cly-main>
   <drawer :controls="drawers.parameters" @submit="onSubmit"></drawer>
-</div>
\ No newline at end of file
+</div>

From 6cb74ae42d466b3d72f32f5f4097ca5813971550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Art=C5=ABrs=20Kadi=C4=B7is?= <kadikis.arturs@gmail.com>
Date: Mon, 25 Nov 2024 18:42:16 +0200
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6aedf66af5..06c3e4a8b69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Version XX.XX.XX
+Fixes:
+- [remote-config] Moving the remote config enable/disable functionality to the drop-down
+
+Enterprise fixes:
+
 ## Version 24.10.2
 Fixes:
 - [core] Correct aggregated collection cleanup on event omitting