Merge branch 'master' into SER-2559-Journey-Browser-Console-errors-related-to-task-processing

Author: coskunaydinoglu

CHANGELOG.md

@@ -991,10 +991,10 @@
         },
         template: '<div class="bu-is-flex bu-is-flex-wrap-wrap bu-is-align-items-center">\
                                 <div class="cly-vue-color-tag__color-tag-wrapper"  v-for="(tag,idx) in tags">\
-                                <div v-if="tag.value == selectedTag.value" @click="click(tag)" class="cly-vue-color-tag__color-tag cly-vue-color-tag__color-tag__selected bu-is-flex bu-is-align-items-center bu-is-justify-content-center" :style="{backgroundColor: tag.label}">\
+                                <div v-if="tag.value == selectedTag.value" @click="click(tag)" :data-test-id="`color-tag-${idx}`" class="cly-vue-color-tag__color-tag cly-vue-color-tag__color-tag__selected bu-is-flex bu-is-align-items-center bu-is-justify-content-center" :style="{backgroundColor: tag.label}">\
                                     <i class="ion-checkmark cly-vue-color-tag__checkmark"></i>\
                                 </div>\
-                                <div v-else @click="click(tag)" class="cly-vue-color-tag__color-tag bu-is-flex bu-is-align-items-center bu-is-justify-content-center" :style="{backgroundColor: tag.label}"></div>\
+                                <div v-else @click="click(tag)" :data-test-id="`color-tag-${idx}`" class="cly-vue-color-tag__color-tag bu-is-flex bu-is-align-items-center bu-is-justify-content-center" :style="{backgroundColor: tag.label}"></div>\
                                 </div>\
                     </div>'
     }));

api/utils/countly-request/package-lock.json

@@ -59,7 +59,7 @@
     "ejs": "3.1.10",
     "errorhandler": "1.5.1",
     "express": "4.21.2",
-    "express-rate-limit": "8.0.1",
+    "express-rate-limit": "8.1.0",
     "express-session": "1.18.2",
     "form-data": "^4.0.0",
     "formidable": "2.1.3",
@@ -85,14 +85,14 @@
     "method-override": "3.0.0",
     "moment": "2.30.1",
     "moment-timezone": "0.6.0",
-    "mongodb": "6.18.0",
+    "mongodb": "6.19.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "7.0.5",
+    "nodemailer": "7.0.6",
     "object-hash": "3.0.0",
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",
     "puppeteer": "^24.6.1",
-    "sass": "1.90.0",
+    "sass": "1.92.1",
     "semver": "^7.7.1",
     "sharp": "^0.34.2",
     "sqlite3": "^5.1.7",

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

@@ -3,25 +3,28 @@
     @copy="onCopy"
     @close="onClose"
     :title="title"
+    test-id="create-dashboard-drawer"
     :saveButtonLabel="saveButtonLabel"
     v-bind="controls">
     <template v-slot:default="drawerScope">
         <cly-form-step id="dashboards-drawer">
-            <cly-form-field :label="i18n('dashboards.dashboard-name')" name="name" rules="required" v-slot:default>
+            <cly-form-field :label="i18n('dashboards.dashboard-name')" name="name" rules="required" v-slot:default test-id="dashboard-name-input-label">
                 <el-input
                     v-model="drawerScope.editedObject.name"
+                    test-id="dashboard-name-input"
                     :placeholder="i18n('placeholder.dashboards.dashboard-name')">
                 </el-input>
             </cly-form-field>
-            <div class="text-big font-weight-bold">
+            <div class="text-big font-weight-bold" data-test-id="dashboard-visibility-label">
                 {{i18n('dashboards.share-with')}}
-                <cly-tooltip-icon :tooltip="i18n('dashboards.share-with-tooltip-content')"></cly-tooltip-icon>
+                <cly-tooltip-icon :tooltip="i18n('dashboards.share-with-tooltip-content')" data-test-id="dashboard-visibility-tooltip"></cly-tooltip-icon>
             </div>
             <cly-form-field name="share_with" rules="required">
                 <el-radio-group :disabled="!canShare" v-model="drawerScope.editedObject.share_with" style="width: 100%;">
                     <el-radio
                         border
                         class="is-autosized-vstack"
+                        :test-id="'dashboard-visibility-option-' + item.value"
                         v-for="(item) in constants.sharingOptions"
                         :label="item.value"
                         :key="item.value">
@@ -37,29 +40,31 @@
 
 
             <div v-if="drawerScope.editedObject.share_with === 'selected-users'">
-                <div class="text-big font-weight-bold">
+                <div class="text-big font-weight-bold" data-test-id="dashboard-user-permissions-label">
                     {{i18n('dashboards.user-permissions')}}
-                    <cly-tooltip-icon :tooltip="i18n('dashboards.user-permissions-tooltip-content')"></cly-tooltip-icon>
+                    <cly-tooltip-icon :tooltip="i18n('dashboards.user-permissions-tooltip-content')" data-test-id="dashboard-user-permissions-tooltip"></cly-tooltip-icon>
                 </div>
-                <cly-form-field :label="i18n('dashboards.users-edit-permission')" :subheading="i18n('dashboards.users-edit-description')">
-                    <cly-select-email :disabled="!canShare" v-model="sharedEmailEdit" :placeholder="canShare ? i18n('dashboards.enter-user-email') : i18n('dashbaords.sharing-disabled')"></cly-select-email>
+                <cly-form-field :label="i18n('dashboards.users-edit-permission')" :subheading="i18n('dashboards.users-edit-description')" test-id="dashboard-users-edit-permission-label">
+                    <cly-select-email :disabled="!canShare" v-model="sharedEmailEdit" :placeholder="canShare ? i18n('dashboards.enter-user-email') : i18n('dashbaords.sharing-disabled')" test-id="edit-permission-user-email-input"></cly-select-email>
                 </cly-form-field>
-                <cly-form-field :label="i18n('dashboards.users-view-permission')" :subheading="i18n('dashboards.users-view-description')">
-                    <cly-select-email :disabled="!canShare" v-model="sharedEmailView" :placeholder="canShare ? i18n('dashboards.enter-user-email') : i18n('dashbaords.sharing-disabled')"></cly-select-email>
+                <cly-form-field :label="i18n('dashboards.users-view-permission')" :subheading="i18n('dashboards.users-view-description')" test-id="dashboard-users-view-permission-label">
+                    <cly-select-email :disabled="!canShare" v-model="sharedEmailView" :placeholder="canShare ? i18n('dashboards.enter-user-email') : i18n('dashbaords.sharing-disabled')" test-id="view-permission-user-email-input"></cly-select-email>
                 </cly-form-field>
             </div>
 
             <div v-if="(drawerScope.editedObject.share_with === 'selected-users') && groupSharingAllowed">
-                <div class="text-big font-weight-bold">
+                <div class="text-big font-weight-bold" data-test-id="dashboard-user-group-permissions-label">
                     {{i18n('dashboards.user-group-permission')}}
-                    <cly-tooltip-icon :tooltip="i18n('dashboards.user-group-permission-tooltip-content')"></cly-tooltip-icon>
+                    <cly-tooltip-icon :tooltip="i18n('dashboards.user-group-permission-tooltip-content')" data-test-id="dashboard-user-group-permission-tooltip"></cly-tooltip-icon>
                 </div>
                 <cly-form-field
                     name="shared_user_groups_edit"
+                    test-id="dashboard-user-group-edit-permission-label"
                     :label="i18n('dashboards.users-edit-permission')"
                     :subheading="i18n('dashboards.users-edit-description')">
                     <el-select
                         :key="elSelectKey"
+                        test-id="dashboard-user-group-edit-permission"
                         multiple
                         :disabled="!canShare"
                         v-model="sharedGroupEdit"
@@ -75,10 +80,12 @@
                 </cly-form-field>
                 <cly-form-field
                     name="shared_user_groups_view"
+                    test-id="dashboard-user-group-view-permission-label"
                     :label="i18n('dashboards.users-view-permission')"
                     :subheading="i18n('dashboards.users-view-description')">
                     <el-select
                         :key="elSelectKey"
+                        test-id="dashboard-user-group-view-permission"
                         multiple
                         :disabled="!canShare"
                         v-model="sharedGroupView"
@@ -94,28 +101,29 @@
                 </cly-form-field>
             </div>
 
-            <div class="text-big font-weight-bold bu-mt-4">
+            <div class="text-big font-weight-bold bu-mt-4" data-test-id="dashboard-additional-settings-label">
                 {{i18n('dashboards.additional-settings')}}
             </div>
             <cly-form-field name="send-email">
-                <el-checkbox v-model="drawerScope.editedObject.send_email_invitation">{{i18n('dashboards.send-email')}}</el-checkbox>
+                <el-checkbox v-model="drawerScope.editedObject.send_email_invitation" test-id="dashboard-send-email-checkbox">{{i18n('dashboards.send-email')}}</el-checkbox>
             </cly-form-field>
             <cly-form-field name="use-refresh-rate">
-                <el-checkbox v-model="drawerScope.editedObject.use_refresh_rate">
+                <el-checkbox v-model="drawerScope.editedObject.use_refresh_rate" test-id="dashboard-use-refresh-rate-checkbox">
                     {{ i18nM("dashboards.custom-refresh-rate") }}
-                    <cly-tooltip-icon :tooltip="i18n('dashboards.custom-refresh-rate-description')"></cly-tooltip-icon>
+                    <cly-tooltip-icon :tooltip="i18n('dashboards.custom-refresh-rate-description')" data-test-id="dashboard-custom-refresh-rate-tooltip"></cly-tooltip-icon>
                 </el-checkbox>
                 <cly-form-field
                     v-if="drawerScope.editedObject.use_refresh_rate"
                     name="title"
                     :rules="drawerScope.editedObject.use_refresh_rate ? 'required' : ''">
                     <el-input
                         v-model="drawerScope.editedObject.refreshRate"
+                        test-id="dashboard-custom-refresh-rate-input"
                         placeholder="">
                     </el-input>
                 </cly-form-field>
             </cly-form-field>
 
         </cly-form-step>
     </template>
-</cly-drawer>
+</cly-drawer>

package-lock.json

@@ -1,15 +1,16 @@
 <div style="height: 100%;">
     <div class="cly-vue-sidebar__header">
-        <span class="cly-vue-sidebar__header-title">Dashboards</span>
+        <span class="cly-vue-sidebar__header-title" data-test-id="dashboard-menu-title">Dashboards</span>
         <span class="cly-vue-sidebar__header-button" v-if="canCreate">
-            <el-button type="success" size="small" @click="addDashboard">
+            <el-button type="success" size="small" @click="addDashboard" data-test-id="add-dashboard-button">
                 <i class="ion-plus-circled"></i>
                 <span>New</span>
             </el-button>
         </span>
         <form>
             <el-input
                 class="bu-mt-5 cly-vue-sidebar__header-search"
+                test-id="dashboard-search-box"
                 autocomplete="off"
                 v-model="searchQuery"
                 placeholder="Search in Dashboards">
@@ -20,7 +21,12 @@
     <div class="cly-vue-sidebar__main-menu">
         <vue-scroll :ops="{scrollPanel: { scrollingX: false }}">
             <ul>
-                <li v-for="(dashboard, idx) in allDashboards" :key="dashboard.id" :class="['bu-px-3 bu-mb-1 bu-is-clickable', {'bu-mb-6': (idx === (allDashboards.length - 1) ? true: false)}]">
+                <li 
+                    v-for="(dashboard, idx) in allDashboards" 
+                    :key="dashboard.id" 
+                    :class="['bu-px-3 bu-mb-1 bu-is-clickable', {'bu-mb-6': (idx === (allDashboards.length - 1) ? true: false)}]"
+                    :data-test-id="'custom-dashboard-' + idx"
+                >
                     <a :href="'#/custom/' + dashboard._id">
                         <div
                             style="width: calc(100% - 24px);"

package.json

@@ -1,9 +1,11 @@
 <cly-form-field
     name="metrics"
+    test-id="metric"
     rules="required"
     :label="i18nM(multiple ? 'dashboards.metrics-multi': 'dashboards.metrics-single')">
     <el-select
         :is-full-width="true"
+        test-id="metric"
         :key="rerender"
         style="width: 100%;"
         v-bind="$attrs"
@@ -20,4 +22,4 @@
             :value="metric.value">
         </el-option>
     </el-select>
-</cly-form-field>
+</cly-form-field>

plugins/dashboards/frontend/public/templates/dashboards-drawer.html

@@ -1,9 +1,11 @@
 <cly-form-field
     name="apps"
+    test-id="source-apps"
     rules="required"
     :label="i18nM('dashboards.source-apps')">
     <cly-app-select
         :key="rerender"
+        test-id="source-apps-select"
         style="width: 100%;"
         v-bind="$attrs"
         v-on="allListeners"
@@ -13,4 +15,4 @@
         :multiple-limit="multipleLimit"
         :placeholder="placeholderText">
     </cly-app-select>
-</cly-form-field>
+</cly-form-field>

plugins/dashboards/frontend/public/templates/dashboards-menu.html

@@ -1,5 +1,6 @@
 <cly-form-field
     name="visualization"
+    test-id="visualization"
     :rules="{ required: { allowFalse: false } }"
     :subheading="!mute && i18nM('dashbaords.visualization-description')"
     :label="!mute && i18nM('dashbaords.visualization')">
@@ -14,6 +15,7 @@
                 :class="['clyd-visualization__item bu-is-clickable',
                         'bu-is-flex bu-is-flex-direction-column bu-is-justify-content-center bu-is-align-items-center',
                         {'selected': item.value === selectedType}]"
+                :data-test-id="`visualization-item-${item.value}`"
                 @click="onClick(item)">
                 <div class="text-smallish">{{item.label}}</div>
             </div>