Merge branch 'next' into SER-1548

Author: ArtursKadikis

CHANGELOG.md

@@ -1,3 +1,18 @@
+## Version 24.05.11
+Fixes:
+- [cache] Use a cursor without timeout
+
+## Version 24.05.10
+Fixes:
+- [alerts] Alerts improvements
+- [core] Various fixes for frontend to support running countly from subdirectory
+- [logs]  Show collected problems on logger
+
+Enterprise fixes:
+- [data-manager] Fixes n UI to allow events starting with "/"
+- [flows] Fixes for flows step generation
+- [surveys] Other is not allowed as a valid answer for required questions
+
 ## Version 24.05.9
 Fixes:
 - [crashes] Fix crashes template paths and add data check

api/parts/data/cache.js

@@ -971,7 +971,7 @@ class StreamedCollection {
             let [col, last] = await createCollection(this.db, this.name, 1e7);
 
             this.col = col;
-            this.stream = col.find({_id: {$gt: last}}, {tailable: true, awaitData: true, numberOfRetries: -1}).stream();
+            this.stream = col.find({_id: {$gt: last}}, {tailable: true, awaitData: true, noCursorTimeout: true, numberOfRetries: -1}).stream();
 
             this.stream.on('data', doc => {
                 if (this.inserts.indexOf(doc._id.toString()) !== -1) {

frontend/express/public/core/app-management/templates/app-management.html

@@ -364,7 +364,27 @@ <h3 class="bu-mb-2" v-if="!newApp && hasAppAdminRights">{{i18n('management-appli
                                 </cly-inline-form-field>
                             </el-collapse-item>
                         </el-collapse>
-                        <cly-diff-helper :diff="changeKeys" @discard="onDiscard" @save="saveSettings" :disabled="v.invalid" :emitSaveWhenDisabled="true"></cly-diff-helper>
+                        <cly-diff-helper :diff="changeKeys" @discard="onDiscard" @save="saveSettings" :disabled="v.invalid" :emitSaveWhenDisabled="true" :isModal=true>
+                            <template v-slot:main>
+                                <div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
+                                    <span class="selected-count-blue bu-pl-1 text-medium">
+                                        <span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{changeKeys.length}}</span>
+								        <span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
+								        <span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
+                                    </span>
+                                    <span class="vertical-divider bu-mr-4 bu-ml-4"></span>
+                                    <el-button skin="red" class="bu-mr-2" size="small" type="default" @click="saveSettings">
+                                        <i class="cly-io-16 cly-io cly-io-save" style="font-size: larger;"></i>
+                                        <span class="bu-ml-1">
+                                            {{ i18n('dashboards.save-changes') }}
+                                        </span>
+                                    </el-button>
+                                    <el-button class="x-button" @click="onDiscard">
+                                        <i class="cly-io-16 cly-io cly-io-x color-cool-gray-50"></i>
+                                    </el-button>
+                                </div>
+                            </template>
+                        </cly-diff-helper>
                     </validation-observer>
                 </cly-section>
                 <el-card class="box-card color-cool-gray-100" v-if="!newApp && isCode">

frontend/express/public/core/events/javascripts/countly.details.views.js

@@ -1,4 +1,4 @@
-/* global countlyVue, countlyGlobal, countlyAllEvents, countlyCommon, CV,app*/
+/* global countlyVue, countlyGlobal, countlyAllEvents, countlyCommon, CountlyHelpers, CV,app*/
 (function() {
     var EventsTable = countlyVue.views.create({
         template: CV.T("/core/events/templates/eventsTable.html"),
@@ -400,9 +400,10 @@
             clyModel: countlyAllEvents
         }],
     });
-    app.route("/analytics/events/key/:eventKey", "events", function(eventKey) {
+    app.route("/analytics/events/key/*eventKey", "events", function(query) {
+        var queryUrlParameter = query && CountlyHelpers.isJSON(query) ? JSON.parse(query) : query;
         var params = {
-            eventKey: eventKey
+            eventKey: queryUrlParameter
         };
         var eventsViewWrapper = getAllEventsView();
         eventsViewWrapper.params = params;

frontend/express/public/core/events/javascripts/countly.overview.views.js

@@ -12,7 +12,7 @@
         },
         methods: {
             onRowClick: function(params) {
-                app.navigate("#/analytics/events/key/" + params.key, true);
+                app.navigate("#/analytics/events/key/" + JSON.stringify(params.key), true);
             },
             formatNumber: function(val) {
                 return countlyCommon.formatNumber(val);
@@ -243,7 +243,7 @@
                 this.$store.dispatch('countlyEventsOverview/fetchMonitorEvents');
             },
             onMetricClick: function(params) {
-                app.navigate("#/analytics/events/key/" + params.key, true);
+                app.navigate("#/analytics/events/key/" + JSON.stringify(params.key), true);
             },
             durCheck: function(item) {
                 var eventMapKey = item.eventKey;

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

@@ -529,8 +529,9 @@
         template: '<cly-dropdown class="cly-vue-more-options" ref="dropdown" :placement="placement" :disabled="disabled" v-on="$listeners">\
                         <template v-slot:trigger>\
                             <slot name="trigger">\
-                                <el-button :data-test-id="testId + \'-more-option-button\'" :size="size" :icon="icon" :type="type">\
-                                <span :data-test-id="testId + \'-more-option-text\'" v-if="text">{{text}}</span>\
+                                <el-button :data-test-id="testId + \'-more-option-button\'" :size="size" :icon="icon" :type="type" @click="toggleArrowState">\
+                                    <span :data-test-id="testId + \'-more-option-text\'" v-if="text">{{text}}</span>\
+                                    <i v-if="showArrows" class="el-select__caret" :class="[iconClass]"></i>\
                                 </el-button>\
                             </slot>\
                         </template>\
@@ -567,16 +568,36 @@
             testId: {
                 type: String,
                 default: 'cly-more-options-test-id'
+            },
+            showArrows: {
+                type: Boolean,
+                default: false
             }
         },
+        data: function() {
+            return {
+                arrowState: false,
+            };
+        },
         mounted: function() {
             this.$on('menu-item-click', this.handleMenuItemClick);
         },
+        computed: {
+            iconClass: function() {
+                return this.arrowState ? 'ion-arrow-up-b is-reverse' : 'ion-arrow-up-b';
+            },
+        },
         methods: {
             handleMenuItemClick: function(command, instance) {
                 if (!this.disabled) {
                     this.$emit('command', command, instance);
                     this.$refs.dropdown.handleClose();
+                    this.arrowState = false;
+                }
+            },
+            toggleArrowState: function() {
+                if (!this.disabled) {
+                    this.arrowState = !this.arrowState;
                 }
             }
         },

frontend/express/public/localization/dashboard/dashboard.properties

@@ -261,6 +261,7 @@ common.undo = Undo
 common.drawer.next-step = Next step
 common.drawer.previous-step = Previous step
 common.diff-helper.changes = You made {0} changes.
+common.diff-helper.changes-made = changes have been made.
 common.diff-helper.keep = Do you want to keep them?
 common.save-changes = Save Changes
 common.discard-changes = Discard

frontend/express/public/stylesheets/styles/blocks/_dropdown.scss

@@ -175,5 +175,9 @@
 .cly-vue-more-options {
     .el-button {
         border: 1px solid #CFD6E4;
+        .is-reverse {
+            -webkit-transform: rotateZ(0);
+            transform: rotateZ(0);
+        }
     }
 }