@newskit-render/my-account 0.123.0 → 0.124.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/dist/Components/Elements/Toast/Toast.d.ts +2 -2
- package/dist/Components/Elements/Toast/Toast.js +9 -9
- package/dist/Components/Elements/Toast/Toast.js.map +1 -1
- package/dist/Components/Elements/Toast/sendToast.d.ts +3 -3
- package/dist/Components/Elements/Toast/sendToast.js +2 -2
- package/dist/Components/Elements/Toast/sendToast.js.map +1 -1
- package/dist/Components/Elements/Toast/types.d.ts +2 -2
- package/dist/Components/Sections/Form/CommentingNotifications/CommentingNotifications.js +6 -4
- package/dist/Components/Sections/Form/CommentingNotifications/CommentingNotifications.js.map +1 -1
- package/dist/Components/Sections/Form/onFormSubmit.js +0 -4
- package/dist/Components/Sections/Form/onFormSubmit.js.map +1 -1
- package/dist/Components/Templates/LayoutTemplate.js +3 -2
- package/dist/Components/Templates/LayoutTemplate.js.map +1 -1
- package/dist/Components/Templates/types.d.ts +2 -1
- package/dist/context/types.d.ts +6 -6
- package/dist/helpers/toastFunctions.d.ts +3 -3
- package/dist/helpers/toastFunctions.js +4 -4
- package/dist/helpers/toastFunctions.js.map +1 -1
- package/dist/hooks/index.d.ts +1 -0
- package/dist/hooks/index.js +14 -0
- package/dist/hooks/index.js.map +1 -0
- package/dist/hooks/useSuccessToast.d.ts +14 -0
- package/dist/hooks/useSuccessToast.js +38 -0
- package/dist/hooks/useSuccessToast.js.map +1 -0
- package/dist/pages/NewslettersAndAlerts.js +13 -2
- package/dist/pages/NewslettersAndAlerts.js.map +1 -1
- package/dist/pages/PersonalDetails.d.ts +0 -10
- package/dist/pages/PersonalDetails.js +6 -33
- package/dist/pages/PersonalDetails.js.map +1 -1
- package/dist/pages/SubscriptionAndBilling.js +9 -23
- package/dist/pages/SubscriptionAndBilling.js.map +1 -1
- package/package.json +4 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [0.124.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/my-account@0.123.0...@newskit-render/my-account@0.124.0) (2022-01-20)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **PPDSR-543:** Update newskitAPI session ([#564](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/564)) ([1e60be8](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/1e60be84984fc5fa163a9ab2e29d1e6a4eb4a935))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [0.123.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/my-account@0.122.0...@newskit-render/my-account@0.123.0) (2022-01-19)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -11,11 +11,11 @@ export declare const getToast: (type: ToastType, fieldType: string, messageOverr
|
|
|
11
11
|
success?: string | undefined;
|
|
12
12
|
pending?: string | undefined;
|
|
13
13
|
} | undefined) => React.FC<ToastProps>;
|
|
14
|
-
export declare const getMessage: (fieldType: string, type: string,
|
|
14
|
+
export declare const getMessage: (fieldType: string, type: string, genericMessage?: {
|
|
15
15
|
error?: string | undefined;
|
|
16
16
|
success?: string | undefined;
|
|
17
17
|
pending?: string | undefined;
|
|
18
|
-
} | undefined,
|
|
18
|
+
} | undefined, messages?: {
|
|
19
19
|
[key: string]: {
|
|
20
20
|
error?: string | undefined;
|
|
21
21
|
success?: string | undefined;
|
|
@@ -27,22 +27,22 @@ var getToast = function (type, fieldType, messageOverride, errorMessages, generi
|
|
|
27
27
|
}
|
|
28
28
|
};
|
|
29
29
|
exports.getToast = getToast;
|
|
30
|
-
var getMessage = function (fieldType, type,
|
|
30
|
+
var getMessage = function (fieldType, type, genericMessage, messages) {
|
|
31
31
|
var _a;
|
|
32
|
-
var hasGenericErrorMessage =
|
|
33
|
-
var
|
|
34
|
-
if (
|
|
35
|
-
return
|
|
32
|
+
var hasGenericErrorMessage = genericMessage && genericMessage[type];
|
|
33
|
+
var hasMessage = messages && messages[fieldType];
|
|
34
|
+
if (hasMessage && messages) {
|
|
35
|
+
return messages[fieldType][type];
|
|
36
36
|
}
|
|
37
|
-
if (hasGenericErrorMessage &&
|
|
38
|
-
return (_a =
|
|
37
|
+
if (hasGenericErrorMessage && genericMessage) {
|
|
38
|
+
return (_a = genericMessage[type]) === null || _a === void 0 ? void 0 : _a.replace('${field}', (0, helpers_1.getErrorName)(fieldType));
|
|
39
39
|
}
|
|
40
40
|
return '';
|
|
41
41
|
};
|
|
42
42
|
exports.getMessage = getMessage;
|
|
43
43
|
var ToastComponent = function (_a) {
|
|
44
|
-
var type = _a.type, fieldType = _a.fieldType,
|
|
45
|
-
var toast = (0, exports.getToast)(type, fieldType, messageOverride,
|
|
44
|
+
var type = _a.type, fieldType = _a.fieldType, messagesMap = _a.messagesMap, genericMessageMap = _a.genericMessageMap, messageOverride = _a.messageOverride;
|
|
45
|
+
var toast = (0, exports.getToast)(type, fieldType, messageOverride, messagesMap, genericMessageMap);
|
|
46
46
|
return react_1.default.createElement(react_1.default.Fragment, null, toast);
|
|
47
47
|
};
|
|
48
48
|
exports.default = ToastComponent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Toast.js","sourceRoot":"","sources":["../../../../src/Components/Elements/Toast/Toast.tsx"],"names":[],"mappings":";;;;;;AAAA,gDAAyB;AAEzB,mCAKgB;AAChB,4CAA+C;AAExC,IAAM,QAAQ,GAAG,UACtB,IAAe,EACf,SAAiB,EACjB,eAAwB,EACxB,aAEC,EACD,mBAAqD;IAErD,QAAQ,IAAI,EAAE;QACZ,KAAK,SAAS;YACZ,OAAO,CACL,8BAAC,eAAK,IACJ,IAAI,EACF,8BAAC,+BAAqB,IACpB,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;qBACpB,GACD,EAEJ,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,IAE1C,eAAe;gBACd,IAAA,kBAAU,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAC3D,CAC0B,CAAA;QACtC,KAAK,OAAO;YACV,OAAO,CACL,8BAAC,eAAK,IACJ,IAAI,EACF,8BAAC,yBAAe,IACd,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;qBACpB,GACD,EAEJ,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,IAE1C,eAAe;gBACd,IAAA,kBAAU,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAC3D,CAC0B,CAAA;QACtC,KAAK,SAAS;YACZ,OAAO,CACL,8BAAC,eAAK,IACJ,IAAI,EACF,8BAAC,wBAAc,IACb,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;qBACpB,GACD,EAEJ,SAAS,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,IAEzC,eAAe;gBACd,IAAA,kBAAU,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAC3D,CAC0B,CAAA;KACvC;AACH,CAAC,CAAA;AA3DY,QAAA,QAAQ,YA2DpB;AACM,IAAM,UAAU,GAAG,UACxB,SAAiB,EACjB,IAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"Toast.js","sourceRoot":"","sources":["../../../../src/Components/Elements/Toast/Toast.tsx"],"names":[],"mappings":";;;;;;AAAA,gDAAyB;AAEzB,mCAKgB;AAChB,4CAA+C;AAExC,IAAM,QAAQ,GAAG,UACtB,IAAe,EACf,SAAiB,EACjB,eAAwB,EACxB,aAEC,EACD,mBAAqD;IAErD,QAAQ,IAAI,EAAE;QACZ,KAAK,SAAS;YACZ,OAAO,CACL,8BAAC,eAAK,IACJ,IAAI,EACF,8BAAC,+BAAqB,IACpB,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;qBACpB,GACD,EAEJ,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,IAE1C,eAAe;gBACd,IAAA,kBAAU,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAC3D,CAC0B,CAAA;QACtC,KAAK,OAAO;YACV,OAAO,CACL,8BAAC,eAAK,IACJ,IAAI,EACF,8BAAC,yBAAe,IACd,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;qBACpB,GACD,EAEJ,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,IAE1C,eAAe;gBACd,IAAA,kBAAU,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAC3D,CAC0B,CAAA;QACtC,KAAK,SAAS;YACZ,OAAO,CACL,8BAAC,eAAK,IACJ,IAAI,EACF,8BAAC,wBAAc,IACb,SAAS,EAAE;wBACT,IAAI,EAAE,aAAa;qBACpB,GACD,EAEJ,SAAS,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,IAEzC,eAAe;gBACd,IAAA,kBAAU,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAC3D,CAC0B,CAAA;KACvC;AACH,CAAC,CAAA;AA3DY,QAAA,QAAQ,YA2DpB;AACM,IAAM,UAAU,GAAG,UACxB,SAAiB,EACjB,IAAY,EACZ,cAAgD,EAChD,QAEC;;IAED,IAAM,sBAAsB,GAAG,cAAc,IAAI,cAAc,CAAC,IAAI,CAAC,CAAA;IAErE,IAAM,UAAU,GAAG,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAA;IAElD,IAAI,UAAU,IAAI,QAAQ,EAAE;QAC1B,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAA;KACjC;IACD,IAAI,sBAAsB,IAAI,cAAc,EAAE;QAC5C,OAAO,MAAA,cAAc,CAAC,IAAI,CAAC,0CAAE,OAAO,CAAC,UAAU,EAAE,IAAA,sBAAY,EAAC,SAAS,CAAC,CAAC,CAAA;KAC1E;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAnBY,QAAA,UAAU,cAmBtB;AACD,IAAM,cAAc,GAAyB,UAAC,EAM7C;QALC,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,WAAW,iBAAA,EACX,iBAAiB,uBAAA,EACjB,eAAe,qBAAA;IAEf,IAAM,KAAK,GAAG,IAAA,gBAAQ,EACpB,IAAI,EACJ,SAAS,EACT,eAAe,EACf,WAAW,EACX,iBAAiB,CAClB,CAAA;IAED,OAAO,8DAAG,KAAK,CAAI,CAAA;AACrB,CAAC,CAAA;AAED,kBAAe,cAAc,CAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { ToastType } from '.';
|
|
2
|
-
export declare type
|
|
2
|
+
export declare type MessageMap = {
|
|
3
3
|
[key: string]: {
|
|
4
4
|
[key in ToastType]?: string;
|
|
5
5
|
};
|
|
6
6
|
};
|
|
7
|
-
export declare type
|
|
7
|
+
export declare type GenericMessageMap = {
|
|
8
8
|
[key in ToastType]?: string;
|
|
9
9
|
};
|
|
10
|
-
declare const sendToast: (fieldName: string, type: ToastType,
|
|
10
|
+
declare const sendToast: (fieldName: string, type: ToastType, messageMap?: MessageMap | undefined, genericMessageMap?: GenericMessageMap | undefined, messageOverride?: string | undefined, autoHideDuration?: number | undefined) => Promise<any>;
|
|
11
11
|
export default sendToast;
|
|
@@ -42,7 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
42
42
|
var newskit_1 = require("newskit");
|
|
43
43
|
var react_1 = __importDefault(require("react"));
|
|
44
44
|
var Toast_1 = __importDefault(require("./Toast"));
|
|
45
|
-
var sendToast = function (fieldName, type,
|
|
45
|
+
var sendToast = function (fieldName, type, messageMap, genericMessageMap, messageOverride, autoHideDuration) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
46
|
var closeLoading;
|
|
47
47
|
return __generator(this, function (_a) {
|
|
48
48
|
switch (_a.label) {
|
|
@@ -51,7 +51,7 @@ var sendToast = function (fieldName, type, errorMessages, genericErrorMessage, m
|
|
|
51
51
|
function (_a) {
|
|
52
52
|
var onClose = _a.onClose;
|
|
53
53
|
closeLoading = onClose;
|
|
54
|
-
return (react_1.default.createElement(Toast_1.default, { type: type, fieldType: fieldName,
|
|
54
|
+
return (react_1.default.createElement(Toast_1.default, { type: type, fieldType: fieldName, messagesMap: messageMap, genericMessageMap: genericMessageMap, messageOverride: messageOverride }));
|
|
55
55
|
}, { autoHideDuration: autoHideDuration })];
|
|
56
56
|
case 1:
|
|
57
57
|
_a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendToast.js","sourceRoot":"","sources":["../../../../src/Components/Elements/Toast/sendToast.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+B;AAC/B,gDAAyB;AAEzB,kDAAoC;AAOpC,IAAM,SAAS,GAAG,UAChB,SAAiB,EACjB,IAAe,EACf,
|
|
1
|
+
{"version":3,"file":"sendToast.js","sourceRoot":"","sources":["../../../../src/Components/Elements/Toast/sendToast.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+B;AAC/B,gDAAyB;AAEzB,kDAAoC;AAOpC,IAAM,SAAS,GAAG,UAChB,SAAiB,EACjB,IAAe,EACf,UAAuB,EACvB,iBAAqC,EACrC,eAAwB,EACxB,gBAAyB;;;;oBAGzB,qBAAM,IAAA,eAAK;gBACT,0BAA0B;gBAC1B,UAAC,EAAW;wBAAT,OAAO,aAAA;oBACR,YAAY,GAAG,OAAO,CAAA;oBACtB,OAAO,CACL,8BAAC,eAAc,IACb,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,UAAU,EACvB,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe,GAChC,CACH,CAAA;gBACH,CAAC,EACD,EAAE,gBAAgB,kBAAA,EAAE,CACrB,EAAA;;gBAfD,SAeC,CAAA;gBAED,sBAAO,YAAY,EAAA;;;KACpB,CAAA;AACD,kBAAe,SAAS,CAAA"}
|
|
@@ -2,12 +2,12 @@ export declare type ToastType = 'success' | 'error' | 'pending';
|
|
|
2
2
|
export interface ToastProps {
|
|
3
3
|
type: ToastType;
|
|
4
4
|
fieldType: string;
|
|
5
|
-
|
|
5
|
+
messagesMap?: {
|
|
6
6
|
[key: string]: {
|
|
7
7
|
[key in ToastType]?: string;
|
|
8
8
|
};
|
|
9
9
|
};
|
|
10
|
-
|
|
10
|
+
genericMessageMap?: {
|
|
11
11
|
[key in ToastType]?: string;
|
|
12
12
|
};
|
|
13
13
|
messageOverride?: string;
|
|
@@ -43,6 +43,7 @@ var newskit_1 = require("newskit");
|
|
|
43
43
|
var context_1 = require("../../../../context");
|
|
44
44
|
var helpers_1 = require("../../../../helpers");
|
|
45
45
|
var onFormSubmit_1 = __importDefault(require("../onFormSubmit"));
|
|
46
|
+
var router_1 = require("next/router");
|
|
46
47
|
var CommentingNotifications = function (_a) {
|
|
47
48
|
var description = _a.description, descriptionOverrides = _a.descriptionOverrides, formLabel = _a.formLabel, formLabelOverrides = _a.formLabelOverrides, checkoutbox = _a.checkoutbox, userMentioned = _a.userMentioned, likedYourMessage = _a.likedYourMessage, repliedToMessage = _a.repliedToMessage, buttonGroupProps = _a.buttonGroupProps;
|
|
48
49
|
var _b = (0, context_1.useAccountContext)(), data = _b.data, handleError = _b.handleError, handleSuccess = _b.handleSuccess, handleLoading = _b.handleLoading, baseUrl = _b.baseUrl, errorMessages = _b.errorMessages, genericErrorMessage = _b.genericErrorMessage;
|
|
@@ -52,6 +53,7 @@ var CommentingNotifications = function (_a) {
|
|
|
52
53
|
userMentioned: (0, helpers_1.getEditField)(data, 'userMentioned').value || false,
|
|
53
54
|
repliedToMessage: (0, helpers_1.getEditField)(data, 'repliedToMessage').value || false,
|
|
54
55
|
};
|
|
56
|
+
var router = (0, router_1.useRouter)();
|
|
55
57
|
var _c = (0, react_1.useReducer)(function (state, newState) {
|
|
56
58
|
return __assign(__assign({}, state), newState);
|
|
57
59
|
}, initialState), commentingNotifications = _c[0], setCommentingNotifications = _c[1];
|
|
@@ -75,13 +77,13 @@ var CommentingNotifications = function (_a) {
|
|
|
75
77
|
react_1.default.createElement(newskit_1.Form, { onSubmit: function () {
|
|
76
78
|
if (handleLoading)
|
|
77
79
|
handleLoading('preferences', errorMessages, genericErrorMessage);
|
|
78
|
-
(0, onFormSubmit_1.default)(__assign(__assign({}, commentingNotifications), { displayName: displayName }), 'commenting-notifications',
|
|
80
|
+
(0, onFormSubmit_1.default)(__assign(__assign({}, commentingNotifications), { displayName: displayName }), 'commenting-notifications', router, handleFormError, handleSuccess, baseUrl + "/newsletters-and-alerts");
|
|
79
81
|
} },
|
|
80
|
-
react_1.default.createElement(newskit_1.Checkbox, __assign({ id: "userMentioned", name: "userMentioned", "data-testid": "userMentioned" }, checkoutbox, userMentioned, { onChange: function (e) { return onChangeHandler('userMentioned', e.target.checked); } })),
|
|
81
|
-
react_1.default.createElement(newskit_1.Checkbox, __assign({ id: "likedYourMessage", name: "likedYourMessage", "data-testid": "likedYourMessage" }, checkoutbox, likedYourMessage, { onChange: function (e) {
|
|
82
|
+
react_1.default.createElement(newskit_1.Checkbox, __assign({ id: "userMentioned", name: "userMentioned", "data-testid": "userMentioned", defaultChecked: initialState.userMentioned }, checkoutbox, userMentioned, { onChange: function (e) { return onChangeHandler('userMentioned', e.target.checked); } })),
|
|
83
|
+
react_1.default.createElement(newskit_1.Checkbox, __assign({ id: "likedYourMessage", name: "likedYourMessage", "data-testid": "likedYourMessage", defaultChecked: initialState.likedYourMessage }, checkoutbox, likedYourMessage, { onChange: function (e) {
|
|
82
84
|
return onChangeHandler('likedYourMessage', e.target.checked);
|
|
83
85
|
} })),
|
|
84
|
-
react_1.default.createElement(newskit_1.Checkbox, __assign({ id: "repliedToMessage", name: "repliedToMessage", "data-testid": "repliedToMessage" }, checkoutbox, repliedToMessage, { onChange: function (e) {
|
|
86
|
+
react_1.default.createElement(newskit_1.Checkbox, __assign({ id: "repliedToMessage", name: "repliedToMessage", "data-testid": "repliedToMessage", defaultChecked: initialState.repliedToMessage }, checkoutbox, repliedToMessage, { onChange: function (e) {
|
|
85
87
|
return onChangeHandler('repliedToMessage', e.target.checked);
|
|
86
88
|
} })),
|
|
87
89
|
react_1.default.createElement(newskit_1.Block, { spaceStack: { xs: 'space070', sm: 'space080', md: 'space090' } }),
|
package/dist/Components/Sections/Form/CommentingNotifications/CommentingNotifications.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentingNotifications.js","sourceRoot":"","sources":["../../../../../src/Components/Sections/Form/CommentingNotifications/CommentingNotifications.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,uEAAyE;AACzE,mCAAuE;AACvE,+CAAuD;AAKvD,+CAAkD;AAClD,iEAAsC;
|
|
1
|
+
{"version":3,"file":"CommentingNotifications.js","sourceRoot":"","sources":["../../../../../src/Components/Sections/Form/CommentingNotifications/CommentingNotifications.tsx"],"names":[],"mappings":"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"}
|
|
@@ -78,14 +78,10 @@ var onSubmit = function (e, validationSchemaKey, router, handleError, handleSucc
|
|
|
78
78
|
}
|
|
79
79
|
//Redirect to personal details page.
|
|
80
80
|
if ((result === null || result === void 0 ? void 0 : result.ok) && router) {
|
|
81
|
-
console.log('Is result ok?');
|
|
82
|
-
console.log((redirectUrl || '/') + "?success=" + encodeURIComponent('landline'));
|
|
83
81
|
router
|
|
84
82
|
.push((redirectUrl || '/') + "?success=" + encodeURIComponent(validationSchemaKey))
|
|
85
83
|
.then(function () {
|
|
86
|
-
console.log('then');
|
|
87
84
|
if ((result === null || result === void 0 ? void 0 : result.ok) && handleSuccess) {
|
|
88
|
-
console.log('handleSuccess??');
|
|
89
85
|
handleSuccess();
|
|
90
86
|
}
|
|
91
87
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onFormSubmit.js","sourceRoot":"","sources":["../../../../src/Components/Sections/Form/onFormSubmit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAE/B,8DAAgE;AAChE,kDAA2B;AAE3B,IAAM,QAAQ,GASW,UACvB,CAAuB,EACvB,mBAAqC,EACrC,MAAmB,EACnB,WAAwB,EACxB,aAA0B,EAC1B,WAAoB;;;;;gBAEd,IAAI,GAAG,IAAI,CAAC,SAAS,uBAAM,CAAC,KAAE,mBAAmB,qBAAA,IAAG,CAAA;gBAEpD,OAAO,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;gBAE9B,qBAAM,IAAA,qBAAK,EAAC,qBAAqB,EAAE;wBAChD,MAAM,EAAE,MAAM;wBACd,QAAQ,EAAE,QAAQ;wBAClB,OAAO,EAAE;4BACP,cAAc,EAAE,kBAAkB;4BAClC,GAAG,EAAE,gBAAM,CAAC,SAAS,CACnB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAC5B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CACtC;yBACF;wBACD,IAAI,MAAA;qBACL,CAAC,EAAA;;gBAXI,MAAM,GAAG,SAWb;gBAEF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,EAAE;oBACd,IAAI,mBAAmB,KAAK,UAAU,IAAI,mBAAmB,KAAK,OAAO,EAAE;wBACzE,IAAA,+BAAgB,EAAC,mBAAmB,CAAC,CAAA;qBACtC;iBACF;gBAED,oCAAoC;gBACpC,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,KAAI,MAAM,EAAE;oBACxB,
|
|
1
|
+
{"version":3,"file":"onFormSubmit.js","sourceRoot":"","sources":["../../../../src/Components/Sections/Form/onFormSubmit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAE/B,8DAAgE;AAChE,kDAA2B;AAE3B,IAAM,QAAQ,GASW,UACvB,CAAuB,EACvB,mBAAqC,EACrC,MAAmB,EACnB,WAAwB,EACxB,aAA0B,EAC1B,WAAoB;;;;;gBAEd,IAAI,GAAG,IAAI,CAAC,SAAS,uBAAM,CAAC,KAAE,mBAAmB,qBAAA,IAAG,CAAA;gBAEpD,OAAO,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;gBAE9B,qBAAM,IAAA,qBAAK,EAAC,qBAAqB,EAAE;wBAChD,MAAM,EAAE,MAAM;wBACd,QAAQ,EAAE,QAAQ;wBAClB,OAAO,EAAE;4BACP,cAAc,EAAE,kBAAkB;4BAClC,GAAG,EAAE,gBAAM,CAAC,SAAS,CACnB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAC5B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CACtC;yBACF;wBACD,IAAI,MAAA;qBACL,CAAC,EAAA;;gBAXI,MAAM,GAAG,SAWb;gBAEF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,EAAE;oBACd,IAAI,mBAAmB,KAAK,UAAU,IAAI,mBAAmB,KAAK,OAAO,EAAE;wBACzE,IAAA,+BAAgB,EAAC,mBAAmB,CAAC,CAAA;qBACtC;iBACF;gBAED,oCAAoC;gBACpC,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,KAAI,MAAM,EAAE;oBACxB,MAAM;yBACH,IAAI,CACH,CAAG,WAAW,IAAI,GAAG,kBAAY,kBAAkB,CACjD,mBAA6B,CAC5B,CACJ;yBACA,IAAI,CAAC;wBACJ,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,KAAI,aAAa,EAAE;4BAC/B,aAAa,EAAE,CAAA;yBAChB;oBACH,CAAC,CAAC,CAAA;iBACL;qBAAM,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,KAAI,aAAa,EAAE;oBACtC,aAAa,IAAI,aAAa,EAAE,CAAA;iBACjC;gBAED,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,WAAW,EAAE;oBAC7B,WAAW,EAAE,CAAA;iBACd;gBAED,sBAAO,MAAM,EAAA;;;KACd,CAAA;AAED,kBAAe,QAAQ,CAAA"}
|
|
@@ -47,7 +47,7 @@ var NavigationPrimaryWrapper = function (_a) {
|
|
|
47
47
|
return (react_1.default.createElement(shared_components_1.NavigationPrimary, __assign({}, navigationPrimary, { customTheme: customTheme, setTheme: setTheme })));
|
|
48
48
|
};
|
|
49
49
|
var LayoutTemplate = function (_a) {
|
|
50
|
-
var children = _a.children, _b = _a.sidebar, sidebar = _b === void 0 ? false : _b, _c = _a.footer, footer = _c === void 0 ? false : _c, customTheme = _a.customTheme, setTheme = _a.setTheme, context = _a.context;
|
|
50
|
+
var children = _a.children, _b = _a.sidebar, sidebar = _b === void 0 ? false : _b, _c = _a.footer, footer = _c === void 0 ? false : _c, customTheme = _a.customTheme, setTheme = _a.setTheme, context = _a.context, toastProviderProps = _a.toastProviderProps;
|
|
51
51
|
return (react_1.default.createElement(context_1.AccountContextProvider, { context: context },
|
|
52
52
|
react_1.default.createElement(Head_1.default, null),
|
|
53
53
|
react_1.default.createElement(newskit_1.ThemeProvider, { theme: customTheme || shared_components_1.sharedTheme },
|
|
@@ -69,7 +69,8 @@ var LayoutTemplate = function (_a) {
|
|
|
69
69
|
xsColumnGutter: 'space020',
|
|
70
70
|
smColumnGutter: 'space040',
|
|
71
71
|
} }, children),
|
|
72
|
-
footer && react_1.default.createElement(FooterWrapper, null))))
|
|
72
|
+
footer && react_1.default.createElement(FooterWrapper, null)))),
|
|
73
|
+
react_1.default.createElement(newskit_1.ToastProvider, __assign({ position: 'bottom-center' }, toastProviderProps))));
|
|
73
74
|
};
|
|
74
75
|
exports.default = LayoutTemplate;
|
|
75
76
|
var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LayoutTemplate.js","sourceRoot":"","sources":["../../../src/Components/Templates/LayoutTemplate.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"LayoutTemplate.js","sourceRoot":"","sources":["../../../src/Components/Templates/LayoutTemplate.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
import { UncompiledTheme } from 'newskit';
|
|
2
|
+
import { ToastProviderProps, UncompiledTheme } from 'newskit';
|
|
3
3
|
import { ContextOptions } from '../../context';
|
|
4
4
|
export declare type LayoutProps = {
|
|
5
5
|
children: React.ReactNode;
|
|
@@ -8,6 +8,7 @@ export declare type LayoutProps = {
|
|
|
8
8
|
customTheme?: UncompiledTheme;
|
|
9
9
|
setTheme?: (theme: UncompiledTheme) => void;
|
|
10
10
|
context: ContextOptions;
|
|
11
|
+
toastProviderProps?: ToastProviderProps;
|
|
11
12
|
};
|
|
12
13
|
export interface CancellationReasonPayload {
|
|
13
14
|
answer: string;
|
package/dist/context/types.d.ts
CHANGED
|
@@ -5,8 +5,8 @@ import { TitleOverrides, DescriptionOverrides, FooterContext, FooterContextOverr
|
|
|
5
5
|
import { MQ, InlineMessageProps } from 'newskit';
|
|
6
6
|
import { HeadProps } from '../Components/Elements/Head';
|
|
7
7
|
import { UserData, Data } from '../pages/types';
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
8
|
+
import { PaymentProvider, ZuoraCustomErrorMessages, ZuoraPaymentData } from '../Components/Sections/Form/Payment';
|
|
9
|
+
import { MessageMap, GenericMessageMap } from '../Components/Elements/Toast';
|
|
10
10
|
import { CommentingNotificationsProps } from '../Components/Sections/Form/CommentingNotifications';
|
|
11
11
|
import { CancellationReasonProps } from '../Components/Sections/Form/CancellationReason';
|
|
12
12
|
import { ConfirmCancellationProps } from '../Components/Sections/Form/ConfirmCancellation';
|
|
@@ -117,10 +117,10 @@ export interface ContextOptions {
|
|
|
117
117
|
};
|
|
118
118
|
footer?: FooterContext;
|
|
119
119
|
footerOverrides?: FooterContextOverrides;
|
|
120
|
-
errorMessages?:
|
|
121
|
-
genericErrorMessage?:
|
|
122
|
-
handleError?: (type: string,
|
|
123
|
-
handleLoading?: (type: string,
|
|
120
|
+
errorMessages?: MessageMap;
|
|
121
|
+
genericErrorMessage?: GenericMessageMap;
|
|
122
|
+
handleError?: (type: string, messageMap?: MessageMap, genericMessageMap?: GenericMessageMap, message?: string) => void;
|
|
123
|
+
handleLoading?: (type: string, messageMap?: MessageMap, genericMessageMap?: GenericMessageMap) => void;
|
|
124
124
|
handleSuccess?: () => void;
|
|
125
125
|
buttonGroupProps?: Partial<ButtonGroupProps>;
|
|
126
126
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MessageMap, GenericMessageMap } from '../Components/Elements/Toast/sendToast';
|
|
2
2
|
export declare let closeLoading: any;
|
|
3
|
-
export declare const handleError: (fieldName: string,
|
|
3
|
+
export declare const handleError: (fieldName: string, messageMap?: MessageMap | undefined, genericMessageMap?: GenericMessageMap | undefined, message?: string | undefined) => Promise<void>;
|
|
4
4
|
export declare const handleSuccess: () => void;
|
|
5
|
-
export declare const handleLoading: (fieldName: string,
|
|
5
|
+
export declare const handleLoading: (fieldName: string, message?: MessageMap | undefined, genericMessageMap?: GenericMessageMap | undefined) => Promise<void>;
|
|
@@ -41,12 +41,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.handleLoading = exports.handleSuccess = exports.handleError = exports.closeLoading = void 0;
|
|
43
43
|
var sendToast_1 = __importDefault(require("../Components/Elements/Toast/sendToast"));
|
|
44
|
-
var handleError = function (fieldName,
|
|
44
|
+
var handleError = function (fieldName, messageMap, genericMessageMap, message) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
45
|
return __generator(this, function (_a) {
|
|
46
46
|
switch (_a.label) {
|
|
47
47
|
case 0:
|
|
48
48
|
exports.closeLoading && (0, exports.closeLoading)();
|
|
49
|
-
return [4 /*yield*/, (0, sendToast_1.default)(fieldName, 'error',
|
|
49
|
+
return [4 /*yield*/, (0, sendToast_1.default)(fieldName, 'error', messageMap, genericMessageMap, message)];
|
|
50
50
|
case 1:
|
|
51
51
|
_a.sent();
|
|
52
52
|
return [2 /*return*/];
|
|
@@ -58,10 +58,10 @@ var handleSuccess = function () {
|
|
|
58
58
|
exports.closeLoading && (0, exports.closeLoading)();
|
|
59
59
|
};
|
|
60
60
|
exports.handleSuccess = handleSuccess;
|
|
61
|
-
var handleLoading = function (fieldName,
|
|
61
|
+
var handleLoading = function (fieldName, message, genericMessageMap) { return __awaiter(void 0, void 0, void 0, function () {
|
|
62
62
|
return __generator(this, function (_a) {
|
|
63
63
|
switch (_a.label) {
|
|
64
|
-
case 0: return [4 /*yield*/, (0, sendToast_1.default)(fieldName, 'pending',
|
|
64
|
+
case 0: return [4 /*yield*/, (0, sendToast_1.default)(fieldName, 'pending', message, genericMessageMap)];
|
|
65
65
|
case 1:
|
|
66
66
|
exports.closeLoading = _a.sent();
|
|
67
67
|
return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toastFunctions.js","sourceRoot":"","sources":["../../src/helpers/toastFunctions.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qFAG+C;AAIxC,IAAM,WAAW,GAAG,UACzB,SAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"toastFunctions.js","sourceRoot":"","sources":["../../src/helpers/toastFunctions.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qFAG+C;AAIxC,IAAM,WAAW,GAAG,UACzB,SAAiB,EACjB,UAAuB,EACvB,iBAAqC,EACrC,OAAgB;;;;gBAEhB,oBAAY,IAAI,IAAA,oBAAY,GAAE,CAAA;gBAC9B,qBAAM,IAAA,mBAAS,EAAC,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAA;;gBAA3E,SAA2E,CAAA;;;;KAC5E,CAAA;AARY,QAAA,WAAW,eAQvB;AAEM,IAAM,aAAa,GAAG;IAC3B,oBAAY,IAAI,IAAA,oBAAY,GAAE,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,aAAa,iBAEzB;AAEM,IAAM,aAAa,GAAG,UAC3B,SAAiB,EACjB,OAAoB,EACpB,iBAAqC;;;oBAEtB,qBAAM,IAAA,mBAAS,EAC5B,SAAS,EACT,SAAS,EACT,OAAO,EACP,iBAAiB,CAClB,EAAA;;gBALD,oBAAY,GAAG,SAKd,CAAA;;;;KACF,CAAA;AAXY,QAAA,aAAa,iBAWzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './useSuccessToast';
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
__exportStar(require("./useSuccessToast"), exports);
|
|
14
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAiC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { ContextOptions } from '../context/types';
|
|
2
|
+
export declare const toastMessageMap: {
|
|
3
|
+
name: string;
|
|
4
|
+
dob: string;
|
|
5
|
+
displayName: string;
|
|
6
|
+
email: string;
|
|
7
|
+
password: string;
|
|
8
|
+
mobile: string;
|
|
9
|
+
phoneNumber: string;
|
|
10
|
+
address: string;
|
|
11
|
+
'commenting-notifications': string;
|
|
12
|
+
'payment method': string;
|
|
13
|
+
};
|
|
14
|
+
export declare const useSuccessToast: (context: ContextOptions) => void;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.useSuccessToast = exports.toastMessageMap = void 0;
|
|
7
|
+
var sendToast_1 = __importDefault(require("../Components/Elements/Toast/sendToast"));
|
|
8
|
+
var router_1 = require("next/router");
|
|
9
|
+
var qs_1 = __importDefault(require("qs"));
|
|
10
|
+
var react_1 = require("react");
|
|
11
|
+
exports.toastMessageMap = {
|
|
12
|
+
name: 'name',
|
|
13
|
+
dob: 'dob',
|
|
14
|
+
displayName: 'display',
|
|
15
|
+
email: 'email',
|
|
16
|
+
password: 'password',
|
|
17
|
+
mobile: 'mobile',
|
|
18
|
+
phoneNumber: 'landline',
|
|
19
|
+
address: 'address',
|
|
20
|
+
'commenting-notifications': 'commenting notifications',
|
|
21
|
+
'payment method': 'payment method',
|
|
22
|
+
};
|
|
23
|
+
var useSuccessToast = function (context) {
|
|
24
|
+
var router = (0, router_1.useRouter)();
|
|
25
|
+
(0, react_1.useEffect)(function () {
|
|
26
|
+
var result = qs_1.default.parse(window.location.search.slice(1));
|
|
27
|
+
if (result.success &&
|
|
28
|
+
typeof result.success === 'string' &&
|
|
29
|
+
exports.toastMessageMap[result.success]) {
|
|
30
|
+
(0, sendToast_1.default)(exports.toastMessageMap[result.success], 'success', context.errorMessages, context.genericErrorMessage);
|
|
31
|
+
}
|
|
32
|
+
if (context.baseUrl) {
|
|
33
|
+
router.replace(context.baseUrl, undefined, { shallow: true });
|
|
34
|
+
}
|
|
35
|
+
}, []);
|
|
36
|
+
};
|
|
37
|
+
exports.useSuccessToast = useSuccessToast;
|
|
38
|
+
//# sourceMappingURL=useSuccessToast.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useSuccessToast.js","sourceRoot":"","sources":["../../src/hooks/useSuccessToast.ts"],"names":[],"mappings":";;;;;;AACA,qFAA8D;AAC9D,sCAAmD;AACnD,0CAAmB;AACnB,+BAAiC;AAEpB,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;IACV,WAAW,EAAE,SAAS;IACtB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,UAAU;IACvB,OAAO,EAAE,SAAS;IAClB,0BAA0B,EAAE,0BAA0B;IACtD,gBAAgB,EAAE,gBAAgB;CACnC,CAAA;AAEM,IAAM,eAAe,GAAG,UAAC,OAAuB;IACrD,IAAM,MAAM,GAAe,IAAA,kBAAS,GAAE,CAAA;IACtC,IAAA,iBAAS,EAAC;QACR,IAAM,MAAM,GAAG,YAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAExD,IACE,MAAM,CAAC,OAAO;YACd,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;YAClC,uBAAe,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/B;YACA,IAAA,mBAAS,EACP,uBAAe,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/B,SAAS,EACT,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,mBAAmB,CAC5B,CAAA;SACF;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;SAC9D;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;AACR,CAAC,CAAA;AAtBY,QAAA,eAAe,mBAsB3B"}
|
|
@@ -38,6 +38,7 @@ var react_1 = __importDefault(require("react"));
|
|
|
38
38
|
var Templates_1 = __importStar(require("../Components/Templates"));
|
|
39
39
|
var shared_components_1 = require("@newskit-render/shared-components");
|
|
40
40
|
var PastDueBanner_1 = require("../Components/Elements/PastDueBanner");
|
|
41
|
+
var hooks_1 = require("../hooks");
|
|
41
42
|
var title = 'Newsletters & Alerts';
|
|
42
43
|
exports.NewslettersAndAlertsContext = {
|
|
43
44
|
head: {
|
|
@@ -90,11 +91,21 @@ exports.NewslettersAndAlertsContext = {
|
|
|
90
91
|
},
|
|
91
92
|
},
|
|
92
93
|
],
|
|
94
|
+
genericErrorMessage: {
|
|
95
|
+
pending: 'Updating your ${field}...',
|
|
96
|
+
error: "Sorry, we're unable to save your ${field} right now. Please try again or come back later.",
|
|
97
|
+
success: 'Your ${field} has been updated.',
|
|
98
|
+
},
|
|
99
|
+
errorMessages: {
|
|
100
|
+
password: { success: 'Your password was successfully updated' },
|
|
101
|
+
email: { success: 'Your email address was successfully updated' },
|
|
102
|
+
},
|
|
93
103
|
};
|
|
94
104
|
var NewslettersAndAlerts = function (_a) {
|
|
95
105
|
var customTheme = _a.customTheme, setTheme = _a.setTheme, context = _a.context, user = _a.user;
|
|
96
|
-
var
|
|
97
|
-
|
|
106
|
+
var enhancedContext = __assign(__assign({}, (context || exports.NewslettersAndAlertsContext)), { userData: user });
|
|
107
|
+
(0, hooks_1.useSuccessToast)(enhancedContext);
|
|
108
|
+
return (react_1.default.createElement(Templates_1.default, { sidebar: true, footer: true, context: enhancedContext, customTheme: customTheme || shared_components_1.sharedTheme, setTheme: setTheme },
|
|
98
109
|
react_1.default.createElement(Templates_1.DisplayRenderer, null)));
|
|
99
110
|
};
|
|
100
111
|
exports.NewslettersAndAlerts = NewslettersAndAlerts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewslettersAndAlerts.js","sourceRoot":"","sources":["../../src/pages/NewslettersAndAlerts.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,mEAAiE;AAGjE,uEAA+E;AAC/E,sEAAkF;
|
|
1
|
+
{"version":3,"file":"NewslettersAndAlerts.js","sourceRoot":"","sources":["../../src/pages/NewslettersAndAlerts.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,mEAAiE;AAGjE,uEAA+E;AAC/E,sEAAkF;AAClF,kCAA0C;AAE1C,IAAM,KAAK,GAAG,sBAAsB,CAAA;AAEvB,QAAA,2BAA2B,GAAmB;IACzD,IAAI,EAAE;QACJ,SAAS,EAAE,KAAK;KACjB;IACD,aAAa,EAAE,2CAA2B;IAC1C,MAAM,EAAE;QACN,KAAK,OAAA;QACL,WAAW,EACT,2EAA2E;QAC7E,oBAAoB,EAAE;YACpB,UAAU,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE;SAC/C;QACD,KAAK,EAAE;YACL,GAAG,EAAE,oCAAoC;YACzC,GAAG,EAAE,EAAE;SACR;KACF;IACD,eAAe,EAAE,wBAAwB;IACzC,QAAQ,EAAE;QACR;YACE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,SAAS,EAAE,2BAA2B;gBACtC,KAAK,EAAE;oBACL;wBACE,KAAK,EAAE,aAAa;wBACpB,gBAAgB,EACd,gJAAgJ;wBAClJ,OAAO,EAAE,EAAE;wBACX,SAAS,EAAE,aAAa;wBACxB,IAAI,EAAE,GAAG;wBACT,IAAI,EAAE,UAAU;qBACjB;oBACD;wBACE,KAAK,EAAE,0BAA0B;wBACjC,gBAAgB,EACd,4JAA4J;wBAC9J,OAAO,EAAE,EAAE;wBACX,SAAS,EAAE,0BAA0B;wBACrC,IAAI,EAAE,yCAAyC;wBAC/C,IAAI,EAAE,UAAU;qBACjB;oBACD;wBACE,KAAK,EAAE,qBAAqB;wBAC5B,gBAAgB,EACd,qJAAqJ;wBACvJ,OAAO,EAAE,EAAE;wBACX,SAAS,EAAE,qBAAqB;wBAChC,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,GAAG;qBACV;iBACF;aACF;SACF;KACF;IACD,mBAAmB,EAAE;QACnB,OAAO,EAAE,2BAA2B;QACpC,KAAK,EACH,2FAA2F;QAC7F,OAAO,EAAE,iCAAiC;KAC3C;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,EAAE,OAAO,EAAE,wCAAwC,EAAE;QAC/D,KAAK,EAAE,EAAE,OAAO,EAAE,6CAA6C,EAAE;KAClE;CACF,CAAA;AAEM,IAAM,oBAAoB,GAAwC,UAAC,EAKzE;QAJC,WAAW,iBAAA,EACX,QAAQ,cAAA,EACR,OAAO,aAAA,EACP,IAAI,UAAA;IAEJ,IAAM,eAAe,yBAChB,CAAC,OAAO,IAAI,mCAA2B,CAAC,KAC3C,QAAQ,EAAE,IAAI,GACf,CAAA;IACD,IAAA,uBAAe,EAAC,eAAe,CAAC,CAAA;IAChC,OAAO,CACL,8BAAC,mBAAM,IACL,OAAO,QACP,MAAM,QACN,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,WAAW,IAAI,+BAAY,EACxC,QAAQ,EAAE,QAAQ;QAElB,8BAAC,2BAAe,OAAG,CACZ,CACV,CAAA;AACH,CAAC,CAAA;AAtBY,QAAA,oBAAoB,wBAsBhC"}
|
|
@@ -1,15 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { PersonalDetailsProps } from './types';
|
|
3
3
|
import { ContextOptions } from '../context';
|
|
4
|
-
export declare const PersonalDetailsTypeMap: {
|
|
5
|
-
name: string;
|
|
6
|
-
dob: string;
|
|
7
|
-
display: string;
|
|
8
|
-
email: string;
|
|
9
|
-
password: string;
|
|
10
|
-
mobile: string;
|
|
11
|
-
phoneNumber: string;
|
|
12
|
-
address: string;
|
|
13
|
-
};
|
|
14
4
|
export declare const personalDetailsContext: ContextOptions;
|
|
15
5
|
export declare const PersonalDetails: React.FC<PersonalDetailsProps>;
|
|
@@ -33,26 +33,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
33
33
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
34
34
|
};
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.PersonalDetails = exports.personalDetailsContext =
|
|
37
|
-
var react_1 =
|
|
36
|
+
exports.PersonalDetails = exports.personalDetailsContext = void 0;
|
|
37
|
+
var react_1 = __importDefault(require("react"));
|
|
38
38
|
var Templates_1 = __importStar(require("../Components/Templates"));
|
|
39
39
|
var PastDueBanner_1 = require("../Components/Elements/PastDueBanner");
|
|
40
40
|
var constants_1 = require("../constants");
|
|
41
|
-
var
|
|
42
|
-
var query_string_1 = __importDefault(require("query-string"));
|
|
43
|
-
var router_1 = require("next/router");
|
|
44
|
-
var sendToast_1 = __importDefault(require("../Components/Elements/Toast/sendToast"));
|
|
41
|
+
var hooks_1 = require("../hooks");
|
|
45
42
|
var title = 'Personal Details';
|
|
46
|
-
exports.PersonalDetailsTypeMap = {
|
|
47
|
-
name: 'name',
|
|
48
|
-
dob: 'dob',
|
|
49
|
-
display: 'display',
|
|
50
|
-
email: 'email',
|
|
51
|
-
password: 'password',
|
|
52
|
-
mobile: 'mobile',
|
|
53
|
-
phoneNumber: 'landline',
|
|
54
|
-
address: 'address',
|
|
55
|
-
};
|
|
56
43
|
var clientHeaderImages = {
|
|
57
44
|
'sun-theme': 'display-personalDetails-header-sun.svg',
|
|
58
45
|
'virgin-radio': 'display-personalDetails-header-vr.svg',
|
|
@@ -181,23 +168,9 @@ var PersonalDetails = function (_a) {
|
|
|
181
168
|
? "MyAccount/" + clientHeaderImages[customTheme.name]
|
|
182
169
|
: 'MyAccount/personal-details-header.svg',
|
|
183
170
|
} }) });
|
|
184
|
-
|
|
185
|
-
(
|
|
186
|
-
|
|
187
|
-
if (result.success &&
|
|
188
|
-
typeof result.success === 'string' &&
|
|
189
|
-
exports.PersonalDetailsTypeMap[result.success]) {
|
|
190
|
-
(0, sendToast_1.default)(exports.PersonalDetailsTypeMap[result.success], 'success', (context === null || context === void 0 ? void 0 : context.errorMessages) || exports.personalDetailsContext.errorMessages, (context === null || context === void 0 ? void 0 : context.genericErrorMessage) ||
|
|
191
|
-
exports.personalDetailsContext.genericErrorMessage);
|
|
192
|
-
}
|
|
193
|
-
if (enhancedContext.baseUrl) {
|
|
194
|
-
router.replace(enhancedContext.baseUrl, undefined, { shallow: true });
|
|
195
|
-
}
|
|
196
|
-
}, []);
|
|
197
|
-
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
198
|
-
react_1.default.createElement(Templates_1.default, { sidebar: true, footer: true, context: enhancedContext, customTheme: customTheme, setTheme: setTheme },
|
|
199
|
-
react_1.default.createElement(Templates_1.DisplayRenderer, null)),
|
|
200
|
-
react_1.default.createElement(newskit_1.ToastProvider, { position: 'bottom-center' })));
|
|
171
|
+
(0, hooks_1.useSuccessToast)(enhancedContext);
|
|
172
|
+
return (react_1.default.createElement(Templates_1.default, { sidebar: true, footer: true, context: enhancedContext, customTheme: customTheme, setTheme: setTheme },
|
|
173
|
+
react_1.default.createElement(Templates_1.DisplayRenderer, null)));
|
|
201
174
|
};
|
|
202
175
|
exports.PersonalDetails = PersonalDetails;
|
|
203
176
|
//# sourceMappingURL=PersonalDetails.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersonalDetails.js","sourceRoot":"","sources":["../../src/pages/PersonalDetails.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"PersonalDetails.js","sourceRoot":"","sources":["../../src/pages/PersonalDetails.tsx"],"names":[],"mappings":"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"}
|
|
@@ -34,18 +34,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
34
34
|
};
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.SubscriptionAndBilling = exports.SubscriptionAndBillingContext = void 0;
|
|
37
|
-
var react_1 =
|
|
38
|
-
var Templates_1 = __importStar(require("../Components/Templates"));
|
|
37
|
+
var react_1 = __importDefault(require("react"));
|
|
39
38
|
var shared_components_1 = require("@newskit-render/shared-components");
|
|
39
|
+
var Templates_1 = __importStar(require("../Components/Templates"));
|
|
40
40
|
var PastDueBanner_1 = require("../Components/Elements/PastDueBanner");
|
|
41
|
-
var
|
|
42
|
-
var newskit_1 = require("newskit");
|
|
43
|
-
var query_string_1 = __importDefault(require("query-string"));
|
|
44
|
-
var sendToast_1 = __importDefault(require("../Components/Elements/Toast/sendToast"));
|
|
45
|
-
var constants_1 = require("../constants");
|
|
41
|
+
var hooks_1 = require("../hooks");
|
|
46
42
|
var title = 'Subscription & Billing';
|
|
47
43
|
exports.SubscriptionAndBillingContext = {
|
|
48
|
-
baseUrl: constants_1.BASE_URL,
|
|
49
44
|
head: {
|
|
50
45
|
pageTitle: title,
|
|
51
46
|
},
|
|
@@ -150,22 +145,13 @@ exports.SubscriptionAndBillingContext = {
|
|
|
150
145
|
var SubscriptionAndBilling = function (_a) {
|
|
151
146
|
var customTheme = _a.customTheme, setTheme = _a.setTheme, context = _a.context, user = _a.user;
|
|
152
147
|
var enhancedContext = __assign(__assign({}, (context || exports.SubscriptionAndBillingContext)), { userData: user });
|
|
153
|
-
|
|
154
|
-
(0, react_1.useEffect)(function () {
|
|
155
|
-
var result = query_string_1.default.parse(window.location.search);
|
|
156
|
-
if (result.success && typeof result.success === 'string') {
|
|
157
|
-
(0, sendToast_1.default)(result.success, 'success', enhancedContext.errorMessages, enhancedContext.genericErrorMessage);
|
|
158
|
-
}
|
|
159
|
-
if (enhancedContext.baseUrl) {
|
|
160
|
-
router.replace(enhancedContext.baseUrl + "/subscription-and-billing", undefined, {
|
|
161
|
-
shallow: true,
|
|
162
|
-
});
|
|
163
|
-
}
|
|
164
|
-
}, []);
|
|
148
|
+
(0, hooks_1.useSuccessToast)(enhancedContext);
|
|
165
149
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
166
|
-
react_1.default.createElement(Templates_1.default, { sidebar: true, footer: true, context: enhancedContext, customTheme: customTheme || shared_components_1.sharedTheme, setTheme: setTheme
|
|
167
|
-
|
|
168
|
-
|
|
150
|
+
react_1.default.createElement(Templates_1.default, { sidebar: true, footer: true, context: enhancedContext, customTheme: customTheme || shared_components_1.sharedTheme, setTheme: setTheme, toastProviderProps: {
|
|
151
|
+
verticalOffset: 'space040',
|
|
152
|
+
horizontalOffset: { xs: 'space000', lg: 'space040' },
|
|
153
|
+
} },
|
|
154
|
+
react_1.default.createElement(Templates_1.DisplayRenderer, null))));
|
|
169
155
|
};
|
|
170
156
|
exports.SubscriptionAndBilling = SubscriptionAndBilling;
|
|
171
157
|
//# sourceMappingURL=SubscriptionAndBilling.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionAndBilling.js","sourceRoot":"","sources":["../../src/pages/SubscriptionAndBilling.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"SubscriptionAndBilling.js","sourceRoot":"","sources":["../../src/pages/SubscriptionAndBilling.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@newskit-render/my-account",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.124.0",
|
|
4
4
|
"description": "Newskit Render",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -28,11 +28,12 @@
|
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@apollo/client": "^3.4.16",
|
|
30
30
|
"@hookform/resolvers": "^2.5.2",
|
|
31
|
-
"@newskit-render/api": "^0.
|
|
32
|
-
"@newskit-render/shared-components": "^0.
|
|
31
|
+
"@newskit-render/api": "^0.9.0",
|
|
32
|
+
"@newskit-render/shared-components": "^0.26.0",
|
|
33
33
|
"@newskit-render/validation": "^0.30.0",
|
|
34
34
|
"@stripe/react-stripe-js": "^1.4.1",
|
|
35
35
|
"@stripe/stripe-js": "^1.17.0",
|
|
36
|
+
"@testing-library/react-hooks": "^7.0.2",
|
|
36
37
|
"cookie": "^0.4.1",
|
|
37
38
|
"cross-fetch": "^3.1.4",
|
|
38
39
|
"graphql": "^15.6.0",
|