Merge pull request #6723 from Countly/master-v25.03.21-into-next

Master v25.03.21 into next

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -2,6 +2,12 @@
 Dependencies:
 - Remove SQLite
 
+## Version 25.03.21
+Fixes:
+- [feedback] Prevent showing the application when switching between the NPS and Survey pages
+- [populator] Fix NPS generator
+- [surveys] Fix survey details results summary tiles display when journeys plugin in not enabled
+
 ## Version 25.03.20
 Fixes:
 - [push] Fix: Migrate push to the new events model

plugins/populator/frontend/public/javascripts/countly.models.js

@@ -1815,8 +1815,13 @@
             },
             success: function(json, textStatus, xhr) {
                 if (json && json.result) {
-                    var id = json.result.split(" ");
-                    npsWidgetList.push(id[2]);
+                    if (json.result._id) {
+                        npsWidgetList.push(json.result._id);
+                    }
+                    else if (json.result.text) {
+                        var id = json.result.text.split(" ");
+                        npsWidgetList.push(id[2]);
+                    }
                 }
                 callback(json, textStatus, xhr);
             },

plugins/remote-config/frontend/public/javascripts/countly.views.js

@@ -67,11 +67,11 @@
 			<tbody>\
                 <tr><td class="cly-vue-remote-config-percentages-breakdown__sequence__heading"><div class="cly-vue-remote-config-percentages-breakdown__sequence bu-py-1 bu-px-2" :data-test-id="testId + \'-order-label\'">1</div></td><td class="has-ellipsis cly-vue-remote-config-percentages-breakdown__condition__heading bu-pr-1"><div class="has-ellipsis cly-vue-remote-config-percentages-breakdown__data bu-py-2 bu-px-1  cly-vue-remote-config-percentages-breakdown__default-value"><span class="bu-ml-2 bu-mr-3 text-medium" :data-test-id="testId + \'-default-value-label\'">{{i18n("remote-config.default-value")}}</span><span class="cly-vue-remote-config-percentages-breakdown__default-value__value bu-py-1 bu-px-2 text-small" v-tooltip="defaultValue.value" :data-test-id="testId + \'-default-value\'">{{defaultValue.value}}</span></div></td><td class="cly-vue-remote-config-percentages-breakdown__percentage__heading"><div class="bu-is-flex"><div class="text-big font-weight-bold" :data-test-id="testId + \'-percentage\'">{{defaultValue.percentage}}% </div> <div class="font-weight-normal color-cool-gray-100 bu-pt-1 bu-pl-1" :data-test-id="testId + \'-percent-of-total\'">{{i18n("remote-config.percent.of.total")}}</div></div></td></tr>\
 				<tr v-if="isDrillEnabled" v-for="(condition, i) in conditions" :key="i">\
-                    <td class="cly-vue-remote-config-percentages-breakdown__sequence__heading"><div class="cly-vue-remote-config-percentages-breakdown__sequence bu-py-1 bu-px-2" :data-test-id="testId + \'other-order-label\'">{{i+2}}</div>\
+                    <td class="cly-vue-remote-config-percentages-breakdown__sequence__heading"><div class="cly-vue-remote-config-percentages-breakdown__sequence bu-py-1 bu-px-2" :data-test-id="testId + \'-other-order-label-\' + i">{{i+2}}</div>\
                     </td>\
-					<td class="has-ellipsis cly-vue-remote-config-percentages-breakdown__condition__heading bu-pr-1"><div class="has-ellipsis cly-vue-remote-config-percentages-breakdown__data bu-py-2 bu-px-1 cly-vue-remote-config-percentages-breakdown__condition" :style="{backgroundColor: condition.color}"><span class="cly-vue-remote-config-percentages-breakdown__condition__vertical-align"><img src="/remote-config/images/call_split.svg"/></span><span class="cly-vue-remote-config-percentages-breakdown__condition__vertical-align bu-ml-2 bu-mr-3 text-medium" :data-test-id="testId + \'condition-name-label\'">{{condition.name}}</span><span class="cly-vue-remote-config-percentages-breakdown__condition__vertical-align cly-vue-remote-config-percentages-breakdown__condition__value bu-py-1 bu-px-2 text-small" v-tooltip="condition.value" :data-test-id="testId + \'condition-value\'">{{condition.value}}</span></div></td>\
+					<td class="has-ellipsis cly-vue-remote-config-percentages-breakdown__condition__heading bu-pr-1"><div class="has-ellipsis cly-vue-remote-config-percentages-breakdown__data bu-py-2 bu-px-1 cly-vue-remote-config-percentages-breakdown__condition" :style="{backgroundColor: condition.color}"><span class="cly-vue-remote-config-percentages-breakdown__condition__vertical-align"><img src="/remote-config/images/call_split.svg"/></span><span class="cly-vue-remote-config-percentages-breakdown__condition__vertical-align bu-ml-2 bu-mr-3 text-medium" :data-test-id="testId + \'-condition-name-label-\' + i">{{condition.name}}</span><span class="cly-vue-remote-config-percentages-breakdown__condition__vertical-align cly-vue-remote-config-percentages-breakdown__condition__value bu-py-1 bu-px-2 text-small" v-tooltip="condition.value" :data-test-id="testId + \'-condition-value-\' + i">{{condition.value}}</span></div></td>\
 					<td class="cly-vue-remote-config-percentages-breakdown__percentage__heading">\
-                    <div class="bu-is-flex"><div class="text-big font-weight-bold" :data-test-id="testId + \'percentage-label\'">{{condition.percentage}}% </div> <div class="font-weight-normal color-cool-gray-100 bu-pt-1 bu-pl-1" :data-test-id="testId + \'percent-of-label\'">{{i18n("remote-config.percent.of.total")}}</div></div>\
+                    <div class="bu-is-flex"><div class="text-big font-weight-bold" :data-test-id="testId + \'-percentage-label-\' + i">{{condition.percentage}}% </div> <div class="font-weight-normal color-cool-gray-100 bu-pt-1 bu-pl-1" :data-test-id="testId + \'-percent-of-label-\' + i">{{i18n("remote-config.percent.of.total")}}</div></div>\
 					</td>\
 				</tr>\
 			</tbody>\

plugins/remote-config/frontend/public/templates/create-condition.html

@@ -9,6 +9,7 @@
     <div class="text-medium text-heading bu-mt-4">{{condition.name}}</div>
     <div>
       <el-input
+        :test-id="'add-value-for-selected-condition-' + condition.name"
         v-model ="condition.value"
         placeholder="Enter condition value">
         <el-button type="text" slot="suffix" @click="openJsonEditorForCondition" class="cly-vue-remote-config-parameters-drawer__autocomplete-button">{ }</el-button>

plugins/remote-config/frontend/public/templates/parameters.html

@@ -21,7 +21,7 @@
           type="expand" min-width="50">
           <template v-slot="props">
             <cly-section>
-              <condition-stats :test-id="'datatable-remote-config-' + scope.$index" :parameter="props.row"></condition-stats>
+              <condition-stats :test-id="'datatable-remote-config-' + props.$index" :parameter="props.row"></condition-stats>
             </cly-section>
           </template>
         </el-table-column>

plugins/views/scripts/omitViewSegments.js

@@ -1,4 +1,4 @@
-//Put script in ./countly/plugins/views/omitViewSegments.js
+//Put script in ./countly/plugins/views/scripts/omitViewSegments.js
 /*
 The script deletes data for specific segments in aggregated data. It also can set an omitting list in the database to ensure that segments are also omitted on incoming data.
 */