Merge pull request #5604 from Countly/anna/next

[SER-1791]  UI fixes density/user-activity

Author: Cookiezaurs

frontend/express/public/core/user-activity/javascripts/countly.views.js

@@ -146,12 +146,14 @@
 
     var getUserLoyaltyView = function() {
         var tabsVuex = countlyVue.container.tabsVuex(["/analytics/loyalty"]);
+        var templates = [];
+        if (countlyGlobal.plugins.indexOf("drill") !== -1) {
+            templates.push("/drill/templates/query.builder.v2.html");
+        }
         return new countlyVue.views.BackboneWrapper({
             component: UserLoyaltyView,
             vuex: tabsVuex,
-            templates: [
-                "/drill/templates/query.builder.v2.html"
-            ]
+            templates: templates
         });
     };
 

plugins/density/frontend/public/templates/density.html

@@ -46,10 +46,7 @@ <h4 data-test-id="densities-for-label">{{i18n('density.densities-for')}}</h4>
             </vue-scroll>
         </div>
 		<h5 class="bu-pb-4" data-test-id="density-distribution-label"> {{i18n('density.distribution')}} </h5>
-		<div v-if="densityVersions.length < 4 && !isLoading" class="technology-density-wrapper__versions-empty-card">
-			<div class="text-medium" data-test-id="density-distribution-no-data-label">{{i18n('common.table.no-data')}}</div>
-		</div>
-		<div v-else-if="densityVersions.length === 0 && isLoading">
+		<div v-if="densityVersions.length === 0 && isLoading">
 			<div style="height: 200px;" v-loading="isLoading"></div>
 		</div>
         <div v-else v-loading="isLoading" class="technology-density-wrapper__versions">
@@ -64,9 +61,6 @@ <h5 class="bu-pb-4" data-test-id="density-distribution-label"> {{i18n('density.d
 							:scroll-ops="breakdownScrollOps" 
 							v-for="(item, idx) in densityVersions">
 						</cly-metric-breakdown>
-						<div v-if="densityItems.length < 4 && !isLoading" class="technology-density-wrapper__empty-card">
-                            <div class="text-medium">{{i18n('common.table.no-data')}}</div>
-                        </div>
 					</cly-metric-cards>
             </vue-scroll>
         </div>

plugins/slipping-away-users/frontend/public/javascripts/countly.views.js

@@ -17,7 +17,7 @@
             },
 
             showDrillFilter: function() {
-                if (countlyAuth.validateRead('drill')) {
+                if (countlyAuth.validateRead('drill') && countlyGlobal.plugins.indexOf("drill") !== -1) {
                     return true;
                 }
                 else {