[PRME-73] Resolve issues with merge conflicts (#738)

Author: lillie-dae

app/src/components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage.tsx

@@ -162,10 +162,10 @@ const DocumentSelectOrderStage = ({ documents, setDocuments, setMergedPdfBlob }:
 
     const submitDocuments = () => {
         updateDocumentPositions();
-        if (documents.length === 1) {
-            navigate(routeChildren.DOCUMENT_UPLOAD_UPLOADING);
-            return;
-        }
+        // if (documents.length === 1) {
+        //     navigate(routeChildren.DOCUMENT_UPLOAD_UPLOADING);
+        //     return;
+        // }
         navigate(routeChildren.DOCUMENT_UPLOAD_CONFIRMATION);
     };
 
@@ -181,7 +181,7 @@ const DocumentSelectOrderStage = ({ documents, setDocuments, setMergedPdfBlob }:
                     return undefined;
                 }
                 return {
-                    filename: document.file.name,
+                    linkId: document.file.name,
                     error: UPLOAD_FILE_ERROR_TYPE.duplicatePositionError,
                     details: error.message,
                 };

app/src/components/layout/errorBox/ErrorBox.tsx

@@ -32,7 +32,7 @@ function UploadErrorMessages({
                 return (
                     <div key={errorType}>
                         <ErrorSummary.List>
-                            <ErrorSummary.Item href={'#' + linkIds} key={errorType + linkIds}>
+                            <ErrorSummary.Item href={'#' + firstFile} key={errorType + firstFile}>
                                 {errorMessage}
                             </ErrorSummary.Item>
                         </ErrorSummary.List>