Skip to content

Commit 1e55c70

Browse files
tremesiNecas
authored andcommitted
OU-1264: use TimZoneProvider with default UTC timezone
1 parent be4c100 commit 1e55c70

4 files changed

Lines changed: 24 additions & 10 deletions

File tree

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import React from 'react';
22

3-
export const OlsToolUIPersesWrapper = ({ children, initialTimeRange }) => (
4-
<div data-testid="perses-wrapper" data-time-range={JSON.stringify(initialTimeRange)}>
3+
export const OlsToolUIPersesWrapper = ({ children, initialTimeRange, initialTimeZone = 'local' }) => (
4+
<div
5+
data-testid="perses-wrapper"
6+
data-time-range={JSON.stringify(initialTimeRange)}
7+
data-timezone={initialTimeZone}
8+
>
59
{children}
610
</div>
711
);

web/cypress/component/ols-tool-ui/ShowTimeseries.cy.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,10 @@ describe('ShowTimeseries', () => {
108108
});
109109
});
110110
});
111+
112+
it('timezone support: defaults to UTC when not specified', () => {
113+
cy.mount(<ShowTimeseries tool={tool} />);
114+
cy.get('[data-testid="perses-wrapper"]')
115+
.should('have.attr', 'data-timezone', 'UTC');
116+
});
111117
});

web/src/components/ols-tool-ui/ShowTimeseries.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export const ShowTimeseries: React.FC<{ tool: ShowTimeseriesTool }> = ({ tool })
2222
const { t } = useTranslation(process.env.I18N_NAMESPACE);
2323
const { query, title, description, start, end, duration } = tool.args;
2424
const timeRange = useTimeRange(start, end, duration);
25+
2526
const queryDescription = t('Query: {{query}}', { query: query });
2627
const definitions = [
2728
{
@@ -34,7 +35,7 @@ export const ShowTimeseries: React.FC<{ tool: ShowTimeseriesTool }> = ({ tool })
3435

3536
return (
3637
<>
37-
<OlsToolUIPersesWrapper initialTimeRange={timeRange}>
38+
<OlsToolUIPersesWrapper initialTimeRange={timeRange} initialTimeZone="UTC">
3839
<DataQueriesProvider
3940
definitions={definitions}
4041
options={{ suggestedStepMs: 15000, mode: 'range' }}

web/src/components/ols-tool-ui/helpers/OlsToolUIPersesWrapper.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
33
import { VariableProvider } from '@perses-dev/dashboards';
44
import { TimeRangeProviderBasic } from '@perses-dev/plugin-system';
5+
import { TimeZoneProvider } from '@perses-dev/components';
56
import type { DurationString, TimeRangeValue } from '@perses-dev/core';
67

78
import {
@@ -32,13 +33,15 @@ export const OlsToolUIPersesWrapper: React.FC<OlsToolUIPersesWrapperProps> = ({
3233
return (
3334
<QueryClientProvider client={queryClient}>
3435
<PersesWrapper project={null}>
35-
<TimeRangeProviderBasic initialTimeRange={initialTimeRange}>
36-
<VariableProvider>
37-
<PersesPrometheusDatasourceWrapper queries={[]}>
38-
<div style={{ width: '100%', height: height }}>{children}</div>
39-
</PersesPrometheusDatasourceWrapper>
40-
</VariableProvider>
41-
</TimeRangeProviderBasic>
36+
<TimeZoneProvider timeZone="UTC">
37+
<TimeRangeProviderBasic initialTimeRange={initialTimeRange}>
38+
<VariableProvider>
39+
<PersesPrometheusDatasourceWrapper queries={[]}>
40+
<div style={{ width: '100%', height: height }}>{children}</div>
41+
</PersesPrometheusDatasourceWrapper>
42+
</VariableProvider>
43+
</TimeRangeProviderBasic>
44+
</TimeZoneProvider>
4245
</PersesWrapper>
4346
</QueryClientProvider>
4447
);

0 commit comments

Comments
 (0)