MapExists boolean dashboard update (#2124)

* update map dashboard * code smells * add console log * Update map exists boolean for dashboard * remove console log * update map exists to optional chaining * code smells * update imports * add loading variable * nest grid into projectlocation component
bcgov · Sep 8, 2023 · e217261 · e217261
1 parent d59de15
commit e217261
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 35 deletions.
diff --git a/met-api/tests/unit/services/test_submission.py b/met-api/tests/unit/services/test_submission.py
@@ -52,7 +52,7 @@ def test_create_submission(session):  # pylint:disable=unused-argument
 
 def test_create_submission_rollback(session):  # pylint:disable=unused-argument
     """Assert that a submission failure will rollback changes to email verification."""
-    survey, eng = factory_survey_and_eng_model()
+    survey, _ = factory_survey_and_eng_model()
     email_verification = factory_email_verification(survey.id)
     participant = factory_participant_model()
 

diff --git a/met-web/src/components/dashboard/EngagementsAccordion.tsx b/met-web/src/components/dashboard/EngagementsAccordion.tsx
@@ -104,15 +104,11 @@ const EngagementsAccordion = ({
                                     <Grid item xs={12} sm={!mapExists ? 6 : 4}>
                                         <SurveysCompleted engagement={engagement} engagementIsLoading={false} />
                                     </Grid>
-                                    <When condition={mapExists}>
-                                        <Grid item xs={12} sm={4}>
-                                            <ProjectLocation
-                                                engagement={engagement}
-                                                engagementIsLoading={false}
-                                                handleProjectMapData={handleProjectMapData}
-                                            />
-                                        </Grid>
-                                    </When>
+                                    <ProjectLocation
+                                        engagement={engagement}
+                                        engagementIsLoading={false}
+                                        handleProjectMapData={handleProjectMapData}
+                                    />
                                 </Grid>
                                 <Grid item xs={12} mt={2}>
                                     <SubmissionTrend engagement={engagement} engagementIsLoading={false} />

diff --git a/met-web/src/components/publicDashboard/Dashboard.tsx b/met-web/src/components/publicDashboard/Dashboard.tsx
@@ -180,15 +180,11 @@ const Dashboard = () => {
                                                 engagementIsLoading={isEngagementLoading}
                                             />
                                         </Grid>
-                                        <When condition={mapExists}>
-                                            <Grid item sm={8} md={4} sx={{ width: isTablet ? '90%' : '100%' }}>
-                                                <ProjectLocation
-                                                    engagement={engagement}
-                                                    engagementIsLoading={isEngagementLoading}
-                                                    handleProjectMapData={handleProjectMapData}
-                                                />
-                                            </Grid>
-                                        </When>
+                                        <ProjectLocation
+                                            engagement={engagement}
+                                            engagementIsLoading={isEngagementLoading}
+                                            handleProjectMapData={handleProjectMapData}
+                                        />
                                     </Grid>
                                     <Grid id={'submissiontrend'} item xs={12}>
                                         <SubmissionTrend

diff --git a/met-web/src/components/publicDashboard/KPI/ProjectLocation.tsx b/met-web/src/components/publicDashboard/KPI/ProjectLocation.tsx
@@ -93,22 +93,24 @@ const ProjectLocation = ({ engagement, engagementIsLoading, handleProjectMapData
 
     return (
         <>
-            <MetLabel mb={{ md: 0.5, lg: 2 }}>Project Location</MetLabel>
-            <MetPaper sx={{ textAlign: 'center' }}>
-                <Box
-                    sx={{
-                        width: '100%',
-                        height: '280px',
-                    }}
-                >
-                    <MetMap
-                        geojson={geoJSONDecode(data.geojson)}
-                        latitude={data.latitude}
-                        longitude={data.longitude}
-                        markerLabel={data.marker_label}
-                    />
-                </Box>
-            </MetPaper>
+            <Grid item sm={8} md={4} sx={{ width: isTablet ? '90%' : '100%' }}>
+                <MetLabel mb={{ md: 0.5, lg: 2 }}>Project Location</MetLabel>
+                <MetPaper sx={{ textAlign: 'center' }}>
+                    <Box
+                        sx={{
+                            width: '100%',
+                            height: '280px',
+                        }}
+                    >
+                        <MetMap
+                            geojson={geoJSONDecode(data.geojson)}
+                            latitude={data.latitude}
+                            longitude={data.longitude}
+                            markerLabel={data.marker_label}
+                        />
+                    </Box>
+                </MetPaper>
+            </Grid>
         </>
     );
 };