Merge branch 'feature/ingestion' of https://github.com/Countly/countly-server into feature/ingestion

Author: Cookiezaurs

Dockerfile-unified

@@ -1,7 +1,7 @@
 # TODO: if plugins grep hoooks compile v8-sandbox hooks with base as parent and then later copy to plugins/hooks/node_modules
 
 # Global ARGs - available in all stages
-ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,logger,systemlogs,populator,reports,crashes,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,config-transfer,consolidate,data-manager,hooks,dashboards,journey_engine,content,clickhouse,guides,sdk,kafka,oidc,revenue,push
+ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,logger,systemlogs,populator,reports,crashes,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,config-transfer,consolidate,data-manager,hooks,dashboards,journey_engine,content,clickhouse,guides,sdk,kafka,oidc,revenue,push,ai-assistants
 ARG GEOIP=empty
 
 ###############################################################################

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

@@ -75,7 +75,8 @@
             return {
                 controlParams: controlParams,
                 lastSearchQuery: '',
-                firstPage: 1
+                firstPage: 1,
+                lastControlParamsSnapshot: null
             };
         },
 
@@ -328,14 +329,35 @@
             controlParams: {
                 deep: true,
 
-                handler: _.debounce(function() {
-                    // Clear cursor history when search or filters change
-                    if (this.controlParams.searchQuery !== this.lastSearchQuery) {
-                        this.controlParams.cursorHistory = [];
-                        this.lastSearchQuery = this.controlParams.searchQuery;
+                handler: _.debounce(function(newVal) {
+                    // Skip if this is the first run (no snapshot yet)
+                    if (!this.lastControlParamsSnapshot) {
+                        this.lastControlParamsSnapshot = this.getControlParamsSnapshot();
+                        return;
                     }
-                    this.triggerExternalSource();
-                    this.setControlParams();
+
+                    // Check if only internal/derived fields changed (like useCursorPagination)
+                    // These shouldn't trigger a fetch
+                    const meaningfulFields = ['page', 'perPage', 'searchQuery', 'sort', 'cursor', 'selectedDynamicCols'];
+                    const hasMeaningfulChange = meaningfulFields.some(field => {
+                        const newFieldVal = JSON.stringify(newVal[field]);
+                        const oldFieldVal = JSON.stringify(this.lastControlParamsSnapshot[field]);
+                        return newFieldVal !== oldFieldVal;
+                    });
+
+                    // Only trigger fetch if meaningful user-initiated changes occurred
+                    if (hasMeaningfulChange) {
+                        // Clear cursor history when search or filters change
+                        if (this.controlParams.searchQuery !== this.lastSearchQuery) {
+                            this.controlParams.cursorHistory = [];
+                            this.lastSearchQuery = this.controlParams.searchQuery;
+                        }
+                        this.triggerExternalSource();
+                        this.setControlParams();
+                    }
+
+                    // Update snapshot after processing
+                    this.lastControlParamsSnapshot = this.getControlParamsSnapshot();
                 }, 500)
             },
 
@@ -370,6 +392,8 @@
         },
 
         mounted() {
+            // Initialize snapshot on mount to prevent false positives
+            this.lastControlParamsSnapshot = this.getControlParamsSnapshot();
             this.triggerExternalSource();
         },
 
@@ -631,6 +655,19 @@
 
             updateControlParams(newParams) {
                 _.extend(this.controlParams, newParams);
+            },
+
+            getControlParamsSnapshot() {
+                // Create a snapshot of meaningful controlParams fields for comparison
+                // Excludes internal state fields (cursorHistory, useCursorPagination) that get mutated during pagination
+                return {
+                    page: this.controlParams.page,
+                    perPage: this.controlParams.perPage,
+                    searchQuery: this.controlParams.searchQuery,
+                    sort: JSON.parse(JSON.stringify(this.controlParams.sort || [])),
+                    cursor: this.controlParams.cursor,
+                    selectedDynamicCols: JSON.parse(JSON.stringify(this.controlParams.selectedDynamicCols || []))
+                };
             }
         }
     };

plugins/data-manager/frontend/public/localization/data-manager.properties

@@ -209,6 +209,7 @@ data-manager.transformation-method.subheading = Select transformation method tha
 data-manager.incoming = Incoming
 data-manager.existing = Existing
 data-manager.both = Both
+data-manager.clickhouse-incoming-only-message = When using ClickHouse, only incoming data transformations are supported.
 data-manager.rename-type = Rename Type
 data-manager.rename-type.tooltip = Rename Type
 data-manager.rename-with-value = Rename with Specific Value