Minor fixes:

- Adjust api path/openapi param name - Adjust app route not passing survey critter id (was passing critterbase uuid)
bcgov · Oct 7, 2024 · 982c077 · 982c077
1 parent 532a93e
commit 982c077
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 23 deletions.
diff --git a/...res/{captureId}/attachments/index.test.ts → ...rbaseCaptureId}/attachments/index.test.ts b/...res/{captureId}/attachments/index.test.ts → ...rbaseCaptureId}/attachments/index.test.ts
diff --git a/...captures/{captureId}/attachments/index.ts → ...ritterbaseCaptureId}/attachments/index.ts b/...captures/{captureId}/attachments/index.ts → ...ritterbaseCaptureId}/attachments/index.ts
@@ -8,7 +8,7 @@ import { bulkDeleteFilesFromS3 } from '../../../../../../../../../../utils/file-
 import { getLogger } from '../../../../../../../../../../utils/logger';
 
 const defaultLog = getLogger(
-  '/api/project/{projectId}/survey/{surveyId}/critters/{critterId}/captures/{captureId}/attachments'
+  '/api/project/{projectId}/survey/{surveyId}/critters/{critterbaseCaptureId}/captures/{captureId}/attachments'
 );
 
 export const DELETE: Operation = [
@@ -59,7 +59,7 @@ DELETE.apiDoc = {
     },
     {
       in: 'path',
-      name: 'critterId',
+      name: 'critterbaseCaptureId',
       schema: {
         type: 'integer',
         minimum: 1
@@ -68,7 +68,7 @@ DELETE.apiDoc = {
     },
     {
       in: 'path',
-      name: 'critterbaseCaptureId',
+      name: 'captureId',
       schema: {
         type: 'string',
         format: 'uuid',
@@ -98,7 +98,7 @@ DELETE.apiDoc = {
 export function deleteCritterCaptureAttachments(): RequestHandler {
   return async (req, res) => {
     const surveyId = Number(req.params.surveyId);
-    const captureId = req.params.critterbaseCaptureId;
+    const captureId = req.params.captureId;
 
     const connection = getDBConnection(req.keycloak_token);
 

diff --git a/...es/{captureId}/attachments/upload.test.ts → ...baseCaptureId}/attachments/upload.test.ts b/...es/{captureId}/attachments/upload.test.ts → ...baseCaptureId}/attachments/upload.test.ts
diff --git a/...aptures/{captureId}/attachments/upload.ts → ...itterbaseCaptureId}/attachments/upload.ts b/...aptures/{captureId}/attachments/upload.ts → ...itterbaseCaptureId}/attachments/upload.ts
@@ -14,7 +14,7 @@ import {
 import { getLogger } from '../../../../../../../../../../utils/logger';
 
 const defaultLog = getLogger(
-  '/api/project/{projectId}/survey/{surveyId}/critters/{critterId}/captures/{captureId}/upload/attachments'
+  '/api/project/{projectId}/survey/{surveyId}/critters/{critterId}/captures/{critterbaseCaptureId}/upload/attachments'
 );
 
 export const POST: Operation = [
@@ -89,8 +89,8 @@ POST.apiDoc = {
       'multipart/form-data': {
         schema: {
           type: 'object',
-          additionalProperties: false,
           required: ['media'],
+          additionalProperties: false,
           properties: {
             media: {
               description: 'Uploaded Capture attachments.',
@@ -117,15 +117,15 @@ POST.apiDoc = {
         'application/json': {
           schema: {
             type: 'object',
-            items: {
-              properties: {
-                attachment_ids: {
-                  description: 'The IDs of the capture attachments that were uploaded.',
-                  type: 'array',
-                  items: {
-                    type: 'integer',
-                    minItems: 1
-                  }
+            required: ['attachment_ids'],
+            additionalProperties: false,
+            properties: {
+              attachment_ids: {
+                description: 'The IDs of the capture attachments that were uploaded.',
+                type: 'array',
+                items: {
+                  type: 'integer',
+                  minItems: 1
                 }
               }
             }

diff --git a/app/src/features/surveys/animals/profile/captures/capture-form/edit/EditCapturePage.tsx b/app/src/features/surveys/animals/profile/captures/capture-form/edit/EditCapturePage.tsx
@@ -53,13 +53,25 @@ export const EditCapturePage = () => {
 
   const { projectId, surveyId } = surveyContext;
 
+  useEffect(() => {
+    if (!surveyCritterId) {
+      return;
+    }
+
+    animalPageContext.critterDataLoader.load(projectId, surveyId, surveyCritterId);
+  }, [animalPageContext.critterDataLoader, projectId, surveyId, surveyCritterId]);
+
   const critter = animalPageContext.critterDataLoader.data;
 
-  const captureDataLoader = useDataLoader(() => critterbaseApi.capture.getCapture(captureId));
+  const captureDataLoader = useDataLoader((captureId: string) => critterbaseApi.capture.getCapture(captureId));
 
   useEffect(() => {
-    captureDataLoader.load();
-  }, [captureDataLoader]);
+    if (!captureId) {
+      return;
+    }
+
+    captureDataLoader.load(captureId);
+  }, [captureDataLoader, captureId]);
 
   const capture = captureDataLoader.data;
 

diff --git a/app/src/features/surveys/animals/profile/captures/components/AnimalCaptureCardContainer.tsx b/app/src/features/surveys/animals/profile/captures/components/AnimalCaptureCardContainer.tsx
@@ -77,7 +77,7 @@ export const AnimalCaptureCardContainer = (props: IAnimalCaptureCardContainer) =
               }
             }}>
             <RouterLink
-              to={`/admin/projects/${projectId}/surveys/${surveyId}/animals/${selectedAnimal.critterbase_critter_id}/capture/${selectedCapture}/edit`}>
+              to={`/admin/projects/${projectId}/surveys/${surveyId}/animals/${selectedAnimal.critter_id}/capture/${selectedCapture}/edit`}>
               <ListItemIcon>
                 <Icon path={mdiPencilOutline} size={1} />
               </ListItemIcon>

diff --git a/...rc/features/surveys/animals/profile/mortality/components/AnimalMortalityCardContainer.tsx b/...rc/features/surveys/animals/profile/mortality/components/AnimalMortalityCardContainer.tsx
@@ -76,7 +76,7 @@ export const AnimalMortalityCardContainer = (props: IAnimalMortalityCardContaine
               }
             }}>
             <RouterLink
-              to={`/admin/projects/${projectId}/surveys/${surveyId}/animals/${selectedAnimal.critterbase_critter_id}/mortality/${selectedMortality}/edit`}>
+              to={`/admin/projects/${projectId}/surveys/${surveyId}/animals/${selectedAnimal.critter_id}/mortality/${selectedMortality}/edit`}>
               <ListItemIcon>
                 <Icon path={mdiPencilOutline} size={1} />
               </ListItemIcon>

diff --git a/app/src/features/surveys/animals/profile/mortality/mortality-form/edit/EditMortalityPage.tsx b/app/src/features/surveys/animals/profile/mortality/mortality-form/edit/EditMortalityPage.tsx
@@ -52,13 +52,26 @@ export const EditMortalityPage = () => {
 
   const { projectId, surveyId } = surveyContext;
 
+  useEffect(() => {
+    if (!surveyCritterId) {
+      return;
+    }
+
+    animalPageContext.critterDataLoader.load(projectId, surveyId, surveyCritterId);
+  }, [animalPageContext.critterDataLoader, projectId, surveyCritterId, surveyId]);
+
   const critter = animalPageContext.critterDataLoader.data;
 
-  const mortalityDataLoader = useDataLoader(() => critterbaseApi.mortality.getMortality(mortalityId));
+  const mortalityDataLoader = useDataLoader((mortalityId: string) =>
+    critterbaseApi.mortality.getMortality(mortalityId)
+  );
 
   useEffect(() => {
-    mortalityDataLoader.load();
-  }, [mortalityDataLoader]);
+    if (!mortalityId) {
+      return;
+    }
+    mortalityDataLoader.load(mortalityId);
+  }, [mortalityDataLoader, mortalityId]);
 
   const mortality = mortalityDataLoader.data;