fix: change web map links (Greenstand#973)

* fix: change web map links * fix: correct .env domains * feat: add shared object for the path type * fix: domain on .env dev and test Co-authored-by: Nick Charlton <[email protected]>
gwynndp · Dec 31, 2022 · 6494e52 · 6494e52
1 parent a2b436e
commit 6494e52
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 19 deletions.
diff --git a/.env.development b/.env.development
@@ -1,4 +1,4 @@
-REACT_APP_WEBMAP_DOMAIN=http://dev.treetracker.org
+REACT_APP_WEBMAP_DOMAIN=https://beta-map.treetracker.org
 REACT_APP_API_ROOT=https://dev-k8s.treetracker.org/api/admin
 REACT_APP_EARNINGS_ROOT=https://dev-k8s.treetracker.org/earnings
 REACT_APP_FIELD_DATA_ROOT=https://dev-k8s.treetracker.org/field-data

diff --git a/.env.production b/.env.production
@@ -1,4 +1,4 @@
-REACT_APP_WEBMAP_DOMAIN=https://treetracker.org
+REACT_APP_WEBMAP_DOMAIN=https://beta-map.treetracker.org
 REACT_APP_API_ROOT=https://prod-k8s.treetracker.org/api/admin
 REACT_APP_EARNINGS_ROOT=https://prod-k8s.treetracker.org/earnings
 REACT_APP_GROWER_QUERY_API_ROOT=https://prod-k8s.treetracker.org/grower-account-query

diff --git a/.env.staging b/.env.staging
@@ -1,4 +1,4 @@
-REACT_APP_WEBMAP_DOMAIN=http://staging.treetracker.org
+REACT_APP_WEBMAP_DOMAIN=https://beta-map.treetracker.org
 REACT_APP_API_ROOT=https://prod-k8s.treetracker.org/api/admin
 REACT_APP_EARNINGS_ROOT=https://prod-k8s.treetracker.org/earnings
 REACT_APP_GROWER_QUERY_API_ROOT=https://prod-k8s.treetracker.org/grower-account-query

diff --git a/.env.test b/.env.test
@@ -1,4 +1,4 @@
-REACT_APP_WEBMAP_DOMAIN=http://test.treetracker.org
+REACT_APP_WEBMAP_DOMAIN=https://beta-map.treetracker.org
 REACT_APP_API_ROOT=https://test-k8s.treetracker.org/api/admin
 REACT_APP_EARNINGS_ROOT=https://test-k8s.treetracker.org/earnings
 REACT_APP_GROWER_QUERY_API_ROOT=https://test-k8s.treetracker.org/grower-account-query

diff --git a/src/components/CaptureDetailDialog.js b/src/components/CaptureDetailDialog.js
@@ -15,7 +15,7 @@ import {
 } from '@material-ui/core';
 import Close from '@material-ui/icons/Close';
 import OptimizedImage from './OptimizedImage';
-import LinkToWebmap from './common/LinkToWebmap';
+import LinkToWebmap, { pathType } from './common/LinkToWebmap';
 import { verificationStates } from '../common/variables';
 import { CaptureDetailContext } from '../context/CaptureDetailContext';
 import CopyNotification from './common/CopyNotification';
@@ -162,7 +162,7 @@ function CaptureDetailDialog({ open, captureId, onClose, page }) {
               <Box m={4}>
                 <Typography color="primary" variant="h6">
                   Capture{' '}
-                  <LinkToWebmap value={capture.reference_id} type="tree" />
+                  <LinkToWebmap value={capture} type={pathType.tree} />
                   <CopyButton
                     label="Capture ID"
                     value={capture.reference_id}
@@ -222,7 +222,7 @@ function CaptureDetailDialog({ open, captureId, onClose, page }) {
                       Open in new tab
                     </Link>
                   ) : (
-                    <LinkToWebmap value={item.value} type="user" />
+                    <LinkToWebmap value={item.value} type={pathType.planter} />
                   )
                 ) : item.value ? (
                   item.value

diff --git a/src/components/Captures/CaptureTable.js b/src/components/Captures/CaptureTable.js
@@ -15,7 +15,7 @@ import {
 } from '@material-ui/core';
 import { GetApp } from '@material-ui/icons';
 import { getDateTimeStringLocale } from '../../common/locale';
-import LinkToWebmap from '../common/LinkToWebmap';
+import LinkToWebmap, { pathType } from '../common/LinkToWebmap';
 import { CapturesContext } from '../../context/CapturesContext';
 import { SpeciesContext } from '../../context/SpeciesContext';
 import { CaptureDetailProvider } from '../../context/CaptureDetailContext';
@@ -364,7 +364,7 @@ export const formatCell = (
     return (
       <LinkToWebmap
         value={capture[attr]}
-        type={attr === 'reference_id' ? 'tree' : 'user'}
+        type={attr === 'reference_id' ? pathType.tree : pathType.planter}
       />
     );
   } else if (attr === 'species_id') {

diff --git a/src/components/GrowerDetail.js b/src/components/GrowerDetail.js
@@ -37,7 +37,7 @@ import { MessagingContext } from 'context/MessagingContext';
 import EditGrower from './EditGrower';
 import GrowerOrganization from './GrowerOrganization';
 import OptimizedImage from './OptimizedImage';
-import LinkToWebmap from './common/LinkToWebmap';
+import LinkToWebmap, { pathType } from './common/LinkToWebmap';
 import { CopyButton } from './common/CopyButton';
 import CopyNotification from './common/CopyNotification';
 import FilterModel from '../models/Filter';
@@ -414,7 +414,11 @@ const GrowerDetail = ({ open, growerId, onClose }) => {
                   {grower.firstName} {grower.lastName}
                 </Typography>
                 <Typography variant="body2">
-                  ID: <LinkToWebmap value={grower.id} type="user" />
+                  ID:{' '}
+                  <LinkToWebmap
+                    value={grower.reference_id || grower.id}
+                    type={pathType.planter}
+                  />
                 </Typography>
               </Grid>
               {process.env.REACT_APP_ENABLE_MESSAGING === 'true' &&

diff --git a/src/components/Growers/Grower.js b/src/components/Growers/Grower.js
@@ -8,7 +8,7 @@ import {
   CardContent,
 } from '@material-ui/core';
 import { Person } from '@material-ui/icons';
-import LinkToWebmap from '../common/LinkToWebmap';
+import LinkToWebmap, { pathType } from '../common/LinkToWebmap';
 import OptimizedImage from '../OptimizedImage';
 import GrowerOrganization from 'components/GrowerOrganization';
 import { useStyle, GROWER_IMAGE_SIZE } from './Growers.styles.js';
@@ -52,7 +52,11 @@ export const Grower = ({ grower, growerClick }) => {
               {grower.firstName} {grower.lastName}
             </Typography>
             <Typography>
-              ID: <LinkToWebmap value={grower.id} type="user" />
+              ID:{' '}
+              <LinkToWebmap
+                value={grower.reference_id || grower.id}
+                type={pathType.planter}
+              />
             </Typography>
             <GrowerOrganization
               organizationName={grower?.organization}

diff --git a/src/components/Verify.js b/src/components/Verify.js
@@ -36,6 +36,7 @@ import { VerifyContext } from 'context/VerifyContext';
 import { SpeciesContext } from 'context/SpeciesContext';
 import { TagsContext } from 'context/TagsContext';
 import { CaptureDetailProvider } from 'context/CaptureDetailContext';
+import { pathType } from './common/LinkToWebmap';
 
 const log = require('loglevel').getLogger('components/Verify');
 const EMPTY_ARRAY = new Array(16).fill();
@@ -288,14 +289,14 @@ const Verify = (props) => {
   const handleCapturePinClick = (captureId) => (e) => {
     e.stopPropagation();
     log.debug('click on capture pin:', captureId);
-    const url = `${process.env.REACT_APP_WEBMAP_DOMAIN}/?treeid=${captureId}`;
+    const url = `${process.env.REACT_APP_WEBMAP_DOMAIN}/${pathType.tree}/${captureId}`;
     window.open(url, '_blank').opener = null;
   };
 
   const handleGrowerMapClick = (growerId) => (e) => {
     e.stopPropagation();
     log.debug('click on grower:', growerId);
-    const url = `${process.env.REACT_APP_WEBMAP_DOMAIN}/?userid=${growerId}`;
+    const url = `${process.env.REACT_APP_WEBMAP_DOMAIN}/${pathType.planter}/${growerId}`;
     window.open(url, '_blank').opener = null;
   };
 

diff --git a/src/components/common/LinkToWebmap.js b/src/components/common/LinkToWebmap.js
@@ -9,6 +9,11 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
+export const pathType = {
+  tree: 'trees',
+  planter: 'planters',
+};
+
 export default function LinkToWebmap(props) {
   const { value, type } = props;
   const classes = useStyles();
@@ -18,7 +23,7 @@ export default function LinkToWebmap(props) {
   return (
     <Link
       onClick={(e) => e.stopPropagation()}
-      href={`${process.env.REACT_APP_WEBMAP_DOMAIN}/?${type}id=${id}`}
+      href={`${process.env.REACT_APP_WEBMAP_DOMAIN}/${type}/${id}`}
       underline="always"
       target="_blank"
     >

diff --git a/src/components/tests/fixtures.js b/src/components/tests/fixtures.js
@@ -255,7 +255,7 @@ const GROWERS = {
       bulk_pack_file_name: null,
       gender: 'female',
       about: null,
-      reference_id: 105,
+      reference_id: 1,
       devices: ['a', 'b', 'c'],
       regions: null,
     },
@@ -282,7 +282,7 @@ const GROWERS = {
       bulk_pack_file_name: null,
       gender: 'male',
       about: null,
-      reference_id: 106,
+      reference_id: 2,
       devices: ['d', 'e', 'f'],
       regions: null,
     },
@@ -310,7 +310,7 @@ const GROWERS = {
       bulk_pack_file_name: null,
       gender: null,
       about: null,
-      reference_id: 107,
+      reference_id: 3,
       devices: ['a'],
       regions: null,
     },