Merge pull request #4 from urbanbigdatacentre/development

Fix v.1 - .slice() method causing client exceptions
urbanbigdatacentre · Aug 19, 2022 · af030b8 · af030b8
2 parents a5f1d1e + c43c2b8
commit af030b8
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 125 deletions.
diff --git a/components/elements/carouselItem.js b/components/elements/carouselItem.js
@@ -32,6 +32,9 @@ const CarouselItem = ({ toggleLanguage, data, toggleLocationPreference, updateCi
         }
     }
 
+    useEffect(() => {
+        console.log(new Date(data['submissiontimestamp']).toLocaleString().split(',')[1] === undefined)
+    })
 
     // Get viewport dimensions
     const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0)
@@ -55,7 +58,7 @@ const CarouselItem = ({ toggleLanguage, data, toggleLocationPreference, updateCi
 
                     <LocationBoxWrapper>
                         <DateText >{new Date(data['submissiontimestamp']).toLocaleString().split(',')[0]}</DateText>
-                        <DateText >{new Date(data['submissiontimestamp']).toLocaleString().split(',')[1].slice(0,6)}</DateText>
+                        <DateText >{new Date(data['submissiontimestamp']).toLocaleString().split(',')[1] !== undefined ? new Date(data['submissiontimestamp']).toLocaleString().split(',')[1].slice(0,6) : "-"}</DateText>
                     </LocationBoxWrapper>
             </CarouselBox>
         )

diff --git a/components/elements/dateFilter.js b/components/elements/dateFilter.js
@@ -45,8 +45,11 @@ const DateFilter = (props) => {
     useEffect(() => {
         // Fix to ensure mui selected patterns are correct on load - should be a better method available
         // Infrequent behaviour
-        if (props.toggleDate.endDate.slice(0,5) !== dates.now.slice(0,5)) {
-            document.querySelector('#custom-date-button').classList += ' Mui-selected'
+
+        if ((props.toggleDate.endDate !== undefined) && (dates.now !== undefined)) {
+            if (props.toggleDate.endDate.slice(0,5) !== dates.now?.slice(0,5)) {
+                document.querySelector('#custom-date-button').classList += ' Mui-selected'
+            }
         }
 
     })

diff --git a/components/elements/floodMap.js b/components/elements/floodMap.js
@@ -131,8 +131,8 @@ const FloodMap = ({ toggleLanguage, configureAPI, toggleDate, updateFloodData, u
                     </TooltipFlex>
                     <Typography sx={{fontSize: `20px`, fontWeight: (theme) => (theme.typography.fontWeightLight), marginTop: (theme) => (theme.spacing(2))}}>{object.submissionText !== undefined ? "'" + object.submissionText + "'" : uiText.global.tooltips.noComment[toggleLanguage.language]}</Typography>
                     <TooltipFlex sx={{marginTop: (theme) => (theme.spacing(2))}}>
-                        <Typography sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[0] : null}</Typography>
-                        <Typography sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[1].slice(0,6) : null}</Typography>
+                        <Typography sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[0] : '-'}</Typography>
+                        <Typography sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[1] !== undefined ? new Date(object.timestamp).toLocaleString().split(',')[1].slice(0,6) : '-' : '-'}</Typography>
                     </TooltipFlex>
                 </MyTooltipBox>
             ) : null;

diff --git a/components/elements/rainfallMap.js b/components/elements/rainfallMap.js
@@ -195,8 +195,8 @@ const RainfallMap = ({ toggleLanguage, toggleDate, toggleDataType, mapBoxToken,
                 </TooltipFlex>
                 <SubmissionText sx={{fontWeight: (theme) => (theme.typography.fontWeightLight), marginTop: (theme) => (theme.spacing(2))}}>{"'" + object.submissionText + "'"}</SubmissionText>
                 <TooltipFlex sx={{marginTop: (theme) => (theme.spacing(2))}}>
-                    <DateText sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[0] : null}</DateText>
-                    <DateText sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[1].slice(0,6) : null}</DateText>
+                    <DateText sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[0] : '-'}</DateText>
+                    <DateText sx={{ color: `#888888`, fontSize: `14px`, fontWeight: (theme) => (theme.typography.fontWeightLight)}} >{object?.timestamp ? new Date(object.timestamp).toLocaleString().split(',')[1] !== undefined ? new Date(object.timestamp).toLocaleString().split(',')[1].slice(0,6) : '-' : '-'}</DateText>
                 </TooltipFlex>
             </MyTooltipBox>
             );

diff --git a/components/elements/searchDropdown.js b/components/elements/searchDropdown.js
@@ -26,6 +26,7 @@ import {
     removeCitizenRiverFloodEventsData
 } from "../../store/actions";
 import locationPaths from "../../data/locationPaths";
+import locationPathsBR from "../../data/locationPathsBR";
 import config from "../../api/config";
 import uiText from "../../data/ui-text";
 import requestCitizenEvents from "../../api/requestCitizenEvents";
@@ -112,7 +113,7 @@ const SearchDropdown = ({ configureAPI, toggleDate, toggleGreatestDateRange, tog
                                         <LocationName>{searchResult['placename']}</LocationName>
                                         <DetailsBox>
                                             <HasCitizenDataText>{searchResult['hascitizendata'] ? "": uiText.global.labels.hasNoCitizenData[toggleLanguage.language]}</HasCitizenDataText>
-                                            <LocationBox locationName={locationPaths[searchResult['placetype']].text}/>
+                                            <LocationBox locationName={toggleLanguage.language === 'en' ? locationPaths[searchResult['placetype']].text : locationPathsBR[searchResult['placetype']].text}/>
                                         </DetailsBox>
                                     </MyListItem>
                                 </ListItemButton>

diff --git a/components/modules/cookies.js b/components/modules/cookies.js
diff --git a/components/modules/landing-page/about.js b/components/modules/landing-page/about.js
@@ -28,7 +28,7 @@ const About = ({ toggleLanguage }) => {
           <AboutVideoBox >
               <ReactPlayerWrapper >
                   <ReactPlayerInnerWrapper>
-                      <ReactPlayer className={styles.reactPlayer} url='https://www.youtube.com/embed/lQUulgzMA18?showinfo=0&enablejsapi=1&origin=http://localhost:3000'/>
+                      <ReactPlayer className={styles.reactPlayer} url={toggleLanguage.language === 'en' ? 'https://www.youtube.com/embed/lQUulgzMA18?showinfo=0&enablejsapi=1&origin=http://localhost:3000' : 'https://www.youtube.com/embed/U92B4gBIgik?showinfo=0&enablejsapi=1&origin=http://localhost:3000'}/>
                       <div className={styles.reactPlayerBackground}></div>
                   </ReactPlayerInnerWrapper>
               </ReactPlayerWrapper>

diff --git a/data/locationPathsBR.js b/data/locationPathsBR.js
@@ -0,0 +1,14 @@
+export default {
+    M: {
+        text: "Município",
+        zoom: 8,
+    },
+    O: {
+        text: "Organização",
+        zoom: 15,
+    },
+    E: {
+        text: "Estado",
+        zoom: 6,
+    }
+}