From 3a13c54822c852fe5bafd8b856d96b7b4bcc0b24 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 18 Jul 2022 17:18:31 -0700
Subject: Load event types

---
 modern/src/reports/EventReportPage.js | 37 +++++++++++++----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

(limited to 'modern')

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index 1362934b..264e874a 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -11,31 +11,10 @@ import PageLayout from '../common/components/PageLayout';
 import ReportsMenu from './components/ReportsMenu';
 import usePersistedState from '../common/util/usePersistedState';
 import ColumnSelect from './components/ColumnSelect';
-import { useCatch } from '../reactHelper';
+import { useCatch, useEffectAsync } from '../reactHelper';
 import useReportStyles from './common/useReportStyles';
 import TableShimmer from '../common/components/TableShimmer';
 
-const typesArray = [
-  ['allEvents', 'eventAll'],
-  ['deviceOnline', 'eventDeviceOnline'],
-  ['deviceUnknown', 'eventDeviceUnknown'],
-  ['deviceOffline', 'eventDeviceOffline'],
-  ['deviceInactive', 'eventDeviceInactive'],
-  ['deviceMoving', 'eventDeviceMoving'],
-  ['deviceStopped', 'eventDeviceStopped'],
-  ['deviceOverspeed', 'eventDeviceOverspeed'],
-  ['deviceFuelDrop', 'eventDeviceFuelDrop'],
-  ['commandResult', 'eventCommandResult'],
-  ['geofenceEnter', 'eventGeofenceEnter'],
-  ['geofenceExit', 'eventGeofenceExit'],
-  ['alarm', 'eventAlarm'],
-  ['ignitionOn', 'eventIgnitionOn'],
-  ['ignitionOff', 'eventIgnitionOff'],
-  ['maintenance', 'eventMaintenance'],
-  ['textMessage', 'eventTextMessage'],
-  ['driverChanged', 'eventDriverChanged'],
-];
-
 const columnsArray = [
   ['eventTime', 'positionFixTime'],
   ['type', 'sharedType'],
@@ -51,11 +30,23 @@ const EventReportPage = () => {
 
   const geofences = useSelector((state) => state.geofences.items);
 
+  const [allEventTypes, setAllEventTypes] = useState([['allEvents', 'eventAll']]);
+
   const [columns, setColumns] = usePersistedState('eventColumns', ['eventTime', 'type', 'alarm']);
   const [eventTypes, setEventTypes] = useState(['allEvents']);
   const [items, setItems] = useState([]);
   const [loading, setLoading] = useState(false);
 
+  useEffectAsync(async () => {
+    const response = await fetch('/api/notifications/types');
+    if (response.ok) {
+      const types = await response.json();
+      setAllEventTypes([...allEventTypes, ...types.map((it) => [it.type, prefixString('event', it.type)])]);
+    } else {
+      throw Error(await response.text());
+    }
+  }, []);
+
   const handleSubmit = useCatch(async ({ deviceId, from, to, type }) => {
     const query = new URLSearchParams({ deviceId, from, to });
     eventTypes.forEach((it) => query.append('type', it));
@@ -124,7 +115,7 @@ const EventReportPage = () => {
                 }}
                 multiple
               >
-                {typesArray.map(([key, string]) => (
+                {allEventTypes.map(([key, string]) => (
                   <MenuItem key={key} value={key}>{t(string)}</MenuItem>
                 ))}
               </Select>
-- 
cgit v1.2.3