Merge pull request #4397 from bcgov/test

psp-9316 correct stream route url, axios fileType. (#4388)
bcgov · Oct 16, 2024 · 647a6a3 · 647a6a3
2 parents 87f50be + d525f8f
commit 647a6a3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.5.1-88.19</Version>
-    <Version>5.5.1-88.19</Version>
-    <AssemblyVersion>5.5.1.88</AssemblyVersion>
+    <Version>5.5.2-88.19</Version>
+    <Version>5.5.2-88.19</Version>
+    <AssemblyVersion>5.5.2.88</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
     <TargetFramework>net8.0</TargetFramework>

diff --git a/source/frontend/package.json b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "5.5.1-88.19",
+  "version": "5.5.2-88.19",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",

diff --git a/source/frontend/src/features/documents/DocumentPreviewContainer.tsx b/source/frontend/src/features/documents/DocumentPreviewContainer.tsx
@@ -8,7 +8,7 @@ import { ApiGen_System_HttpStatusCode } from '@/models/api/generated/ApiGen_Syst
 
 import { DocumentViewerContext } from './context/DocumentViewerContext';
 import { IDocumentPreviewViewProps } from './DocumentPreviewView';
-import { createFileDownload } from './DownloadDocumentButton';
+import { showFile } from './DownloadDocumentButton';
 import { useDocumentProvider } from './hooks/useDocumentProvider';
 
 export interface LoadedPage {
@@ -32,7 +32,7 @@ export const DocumentPreviewContainer: FC<
     retrieveDocumentDetail,
     downloadDocumentFilePageImage,
     getDocumentFilePageList,
-    downloadWrappedDocumentFileLatest,
+    streamDocumentFileLatest,
     retrieveDocumentDetailLoading,
     getDocumentFilePageListLoading,
   } = useDocumentProvider();
@@ -166,9 +166,7 @@ export const DocumentPreviewContainer: FC<
         pages={documentPages}
         resetDocumentPreview={resetDocumentPreview}
         handleDownload={() => {
-          downloadWrappedDocumentFileLatest(previewDocumentId).then(file =>
-            createFileDownload(file),
-          );
+          streamDocumentFileLatest(previewDocumentId).then(response => showFile(response));
         }}
       />
     </>

diff --git a/source/frontend/src/features/documents/DownloadDocumentButton.tsx b/source/frontend/src/features/documents/DownloadDocumentButton.tsx
@@ -98,7 +98,7 @@ export const createFileDownload = async (
   }
 };
 
-const showFile = async (response: AxiosResponse<File, any>, fileName?: string) => {
+export const showFile = async (response: AxiosResponse<File, any>, fileName?: string) => {
   const groups = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/g.exec(
     response.headers['content-disposition'],
   );

diff --git a/source/frontend/src/features/documents/documentDetail/DocumentDetailContainer.tsx b/source/frontend/src/features/documents/documentDetail/DocumentDetailContainer.tsx
@@ -95,9 +95,8 @@ export const DocumentDetailContainer: React.FunctionComponent<
           const mayanMetadataResult = metadataResponse.payload?.results;
 
           let mayanFileId: number | undefined = undefined;
-          if (exists(mayanMetadataResult) && mayanMetadataResult.length > 0) {
-            const document = mayanMetadataResult[0].document;
-            mayanFileId = document?.file_latest?.id;
+          if (exists(detailResponse)) {
+            mayanFileId = detailResponse?.payload?.file_latest?.id;
           }
 
           setDocument(document => ({

diff --git a/source/frontend/src/hooks/pims-api/useApiDocuments.ts b/source/frontend/src/hooks/pims-api/useApiDocuments.ts
@@ -77,10 +77,14 @@ export const useApiDocuments = () => {
         ),
 
       streamDocumentFileApiCall: (mayanDocumentId: number, mayanFileId: number) =>
-        api.get<File>(`/documents/storage/${mayanDocumentId}/stream/${mayanFileId}`),
+        api.get<File>(`/documents/storage/${mayanDocumentId}/files/${mayanFileId}/stream`, {
+          responseType: 'blob',
+        }),
 
       streamDocumentFileLatestApiCall: (mayanDocumentId: number) =>
-        api.get<File>(`/documents/storage/${mayanDocumentId}/stream`),
+        api.get<File>(`/documents/storage/${mayanDocumentId}/stream`, {
+          responseType: 'blob',
+        }),
 
       uploadDocumentRelationshipApiCall: (
         relationshipType: ApiGen_CodeTypes_DocumentRelationType,