From 9f255eba893e5d48aeff3a5b183cc2c77a73b0ed Mon Sep 17 00:00:00 2001
From: YANG QIA <2013xile@gmail.com>
Date: Wed, 27 Nov 2024 19:48:07 +0800
Subject: [PATCH] fix(data-vi): issue where getting timezone from context
 (#5743)

* fix(data-vi): issue where getting timezone from context

* fix: test
---
 .../src/server/__tests__/formatter.test.ts             | 10 +++++-----
 .../src/server/query-parser/query-parser.ts            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/formatter.test.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/formatter.test.ts
index 0230c0f74c..4a37306050 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/formatter.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/formatter.test.ts
@@ -71,7 +71,6 @@ describe('formatter', () => {
     const ctx = {
       app,
       db,
-      timezone: '+05:30',
       action: {
         params: {
           values: {
@@ -85,6 +84,7 @@ describe('formatter', () => {
           },
         },
       },
+      get: () => '+05:30',
     } as any;
     const queryParser = createQueryParser(db);
     await compose([parseFieldAndAssociations, queryParser.parse(), queryData])(ctx, async () => {});
@@ -112,7 +112,7 @@ describe('formatter', () => {
     const ctx = {
       app,
       db,
-      timezone: '+05:30',
+      get: () => '+05:30',
       action: {
         params: {
           values: {
@@ -153,7 +153,7 @@ describe('formatter', () => {
     const ctx = {
       app,
       db,
-      timezone: '+05:30',
+      get: () => '+05:30',
       action: {
         params: {
           values: {
@@ -202,7 +202,7 @@ describe('formatter', () => {
     const ctx = {
       app,
       db,
-      timezone: '+05:30',
+      get: () => '+05:30',
       action: {
         params: {
           values: {
@@ -250,7 +250,7 @@ describe('formatter', () => {
     const ctx = {
       app,
       db,
-      timezone: '+05:30',
+      get: () => '+05:30',
       action: {
         params: {
           values: {
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/server/query-parser/query-parser.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/server/query-parser/query-parser.ts
index a593591b76..82144c16f4 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/server/query-parser/query-parser.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/server/query-parser/query-parser.ts
@@ -97,7 +97,7 @@ export class QueryParser {
         attributes: dimensionAttributes,
         group,
         fieldMap: dimensionFieldMap,
-      } = this.parseDimensions(ctx, dimensions, hasAgg, ctx.timezone);
+      } = this.parseDimensions(ctx, dimensions, hasAgg, ctx.get?.('x-timezone'));
       const order = this.parseOrders(ctx, orders, hasAgg);
 
       ctx.action.params.values = {