Merge branch 'next' into ar2rsawseen/next

Author: ar2rsawseen

.eslintrc.json

@@ -251,6 +251,28 @@
                 ]
             }
         },
+        {
+            "files": [ "plugins/content/api/positioning/**/*.js" ],
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "module"
+            },
+            "env": {
+                "node": true,
+                "es2023": true
+            }
+        },
+        {
+            "files": [ "plugins/content/api/positioning/**/*.cjs" ],
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "commonjs"
+            },
+            "env": {
+                "node": true,
+                "es2023": true
+            }
+        },
         {
             "files": [
                 "api/**/*.js",

.github/workflows/main.yml

@@ -6,7 +6,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   pull_request:
-    branches: [ master, next, release.* ]
+    branches: [ master, next, release.*, flex ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

CHANGELOG.md

@@ -53,6 +53,29 @@ Dependencies:
 - Bump sass from 1.81.0 to 1.83.3
 - Bump tslib from 2.7.0 to 2.8.1
 
+## Version 24.10.6
+  
+Fixes:
+- [push] Using apns-id header as message result in debug mode
+- [server-stats] Fix data point calculation in job
+- [TopEventsJob] preserver previous state if overwriting fails
+- [ui] scroll top on step changes in drawers
+
+Enterprise fixes:
+- [drill] Encoding url component before changing history state
+- [drill] Fixed drill meta regeneration
+- [drill] [license] Update license loader to enable supplying db client
+- [users] Format data points displayed in user sidebar
+- [cohorts] Unescape drill texts in cohort component
+   
+Dependencies:
+- Bump fs-extra from 11.2.0 to 11.3.0
+- Bump nodemailer from 6.9.16 to 6.10.0
+
+Enterprise Dependencies:
+- Bump nanoid in /plugins/cognito from 2.1.11 to 3.3.8
+- Bump shortid in /plugins/cognito from 2.2.16 to 2.2.17
+
 ## Version 24.10.3
 Fixes:
 - [dashboards] Fixing issue where dashboard widgets go into single column

api/jobs/topEvents.js

@@ -19,8 +19,8 @@ class TopEventsJob extends job.Job {
     /**
      * TopEvents initialize function
      */
-    init() {
-        this.getAllApps();
+    async init() {
+        return this.getAllApps();
     }
 
     /**
@@ -144,6 +144,7 @@ class TopEventsJob extends job.Job {
         }
         catch (error) {
             log.e("TopEvents Job has a error: ", error);
+            throw error;
         }
     }
 
@@ -157,7 +158,18 @@ class TopEventsJob extends job.Job {
         const encodedData = this.encodeEvents(data);
         const timeSecond = this.timeSecond();
         const currentPeriood = this.mutatePeriod(period);
-        await new Promise((res, rej) => common.db.collection(TopEventsJob.COLLECTION_NAME).insert({ app_id: _id, ts: timeSecond, period: currentPeriood, data: encodedData, totalCount: totalCount, prevTotalCount: prevTotalCount, totalSum: totalSum, prevTotalSum: prevTotalSum, totalDuration: totalDuration, prevTotalDuration: prevTotalDuration, prevSessionCount: sessionData.prevSessionCount, totalSessionCount: sessionData.totalSessionCount, prevUsersCount: usersData.prevUsersCount, totalUsersCount: usersData.totalUsersCount }, (error, records) => !error && records ? res(records) : rej(error)));
+        await new Promise((res, rej) => common.db.collection(TopEventsJob.COLLECTION_NAME).findOneAndReplace(
+            {
+                app_id: _id, period: currentPeriood,
+            },
+            {
+                app_id: _id, ts: timeSecond, period: currentPeriood, data: encodedData, totalCount: totalCount, prevTotalCount: prevTotalCount, totalSum: totalSum, prevTotalSum: prevTotalSum, totalDuration: totalDuration, prevTotalDuration: prevTotalDuration, prevSessionCount: sessionData.prevSessionCount, totalSessionCount: sessionData.totalSessionCount, prevUsersCount: usersData.prevUsersCount, totalUsersCount: usersData.totalUsersCount
+            },
+            {
+                upsert: true
+            },
+            (error, records) => !error && records ? res(records) : rej(error))
+        );
     }
 
     /**
@@ -169,7 +181,6 @@ class TopEventsJob extends job.Job {
         const getEvents = await new Promise((res, rej) => common.db.collection("events").findOne({ _id: app._id }, (errorEvents, result) => errorEvents ? rej(errorEvents) : res(result)));
         if (getEvents && 'list' in getEvents) {
             const eventMap = this.eventsFilter(getEvents.list);
-            await new Promise((res, rej) => common.db.collection(TopEventsJob.COLLECTION_NAME).remove({ app_id: app._id }, (error, result) => error ? rej(error) : res(result)));
             if (eventMap && eventMap instanceof Array) {
                 for (const period of TopEventsJob.PERIODS) {
                     const data = {};
@@ -211,9 +222,14 @@ class TopEventsJob extends job.Job {
      * @param {Db} db connection
      * @param {done} done callback
      */
-    run(db, done) {
-        this.init();
-        done();
+    async run(db, done) {
+        try {
+            await this.init();
+            done();
+        }
+        catch (error) {
+            done(error);
+        }
     }
 }
 

api/parts/mgmt/app_users.js

@@ -439,6 +439,7 @@ usersApi.mergeOtherPlugins = function(options, callback) {
                         if (result && result.length) {
                             for (let index = 0; index < result.length; index++) {
                                 if (result[index].status === "rejected") {
+                                    log.e(result[index]);
                                     retry = true;
                                     break;
                                 }

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

@@ -409,6 +409,11 @@
         template: CV.T('/javascripts/countly/vue/templates/content/UI/content-sidebar-input.html'),
 
         props: {
+            componentTooltip: {
+                default: null,
+                type: String
+            },
+
             disabled: {
                 default: false,
                 type: Boolean
@@ -419,6 +424,15 @@
                 type: String
             },
 
+            labelIcon: {
+                default: 'cly-io cly-io-question-mark-circle',
+                type: String
+            },
+            labelTooltip: {
+                default: null,
+                type: String
+            },
+
             options: {
                 default: () => [],
                 type: Array
@@ -457,6 +471,16 @@
             size: {
                 default: null,
                 type: String
+            },
+
+            withComponentTooltip: {
+                default: false,
+                type: Boolean
+            },
+
+            withLabelTooltip: {
+                default: false,
+                type: Boolean
             }
         },
 
@@ -498,6 +522,10 @@
                 return this.isDropdownInput && Array.isArray(this.options) && this.options.length;
             },
 
+            isLabelTooltipVisible() {
+                return this.withLabelTooltip && this.labelTooltip;
+            },
+
             isSliderInput() {
                 return this.type === COUNTLY_CONTENT_SIDEBAR_INPUT_COMPONENT_BY_TYPE_SLIDER;
             },
@@ -519,6 +547,13 @@
 
             mainComponent() {
                 return COUNTLY_CONTENT_SIDEBAR_INPUT_COMPONENT_BY_TYPE[this.type] || 'div';
+            },
+
+            tooltip() {
+                if (this.withComponentTooltip) {
+                    return this.componentTooltip || null;
+                }
+                return null;
             }
         }
     }));

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

@@ -1660,9 +1660,48 @@
                 type: Boolean,
                 default: true,
                 required: false
+            },
+            minDateValue: {
+                type: Date
+            },
+            isFuture: {
+                type: Boolean,
+                default: false
+            }
+        },
+        computed: {
+            pickerOptions() {
+                const defaultRange = { selectableRange: '00:00:00 - 23:59:00' };
+
+                if (!this.minDateValue) {
+                    return defaultRange;
+                }
+
+                const now = moment();
+                const minDateMoment = moment(this.minDateValue);
+                const isToday = minDateMoment.isSame(now, 'day');
+
+                if (this.isFuture && isToday) {
+                    return {
+                        selectableRange: `${now.format('HH:mm:ss')} - 23:59:00`
+                    };
+                }
+
+                return defaultRange;
             }
         },
-        template: '<el-time-picker :append-to-body="appendToBody" :style="{\'width\': width + \'px\'}" class="cly-vue-time-picker" v-bind="$attrs" v-on="$listeners" :format="format" :clearable="clearable"></el-time-picker>'
+        template: `
+                <el-time-picker
+                    :append-to-body="appendToBody"
+                    :clearable="clearable"
+                    :format="format"
+                    :picker-options="pickerOptions"
+                    :style="{\'width\': width + \'px\'}"
+                    class="cly-vue-time-picker"
+                    v-bind="$attrs"
+                    v-on="$listeners"
+                >
+                </el-time-picker>`
     });
 
 

frontend/express/public/javascripts/countly/vue/templates/content/UI/content-sidebar-input.html

@@ -17,12 +17,18 @@
       class="cly-vue-content-builder-sidebar-input__label"
     >
       {{ label }}
+      <i
+        v-if="isLabelTooltipVisible"
+        v-tooltip.left="labelTooltip"
+        :class="labelIcon"
+      />
     </label>
     <slot name="content-builder-layout-step">
       <component
         :is="mainComponent"
         v-bind="$attrs"
         v-model="componentValue"
+        v-tooltip.left="tooltip"
         class="cly-vue-content-builder-sidebar-input__component"
         :class="{ 'cly-vue-content-builder-sidebar-input__component--slider': isSliderInput }"
         :controls="controlsProp"

frontend/express/public/javascripts/countly/vue/templates/content/content-header.html

@@ -23,12 +23,14 @@
             <div
                 v-tooltip="inputTooltip"
                 class="cly-vue-content-builder-header__input-container"
+                data-test-id="content-header-input-container"       
                 @click="onInputContainerClick"
             >
                 <el-input
                     v-model="localValue"
                     class="cly-vue-content-builder-header__input"
                     :class="{ 'cly-vue-content-builder-header__input--editing': !isReadonlyInput }"
+                    test-id="content-header-input"
                     :maxlength="valueMaxLength"
                     :readonly="isReadonlyInput"
                     @blur="onInputBlur"
@@ -66,6 +68,7 @@
         <el-button
             v-if="!hideSaveButton"
             class="cly-vue-content-builder-header__save-button"
+            data-test-id="content-header-save-button"
             :disabled="disableSaveButton"
             size="small"
             type="success"

frontend/express/public/javascripts/countly/vue/templates/datepicker.html

@@ -207,7 +207,7 @@
                         <span class="text-medium">{{i18n('common.time')}}</span>
                     </div>
                     <div>
-                        <cly-time-picker align="right" :width="100" v-model="minTime"></cly-time-picker>
+                        <cly-time-picker align="right" :width="100" v-model="minTime" :min-date-value="minDate" :is-future="isFuture"></cly-time-picker>
                     </div>
                 </div>
             </div>