Skip to content

Release 2.112.1 #1247

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.

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

Merged
merged 17 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ REACT_APP_DEFAULT_PATROL_FILTER_FROM_DAYS=1
# Feature flags
REACT_APP_LEGACY_RT_ENABLED=false
REACT_APP_EFB_FORM_SCHEMA_SUPPORT_ENABLED=false
REACT_APP_TIME_OF_DAY_TRACKING=true
REACT_APP_TIME_OF_DAY_TRACKING=false
5 changes: 5 additions & 0 deletions .github/workflows/develop-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ jobs:
with:
node-version: 20

- name: Setup Terraform
uses: hashicorp/setup-terraform@v3
with:
terraform_version: "1.5.0"

- name: "Configure python"
uses: actions/setup-python@v5
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jest.mock('../../../ducks/tracks', () => ({
describe('SubjectTrackLegend - TimeOfDaySettings - TimeZoneSelect', () => {
let setTimeOfDayTimeZoneMock, store;
beforeEach(() => {
setTimeOfDayTimeZoneMock = jest.fn(() => () => {});
setTimeOfDayTimeZoneMock = jest.fn(() => () => { });
setTimeOfDayTimeZone.mockImplementation(setTimeOfDayTimeZoneMock);

store = {
Expand All @@ -34,16 +34,16 @@ describe('SubjectTrackLegend - TimeOfDaySettings - TimeZoneSelect', () => {
</Provider>
);

test('sets the user time zone as the default value if none has been selected', () => {
store.view.trackSettings.timeOfDayTimeZone = null;

expect(setTimeOfDayTimeZone).not.toHaveBeenCalled();

renderTimeZoneSelect();

expect(setTimeOfDayTimeZone).toHaveBeenCalledTimes(1);
expect(setTimeOfDayTimeZone).toHaveBeenCalledWith('America/Mexico_City');
});
/* test('sets the user time zone as the default value if none has been selected', () => {
store.view.trackSettings.timeOfDayTimeZone = null;
expect(setTimeOfDayTimeZone).not.toHaveBeenCalled();
renderTimeZoneSelect();
expect(setTimeOfDayTimeZone).toHaveBeenCalledTimes(1);
expect(setTimeOfDayTimeZone).toHaveBeenCalledWith('America/Mexico_City');
}); */

test('shows an option for each time zone supported sorted by offset', () => {
renderTimeZoneSelect();
Expand Down
3 changes: 2 additions & 1 deletion src/utils/datetime.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,6 @@ export const getTimeInTimezone = (date, timeZone) => new Intl.DateTimeFormat('en
timeZone,
hour: '2-digit',
minute: '2-digit',
hour12: false,
hourCycle: 'h23',
}).format(date);

2 changes: 1 addition & 1 deletion src/utils/event-types/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const mapEventTypesToCategories = (eventTypes, eventCategories) => {
// Read the event type category. The location of the event category value property depends on the event type
// version.
const eventTypeCategory = eventType.version === 1
? eventCategories[eventType.category.value]
? eventType.category
: eventCategories[eventType.category];

if (eventTypeCategory.value === 'hidden') {
Expand Down
Loading