scandipwa#3780 - Create confirm newsletter subscription page

IrinaZhadzinets · Jul 21, 2022 · b403255 · b403255
1 parent 2e50918
commit b403255
Show file tree

Hide file tree

Showing 25 changed files with 386 additions and 17 deletions.
diff --git a/packages/scandipwa/i18n/da_DK.json b/packages/scandipwa/i18n/da_DK.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/de_DE.json b/packages/scandipwa/i18n/de_DE.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/es_ES.json b/packages/scandipwa/i18n/es_ES.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/fa_IR.json b/packages/scandipwa/i18n/fa_IR.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/fi_FI.json b/packages/scandipwa/i18n/fi_FI.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/fr_FR.json b/packages/scandipwa/i18n/fr_FR.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/it_IT.json b/packages/scandipwa/i18n/it_IT.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/lv_LV.json b/packages/scandipwa/i18n/lv_LV.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/nb_NO.json b/packages/scandipwa/i18n/nb_NO.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/nl_NL.json b/packages/scandipwa/i18n/nl_NL.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/pl_PL.json b/packages/scandipwa/i18n/pl_PL.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/pt_BR.json b/packages/scandipwa/i18n/pt_BR.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/ru_RU.json b/packages/scandipwa/i18n/ru_RU.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/sl_SI.json b/packages/scandipwa/i18n/sl_SI.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/sv_SE.json b/packages/scandipwa/i18n/sv_SE.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/tr_TR.json b/packages/scandipwa/i18n/tr_TR.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/i18n/zh_TW.json b/packages/scandipwa/i18n/zh_TW.json
@@ -610,5 +610,9 @@
     "Send Confirmation Action": null,
     "This email does not require confirmation.": null,
     "Remove file": null,
-    "Region": null
+    "Region": null,
+    "Confirm Newsletter Page": null,
+    "Confirm subscription": null,
+    "Unable to confirm subscrabition": null,
+    "Thank you for subscribing to our newsletter!": null
 }
diff --git a/packages/scandipwa/src/component/Router/Router.component.js b/packages/scandipwa/src/component/Router/Router.component.js
@@ -52,6 +52,7 @@ import {
     CMS_PAGE,
     COMPARE,
     CONFIRM_ACCOUNT,
+    CONFIRM_NEWSLETTER,
     CONTACT_PAGE,
     COOKIE_POPUP,
     CREATE_ACCOUNT,
@@ -93,6 +94,7 @@ export const PasswordChangePage = lazy(() => import(/* webpackMode: "lazy", webp
 export const SearchPage = lazy(() => import(/* webpackMode: "lazy", webpackChunkName: "search" */ 'Route/SearchPage'));
 export const SendConfirmationPage = lazy(() => import(/* webpackMode: "lazy", webpackChunkName: "cms" */ 'Route/SendConfirmationPage'));
 export const ConfirmAccountPage = lazy(() => import(/* webpackMode: "lazy", webpackChunkName: "cms" */ 'Route/ConfirmAccountPage'));
+export const ConfirmNewsletterPage = lazy(() => import(/* webpackMode: "lazy", webpackChunkName: "cms" */ 'Route/ConfirmNewsletterPage'));
 export const MenuPage = lazy(() => import(/* webpackMode: "lazy", webpackChunkName: "cms" */ 'Route/MenuPage'));
 export const Footer = lazy(() => import(/* webpackMode: "lazy", webpackChunkName: "footer" */ 'Component/Footer'));
 export const NavigationTabs = lazy(() => import(/* webpackMode: "lazy", webpackChunkName: "header" */ 'Component/NavigationTabs'));
@@ -309,6 +311,11 @@ export class Router extends PureComponent {
             position: 95,
             name: PRINT_ORDER
         },
+        {
+            component: <Route path={ withStoreRegex('/newsletter/subscriber/confirm/:id?/code/:code?') } render={ (props) => <ConfirmNewsletterPage { ...props } /> } />,
+            position: 100,
+            name: CONFIRM_NEWSLETTER
+        },
         {
             component: <Route render={ (props) => <UrlRewrites { ...props } /> } />,
             position: 1000,

diff --git a/packages/scandipwa/src/component/Router/Router.config.js b/packages/scandipwa/src/component/Router/Router.config.js
@@ -32,6 +32,7 @@ export const LOGIN = 'LOGIN';
 export const ACCOUNT_FORGOT_PASSWORD = 'ACCOUNT_FORGOT_PASSWORD';
 export const FORGOT_PASSWORD = 'FORGOT_PASSWORD';
 export const CONFIRM_ACCOUNT = 'CONFIRM_ACCOUNT';
+export const CONFIRM_NEWSLETTER = 'CONFIRM_NEWSLETTER';
 export const MY_ACCOUNT = 'MY_ACCOUNT';
 export const MY_ACCOUNT_ORDER = 'MY_ACCOUNT_ORDER';
 export const MY_ACCOUNT_ORDERS = 'MY_ACCOUNT_ORDERS';

diff --git a/packages/scandipwa/src/query/NewsletterSubscription.query.js b/packages/scandipwa/src/query/NewsletterSubscription.query.js
@@ -27,6 +27,20 @@ export class NewsletterSubscriptionQuery {
             'status'
         ];
     }
+
+    confirmSubscribeToNewsletterMutation(id, code) {
+        return new Field('confirmSubscribingToNewsletter')
+            .addArgument('id', 'String!', id)
+            .addArgument('code', 'String!', code)
+            .addFieldList(this._getConfirmFields());
+    }
+
+    _getConfirmFields() {
+        return [
+            'status',
+            'message'
+        ];
+    }
 }
 
 export default new NewsletterSubscriptionQuery();
diff --git a/packages/scandipwa/src/route/ConfirmNewsletterPage/ConfirmNewsletterPage.component.js b/packages/scandipwa/src/route/ConfirmNewsletterPage/ConfirmNewsletterPage.component.js
@@ -0,0 +1,97 @@
+/**
+ * ScandiPWA - Progressive Web App for Magento
+ *
+ * Copyright © Scandiweb, Inc. All rights reserved.
+ * See LICENSE for license details.
+ *
+ * @license OSL-3.0 (Open Software License ("OSL") v. 3.0)
+ * @package scandipwa/scandipwa
+ * @link https://github.com/scandipwa/scandipwa
+ */
+
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import ContentWrapper from 'Component/ContentWrapper';
+import Link from 'Component/Link';
+
+import { FAILED_STATUS, SUCCESS_STATUS } from './ConfirmNewsletterPage.config';
+
+import './ConfirmNewsletterPage.style';
+
+/** @namespace Route/ConfirmNewsletterPage/Component */
+export class ConfirmNewsletterPage extends PureComponent {
+    static propTypes = {
+        status: PropTypes.string.isRequired,
+        message: PropTypes.string.isRequired,
+        shouldDisplayWarning: PropTypes.bool.isRequired
+    };
+
+    renderWarningMessage() {
+        const { status, message, shouldDisplayWarning } = this.props;
+
+        if (!shouldDisplayWarning && status !== FAILED_STATUS) {
+            return null;
+        }
+
+        return (
+            <div block="ConfirmNewsletterPage" elem="WarningMsg">
+                <h2>
+                    { __('Unable to confirm subscrabition') }
+                </h2>
+                <div>
+                    { message }
+                </div>
+            </div>
+        );
+    }
+
+    renderButtons() {
+        return (
+            <div block="ConfirmNewsletterPage" elem="ButtonWrapper">
+                <Link
+                  block="Button"
+                  mix={ { block: 'ConfirmNewsletterPage', elem: 'ContinueButton' } }
+                  to="/"
+                >
+                    { __('Continue shopping') }
+                </Link>
+            </div>
+        );
+    }
+
+    renderPageContents() {
+        const { status, message, shouldDisplayWarning } = this.props;
+
+        if (shouldDisplayWarning || status !== SUCCESS_STATUS) {
+            return null;
+        }
+
+        return (
+            <>
+                <h1 block="ConfirmNewsletterPage" elem="Heading">
+                    { message }
+                </h1>
+                <h3 block="ConfirmNewsletterPage" elem="Message">
+                    { __('Thank you for subscribing to our newsletter!') }
+                </h3>
+                { this.renderButtons() }
+            </>
+        );
+    }
+
+    render() {
+        return (
+            <main block="ConfirmNewsletterPage" aria-label={ __('Confirm Newsletter Page') }>
+                <ContentWrapper
+                  wrapperMix={ { block: 'ConfirmNewsletterPage', elem: 'Wrapper' } }
+                >
+                    { this.renderWarningMessage() }
+                    { this.renderPageContents() }
+                </ContentWrapper>
+            </main>
+        );
+    }
+}
+
+export default ConfirmNewsletterPage;
diff --git a/packages/scandipwa/src/route/ConfirmNewsletterPage/ConfirmNewsletterPage.config.js b/packages/scandipwa/src/route/ConfirmNewsletterPage/ConfirmNewsletterPage.config.js
@@ -0,0 +1,13 @@
+/**
+ * ScandiPWA - Progressive Web App for Magento
+ *
+ * Copyright © Scandiweb, Inc. All rights reserved.
+ * See LICENSE for license details.
+ *
+ * @license OSL-3.0 (Open Software License ("OSL") v. 3.0)
+ * @package scandipwa/scandipwa
+ * @link https://github.com/scandipwa/scandipwa
+ */
+
+export const SUCCESS_STATUS = 'success';
+export const FAILED_STATUS = 'failed';