MDS-5737 Fixed opening of document viewer from action menu

bcgov · Jan 17, 2024 · 393746a · 393746a
1 parent d3368a7
commit 393746a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/services/common/src/components/documents/DocumentTable.tsx b/services/common/src/components/documents/DocumentTable.tsx
@@ -182,7 +182,7 @@ export const DocumentTable: FC<DocumentTableProps> = ({
       label: FileOperations.View,
       icon: <FileOutlined />,
       clickFunction: (_event, record: MineDocument) =>
-        dispatch(openDocument(record.document_manager_guid, record.mine_document_guid)),
+        dispatch(openDocument(record.document_manager_guid, record.document_name)),
     },
     {
       key: "download",

diff --git a/services/core-web/src/components/common/DocumentTable.tsx b/services/core-web/src/components/common/DocumentTable.tsx
@@ -180,7 +180,7 @@ export const DocumentTable: FC<DocumentTableProps> = ({
       label: FileOperations.View,
       icon: <FileOutlined />,
       clickFunction: (_event, record: MineDocument) =>
-        dispatch(openDocument(record.document_manager_guid, record.mine_document_guid)),
+        dispatch(openDocument(record.document_manager_guid, record.document_name)),
     },
     {
       key: "download",

diff --git a/services/document-manager/backend/app/docman/utils/document_upload_helper.py b/services/document-manager/backend/app/docman/utils/document_upload_helper.py
@@ -19,7 +19,6 @@
 from flask import request, current_app
 
 from app.extensions import db
-from app.config import Config
 from app.services.object_store_storage_service import ObjectStoreStorageService
 from app.docman.models.document import Document
 from app.docman.models.document_version import DocumentVersion
@@ -220,7 +219,9 @@ def complete_upload(cls, key, new_key, doc_guid, versions=None, version_guid=Non
 
         # Copy the file to its new location
         try:
-            oss.copy_file(source_key=key, key=new_key)
+            key_prefix = Config.S3_PREFIX[:-1] if Config.S3_PREFIX and Config.S3_PREFIX !='/' else ''
+
+            oss.copy_file(source_key=key, key=key_prefix + new_key)
 
             if version_guid is not None and versions is None:
                 versions = oss.list_versions(new_key)['Versions']
@@ -237,6 +238,7 @@ def complete_upload(cls, key, new_key, doc_guid, versions=None, version_guid=Non
             if doc.object_store_path != new_key:
                 doc.object_store_path = new_key
                 doc.update_user = 'mds'
+                doc.upload_completed_date = datetime.utcnow()
 
                 db.session.add(doc)
 

diff --git a/services/minespace-web/src/components/syncfusion/DocumentViewer.js b/services/minespace-web/src/components/syncfusion/DocumentViewer.js
@@ -5,7 +5,10 @@ import PropTypes from "prop-types";
 import { ENVIRONMENT } from "@mds/common";
 import { createRequestHeader } from "@common/utils/RequestHeaders";
 import { Modal, Skeleton } from "antd";
-import { closeDocumentViewer, openDocumentViewer } from "@mds/common/redux/actions/documentViewerActions";
+import {
+  closeDocumentViewer,
+  openDocumentViewer,
+} from "@mds/common/redux/actions/documentViewerActions";
 import {
   getDocumentPath,
   getDocumentName,
@@ -113,10 +116,10 @@ export class DocumentViewer extends Component {
         >
           <Suspense fallback={<Skeleton />}>
             <PdfViewer
-              serviceUrl={this.pdfViewerServiceUrl}
+              pdfViewerServiceUrl={this.pdfViewerServiceUrl}
               documentPath={this.props.documentPath}
-              ajaxRequestSettings={ajaxRequestSettings}>
-            </PdfViewer>
+              ajaxRequestSettings={ajaxRequestSettings}
+            ></PdfViewer>
           </Suspense>
         </Modal>
       </>