Merge pull request #4006 from NCI-Agency/fix-map-initialization-error

Fix some UI bugs
NCI-Agency · Apr 1, 2022 · 4ebecb6 · 4ebecb6
2 parents a75ba41 + 1b4cc28
commit 4ebecb6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/client/src/components/Leaflet.js b/client/src/components/Leaflet.js
@@ -173,6 +173,9 @@ const Leaflet = ({
     setMarkerLayer(newMarkerLayer)
 
     setDoInitializeMarkerLayer(true)
+
+    // Destroy map when done
+    return () => newMap.remove()
   }, [mapId])
 
   useEffect(() => {

diff --git a/client/src/pages/dashboards/BoardDashboard.js b/client/src/pages/dashboards/BoardDashboard.js
@@ -270,7 +270,7 @@ const BoardDashboard = ({ pageDispatchers }) => {
         {edit && (
           <>
             <Card variant="primary">
-              <Card.Heading>Node palette</Card.Heading>
+              <Card.Header>Node palette</Card.Header>
               <Card.Body style={{ display: "flex", flexDirection: "column" }}>
                 {Object.values(Models).map(Model => {
                   const instance = new Model()
@@ -296,7 +296,7 @@ const BoardDashboard = ({ pageDispatchers }) => {
               </Card.Body>
             </Card>
             <Card variant="primary">
-              <Card.Heading>Node editor</Card.Heading>
+              <Card.Header>Node editor</Card.Header>
               <Card.Body>
                 {editedNode ? (
                   <>

diff --git a/client/src/pages/dashboards/DiagramNode.js b/client/src/pages/dashboards/DiagramNode.js
@@ -24,6 +24,7 @@ import { SPECIAL_WIDGET_TYPES } from "components/CustomFields"
 import LinkTo from "components/LinkTo"
 import { CUSTOM_FIELD_TYPE, GRAPHQL_ENTITY_FIELDS } from "components/Model"
 import { GRAPHQL_NOTES_FIELDS } from "components/RelatedObjectNotes"
+import _isEmpty from "lodash/isEmpty"
 import * as Models from "models"
 import moment from "moment"
 import { PERIOD_FACTORIES, RECURRENCE_TYPE } from "periodUtils"
@@ -125,7 +126,8 @@ export const DiagramNodeWidget = ({ size, node, engine }) => {
   const instantAssessmentConfig =
     anetObject && anetObject.getInstantAssessmentConfig()
   const instantAssessmentResults =
-    instantAssessmentConfig && anetObject.getInstantAssessmentResults(period)
+    !_isEmpty(instantAssessmentConfig) &&
+    anetObject.getInstantAssessmentResults(period)
   return (
     <div
       className="diagram-node"