Merge branch 'feature/liveMonitoring' into tm/feature/liveMonitoring

naxa-developers · Jan 18, 2024 · c1af4cb · c1af4cb
2 parents 494fe3b + e7ca921
commit c1af4cb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/frontend/src/components/projectDetail/index.js b/frontend/src/components/projectDetail/index.js
@@ -362,8 +362,11 @@ export const ProjectDetail = (props) => {
             className="bg-white blue-dark ba b--grey-light pa3"
           />
 
-          {/* show live view button only when the project has live monitoring feature */}
-          {hasLiveMonitoringFeature && (
+          {/* 
+            show live view button only for published projects &
+            when the project has live monitoring feature 
+          */}
+          {props.project.status === 'PUBLISHED' && hasLiveMonitoringFeature && (
             <LiveViewButton
               projectId={props.project.projectId}
               className="bg-white blue-dark ba b--grey-light pa3"

diff --git a/frontend/src/views/projectLiveMonitoring.js b/frontend/src/views/projectLiveMonitoring.js
@@ -39,6 +39,13 @@ const config = {
       attribution: '&copy; OpenStreetMap Contributors',
       maxzoom: 19,
     },
+    Bing: {
+      type: 'raster',
+      tiles: ['https://ecn.t3.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=1'],
+      tileSize: 256,
+      attribution: '&copy; OpenStreetMap Contributors',
+      maxzoom: 18,
+    },
     Mapbox: {
       type: 'raster',
       tiles: [
@@ -57,13 +64,6 @@ const config = {
       attribution: '&copy; OpenStreetMap Contributors &copy; ESRI',
       maxzoom: 18,
     },
-    Bing: {
-      type: 'raster',
-      tiles: ['http://ecn.t3.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=1'],
-      tileSize: 256,
-      attribution: '&copy; OpenStreetMap Contributors',
-      maxzoom: 18,
-    },
   },
 };
 
@@ -330,7 +330,7 @@ export function ProjectLiveMonitoring() {
             <UnderpassFeatureList
               style={{
                 display: 'flex',
-                'flex-flow': 'column',
+                flexFlow: 'column',
                 height: '100px',
                 flex: '1 1 auto',
               }}