Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(TMC-27619/cellDate): enable tz conversion with sourceTz #5332

Merged
merged 2 commits into from
Jun 11, 2024
Merged

fix(TMC-27619/cellDate): enable tz conversion with sourceTz #5332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9337fb
fix(TMC-27619/cellDate): enable tz offset conversion with sourceTz
ybaskaran Jun 10, 2024
8f8ed12
fix(TMC-27619/cellDate): enable tz offset conversion with sourceTz
ybaskaran Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/five-ears-guess.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@talend/react-components": patch
---

fix(TMC-27619/cellDate): enable tz offset conversion with sourceTz
1 change: 1 addition & 0 deletions packages/components/src/VirtualizedList/CellDatetime/CellDatetime.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export function computeValue(cellData, columnData, t) {
} else if (columnData.mode === 'format') {
if (columnData.timeZone) {
return dateUtils.formatToTimeZone(dateFNS, columnData.pattern || DATE_TIME_FORMAT, {
...(columnData.sourceTimeZone && { sourceTimeZone: columnData.sourceTimeZone }),
timeZone: columnData.timeZone,
locale: getLocale(t),
});
Expand Down
6 changes: 5 additions & 1 deletion packages/components/src/VirtualizedList/CellDatetime/CellDatetime.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,18 +167,22 @@ describe('CellDatetime', () => {
mode: 'format',
pattern: 'YYYY-MM-DD HH:mm:ss',
timeZone: 'Pacific/Niue',
sourceTimeZone: 'Europe/Paris',
};
const t = jest.fn();

const cellData = 1474495200000;
computeValue(cellData, columnData, t);
const expectedStrDate = '2016-09-22 09:00:00';
const computedStrOffset = computeValue(cellData, columnData, t);

// then
expect(computedStrOffset).toEqual(expectedStrDate);
expect(dateUtils.formatToTimeZone).toHaveBeenCalledWith(
new Date(cellData),
columnData.pattern,
{
timeZone: columnData.timeZone,
sourceTimeZone: columnData.sourceTimeZone,
locale: getLocale(t),
},
);
Expand Down
Loading