Merge branch 'master' into dependabot/npm_and_yarn/multi-2f20eee292

Author: ar2rsawseen

CHANGELOG.md

@@ -6,13 +6,17 @@ Enterprise Features:
 Fixes:
 - [core] Unifying alphabetical order for dropdowns with dashboard apps
 - [hooks] Added null check for incoming data
+- [core] Fix auto refresh frontend component
+- [times-of-day] Fix chart component
+- [push] Fix external drawer initialization
 
 Enterprise Fixes:
 - [content] Asset URL was wrongly constructed when user switches between apps
 - [ab-testing] Updates
     - Do not wait for result calculation when requesting experiments
     - Do not calculate result for completed experiments
 - [drill] [license] Shorten warning period from 14 days to 3 days
+- [license] Fix chart legend
 
 Dependencies:
 - Bump eslint-plugin-vue from 9.33.0 to 10.1.0

frontend/express/public/javascripts/countly/vue/components/helpers.js

@@ -1442,7 +1442,7 @@
                             <el-button @click='stopAutoRefresh()'><i class='bu-ml-2 fa fa-stop-circle' :data-test-id='testId + \"-auto-refresh-toggle-button\"'></i> {{i18n('auto-refresh.stop')}}\
                             </el-button>\
                         </div>\
-                        <div v-else-if='!autoRefresh' class='bu-level-item'>\
+                        <div class='bu-level-item' :class=\"{ 'bu-is-hidden': autoRefresh }\">\
                             <el-switch v-model='autoRefresh' :test-id='testId + \"-auto-refresh-toggle\"'>\
                             </el-switch>\
                             <span class='cly-vue-auto-refresh-toggle__refresh--disabled' :data-test-id='testId + \"-auto-refresh-toggle-disabled-label\"'>{{i18n('auto-refresh.enable')}}</span>\

plugins/push/frontend/public/javascripts/countly.views.js

@@ -731,7 +731,21 @@
                 }
                 this.updatePlatformsBasedOnAppConfig();
                 this.estimateIfNecessary();
-                this.setEnabledUsers(this.$store.state.countlyPushNotificationDashboard.enabledUsers);
+
+                if (this.$store.state.countlyPushNotificationDashboard) {
+                    this.setEnabledUsers(this.$store.state.countlyPushNotificationDashboard.enabledUsers);
+                }
+                else {
+                    var self = this;
+
+                    countlyPushNotification.service.fetchDashboard()
+                        .then(function(response) {
+                            self.setEnabledUsers(response.enabledUsers);
+                        })
+                        .catch(function(error) {
+                            console.error(error);
+                        });
+                }
             },
             addButton: function() {
                 this.pushNotificationUnderEdit.message[this.activeLocalization].buttons.push({label: "", url: ""});
@@ -2906,4 +2920,4 @@
         app.configurationsView.registerLabel("push.proxyport", "push-notification.proxy-port");
         app.configurationsView.registerLabel("push.proxyuser", "push-notification.proxy-user");
     }
-}());
+}());

plugins/push/package-lock.json

@@ -4,7 +4,7 @@
     var MAX_SYMBOL_VALUE = 20;
 
     countlyTimesOfDayComponent.ScatterChart = countlyVue.views.create({
-        template: '<cly-chart-generic v-bind="$attrs" :option="timesOfDayOptions" v-loading="isLoading"></cly-chart-generic>',
+        template: '<cly-chart-generic v-bind="$attrs" :option="timesOfDayOptions"></cly-chart-generic>',
         mixins: [countlyVue.mixins.commonFormatters],
         props: {
             maxSeriesValue: {
@@ -116,4 +116,4 @@
         }
     });
 
-}(window.countlyTimesOfDayComponent = window.countlyTimesOfDayComponent || {}));
+}(window.countlyTimesOfDayComponent = window.countlyTimesOfDayComponent || {}));