fix: capture detail dialog open from captures & capture-match (Greens…

…tand#891)
nmcharlton · Oct 13, 2022 · 40419b8 · 40419b8
1 parent bbbeadd
commit 40419b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/api/treeTrackerApi.js b/src/api/treeTrackerApi.js
@@ -246,7 +246,7 @@ export default {
   },
   getSpeciesById(id) {
     try {
-      const query = `${API_ROOT}/api/species/${id}`;
+      const query = `${API_ROOT}/api/species?filter={"where":{"uuid": "${id}"}}`;
 
       return fetch(query, {
         method: 'GET',

diff --git a/src/components/CaptureMatching/CaptureMatchingView.js b/src/components/CaptureMatching/CaptureMatchingView.js
@@ -817,8 +817,9 @@ function CaptureMatchingView() {
         {isDetailsPaneOpen && (
           <CaptureDetailDialog
             open={isDetailsPaneOpen}
-            captureId={captureImage?.reference_id}
+            captureId={captureImage?.id}
             onClose={closeDrawer}
+            page={'CAPTURES'}
           />
         )}
       </CaptureDetailProvider>

diff --git a/src/components/Captures/CaptureTable.js b/src/components/Captures/CaptureTable.js
@@ -327,7 +327,7 @@ const CaptureTable = () => {
               >
                 <TableRow
                   key={capture.id}
-                  onClick={createToggleDrawerHandler(capture.uuid)}
+                  onClick={createToggleDrawerHandler(capture.id)}
                   className={classes.tableRow}
                 >
                   {columns.map(({ attr, renderer }, i) => (
@@ -356,7 +356,7 @@ const CaptureTable = () => {
           open={captureDetail.isDetailsPaneOpen}
           captureId={captureDetail.id}
           onClose={closeDrawer}
-          page={'CAPTURES'}
+          page={'LEGACY'}
         />
       </CaptureDetailProvider>
     </Grid>

diff --git a/src/context/CaptureDetailContext.js b/src/context/CaptureDetailContext.js
@@ -1,10 +1,11 @@
 import React, { useState, createContext, useEffect } from 'react';
-import { handleError } from '../api/apiUtils';
+import { handleError, getOrganization } from '../api/apiUtils';
 import api from '../api/treeTrackerApi';
 import * as loglevel from 'loglevel';
 
 const log = loglevel.getLogger('../context/CaptureDetailContext');
 
+const API_ROOT = process.env.REACT_APP_API_ROOT;
 const QUERY_API = process.env.REACT_APP_QUERY_API_ROOT;
 
 export const CaptureDetailContext = createContext({
@@ -39,6 +40,7 @@ export function CaptureDetailProvider(props) {
 
   const getCaptureDetail = async (id, page) => {
     const BASE_URL = {
+      LEGACY: `${API_ROOT}/api/${getOrganization()}trees`,
       CAPTURES: `${QUERY_API}/v2/captures`,
       VERIFY: `${QUERY_API}/raw-captures`,
     };