conditionally show/hide continue button on Confirmation component usi…

…ng isFinalCard
theopensystemslab · Dec 2, 2024 · a5ce539 · a5ce539
1 parent dc937a0
commit a5ce539
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/editor.planx.uk/src/@planx/components/Confirmation/Public.tsx b/editor.planx.uk/src/@planx/components/Confirmation/Public.tsx
@@ -85,6 +85,7 @@ interface PresentationalProps extends Props {
 }
 
 export function Presentational(props: PresentationalProps) {
+  const isFinalCard = useStore().isFinalCard();
   return (
     <Box width="100%">
       <Banner
@@ -99,7 +100,7 @@ export function Presentational(props: PresentationalProps) {
           </Box>
         )}
       </Banner>
-      <Card>
+      <Card handleSubmit={isFinalCard ? undefined : props.handleSubmit}>
         <SummaryListTable>
           {Object.entries(props.applicableDetails).map(([k, v], i) => (
             <React.Fragment key={`detail-${i}`}>

diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts
@@ -670,9 +670,8 @@ export const previewStore: StateCreator<
   },
 
   isFinalCard: () => {
-    // Temporarily always returns false until upcomingCardIds is optimised
-    // OSL Slack explanation: https://bit.ly/3x38IRY
-    return false;
+    const { upcomingCardIds } = get();
+    return upcomingCardIds().length === 1;
   },
 
   restore: false,

diff --git a/editor.planx.uk/src/pages/Preview/Node.tsx b/editor.planx.uk/src/pages/Preview/Node.tsx
@@ -75,16 +75,13 @@ interface Props {
 }
 
 const Node: React.FC<Props> = (props) => {
-  const [childNodesOf, isFinalCard, resetPreview, cachedBreadcrumbs] = useStore(
-    (state) => [
-      state.childNodesOf,
-      state.isFinalCard(),
-      state.resetPreview,
-      state.cachedBreadcrumbs,
-    ],
-  );
-
-  const handleSubmit = isFinalCard ? undefined : props.handleSubmit;
+  const [childNodesOf, resetPreview, cachedBreadcrumbs] = useStore((state) => [
+    state.childNodesOf,
+    state.resetPreview,
+    state.cachedBreadcrumbs,
+  ]);
+
+  const handleSubmit = props.handleSubmit;
 
   const nodeId = props.node.id;
   const previouslySubmittedData =