fix: Name improvement change

namings fixed for backward compatibility
Countly · Jan 10, 2025 · 25b46a2 · 25b46a2
1 parent 31bc58f
commit 25b46a2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/frontend/express/public/javascripts/countly/vue/components/content.js b/frontend/express/public/javascripts/countly/vue/components/content.js
@@ -52,12 +52,18 @@
                 type: Boolean
             },
 
+            isToggleActive: {
+                type: Boolean,
+                required: false,
+                default: false
+            },
+
             isToggleDisabled: {
                 default: false,
                 type: Boolean
             },
 
-            options: {
+            topDropdownOptions: {
                 type: Array,
                 default: () => []
             },
@@ -82,18 +88,14 @@
             },
 
             toggle: {
-                default: false,
-                type: Boolean
+                type: Boolean,
+                required: false,
+                default: false
             },
 
             toggleTooltip: {
-                default: null,
-                type: String
-            },
-
-            toggleValue: {
-                default: false,
-                type: Boolean
+                type: String,
+                required: false
             },
 
             value: {
@@ -151,7 +153,7 @@
             },
 
             isOptionsButtonVisible() {
-                return !!this.options.length;
+                return !!this.topDropdownOptions.length;
             },
 
             localValue: {
@@ -162,15 +164,6 @@
                     this.$emit('input', value);
                 }
             },
-
-            toggleLocalValue: {
-                get() {
-                    return this.toggleValue;
-                },
-                set(value) {
-                    this.$emit('switch-toggle', value);
-                }
-            }
         },
 
         methods: {
@@ -200,7 +193,7 @@
 
             toggleInputReadonlyState() {
                 this.isReadonlyInput = !this.isReadonlyInput;
-            }
+            },
         }
     }));
 
@@ -623,4 +616,4 @@
             </div>
         `
     }));
-}(window.countlyVue = window.countlyVue || {}));
+}(window.countlyVue = window.countlyVue || {}));
diff --git a/frontend/express/public/javascripts/countly/vue/templates/content/content-header.html b/frontend/express/public/javascripts/countly/vue/templates/content/content-header.html
@@ -12,13 +12,14 @@
                 :class="closeButtonIcon"
             />
         </div>
-        <el-switch
-            v-if="toggle"
-            v-tooltip.right="toggleTooltip"
-            v-model="toggleLocalValue"
-            class="cly-vue-content-builder-header__toggle"
-            :disabled="isToggleDisabled"
-        />
+        <div v-if="toggle" class="cly-vue-content-builder__layout-header__toggle bu-mr-4">
+            <el-switch
+                v-tooltip.right="toggleTooltip"
+                :value="isToggleActive"
+                :disabled="isToggleDisabled"
+                @change="$emit('switch-toggle', $event)"
+            />
+        </div>
         <div class="cly-vue-content-builder-header__info">
             <div
                 v-tooltip="inputTooltip"
@@ -80,7 +81,7 @@
             @command="onCommand"
         >
             <el-dropdown-item
-                v-for="(option, idx) in options"
+                v-for="(option, idx) in topDropdownOptions"
                 :key="`cly-vue-content-builder-header-option-${idx}`"
                 class="cly-vue-content-builder-header__option"
                 :command="option.value"
@@ -92,4 +93,4 @@
             </el-dropdown-item>
         </cly-more-options>
     </div>
-</div>
+</div>