Merge pull request #6491 from Countly/validating-active-users

fix: Improve datatable local search

Author: pnrgenc

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

@@ -72,12 +72,33 @@
                 var currentArray = this.rows.slice();
                 if (this.displaySearch && this.controlParams.searchQuery) {
                     var queryLc = (this.controlParams.searchQuery + "").toLowerCase();
+
+                    var searchableFields = [];
+                    if (this.$refs.elTable && this.$refs.elTable.columns) {
+                        this.$refs.elTable.columns.forEach(function(col) {
+                            if (col.columnKey) {
+                                searchableFields.push(col.columnKey);
+                            }
+                        });
+                    }
+
                     currentArray = currentArray.filter(function(item) {
-                        return Object.keys(item).some(function(fieldKey) {
-                            if (item[fieldKey] === null || item[fieldKey] === undefined) {
+                        // If no searchable fields found from columns, use original search logic
+                        if (!searchableFields.length) {
+                            return Object.keys(item).some(function(fieldKey) {
+                                if (item[fieldKey] === null || item[fieldKey] === undefined) {
+                                    return false;
+                                }
+                                return (item[fieldKey] + "").toLowerCase().indexOf(queryLc) > -1;
+                            });
+                        }
+
+                        return searchableFields.some(function(fieldKey) {
+                            var value = item[fieldKey];
+                            if (value === null || value === undefined) {
                                 return false;
                             }
-                            return (item[fieldKey] + "").toLowerCase().indexOf(queryLc) > -1;
+                            return (value + "").toLowerCase().indexOf(queryLc) > -1;
                         });
                     });
                 }

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

@@ -2616,7 +2616,8 @@
     Vue.component("cly-chart-time", BaseLineChart.extend({
         data: function() {
             return {
-                forwardedSlots: ["chart-left", "chart-right"]
+                forwardedSlots: ["chart-left", "chart-right"],
+                chartType: 'line'
             };
         },
         props: {
@@ -2733,6 +2734,7 @@
                 else if (!this.areNotesHidden) {
                     this.getGraphNotes();
                 }
+                this.chartType = this.seriesOptions?.type || 'line';
             },
             notesVisibility: function() {
                 if (!this.areNotesHidden) {
@@ -2745,7 +2747,7 @@
         },
         template: '<div class="cly-vue-chart" :class="chartClasses" :style="chartStyles">\
                         <div class="cly-vue-chart__echart bu-is-flex bu-is-flex-direction-column bu-is-flex-grow-1 bu-is-flex-shrink-1" style="min-height: 0">\
-                        <chart-header :test-id="testId + \'-header\'" ref="header" :category="this.category" :hide-notation="this.hideNotation" v-if="!isChartEmpty" @series-toggle="onSeriesChange" :show-zoom="showZoom" :show-toggle="showToggle" :show-download="showDownload" @graph-notes-refresh="refresh" @notes-visibility="notesVisibility">\
+                        <chart-header :test-id="testId + \'-header\'" ref="header" :chart-type="this.chartType" :category="this.category" :hide-notation="this.hideNotation" v-if="!isChartEmpty" @series-toggle="onSeriesChange" :show-zoom="showZoom" :show-toggle="showToggle" :show-download="showDownload" @graph-notes-refresh="refresh" @notes-visibility="notesVisibility">\
                                 <template v-for="item in forwardedSlots" v-slot:[item]="slotScope">\
                                     <slot :name="item" v-bind="slotScope"></slot>\
                                 </template>\