@newskit-render/my-account 0.114.2 → 0.116.1

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.
Files changed (44) hide show
  1. package/CHANGELOG.md +49 -0
  2. package/README.md +10 -22
  3. package/dist/Components/Sections/Form/Address/FormAddress.d.ts +0 -6
  4. package/dist/Components/Sections/Form/Address/FormAddress.js +19 -35
  5. package/dist/Components/Sections/Form/Address/FormAddress.js.map +1 -1
  6. package/dist/Components/Sections/Form/Address/isoCodes.js +1 -0
  7. package/dist/Components/Sections/Form/Address/isoCodes.js.map +1 -1
  8. package/dist/Components/Sections/Form/Address/types.d.ts +14 -11
  9. package/dist/Components/Sections/Form/CommentingNotifications/CommentingNotifications.js +42 -99
  10. package/dist/Components/Sections/Form/CommentingNotifications/CommentingNotifications.js.map +1 -1
  11. package/dist/Components/Sections/Form/CommentingNotifications/types.d.ts +11 -5
  12. package/dist/Components/Sections/Form/Name/FormName.js.map +1 -1
  13. package/dist/Components/Sections/Form/Password/Password.js +3 -2
  14. package/dist/Components/Sections/Form/Password/Password.js.map +1 -1
  15. package/dist/Components/Sections/Form/Password/types.d.ts +2 -2
  16. package/dist/Components/Sections/Form/onFormSubmit.js +2 -4
  17. package/dist/Components/Sections/Form/onFormSubmit.js.map +1 -1
  18. package/dist/Components/Templates/EditRenderer.js.map +1 -1
  19. package/dist/context/types.d.ts +10 -5
  20. package/dist/getProviderProps.js +5 -8
  21. package/dist/getProviderProps.js.map +1 -1
  22. package/dist/helpers/dataUtils.js +12 -14
  23. package/dist/helpers/dataUtils.js.map +1 -1
  24. package/dist/helpers/getQuery.js +1 -8
  25. package/dist/helpers/getQuery.js.map +1 -1
  26. package/dist/helpers/providerUtils.js +4 -4
  27. package/dist/helpers/providerUtils.js.map +1 -1
  28. package/dist/pages/EditField.js +71 -29
  29. package/dist/pages/EditField.js.map +1 -1
  30. package/dist/pages/PersonalDetails.js +4 -4
  31. package/dist/pages/types.d.ts +22 -7
  32. package/dist/pages/types.js.map +1 -1
  33. package/dist/providers/editFieldProvider.js +3 -12
  34. package/dist/providers/editFieldProvider.js.map +1 -1
  35. package/dist/queries/getEditField.js +1 -1
  36. package/dist/queries/getEditField.js.map +1 -1
  37. package/dist/queries/getUserProfile.js +1 -1
  38. package/dist/queries/getUserProfile.js.map +1 -1
  39. package/dist/queries/getUserQuery.d.ts +1 -2
  40. package/dist/queries/getUserQuery.js +5 -9
  41. package/dist/queries/getUserQuery.js.map +1 -1
  42. package/dist/queries/getUserSubscription.js +1 -1
  43. package/dist/queries/getUserSubscription.js.map +1 -1
  44. package/package.json +5 -4
@@ -1,5 +1,14 @@
1
1
  import { UncompiledTheme } from 'newskit';
2
2
  import { ContextOptions } from '../context';
3
+ export declare type AddressData = {
4
+ country: Country;
5
+ line1: string;
6
+ line2: string;
7
+ line3: string;
8
+ city: string;
9
+ county: string;
10
+ postcode: string;
11
+ };
3
12
  export interface Schedule {
4
13
  name: string;
5
14
  minimumTerm: string;
@@ -48,13 +57,17 @@ export interface SubscriptionPaymentInstance {
48
57
  provider?: StripeProvider;
49
58
  spec?: VxInstanceSpec;
50
59
  }
60
+ export interface Country {
61
+ countryIsoCode?: string;
62
+ name?: string;
63
+ }
51
64
  export interface Address {
52
65
  line1: string;
53
66
  line2: string;
54
67
  line3?: string;
55
- line4?: string;
56
- line5?: string;
57
- line6?: string;
68
+ country?: Country;
69
+ county?: string;
70
+ city?: string;
58
71
  }
59
72
  export interface UserData {
60
73
  firstName: string;
@@ -62,12 +75,14 @@ export interface UserData {
62
75
  cpn: string;
63
76
  email: string;
64
77
  hash: string;
65
- customData: string;
78
+ mobile: string;
79
+ phoneNumber: string;
80
+ dateOfBirth: any;
66
81
  displayName?: string;
67
82
  vxInstances: VxInstance[];
68
- addresses?: [Address];
83
+ address?: Address;
69
84
  }
70
- export declare type PersonalDetailsUserData = Pick<UserData, 'firstName' | 'lastName' | 'customData' | 'vxInstances' | 'displayName'>;
85
+ export declare type PersonalDetailsUserData = Pick<UserData, 'firstName' | 'lastName' | 'mobile' | 'phoneNumber' | 'dateOfBirth' | 'vxInstances' | 'displayName' | 'address'>;
71
86
  export declare type SubscriptionAndBillingUserData = Pick<UserData, 'cpn' | 'vxInstances'>;
72
87
  export declare type NewslettersAndAlertsUserData = Pick<UserData, 'email' | 'hash'>;
73
88
  export interface BasePageProps {
@@ -93,7 +108,7 @@ export interface Fields {
93
108
  }
94
109
  export interface Data {
95
110
  validationSchemaKey?: string;
96
- fields?: Fields[];
111
+ fields?: Fields[] | AddressData;
97
112
  }
98
113
  export interface ZuoraPaymentData {
99
114
  signature: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/pages/types.ts"],"names":[],"mappings":";;;AAqIA,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,kCAAe,CAAA;IACf,oCAAiB,CAAA;AACnB,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/pages/types.ts"],"names":[],"mappings":";;;AA6JA,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,kCAAe,CAAA;IACf,oCAAiB,CAAA;AACnB,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B"}
@@ -54,7 +54,7 @@ var getEditField_1 = require("../queries/getEditField");
54
54
  var editFieldProvider = function (_a) {
55
55
  var mainApolloClient = _a.mainApolloClient, nkApiApolloClient = _a.nkApiApolloClient, context = _a.context;
56
56
  return __awaiter(void 0, void 0, void 0, function () {
57
- var currentEditField, shouldUseNewskitApi, client, response, editFieldMap, queryBody, fragmentName, query, e_1, mappedFields, addressFields, user;
57
+ var currentEditField, shouldUseNewskitApi, client, response, editFieldMap, queryBody, fragmentName, query, e_1, mappedFields, user;
58
58
  return __generator(this, function (_b) {
59
59
  switch (_b.label) {
60
60
  case 0:
@@ -93,22 +93,13 @@ var editFieldProvider = function (_a) {
93
93
  case 4:
94
94
  if (response === null || response === void 0 ? void 0 : response.data) {
95
95
  mappedFields = editFieldMap.map(function (field) {
96
- if (field === 'customData') {
97
- var parsedField = (0, helpers_1.safeJsonParse)(response.data.user[field]);
98
- return {
99
- value: parsedField ? parsedField[currentEditField] : '',
100
- field: currentEditField,
101
- };
102
- }
103
96
  if (field === 'displayName') {
104
97
  return { value: response.data.user['displayName'], field: field };
105
98
  }
106
99
  return { value: response.data.user[field], field: field };
107
100
  });
108
- if (currentEditField === 'address' &&
109
- Array.isArray(mappedFields[0].value)) {
110
- addressFields = mappedFields[0].value[0];
111
- mappedFields = (0, helpers_1.processEditFieldObject)(addressFields);
101
+ if (currentEditField === 'address') {
102
+ mappedFields = mappedFields[0].value;
112
103
  }
113
104
  if (currentEditField === 'commenting-notifications') {
114
105
  user = __assign({ displayName: response.data.user.displayName }, response.data.user.settings.notifications.email);
@@ -1 +1 @@
1
- {"version":3,"file":"editFieldProvider.js","sourceRoot":"","sources":["../../src/providers/editFieldProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editFieldProvider.js","sourceRoot":"","sources":["../../src/providers/editFieldProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA8D;AAE9D,sCAKmB;AACnB,wDAAwD;AAIjD,IAAM,iBAAiB,GAAG,UAAO,EAIzB;QAHb,gBAAgB,sBAAA,EAChB,iBAAiB,uBAAA,EACjB,OAAO,aAAA;;;;;;oBAED,gBAAgB,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,KAAK,KAAI,EAAE,CAAA;oBAC9C,mBAAmB,GAAG,IAAA,uBAAa,EAAC,gBAAgB,CAAC,CAAA;oBACvD,MAAM,GAAoD,gBAAgB,CAAA;oBAC9E,IAAI,mBAAmB,EAAE;wBACvB,MAAM,GAAG,iBAAiB,CAAA;qBAC3B;oBAGK,YAAY,GAAG,IAAA,yBAAe,EAAC,gBAAgB,CAAC,CAAA;yBAClD,YAAY,EAAZ,wBAAY;oBACR,SAAS,GAAG,IAAA,6BAAc,EAAC;wBAC/B,MAAM,EAAE,YAAY;wBACpB,mBAAmB,qBAAA;wBACnB,gBAAgB,kBAAA;qBACjB,CAAC,CAAA;oBAEI,YAAY,GAAG,IAAA,iCAAiB,EAAC,gBAAgB,CAAC,CAAA;oBAClD,KAAK,GAAG,IAAA,kBAAQ,EAAC,SAAS,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;;;;oBAGvD,qBAAM,MAAM,CAAC,KAAK,CAAC;4BAC5B,KAAK,OAAA;4BACL,SAAS,EAAE;gCACT,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gCAC5B,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;6BACjC;yBACF,CAAC,EAAA;;oBANF,QAAQ,GAAG,SAMT,CAAA;;;;oBAEF,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,OAAO,CAAC,CAAA;;;oBAI5B,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE;wBACd,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,UAAC,KAAK;4BACxC,IAAI,KAAK,KAAK,aAAa,EAAE;gCAC3B,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK,OAAA,EAAE,CAAA;6BAC3D;4BACD,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,OAAA,EAAE,CAAA;wBACpD,CAAC,CAAC,CAAA;wBAEF,IAAI,gBAAgB,KAAK,SAAS,EAAE;4BAClC,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;yBACrC;wBAED,IAAI,gBAAgB,KAAK,0BAA0B,EAAE;4BAC7C,IAAI,cACR,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IACxC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CACnD,CAAA;4BAED,YAAY,GAAG,IAAA,gCAAsB,EAAC,IAAI,CAAC,CAAA;yBAC5C;wBAED,sBAAO;gCACL,IAAI,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE;6BACvD,EAAA;qBACF;oBAED,sBAAO;4BACL,IAAI,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;yBACjC,EAAA;;;;CACF,CAAA;AAlEY,QAAA,iBAAiB,qBAkE7B"}
@@ -17,7 +17,7 @@ var buildQueryBody = function (_a) {
17
17
  return (0, client_1.gql)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n fragment ", " on UserDetails {\n ", "\n }\n "], ["\n fragment ", " on UserDetails {\n ", "\n }\n "])), fragmentName, fields.join('\n'));
18
18
  }
19
19
  if (currentEditField === 'address') {
20
- return (0, client_1.gql)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n fragment ", " on User {\n addresses {\n type\n line1\n line2\n line3\n line4\n line5\n line6\n country\n }\n }\n "], ["\n fragment ", " on User {\n addresses {\n type\n line1\n line2\n line3\n line4\n line5\n line6\n country\n }\n }\n "])), fragmentName);
20
+ return (0, client_1.gql)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n fragment ", " on User {\n address {\n city\n country {\n countryIsoCode\n name\n }\n county\n line1\n line2\n line3\n }\n }\n "], ["\n fragment ", " on User {\n address {\n city\n country {\n countryIsoCode\n name\n }\n county\n line1\n line2\n line3\n }\n }\n "])), fragmentName);
21
21
  }
22
22
  return (0, client_1.gql)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n fragment ", " on User {\n ", "\n }\n "], ["\n fragment ", " on User {\n ", "\n }\n "])), fragmentName, fields.join('\n'));
23
23
  };
@@ -1 +1 @@
1
- {"version":3,"file":"getEditField.js","sourceRoot":"","sources":["../../src/queries/getEditField.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAkD;AAClD,sCAA8C;AAEvC,IAAM,cAAc,GAAG,UAAC,EAQ9B;QAPC,MAAM,YAAA,EACN,mBAAmB,yBAAA,EACnB,gBAAgB,sBAAA;IAMhB,IAAM,YAAY,GAAG,IAAA,2BAAiB,EAAC,gBAAgB,CAAC,CAAA;IACxD,IAAI,mBAAmB,EAAE;QACvB,IAAI,gBAAgB,KAAK,0BAA0B,EAAE;YACnD,WAAO,YAAG,wRAAA,mBACC,EAAY,4HAKb,EAAiB,iEAM5B,KAXY,YAAY,EAKb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAM5B;SACA;QACD,WAAO,YAAG,iIAAA,iBACC,EAAY,2BACnB,EAAiB,aAEtB,KAHY,YAAY,EACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAEtB;KACA;IAED,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,WAAO,YAAG,6RAAA,mBACG,EAAY,oMAYxB,KAZY,YAAY,EAYxB;KACF;IACD,WAAO,YAAG,0HAAA,iBACG,EAAY,oBACnB,EAAiB,aAEtB,KAHY,YAAY,EACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAEtB;AACH,CAAC,CAAA;AAtDY,QAAA,cAAc,kBAsD1B"}
1
+ {"version":3,"file":"getEditField.js","sourceRoot":"","sources":["../../src/queries/getEditField.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAkD;AAClD,sCAA8C;AAEvC,IAAM,cAAc,GAAG,UAAC,EAQ9B;QAPC,MAAM,YAAA,EACN,mBAAmB,yBAAA,EACnB,gBAAgB,sBAAA;IAMhB,IAAM,YAAY,GAAG,IAAA,2BAAiB,EAAC,gBAAgB,CAAC,CAAA;IACxD,IAAI,mBAAmB,EAAE;QACvB,IAAI,gBAAgB,KAAK,0BAA0B,EAAE;YACnD,WAAO,YAAG,wRAAA,mBACC,EAAY,4HAKb,EAAiB,iEAM5B,KAXY,YAAY,EAKb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAM5B;SACA;QACD,WAAO,YAAG,iIAAA,iBACC,EAAY,2BACnB,EAAiB,aAEtB,KAHY,YAAY,EACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAEtB;KACA;IAED,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,WAAO,YAAG,uTAAA,mBACG,EAAY,8NAaxB,KAbY,YAAY,EAaxB;KACF;IACD,WAAO,YAAG,0HAAA,iBACG,EAAY,oBACnB,EAAiB,aAEtB,KAHY,YAAY,EACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAEtB;AACH,CAAC,CAAA;AAvDY,QAAA,cAAc,kBAuD1B"}
@@ -6,6 +6,6 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
7
  exports.GET_USER_PROFILE = void 0;
8
8
  var client_1 = require("@apollo/client");
9
- exports.GET_USER_PROFILE = (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserProfile on User {\n cpn\n customData\n firstName\n lastName\n email\n addresses {\n country\n line1\n line2\n line3\n line4\n line5\n line6\n }\n vxInstances {\n id\n isActive\n expiryDate\n spec {\n id\n name\n description\n isActive\n termsAndConditions {\n text\n }\n }\n\n interactions {\n ... on SubscriptionPaymentInstance {\n startAt\n pastDue {\n isPastDue\n since\n }\n provider {\n ... on Stripe {\n reference\n paymentMethod {\n ... on Card {\n brand\n expiryYear\n expiryMonth\n last4\n }\n }\n }\n }\n }\n }\n }\n }\n"], ["\n fragment UserProfile on User {\n cpn\n customData\n firstName\n lastName\n email\n addresses {\n country\n line1\n line2\n line3\n line4\n line5\n line6\n }\n vxInstances {\n id\n isActive\n expiryDate\n spec {\n id\n name\n description\n isActive\n termsAndConditions {\n text\n }\n }\n\n interactions {\n ... on SubscriptionPaymentInstance {\n startAt\n pastDue {\n isPastDue\n since\n }\n provider {\n ... on Stripe {\n reference\n paymentMethod {\n ... on Card {\n brand\n expiryYear\n expiryMonth\n last4\n }\n }\n }\n }\n }\n }\n }\n }\n"])));
9
+ exports.GET_USER_PROFILE = (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n country {\n countryIsoCode\n name\n }\n }\n }\n"], ["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n country {\n countryIsoCode\n name\n }\n }\n }\n"])));
10
10
  var templateObject_1;
11
11
  //# sourceMappingURL=getUserProfile.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getUserProfile.js","sourceRoot":"","sources":["../../src/queries/getUserProfile.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAoC;AAEvB,QAAA,gBAAgB,OAAG,YAAG,8+BAAA,06BAsDlC,KAAA"}
1
+ {"version":3,"file":"getUserProfile.js","sourceRoot":"","sources":["../../src/queries/getUserProfile.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAoC;AAEvB,QAAA,gBAAgB,OAAG,YAAG,sVAAA,kRAoBlC,KAAA"}
@@ -1,4 +1,3 @@
1
1
  import { DocumentNode } from '@apollo/client';
2
- export declare const getUserInternal: (queryFragment: DocumentNode, fragmentName: string) => DocumentNode;
3
- export declare const getUserExternal: (queryFragment: DocumentNode, fragmentName: string) => DocumentNode;
2
+ export declare const getUserMain: (queryFragment: DocumentNode, fragmentName: string) => DocumentNode;
4
3
  export declare const getUserNewskitApi: (queryFragment: DocumentNode, fragmentName: string) => DocumentNode;
@@ -4,19 +4,15 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
4
4
  return cooked;
5
5
  };
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.getUserNewskitApi = exports.getUserExternal = exports.getUserInternal = void 0;
7
+ exports.getUserNewskitApi = exports.getUserMain = void 0;
8
8
  var client_1 = require("@apollo/client");
9
- var getUserInternal = function (queryFragment, fragmentName) {
9
+ var getUserMain = function (queryFragment, fragmentName) {
10
10
  return (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n ", "\n query {\n user {\n ...", "\n }\n }\n "], ["\n ", "\n query {\n user {\n ...", "\n }\n }\n "])), queryFragment, fragmentName);
11
11
  };
12
- exports.getUserInternal = getUserInternal;
13
- var getUserExternal = function (queryFragment, fragmentName) {
14
- return (0, client_1.gql)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n ", "\n query($id: ID) {\n user(id: $id) {\n ...", "\n }\n }\n "], ["\n ", "\n query($id: ID) {\n user(id: $id) {\n ...", "\n }\n }\n "])), queryFragment, fragmentName);
15
- };
16
- exports.getUserExternal = getUserExternal;
12
+ exports.getUserMain = getUserMain;
17
13
  var getUserNewskitApi = function (queryFragment, fragmentName) {
18
- return (0, client_1.gql)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n ", "\n query getUser($publisher: Publisher!) {\n user(publisher: $publisher) {\n ...", "\n }\n }"], ["\n ", "\n query getUser($publisher: Publisher!) {\n user(publisher: $publisher) {\n ...", "\n }\n }"])), queryFragment, fragmentName);
14
+ return (0, client_1.gql)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n ", "\n query getUser($publisher: Publisher!) {\n user(publisher: $publisher) {\n ...", "\n }\n }"], ["\n ", "\n query getUser($publisher: Publisher!) {\n user(publisher: $publisher) {\n ...", "\n }\n }"])), queryFragment, fragmentName);
19
15
  };
20
16
  exports.getUserNewskitApi = getUserNewskitApi;
21
- var templateObject_1, templateObject_2, templateObject_3;
17
+ var templateObject_1, templateObject_2;
22
18
  //# sourceMappingURL=getUserQuery.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getUserQuery.js","sourceRoot":"","sources":["../../src/queries/getUserQuery.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAkD;AAE3C,IAAM,eAAe,GAAG,UAC7B,aAA2B,EAC3B,YAAoB;IAEpB,WAAO,YAAG,gJAAA,QACN,EAAa,0CAGN,EAAY,sBAGtB,KANG,aAAa,EAGN,YAAY,EAGtB;AACH,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B;AAEM,IAAM,eAAe,GAAG,UAC7B,aAA2B,EAC3B,YAAoB;IAEpB,WAAO,YAAG,gLAAA,UACJ,EAAa,kEAGN,EAAY,4BAGtB,KANG,aAAa,EAGN,YAAY,EAGtB;AACL,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B;AAEM,IAAM,iBAAiB,GAAG,UAC/B,aAA2B,EAC3B,YAAoB;IAEpB,WAAO,YAAG,mMAAA,QACN,EAAa,iGAGN,EAAY,kBAEnB,KALA,aAAa,EAGN,YAAY,EAEnB;AACN,CAAC,CAAA;AAXY,QAAA,iBAAiB,qBAW7B"}
1
+ {"version":3,"file":"getUserQuery.js","sourceRoot":"","sources":["../../src/queries/getUserQuery.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAkD;AAE3C,IAAM,WAAW,GAAG,UACzB,aAA2B,EAC3B,YAAoB;IAEpB,WAAO,YAAG,gJAAA,QACN,EAAa,0CAGN,EAAY,sBAGtB,KANG,aAAa,EAGN,YAAY,EAGtB;AACH,CAAC,CAAA;AAZY,QAAA,WAAW,eAYvB;AAEM,IAAM,iBAAiB,GAAG,UAC/B,aAA2B,EAC3B,YAAoB;IAEpB,WAAO,YAAG,mMAAA,QACN,EAAa,iGAGN,EAAY,kBAEnB,KALA,aAAa,EAGN,YAAY,EAEnB;AACN,CAAC,CAAA;AAXY,QAAA,iBAAiB,qBAW7B"}
@@ -6,6 +6,6 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
7
  exports.GET_USER_SUBSCRIPTION = void 0;
8
8
  var client_1 = require("@apollo/client");
9
- exports.GET_USER_SUBSCRIPTION = (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserSubscription on User {\n cpn\n vxInstances {\n isActive\n id\n expiryDate\n interactions {\n ... on SubscriptionPaymentInstance {\n startAt\n pastDue {\n isPastDue\n since\n }\n provider {\n ... on Stripe {\n reference\n paymentMethod {\n ... on Card {\n brand\n expiryYear\n expiryMonth\n last4\n }\n }\n }\n }\n spec {\n name\n schedule {\n name\n minimumTerm\n terminates\n phases {\n billingCycle\n duration\n price {\n amount\n currency\n }\n }\n }\n }\n }\n }\n spec {\n id\n name\n description\n }\n }\n }\n"], ["\n fragment UserSubscription on User {\n cpn\n vxInstances {\n isActive\n id\n expiryDate\n interactions {\n ... on SubscriptionPaymentInstance {\n startAt\n pastDue {\n isPastDue\n since\n }\n provider {\n ... on Stripe {\n reference\n paymentMethod {\n ... on Card {\n brand\n expiryYear\n expiryMonth\n last4\n }\n }\n }\n }\n spec {\n name\n schedule {\n name\n minimumTerm\n terminates\n phases {\n billingCycle\n duration\n price {\n amount\n currency\n }\n }\n }\n }\n }\n }\n spec {\n id\n name\n description\n }\n }\n }\n"])));
9
+ exports.GET_USER_SUBSCRIPTION = (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserSubscription on User {\n cpn\n }\n"], ["\n fragment UserSubscription on User {\n cpn\n }\n"])));
10
10
  var templateObject_1;
11
11
  //# sourceMappingURL=getUserSubscription.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getUserSubscription.js","sourceRoot":"","sources":["../../src/queries/getUserSubscription.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAoC;AAEvB,QAAA,qBAAqB,OAAG,YAAG,6lCAAA,yhCAoDvC,KAAA"}
1
+ {"version":3,"file":"getUserSubscription.js","sourceRoot":"","sources":["../../src/queries/getUserSubscription.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAoC;AAEvB,QAAA,qBAAqB,OAAG,YAAG,6HAAA,yDAIvC,KAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@newskit-render/my-account",
3
- "version": "0.114.2",
3
+ "version": "0.116.1",
4
4
  "description": "Newskit Render",
5
5
  "author": "",
6
6
  "license": "UNLICENSED",
@@ -26,8 +26,9 @@
26
26
  "dependencies": {
27
27
  "@apollo/client": "^3.4.16",
28
28
  "@hookform/resolvers": "^2.5.2",
29
- "@newskit-render/api": "^0.4.2",
30
- "@newskit-render/shared-components": "^0.18.0",
29
+ "@newskit-render/api": "^0.5.0",
30
+ "@newskit-render/shared-components": "^0.20.0",
31
+ "@newskit-render/validation": "^0.27.0",
31
32
  "@stripe/react-stripe-js": "^1.4.1",
32
33
  "@stripe/stripe-js": "^1.17.0",
33
34
  "cookie": "^0.4.1",
@@ -36,7 +37,7 @@
36
37
  "lodash.get": "^4.4.2",
37
38
  "lodash.merge": "^4.6.2",
38
39
  "md5": "^2.3.0",
39
- "newskit": "4.0.1",
40
+ "newskit": "4.3.1",
40
41
  "query-string": "^7.0.1",
41
42
  "react-hook-form": "7.8.4",
42
43
  "react-phone-number-input": "^3.1.23",