chight/Web-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add filtering on dates to all widgets, defualt is past 7 days

Browse Source
This commit is contained in:
vkuchenik
2026-08-10 16:22:34 -07:00
parent 520731aa47
commit d9bdb17217
10 changed files with 495 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/Widgets/IvansAlerts.jsx
+86 -76
View File
@@ -10,84 +10,89 @@ export default function IvansAlerts({ settings, widgetID }) {
const sorts = settings?.activeSorts;
// build url once on mount
const seven_day_url = useMemo(() => {
const base_url = '/api/v2/comm_coor_ivans';
let today = new Date();
let sevenDaysAgo = new Date(today);
sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
const url = useMemo(() =>{
if (settings?.startDate && settings?.endDate)
return '/api/v2/comm_coor_ivans?start_date=' + settings?.startDate + '&end_date=' + settings?.endDate;
else {
const base_url = '/api/v2/comm_coor_ivans';
let today = new Date();
let sevenDaysAgo = new Date(today);
sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
sevenDaysAgo = sevenDaysAgo.toLocaleDateString('en-CA');
today = today.toLocaleDateString('en-CA');
sevenDaysAgo = sevenDaysAgo.toLocaleDateString('en-CA');
today = today.toLocaleDateString('en-CA');
return base_url + '?start_date=' + sevenDaysAgo + '&end_date=' + today;
}, []);
return base_url + '?start_date=' + sevenDaysAgo + '&end_date=' + today;
}
}, [settings?.startDate, settings?.endDate]);
// VdapApi hook only calls api if the url changes and apiData remains stable since vdapApi uses state to track the data
const {data: apiD, isLoading, error} = VdapApi(seven_day_url);
const {data: apiData, isLoading, error} = VdapApi(url);
const apiData = useMemo(() => {
return ([
{
id: 277,
volcano_number: 268010,
report_num: "2026-01",
report_date: "2026-05-08T22:05:44Z",
preparer: "hwright",
reviewer: "dramsey",
send_time: "2026-05-08T22:05:52Z",
volcano_name: "Dukono",
summary: "At 07:41 local time on 8 May 2026, an explosion of persistently active Dukono volcano occurred, producing an ash plume that rose over 15 km (52,000 feet) above sea level and ejecting ballistic blocks of lava beyond the crater rim. The eruption killed three tourists who were hiking within the official exclusion zone; other hikers were rescued and returned to safety.",
files: [
{
name: "277-268010-Dukono-2026-01.pdf",
url: "https://vdap.org/ivans/sitrep/277-268010-Dukono-2026-01.pdf",
type: "pdf"
}
]
},
{
id: 279,
volcano_number: 250030,
report_num: "2026-01",
report_date: "2026-05-15T05:11:53Z",
preparer: "charpel",
reviewer: "jlwnstrn",
send_time: "2026-05-15T05:12:01Z",
volcano_name: "Central Bismarck Sea",
summary: "A M5.4 earthquake occurred on 14 May 2026 at 17:13 (UTC) during the ongoing eruption of the submarine Central Bismarck Sea volcano that began 8 May 2026. The volcano's current activity does not threaten any populated areas, but today’s earthquake indicates that eruptive activity will continue or increase.",
files: [
{
name: "279-250030-Central Bismarck Sea-2026-01.pdf",
url: "https://vdap.org/ivans/sitrep/279-250030-Central Bismarck Sea-2026-01.pdf",
type: "pdf"
}
]
},
{
id: 275,
volcano_number: 273030,
report_num: "2026-02",
report_date: "2026-05-03T05:28:12Z",
preparer: "dramsey",
reviewer: "hwright",
send_time: "2026-05-03T05:28:20Z",
volcano_name: "Mayon",
summary: "At around 5:30 PM local time on May 2, 2026, a pyroclastic flow (cloud of searing ash and rock particles) from erupting Mayon Volcano traveled around 4 km (~2.5 miles) down the southwestern slope of the volcano and produced an ash plume that drifted to the west-southwest. At least 52 villages in various towns in Albay province were heavily affected by thick ash fall, reducing visibility to near zero and making travel extremely difficult. There were no reports of casualties and the volcano alert level remained at Level 3 (on a 0-5 level scale).",
files: [
{
name: "275-273030-Mayon-2026-02.pdf",
url: "https://vdap.org/ivans/sitrep/275-273030-Mayon-2026-02.pdf",
type: "pdf"
},
{
name: "275-273030-Mayon-2026-02.pdf",
url: "https://vdap.org/ivans/sitrep/275-273030-Mayon-2026-02.pdf",
type: "pdf"
}
]
}
])
}, []);
// TEST DATA
// const apiData = useMemo(() => {
// return ([
// {
// id: 277,
// volcano_number: 268010,
// report_num: "2026-01",
// report_date: "2026-05-08T22:05:44Z",
// preparer: "hwright",
// reviewer: "dramsey",
// send_time: "2026-05-08T22:05:52Z",
// volcano_name: "Dukono",
// summary: "At 07:41 local time on 8 May 2026, an explosion of persistently active Dukono volcano occurred, producing an ash plume that rose over 15 km (52,000 feet) above sea level and ejecting ballistic blocks of lava beyond the crater rim. The eruption killed three tourists who were hiking within the official exclusion zone; other hikers were rescued and returned to safety.",
// files: [
// {
// name: "277-268010-Dukono-2026-01.pdf",
// url: "https://vdap.org/ivans/sitrep/277-268010-Dukono-2026-01.pdf",
// type: "pdf"
// }
// ]
// },
// {
// id: 279,
// volcano_number: 250030,
// report_num: "2026-01",
// report_date: "2026-05-15T05:11:53Z",
// preparer: "charpel",
// reviewer: "jlwnstrn",
// send_time: "2026-05-15T05:12:01Z",
// volcano_name: "Central Bismarck Sea",
// summary: "A M5.4 earthquake occurred on 14 May 2026 at 17:13 (UTC) during the ongoing eruption of the submarine Central Bismarck Sea volcano that began 8 May 2026. The volcano's current activity does not threaten any populated areas, but today’s earthquake indicates that eruptive activity will continue or increase.",
// files: [
// {
// name: "279-250030-Central Bismarck Sea-2026-01.pdf",
// url: "https://vdap.org/ivans/sitrep/279-250030-Central Bismarck Sea-2026-01.pdf",
// type: "pdf"
// }
// ]
// },
// {
// id: 275,
// volcano_number: 273030,
// report_num: "2026-02",
// report_date: "2026-05-03T05:28:12Z",
// preparer: "dramsey",
// reviewer: "hwright",
// send_time: "2026-05-03T05:28:20Z",
// volcano_name: "Mayon",
// summary: "At around 5:30 PM local time on May 2, 2026, a pyroclastic flow (cloud of searing ash and rock particles) from erupting Mayon Volcano traveled around 4 km (~2.5 miles) down the southwestern slope of the volcano and produced an ash plume that drifted to the west-southwest. At least 52 villages in various towns in Albay province were heavily affected by thick ash fall, reducing visibility to near zero and making travel extremely difficult. There were no reports of casualties and the volcano alert level remained at Level 3 (on a 0-5 level scale).",
// files: [
// {
// name: "275-273030-Mayon-2026-02.pdf",
// url: "https://vdap.org/ivans/sitrep/275-273030-Mayon-2026-02.pdf",
// type: "pdf"
// },
// {
// name: "275-273030-Mayon-2026-02.pdf",
// url: "https://vdap.org/ivans/sitrep/275-273030-Mayon-2026-02.pdf",
// type: "pdf"
// }
// ]
// }
// ])
// }, []);
const data = useMemo(() => {
if (apiData?.length === 0) return [];
@@ -176,11 +181,17 @@ export default function IvansAlerts({ settings, widgetID }) {
<Collapsible.Content w="100%" h="auto">
{/* This box needs to be at h="100%" for the pdf toolbar to appear */}
<Box w="100%" h="100%" p={1} pl={2} borderBottomRadius="lg" bg="gray.700/45">
<Text fontSize="sm" textAlign="left" color="gray.100">{item?.summary}</Text>
<br />
<Flex direction="column" gap={2} bg="gray.800/75" borderRadius="lg" p={2} align="end">
<Text w="100%" h="100%" fontSize="sm" color="gray.100" textAlign="left" whiteSpace="pre-line">{item?.summary}</Text>
<Text w="fit" fontSize="sm" color="gray.200" pl={1} pr={1} bg="gray.700/50" borderRadius="md">Preparer: {item?.preparer}</Text>
</Flex>
{item?.files?.map((file, index) => {
return (
<Box w="100%" h="100%" key={index} p={1}>
<br />
<Flex mb={2}>
<Text pl={1} pr={1} bg="gray.600/50" borderRadius="md" fontSize="xs" color="gray.300">{file?.name}</Text>
</Flex>
<object
data={`${file?.url}#view=FitH&toolbar=1`}
type="application/pdf"
@@ -195,7 +206,6 @@ export default function IvansAlerts({ settings, widgetID }) {
</a>
</Flex>
</object>
<br />
</Box>
)})}
</Box>