Botts-Innovative-Research · tyronechrisharris · Mar 22, 2026
diff --git a/patches/osh-js+3.1.5.patch b/patches/osh-js+3.1.5.patch
@@ -0,0 +1,55 @@
+diff --git a/node_modules/osh-js/core/parsers/JsonDataParser.js b/node_modules/osh-js/core/parsers/JsonDataParser.js
+index 8bb9f66..0c26f5c 100644
+--- a/node_modules/osh-js/core/parsers/JsonDataParser.js
++++ b/node_modules/osh-js/core/parsers/JsonDataParser.js
+@@ -58,10 +58,13 @@ var JsonDataParser = /** @class */ (function (_super) {
+                 jsonData = input;
+             }
+         }
++        if (!jsonData) return [];
+         if (Array.isArray(jsonData)) {
+             for (var _i = 0, jsonData_1 = jsonData; _i < jsonData_1.length; _i++) {
+                 var d = jsonData_1[_i];
+-                d['timestamp'] = new Date(d[this.getTimeField()]).getTime() + this.props.timeShift;
++                if (d) {
++                    d['timestamp'] = new Date(d[this.getTimeField()]).getTime() + this.props.timeShift;
++                }
+             }
+             return jsonData;
+         }
+diff --git a/node_modules/osh-js/source/core/mqtt/MqttProvider.js b/node_modules/osh-js/source/core/mqtt/MqttProvider.js
+index fb0b3a8..75a9ba2 100644
+--- a/node_modules/osh-js/source/core/mqtt/MqttProvider.js
++++ b/node_modules/osh-js/source/core/mqtt/MqttProvider.js
+@@ -166,10 +166,10 @@ class MqttProvider {
+             this.client.on('message', this.onMessage.bind(this));
+
+             this.client.on('offline', e => {
+-                throw new Error(`The server ${that.endpoint} seems offline`);
++                console.warn(`The server ${that.endpoint} seems offline`);
+             });
+             this.client.on('error', e => {
+-                throw new Error(error);
++                console.error(e);
+             });
+         }
+     }
+diff --git a/node_modules/osh-js/source/core/parsers/JsonDataParser.js b/node_modules/osh-js/source/core/parsers/JsonDataParser.js
+index 67eb795..57490eb 100644
+--- a/node_modules/osh-js/source/core/parsers/JsonDataParser.js
++++ b/node_modules/osh-js/source/core/parsers/JsonDataParser.js
+@@ -38,9 +38,13 @@ class JsonDataParser extends GenericParser {
+             }
+         }
+
++        if (!jsonData) return [];
++
+         if(Array.isArray(jsonData)) {
+             for(let d of jsonData) {
+-                d['timestamp'] = new Date(d[this.getTimeField()]).getTime() + this.props.timeShift;
++                if (d) {
++                    d['timestamp'] = new Date(d[this.getTimeField()]).getTime() + this.props.timeShift;
++                }
+             }
+             return jsonData;
+         } else {
diff --git a/src/app/(dashboard)/page.tsx b/src/app/(dashboard)/page.tsx
@@ -55,19 +55,19 @@ export default function DashboardPage() {
                 let laneDSColl = laneDSMap.get(laneid);
 
                 if(isGammaDataStream(ds))
-                    laneDSColl.addDS('gammaRT', rtDS);
+                    laneDSColl?.addDS('gammaRT', rtDS);
 
                 if(isNeutronDataStream(ds))
-                    laneDSColl.addDS('neutronRT', rtDS);
+                    laneDSColl?.addDS('neutronRT', rtDS);
 
                 if(isTamperDataStream(ds))
-                    laneDSColl.addDS('tamperRT', rtDS);
+                    laneDSColl?.addDS('tamperRT', rtDS);
 
                 if(isConnectionDataStream(ds))
-                    laneDSColl.addDS('connectionRT', rtDS);
+                    laneDSColl?.addDS('connectionRT', rtDS);
 
                 if(isThresholdDataStream(ds))
-                    laneDSColl.addDS('gammaTrshldRT', rtDS);
+                    laneDSColl?.addDS('gammaTrshldRT', rtDS);
             });
 
             newStatusList.push({

diff --git a/src/app/_components/AlarmAudio.tsx b/src/app/_components/AlarmAudio.tsx
@@ -5,6 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
 import Box from "@mui/material/Box";
 import {Alert} from "@mui/material";
 import { selectAlarmAudioVolume } from "@/lib/state/OSCARClientSlice";
+import { useLanguage } from '@/contexts/LanguageContext';
 
 let alarmAudio: HTMLAudioElement | null = null;
 
@@ -17,6 +18,7 @@ export function getAlarmAudio() {
 }
 
 export default function AlarmAudio() {
+    const { t } = useLanguage();
     const dispatch = useDispatch();
     const savedVolume = useSelector(selectAlarmAudioVolume);
     const triggerAlarm = useSelector((state: RootState) => selectTriggeredAlarm(state));
@@ -61,7 +63,7 @@ export default function AlarmAudio() {
 
             {soundLocked && (
                 <Alert severity="info" sx={{ mb: 2, fontSize: "0.8rem" }}>
-                    Click anywhere to enable alarm sound
+                    {t('clickAnywhereToEnableAlarmSound')}
                 </Alert>
             )}
 

diff --git a/src/app/_components/LanguageSelector.tsx b/src/app/_components/LanguageSelector.tsx
@@ -1,15 +1,41 @@
 "use client";
 
-import React, { useState } from 'react';
-import { Select, MenuItem, FormControl, InputLabel, SelectChangeEvent } from '@mui/material';
+import React from 'react';
+import { Select, MenuItem, FormControl, SelectChangeEvent } from '@mui/material';
 import { useLanguage } from '@/contexts/LanguageContext';
 import LanguageIcon from '@mui/icons-material/Language';
 
+const languages = [
+    { code: 'en', name: 'English' },
+    { code: 'es', name: 'Español' },
+    { code: 'fr', name: 'Français' },
+    { code: 'ar', name: 'العربية' },
+    { code: 'ru', name: 'Русский' },
+    { code: 'zh-CN', name: '简体中文' },
+    { code: 'ja', name: '日本語' },
+    { code: 'ko', name: '한국어' },
+    { code: 'ar-JO', name: 'العربية (الأردن)' },
+    { code: 'lv', name: 'Latviešu' },
+    { code: 'et', name: 'Eesti' },
+    { code: 'pt', name: 'Português' },
+    { code: 'de', name: 'Deutsch' },
+    { code: 'th', name: 'ไทย' },
+    { code: 'hi', name: 'हिन्दी' },
+    { code: 'bn', name: 'বাংলা' },
+    { code: 'pa-PK', name: 'پنجابی' },
+    { code: 'vi', name: 'Tiếng Việt' },
+    { code: 'yue', name: '粵語' },
+    { code: 'tr', name: 'Türkçe' },
+    { code: 'id', name: 'Bahasa Indonesia' },
+    { code: 'ur', name: 'اردو' },
+    { code: 'it', name: 'Italiano' }
+];
+
 export default function LanguageSelector() {
   const { language, setLanguage } = useLanguage();
 
   const handleChange = (event: SelectChangeEvent) => {
-    setLanguage(event.target.value as 'en' | 'es' | 'fr');
+    setLanguage(event.target.value as any);
   };
 
   return (
@@ -19,18 +45,28 @@ export default function LanguageSelector() {
         value={language}
         onChange={handleChange}
         displayEmpty
-        inputProps={{ 'aria-label': 'Without label' }}
-        startAdornment={<LanguageIcon sx={{ mr: 1 }} />}
+        inputProps={{ 'aria-label': 'Language' }}
+        startAdornment={<LanguageIcon sx={{ mr: 1, color: 'inherit' }} />}
         renderValue={(selected) => {
-            if (selected === 'en') return 'English';
-            if (selected === 'es') return 'Español';
-            if (selected === 'fr') return 'Français';
-            return selected;
+            const lang = languages.find(l => l.code === selected);
+            return lang ? lang.name : selected;
+        }}
+        sx={{
+            color: 'inherit',
+            '& .MuiSelect-select': {
+                paddingTop: '4px',
+                paddingBottom: '4px',
+            },
+            '&:before': { borderBottomColor: 'rgba(255, 255, 255, 0.7)' },
+            '&:after': { borderBottomColor: 'white' },
+            '& .MuiSvgIcon-root': { color: 'inherit' }
         }}
       >
-        <MenuItem value="en">English</MenuItem>
-        <MenuItem value="es">Español</MenuItem>
-        <MenuItem value="fr">Français</MenuItem>
+        {languages.map((lang) => (
+            <MenuItem key={lang.code} value={lang.code}>
+                {lang.name}
+            </MenuItem>
+        ))}
       </Select>
     </FormControl>
   );

diff --git a/src/app/_components/Navbar.tsx b/src/app/_components/Navbar.tsx
@@ -201,7 +201,7 @@ export default function Navbar({children}: { children: React.ReactNode }) {
                 <Toolbar>
                     <IconButton
                         color="inherit"
-                        aria-label="open drawer"
+                        aria-label={t('openDrawer')}
                         onClick={handleDrawerOpen}
                         edge="start"
                         sx={{
@@ -220,7 +220,7 @@ export default function Navbar({children}: { children: React.ReactNode }) {
                             <Tooltip title={t('alarmVolume')} arrow placement="top">
                                 <IconButton
                                     color="inherit"
-                                    aria-label="open notifications"
+                                    aria-label={t('openNotifications')}
                                     onClick={handleMenuOpen}
                                 >
                                     {savedVolume === 0 ? <NotificationsOffIcon/> : <NotificationsRoundedIcon/>}
@@ -256,7 +256,7 @@ export default function Navbar({children}: { children: React.ReactNode }) {
                         <Stack spacing={2} direction="row" sx={{alignItems: 'center', mb: 1}}>
                             <VolumeDown/>
                             <Slider
-                                aria-label="Volume"
+                                aria-label={t('volume')}
                                 value={volumeValue}
                                 onChange={handleVolumeChange}
                                 valueLabelDisplay="auto"

diff --git a/src/app/_components/adjudication/AdjudicationDetail.tsx b/src/app/_components/adjudication/AdjudicationDetail.tsx
@@ -36,10 +36,12 @@ import IconButton from "@mui/material/IconButton";
 import DeleteOutline from "@mui/icons-material/DeleteOutline"
 import {setAdjudicatedEventId, setSelectedEvent} from "@/lib/state/EventDataSlice";
 import {useAppDispatch} from "@/lib/state/Hooks";
+import {useLanguage} from "@/contexts/LanguageContext";
 
 
 export default function AdjudicationDetail(props: { event: EventTableData }) {
     const dispatch = useAppDispatch();
+    const { t } = useLanguage();
 
     const [uploadedFiles, setUploadedFiles] = useState<File[]>([]);
 
@@ -95,7 +97,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
                     const occupancyObservation = await query.nextPage();
 
                     if (!occupancyObservation || occupancyObservation.length === 0) {
-                        setAdjSnackMsg('Cannot find observation to adjudicate. Please try again.');
+                        setAdjSnackMsg(t('cannotFindObservation'));
                         setColorStatus('error');
                         setOpenSnack(true);
                         return;
@@ -106,7 +108,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
 
                 } catch (err) {
                     console.error(err);
-                    setAdjSnackMsg('Error loading observation.');
+                    setAdjSnackMsg(t('errorLoadingObservation'));
                     setColorStatus('error');
                     setOpenSnack(true);
                 }
@@ -188,7 +190,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
 
     const sendAdjudicationData = async () => {
         if(adjData.adjudicationCode === null || !adjData.adjudicationCode || adjData.adjudicationCode === AdjudicationCodes.codes[0]){
-            setAdjSnackMsg("Please selected a valid adjudication code before submitting.");
+            setAdjSnackMsg(t('selectValidCode'));
             setColorStatus('error');
             setOpenSnack(true)
             return;
@@ -234,7 +236,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
                 const occupancyObservation = await query.nextPage();
 
                 if (!occupancyObservation) {
-                    setAdjSnackMsg('Cannot find observation to adjudicate. Please try again.');
+                    setAdjSnackMsg(t('cannotFindObservation'));
                     setColorStatus('error')
                     setOpenSnack(true);
                     return;
@@ -264,7 +266,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
             );
 
             if (!response.ok) {
-                setAdjSnackMsg('Adjudication failed to submit.')
+                setAdjSnackMsg(t('adjudicationFail'))
                 setColorStatus('error')
                 return;
             }
@@ -274,11 +276,11 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
             dispatch(setSelectedEvent(props.event));
             dispatch(setAdjudicatedEventId(props.event.id));
 
-            setAdjSnackMsg('Adjudication successful for Occupancy ID: ' + props.event.occupancyCount);
+            setAdjSnackMsg(t('adjudicationSuccess') + props.event.occupancyCount);
             setColorStatus('success')
 
         }catch(error){
-            setAdjSnackMsg('Adjudication failed to submit.')
+            setAdjSnackMsg(t('adjudicationFail'))
             setColorStatus('error')
         }finally{
             setShouldFetchLogs(true);
@@ -301,7 +303,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
             <Typography
                 variant="h4"
             >
-                Adjudication
+                {t('adjudicationTitle')}
             </Typography>
 
             <AdjudicationLog
@@ -311,7 +313,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
             />
 
             <Stack spacing={2}>
-                <Typography variant="h5">Adjudication Report Form</Typography>
+                <Typography variant="h5">{t('adjudicationReportForm')}</Typography>
 
                 <Stack
                     direction={"row"}
@@ -320,7 +322,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
                     alignItems={"center"}
                 >
                     <TextField
-                        label="VehicleId"
+                        label={t('vehicleId')}
                         name="vehicleId"
                         value={vehicleId}
                         onChange={handleChange}
@@ -346,7 +348,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
 
                 <TextField
                     id="outlined-multiline-static"
-                    label="Notes"
+                    label={t('notes')}
                     name="notes"
                     multiline
                     rows={4}
@@ -406,7 +408,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
                             color: "secondary.main"
                         }}
                     >
-                        Upload Files
+                        {t('uploadFiles')}
                         <input
                             type="file"
                             multiple
@@ -426,7 +428,7 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
                             color={"success"}
                             onClick={sendAdjudicationData}
                         >
-                            Submit
+                            {t('submit')}
                         </Button>
                         <Snackbar
                             anchorOrigin={{ vertical:'top', horizontal:'center' }}
@@ -445,4 +447,4 @@ export default function AdjudicationDetail(props: { event: EventTableData }) {
             </Stack>
         </Stack>
     );
-}
+}