Merge branch 'next' into fix-remove-console-log-when-selecting-carousel-type

Author: kanwarujjaval

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version XX.XX.XX
+Fixes:
+- [remote-config] Moving the remote config enable/disable functionality to the drop-down
+
 ## Version 24.10.x
 
 Dependencies:

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});
-})();
+})();

plugins/remote-config/frontend/public/templates/parameters.html

@@ -87,28 +87,21 @@
               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"
                 command="remove" :data-test-id="'datatable-remote-config-button-delete-' + rowScope.$index">{{i18n('common.delete')}}</el-dropdown-item>
             </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>
+</div>