V/5.0.0

superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js

@@ -147,8 +147,6 @@ describe('No Results', () => {
 
     cy.visitChartByParams(formData);
     cy.wait('@v1Data').its('response.statusCode').should('eq', 200);
-    cy.get('div.chart-container').contains(
-      'No data',
-    );
+    cy.get('div.chart-container').contains('No data');
   });
 });

superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts

@@ -41,6 +41,7 @@ export enum FeatureFlag {
   EmbeddableCharts = 'EMBEDDABLE_CHARTS',
   EmbeddedSuperset = 'EMBEDDED_SUPERSET',
   EnableAdvancedDataTypes = 'ENABLE_ADVANCED_DATA_TYPES',
+  EnableChartForceRefresh = 'ENABLE_CHART_FORCE_REFRESH',
   /** @deprecated */
   EnableJavascriptControls = 'ENABLE_JAVASCRIPT_CONTROLS',
   EnableTemplateProcessing = 'ENABLE_TEMPLATE_PROCESSING',

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/buildQuery.ts

@@ -18,6 +18,183 @@
  */
 import { buildQueryContext, QueryFormData } from '@superset-ui/core';
 
+/**
+ * Detect time period from time range string
+ * Examples: "Last 7 days" -> "7 days ago", "Last 1 month" -> "1 month ago"
+ */
+function detectTimePeriod(timeRange: string): string | null {
+  const match = timeRange.match(/last\s+(\d+)\s+(day|week|month|year)s?/i);
+  if (match) {
+    const value = parseInt(match[1], 10);
+    const unit = match[2].toLowerCase();
+    // Handle singular vs plural
+    const singularUnit = value === 1 ? unit : `${unit}s`;
+    return `${value} ${singularUnit} ago`;
+  }
+
+  // Handle special cases
+  const lowerTimeRange = timeRange.toLowerCase();
+  if (lowerTimeRange.includes('this week')) return '1 week ago';
+  if (lowerTimeRange.includes('this month')) return '1 month ago';
+  if (lowerTimeRange.includes('this year')) return '1 year ago';
+
+  return null;
+}
+
+/**
+ * Calculate time period from since/until dates
+ * Example: since="2023-08-23", until="2023-08-26" -> "4 days ago"
+ */
+function calculatePeriodFromDates(since: string, until: string): string | null {
+  try {
+    const sinceDate = new Date(since);
+    const untilDate = new Date(until);
+    const diffTime = Math.abs(untilDate.getTime() - sinceDate.getTime());
+    const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24)) + 1; // +1 to include both dates
+
+    if (diffDays === 1) return '1 day ago';
+    if (diffDays < 7) return `${diffDays} days ago`;
+    if (diffDays < 30) {
+      const weeks = Math.floor(diffDays / 7);
+      return weeks === 1 ? '1 week ago' : `${weeks} weeks ago`;
+    }
+    if (diffDays < 365) {
+      const months = Math.floor(diffDays / 30);
+      return months === 1 ? '1 month ago' : `${months} months ago`;
+    }
+    const years = Math.floor(diffDays / 365);
+    return years === 1 ? '1 year ago' : `${years} years ago`;
+  } catch (error) {
+    console.warn('Error calculating period from dates:', error);
+    return null;
+  }
+}
+
 export default function buildQuery(formData: QueryFormData) {
-  return buildQueryContext(formData, baseQueryObject => [baseQueryObject]);
+  // Debug logging for buildQuery
+  console.group('🔧 BigNumberTotal buildQuery - COMPREHENSIVE DEBUG');
+  console.log('📥 Input formData analysis:', {
+    hasExtraFormData: !!formData.extra_form_data,
+    extraFormData: formData.extra_form_data,
+    customFormData: formData.extra_form_data?.custom_form_data,
+    timeCompare: formData.time_compare,
+    timeCompareType: typeof formData.time_compare,
+    timeCompareExtra: (formData.extra_form_data?.custom_form_data as any)
+      ?.time_compare,
+    timeCompareDirect: (formData.extra_form_data as any)?.time_compare,
+    allFormDataKeys: Object.keys(formData),
+    metrics: formData.metrics,
+    datasource: formData.datasource,
+    timeRange: formData.time_range,
+    since: formData.since,
+    until: formData.until,
+  });
+  console.groupEnd();
+
+  const buildQuery = (baseQueryObject: any) => {
+    console.log(
+      'BigNumberTotal buildQuery - baseQueryObject:',
+      baseQueryObject,
+    );
+
+    // Use the proper Superset single-query approach for time comparison
+    // This ensures that formData.time_compare is preserved and passed to transformProps
+    const time_offsets = (() => {
+      const timeCompare =
+        formData.time_compare ||
+        (formData.extra_form_data as any)?.time_compare;
+
+      // Convert string time comparison to array format for transformProps
+      if (timeCompare && timeCompare !== 'NoComparison') {
+        if (timeCompare === 'inherit') {
+          // Enhanced inherit logic: detect actual time period and apply same offset
+          const timeRange = formData.time_range;
+          const { since } = formData;
+          const { until } = formData;
+
+          console.log('BigNumberTotal buildQuery - Inherit logic analysis:', {
+            timeRange,
+            since,
+            until,
+            hasTimeRange: !!timeRange,
+            hasSinceUntil: !!(since && until),
+          });
+
+          if (timeRange && typeof timeRange === 'string') {
+            // Parse time range string to detect period
+            const period = detectTimePeriod(timeRange);
+            if (period) {
+              console.log(
+                'BigNumberTotal buildQuery - Detected period from timeRange:',
+                period,
+              );
+              return [period];
+            }
+          }
+
+          if (since && until) {
+            // Calculate period from since/until dates
+            const period = calculatePeriodFromDates(since, until);
+            if (period) {
+              console.log(
+                'BigNumberTotal buildQuery - Calculated period from dates:',
+                period,
+              );
+              return [period];
+            }
+          }
+
+          // Fallback to default
+          console.log(
+            'BigNumberTotal buildQuery - Using fallback period: 1 day ago',
+          );
+          return ['1 day ago'];
+        }
+        if (timeCompare === 'custom') {
+          // For custom, use the time_compare_value
+          const customValue =
+            formData.time_compare_value ||
+            (formData.extra_form_data as any)?.time_compare_value;
+          return customValue ? [customValue] : [];
+        }
+        // For direct string values like "1 day ago", "1 week ago", etc.
+        return Array.isArray(timeCompare) ? timeCompare : [timeCompare];
+      }
+      return [];
+    })();
+
+    return [
+      {
+        ...baseQueryObject,
+        ...(time_offsets.length > 0 ? { time_offsets } : {}),
+      },
+    ];
+  };
+
+  // Ensure time_compare is preserved on the root formData object
+  const timeCompare =
+    formData.time_compare || (formData.extra_form_data as any)?.time_compare;
+
+  if (timeCompare && !formData.time_compare) {
+    // eslint-disable-next-line no-param-reassign
+    formData.time_compare = timeCompare;
+    console.log(
+      'BigNumberTotal buildQuery - Setting time_compare on root formData:',
+      timeCompare,
+    );
+  }
+
+  const result = buildQueryContext(formData, buildQuery);
+  console.log(
+    'BigNumberTotal buildQuery - Final result from buildQueryContext:',
+    {
+      result,
+      hasQueries: !!result.queries,
+      queriesLength: result.queries?.length,
+      formData: result.form_data,
+      timeCompare: result.form_data?.time_compare,
+    },
+  );
+
+  return result;
 }

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts

@@ -23,7 +23,9 @@ import {
   D3_TIME_FORMAT_OPTIONS,
   Dataset,
   getStandardizedControls,
+  sections,
 } from '@superset-ui/chart-controls';
+
 import { headerFontSize, subheaderFontSize } from '../sharedControls';
 
 export default {
@@ -57,7 +59,9 @@ export default {
               type: 'HiddenControl',
               label: t('URL parameters'),
               hidden: true,
-              description: t('Extra parameters for use in jinja templated queries'),
+              description: t(
+                'Extra parameters for use in jinja templated queries',
+              ),
             },
           },
         ],
@@ -70,6 +74,7 @@ export default {
       expanded: true,
       controlSetRows: [['metric'], ['adhoc_filters']],
     },
+    sections.timeComparisonControls({ multi: false }),
     {
       label: t('Display settings'),
       expanded: true,