From 86320e71d6191e66e2ac1f6d559d6e5b8a61c9d3 Mon Sep 17 00:00:00 2001
From: Charley_Campbell <charley.campbell@guardian.co.uk>
Date: Thu, 16 Nov 2023 16:05:26 +0000
Subject: [PATCH] Moved the storybook scenarios around so Digi Sub Saves are
 all in one file

---
 .../digipack}/DigiSubDiscountConfirm.tsx      |  8 ++--
 ...r.stories.tsx => DigiSubSaves.stories.tsx} | 34 +++++++-------
 .../DigiSubSaves.stories.tsx                  | 47 -------------------
 3 files changed, 22 insertions(+), 67 deletions(-)
 rename client/components/mma/cancel/{digipack/digisubCancellationSaves => cancellationSaves/digipack}/DigiSubDiscountConfirm.tsx (95%)
 rename client/components/mma/cancel/cancellationSaves/digipack/{ThankYouOffer.stories.tsx => DigiSubSaves.stories.tsx} (61%)
 delete mode 100644 client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubSaves.stories.tsx

diff --git a/client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubDiscountConfirm.tsx b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirm.tsx
similarity index 95%
rename from client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubDiscountConfirm.tsx
rename to client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirm.tsx
index 36b76f189..3b5301d7e 100644
--- a/client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubDiscountConfirm.tsx
+++ b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirm.tsx
@@ -9,12 +9,14 @@ import {
 } from '@guardian/source-react-components';
 import { useContext, useEffect } from 'react';
 import { useLocation } from 'react-router';
-import type { CancellationContextInterface ,
+import type {
+	CancellationContextInterface,
 	CancellationPageTitleInterface,
-	CancellationRouterState} from '@/client/components/mma/cancel/CancellationContainer';
+	CancellationRouterState,
+} from '@/client/components/mma/cancel/CancellationContainer';
 import {
 	CancellationContext,
-	CancellationPageTitleContext
+	CancellationPageTitleContext,
 } from '@/client/components/mma/cancel/CancellationContainer';
 import { linkCss } from '@/client/components/mma/upgrade/UpgradeSupportStyles';
 import {
diff --git a/client/components/mma/cancel/cancellationSaves/digipack/ThankYouOffer.stories.tsx b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubSaves.stories.tsx
similarity index 61%
rename from client/components/mma/cancel/cancellationSaves/digipack/ThankYouOffer.stories.tsx
rename to client/components/mma/cancel/cancellationSaves/digipack/DigiSubSaves.stories.tsx
index 2fa190e00..946955d87 100644
--- a/client/components/mma/cancel/cancellationSaves/digipack/ThankYouOffer.stories.tsx
+++ b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubSaves.stories.tsx
@@ -1,28 +1,20 @@
-import type { Meta, StoryObj } from '@storybook/react';
+import type { Meta, StoryFn , StoryObj } from '@storybook/react';
 import { ReactRouterDecorator } from '@/.storybook/ReactRouterDecorator';
+import { CancellationContainer } from '@/client/components/mma/cancel/CancellationContainer';
+import { DigiSubDiscountConfirm } from '@/client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirm';
+import { ThankYouOffer } from '@/client/components/mma/cancel/cancellationSaves/digipack/ThankYouOffer';
 import {
 	digitalPackPaidByDirectDebit,
 	digitalPackWithPaymentFailure,
 } from '@/client/fixtures/productBuilder/testProducts';
 import { PRODUCT_TYPES } from '@/shared/productTypes';
-import { CancellationContainer } from '../../CancellationContainer';
-import { ThankYouOffer } from './ThankYouOffer';
 
 export default {
-	title: 'Pages/CancellationSave/DigiPack/Thank You + Offer',
+	title: 'Pages/DigiSubSaves',
 	component: CancellationContainer,
 	decorators: [ReactRouterDecorator],
 	parameters: {
 		layout: 'fullscreen',
-	},
-} as Meta<typeof CancellationContainer>;
-
-export const Default: StoryObj<typeof ThankYouOffer> = {
-	render: () => {
-		return <ThankYouOffer />;
-	},
-
-	parameters: {
 		reactRouter: {
 			state: {
 				productDetail: digitalPackPaidByDirectDebit(),
@@ -33,22 +25,30 @@ export const Default: StoryObj<typeof ThankYouOffer> = {
 			),
 		},
 	},
+} as Meta<typeof CancellationContainer>;
+
+export const DiscountThankYouPage: StoryFn<
+	typeof DigiSubDiscountConfirm
+> = () => {
+	return <DigiSubDiscountConfirm />;
 };
 
-export const IneligibleForDiscount: StoryObj<typeof ThankYouOffer> = {
+export const EligibleForDiscount: StoryObj<typeof ThankYouOffer> = {
 	render: () => {
 		return <ThankYouOffer />;
 	},
+};
 
+export const IneligibleForDiscount: StoryObj<typeof ThankYouOffer> = {
+	render: () => {
+		return <ThankYouOffer />;
+	},
 	parameters: {
 		reactRouter: {
 			state: {
 				productDetail: digitalPackWithPaymentFailure(),
 				user: { email: 'test@test.com' },
 			},
-			container: (
-				<CancellationContainer productType={PRODUCT_TYPES.digipack} />
-			),
 		},
 	},
 };
diff --git a/client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubSaves.stories.tsx b/client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubSaves.stories.tsx
deleted file mode 100644
index cbca8bdf1..000000000
--- a/client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubSaves.stories.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { Meta, StoryFn } from '@storybook/react';
-import { ReactRouterDecorator } from '@/.storybook/ReactRouterDecorator';
-import { CancellationContainer } from '@/client/components/mma/cancel/CancellationContainer';
-import { DigiSubDiscountConfirm } from '@/client/components/mma/cancel/digipack/digisubCancellationSaves/DigiSubDiscountConfirm';
-import { digitalPackPaidByDirectDebit } from '@/client/fixtures/productBuilder/testProducts';
-import { PRODUCT_TYPES } from '@/shared/productTypes';
-
-export default {
-	title: 'Pages/DigiSub',
-	component: CancellationContainer,
-	decorators: [ReactRouterDecorator],
-	parameters: {
-		layout: 'fullscreen',
-		reactRouter: {
-			state: {
-				productDetail: digitalPackPaidByDirectDebit(),
-				user: { email: 'test@test.com' },
-			},
-			container: (
-				<CancellationContainer productType={PRODUCT_TYPES.digipack} />
-			),
-		},
-	},
-} as Meta<typeof CancellationContainer>;
-
-export const DigiSubThankYouPage: StoryFn<
-	typeof DigiSubDiscountConfirm
-> = () => {
-	return <DigiSubDiscountConfirm />;
-};
-
-/*export const DigiSubCancellationOptionsPage: StoryFn<
-	typeof DigiSubCancellationOptions
-> = () => {
-	return <DigiSubCancellationOptions />;
-};
-
-export const DigiSubOffersPage: StoryFn<typeof DigiSubOffers> = () => {
-	return <DigiSubOffers />;
-};
-
-export const ConfirmDigiSubCancellationPage: StoryFn<
-	typeof ConfirmDigiSubCancellation
-> = () => {
-	return <ConfirmDigiSubCancellation />;
-}
- */