Merge pull request #6692 from Countly/master-v25.03.20-into-next

Master v25.03.20 into next

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -848,6 +848,11 @@ taskmanager.deleteResult = function(options, callback) {
         if (task.gridfs) {
             countlyFs.gridfs.deleteFile("task_results", options.id, {id: options.id}, function() {});
         }
+
+        // Delete additional results specific to task type
+        taskmanager.deleteAdditionalResults(task, options, function() {
+            // Continue with normal task deletion
+        });
         options.db.collection("long_tasks").remove({_id: options.id}, function() {
             callback(null, task);
         });
@@ -863,6 +868,45 @@ taskmanager.deleteResult = function(options, callback) {
     });
 };
 
+/**
+* Delete additional results specific to task type
+* @param {object} task - the task object
+* @param {object} options - options for the task
+* @param {function} callback - callback for the result
+*/
+taskmanager.deleteAdditionalResults = function(task, options, callback) {
+    if (task.type === "journey_engine") {
+        const collectionName = "journey_task_data_" + options.id;
+        options.db.collection(collectionName).drop(function(dropErr) {
+            if (dropErr && dropErr.code !== 26) { // 26 = namespace not found, which is fine
+                log.w("Failed to drop journey task data collection:", collectionName, dropErr);
+            }
+            else {
+                log.d("Successfully dropped journey task data collection:", collectionName);
+            }
+        });
+
+        // Also try to clean up the default collection if it exists and is empty
+        // This is a safety measure for cases where the default collection might have been used
+        options.db.collection("journey_task_data").countDocuments({}, function(countErr, count) {
+            if (!countErr && count === 0) {
+                options.db.collection("journey_task_data").drop(function(defaultDropErr) {
+                    if (defaultDropErr && defaultDropErr.code !== 26) {
+                        log.w("Failed to drop default journey task data collection:", defaultDropErr);
+                    }
+                    else if (!defaultDropErr) {
+                        log.d("Successfully dropped empty default journey task data collection");
+                    }
+                });
+            }
+            callback();
+        });
+    }
+    else {
+        callback();
+    }
+};
+
 /**
 * Mark all running or rerunning tasks as errored
 * @param {object} options - options for the task

api/utils/taskmanager.js

@@ -1005,10 +1005,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>'
     }));

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);"

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

@@ -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-menu.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>