From a40f848e158c6a3b36f0182b0262610d3ca7e567 Mon Sep 17 00:00:00 2001
From: NogaNHS <noga.sasson1@nhs.net>
Date: Tue, 22 Oct 2024 16:34:48 +0100
Subject: [PATCH] [prmp-1035] PR changes

---
 .../LloydGeorgeViewRecordStage.tsx            | 49 ++++++++-----------
 .../generic/pdfViewer/PdfViewer.tsx           |  2 +-
 .../generic/recordCard/RecordCard.tsx         |  5 +-
 .../recordMenuCard/RecordMenuCard.test.tsx    | 46 +++--------------
 .../generic/recordMenuCard/RecordMenuCard.tsx |  8 ++-
 .../LloydGeorgeRecordPage.test.tsx            |  1 +
 6 files changed, 36 insertions(+), 75 deletions(-)

diff --git a/app/src/components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.tsx b/app/src/components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.tsx
index d1f678a49..0d42e19e6 100644
--- a/app/src/components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.tsx
+++ b/app/src/components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.tsx
@@ -211,34 +211,16 @@ function LloydGeorgeViewRecordStage({
             <h1>{pageHeader}</h1>
             <PatientSimpleSummary />
             {!fullScreen ? (
-                <>
-                    <>
-                        <div className="lloydgeorge_record-stage_flex">
-                            <RecordMenuCard
-                                className="lloydgeorge_record-stage_flex-row"
-                                recordLinks={recordLinksToShow}
-                                setStage={setStage}
-                                showMenu={showMenu}
-                            />
+                <div className="lloydgeorge_record-stage_flex">
+                    <RecordMenuCard
+                        recordLinks={recordLinksToShow}
+                        setStage={setStage}
+                        showMenu={showMenu}
+                    />
 
-                            <div
-                                className={`lloydgeorge_record-stage_flex-row lloydgeorge_record-stage_flex-row${menuClass}`}
-                            >
-                                <RecordCard
-                                    heading="Lloyd George record"
-                                    fullScreenHandler={setFullScreen}
-                                    detailsElement={<RecordDetails {...recordDetailsProps} />}
-                                    isFullScreen={fullScreen}
-                                    refreshRecord={refreshRecord}
-                                    cloudFrontUrl={cloudFrontUrl}
-                                />
-                            </div>
-                        </div>
-                    </>
-                </>
-            ) : (
-                <>
-                    <div className="lloydgeorge_record-stage_fs">
+                    <div
+                        className={`lloydgeorge_record-stage_flex-row lloydgeorge_record-stage_flex-row${menuClass}`}
+                    >
                         <RecordCard
                             heading="Lloyd George record"
                             fullScreenHandler={setFullScreen}
@@ -248,7 +230,18 @@ function LloydGeorgeViewRecordStage({
                             cloudFrontUrl={cloudFrontUrl}
                         />
                     </div>
-                </>
+                </div>
+            ) : (
+                <div className="lloydgeorge_record-stage_fs">
+                    <RecordCard
+                        heading="Lloyd George record"
+                        fullScreenHandler={setFullScreen}
+                        detailsElement={<RecordDetails {...recordDetailsProps} />}
+                        isFullScreen={fullScreen}
+                        refreshRecord={refreshRecord}
+                        cloudFrontUrl={cloudFrontUrl}
+                    />
+                </div>
             )}
         </div>
     );
diff --git a/app/src/components/generic/pdfViewer/PdfViewer.tsx b/app/src/components/generic/pdfViewer/PdfViewer.tsx
index 70b14b96f..af2031733 100644
--- a/app/src/components/generic/pdfViewer/PdfViewer.tsx
+++ b/app/src/components/generic/pdfViewer/PdfViewer.tsx
@@ -5,7 +5,7 @@ type Props = { fileUrl: String };
 const PdfViewer = ({ fileUrl }: Props) => {
     useEffect(() => {
         const pdfObject = require('pdfobject');
-        pdfObject.embed(fileUrl + '#toolbar', '#pdf-viewer');
+        pdfObject.embed(fileUrl + '#toolbar=0', '#pdf-viewer');
     }, [fileUrl]);
 
     if (!fileUrl) return null;
diff --git a/app/src/components/generic/recordCard/RecordCard.tsx b/app/src/components/generic/recordCard/RecordCard.tsx
index ed8886bac..f5c7f7b48 100644
--- a/app/src/components/generic/recordCard/RecordCard.tsx
+++ b/app/src/components/generic/recordCard/RecordCard.tsx
@@ -36,10 +36,7 @@ function RecordCard({
     }, [refreshRecord]);
 
     const Record = () => {
-        if (!cloudFrontUrl) {
-            return null;
-        }
-        return <PdfViewer fileUrl={cloudFrontUrl} />;
+        return cloudFrontUrl ? <PdfViewer fileUrl={cloudFrontUrl} /> : null;
     };
 
     const RecordLayout = ({ children }: { children: ReactNode }) => {
diff --git a/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx b/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx
index c6feafee7..d0a5e256b 100644
--- a/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx
+++ b/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx
@@ -49,8 +49,6 @@ const mockLinks: Array<LGRecordActionLink> = [
     },
 ];
 
-const className = 'lloydgeorge_record-stage_flex-row';
-
 jest.mock('react-router-dom', () => ({
     Link: (props: LinkProps) => <a {...props} role="link" />,
     useNavigate: () => mockedUseNavigate,
@@ -69,12 +67,7 @@ describe('RecordMenuCard', () => {
     describe('Rendering', () => {
         it('renders menu', () => {
             render(
-                <RecordMenuCard
-                    setStage={mockSetStage}
-                    recordLinks={mockLinks}
-                    className={className}
-                    showMenu={true}
-                />,
+                <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
             );
             expect(screen.getByRole('heading', { name: 'Download record' })).toBeInTheDocument();
             expect(screen.getByRole('heading', { name: 'Update record' })).toBeInTheDocument();
@@ -92,7 +85,6 @@ describe('RecordMenuCard', () => {
                 <RecordMenuCard
                     setStage={mockSetStage}
                     recordLinks={mockLinksUpdateOnly}
-                    className={className}
                     showMenu={true}
                 />,
             );
@@ -111,7 +103,6 @@ describe('RecordMenuCard', () => {
                 <RecordMenuCard
                     setStage={mockSetStage}
                     recordLinks={mockLinksDownloadOnly}
-                    className={className}
                     showMenu={true}
                 />,
             );
@@ -127,24 +118,14 @@ describe('RecordMenuCard', () => {
 
         it('does not render anything if the given record links array is empty', () => {
             const { container } = render(
-                <RecordMenuCard
-                    setStage={mockSetStage}
-                    recordLinks={[]}
-                    className={className}
-                    showMenu={false}
-                />,
+                <RecordMenuCard setStage={mockSetStage} recordLinks={[]} showMenu={false} />,
             );
             expect(container).toBeEmptyDOMElement();
         });
 
         it('render menu item as a <button> if link item does not have stage or href', () => {
             render(
-                <RecordMenuCard
-                    setStage={mockSetStage}
-                    recordLinks={mockLinks}
-                    className={className}
-                    showMenu={true}
-                />,
+                <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
             );
             expect(
                 screen.getByRole('button', { name: 'Download and remove files' }),
@@ -159,12 +140,7 @@ describe('RecordMenuCard', () => {
 
         it('Does not render the MenuCard if showMenu is false', () => {
             const { container } = render(
-                <RecordMenuCard
-                    setStage={mockSetStage}
-                    recordLinks={mockLinks}
-                    className={className}
-                    showMenu={false}
-                />,
+                <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={false} />,
             );
             expect(container).toBeEmptyDOMElement();
         });
@@ -173,12 +149,7 @@ describe('RecordMenuCard', () => {
     describe('Navigation', () => {
         it('navigates to href when clicked', () => {
             render(
-                <RecordMenuCard
-                    setStage={mockSetStage}
-                    recordLinks={mockLinks}
-                    className={className}
-                    showMenu={true}
-                />,
+                <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
             );
             expect(screen.getByRole('heading', { name: 'Update record' })).toBeInTheDocument();
             expect(screen.getByRole('link', { name: 'Upload files' })).toBeInTheDocument();
@@ -190,12 +161,7 @@ describe('RecordMenuCard', () => {
 
         it('change stage when clicked', () => {
             render(
-                <RecordMenuCard
-                    setStage={mockSetStage}
-                    recordLinks={mockLinks}
-                    className={className}
-                    showMenu={true}
-                />,
+                <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
             );
             expect(screen.getByRole('heading', { name: 'Update record' })).toBeInTheDocument();
             expect(screen.getByRole('link', { name: 'Remove files' })).toBeInTheDocument();
diff --git a/app/src/components/generic/recordMenuCard/RecordMenuCard.tsx b/app/src/components/generic/recordMenuCard/RecordMenuCard.tsx
index 9c308fe5e..7195de5a5 100644
--- a/app/src/components/generic/recordMenuCard/RecordMenuCard.tsx
+++ b/app/src/components/generic/recordMenuCard/RecordMenuCard.tsx
@@ -26,10 +26,10 @@ function RecordMenuCard({ recordLinks, setStage, showMenu, className }: Props) {
     }
 
     if (!showMenu) {
-        return null;
+        return <></>;
     }
     return (
-        <div className={className}>
+        <div className={className} data-testid="record-menu-card">
             <Card className="lloydgeorge_record-stage_menu">
                 <Card.Content className="lloydgeorge_record-stage_menu-content">
                     {updateActions.length > 0 && (
@@ -97,4 +97,8 @@ const LinkItem = ({ link, setStage }: LinkItemProps) => {
         );
     }
 };
+
+RecordMenuCard.defaultProps = {
+    className: 'lloydgeorge_record-stage_flex-row',
+};
 export default RecordMenuCard;
diff --git a/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.test.tsx b/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.test.tsx
index 19019c0d7..921af7a79 100644
--- a/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.test.tsx
+++ b/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.test.tsx
@@ -128,6 +128,7 @@ describe('LloydGeorgeRecordPage', () => {
         await waitFor(async () => {
             expect(screen.getByText('No documents are available.')).toBeInTheDocument();
         });
+        expect(screen.queryByTestId('record-menu-card')).not.toBeInTheDocument();
     });
 
     it('renders initial lg record view with docs are uploading text if response status is 423', async () => {