[PMRP-1035] add resetDocStage to RecordCard, stop reusing old cloudfr…

…ont URL on fullscreen toggle
nhsconnect · Oct 28, 2024 · 9a8ff4a · 9a8ff4a
1 parent bd43803
commit 9a8ff4a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/...onents/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.test.tsx b/...onents/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.test.tsx
@@ -450,6 +450,7 @@ const renderComponent = (propsOverride?: Partial<Props>) => {
         refreshRecord: jest.fn(),
         cloudFrontUrl: 'http://test.com',
         showMenu: true,
+        resetDocState: jest.fn(),
         ...propsOverride,
     };
     render(<TestApp {...props} />);

diff --git a/.../components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.tsx b/.../components/blocks/_lloydGeorge/lloydGeorgeViewRecordStage/LloydGeorgeViewRecordStage.tsx
@@ -41,6 +41,7 @@ export type Props = {
     refreshRecord: () => void;
     cloudFrontUrl: string;
     showMenu: boolean;
+    resetDocState: () => void;
 };
 
 function LloydGeorgeViewRecordStage({
@@ -52,6 +53,7 @@ function LloydGeorgeViewRecordStage({
     refreshRecord,
     cloudFrontUrl,
     showMenu,
+    resetDocState,
 }: Props) {
     const navigate = useNavigate();
     const [fullScreen, setFullScreen] = useState(false);
@@ -121,6 +123,7 @@ function LloydGeorgeViewRecordStage({
                     onClick={(e) => {
                         e.preventDefault();
                         setFullScreen(false);
+                        resetDocState();
                     }}
                 >
                     Exit full screen
@@ -228,6 +231,7 @@ function LloydGeorgeViewRecordStage({
                             isFullScreen={fullScreen}
                             refreshRecord={refreshRecord}
                             cloudFrontUrl={cloudFrontUrl}
+                            resetDocStage={resetDocState}
                         />
                     </div>
                 </div>
@@ -240,6 +244,7 @@ function LloydGeorgeViewRecordStage({
                         isFullScreen={fullScreen}
                         refreshRecord={refreshRecord}
                         cloudFrontUrl={cloudFrontUrl}
+                        resetDocStage={resetDocState}
                     />
                 </div>
             )}

diff --git a/app/src/components/generic/recordCard/RecordCard.test.tsx b/app/src/components/generic/recordCard/RecordCard.test.tsx
@@ -43,6 +43,7 @@ describe('RecordCard Component', () => {
         isFullScreen: false,
         refreshRecord: jest.fn(),
         cloudFrontUrl: 'https://test.com',
+        resetDocStage: jest.fn(),
     };
 
     beforeEach(() => {

diff --git a/app/src/components/generic/recordCard/RecordCard.tsx b/app/src/components/generic/recordCard/RecordCard.tsx
@@ -11,6 +11,7 @@ export type Props = {
     isFullScreen: boolean;
     refreshRecord: () => void;
     cloudFrontUrl: string;
+    resetDocStage: () => void;
 };
 
 function RecordCard({
@@ -20,6 +21,7 @@ function RecordCard({
     isFullScreen,
     cloudFrontUrl,
     refreshRecord,
+    resetDocStage,
 }: Props) {
     const role = useRole();
     const userIsGpClinical = role === REPOSITORY_ROLE.GP_CLINICAL;
@@ -63,6 +65,7 @@ function RecordCard({
                                 data-testid="full-screen-btn"
                                 onClick={() => {
                                     fullScreenHandler(true);
+                                    resetDocStage();
                                 }}
                             >
                                 View in full screen

diff --git a/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.tsx b/app/src/pages/lloydGeorgeRecordPage/LloydGeorgeRecordPage.tsx
@@ -125,6 +125,7 @@ function LloydGeorgeRecordPage() {
                             refreshRecord={refreshRecord}
                             cloudFrontUrl={cloudFrontUrl}
                             showMenu={showMenu}
+                            resetDocState={resetDocState}
                         />
                     }
                 />