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

AA - Prioritize valid data in timeline #1338

Merged
merged 13 commits into from
Sep 25, 2024
Merged

AA - Prioritize valid data in timeline #1338

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f3ab188
Update utils.ts
ericboucher Sep 11, 2024
ad495cc
Prioritize trigger that are valid as ready and set
ericboucher Sep 12, 2024
980b7d0
Use isOtherPhaseValid
ericboucher Sep 12, 2024
d9568f0
Adjust index font size based on character count
ericboucher Sep 12, 2024
45e3a52
Update tests for isOtherPhaseValid
ericboucher Sep 12, 2024
f3341a1
Fix tests
ericboucher Sep 13, 2024
dc346d0
Merge branch 'master' into prioritize-valid-data
ericboucher Sep 17, 2024
5f5312c
Fix moving date snapshots
ericboucher Sep 20, 2024
f813253
Filter empty date
ericboucher Sep 20, 2024
4f87411
Update utils.ts
ericboucher Sep 20, 2024
1e4b44c
Reset aa URL every minute
ericboucher Sep 20, 2024
44eb45d
Update snapshots
ericboucher Sep 23, 2024
0d15360
Merge branch 'master' into prioritize-valid-data
ericboucher Sep 25, 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
30 changes: 18 additions & 12 deletions frontend/src/components/MapView/LeftPanel/AnticipatoryActionPanel/Timeline/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,24 @@ export function timelineTransform({
filtered.forEach(x => {
const key = getColumnKey(x);
const val = categoriesMap.get(key);
categoriesMap.set(
key,
val
? { status: val.status, data: [...val.data, x] }
: {
status: {
category: x.category,
phase: x.phase,
},
data: [x],
},
);
if (val) {
// Prioritize valid elements when multiple indicators overlap on the same date
const existingValidItem = val.data.find(
item => item.isValid && item.date === x.date,
);
if (!existingValidItem || x.isValid) {
// eslint-disable-next-line fp/no-mutation
val.data = [...val.data.filter(item => item.date !== x.date), x];
}
} else {
categoriesMap.set(key, {
status: {
category: x.category,
phase: x.phase,
},
data: [x],
});
}
});
return [win, { months, rows: Object.fromEntries(categoriesMap) }];
}) as [
Expand Down
Loading