@weareconceptstudio/account 2.0.3 → 2.0.4
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/modules/account/AccountSettingsTemplate/AccountInfo/index.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/modules/account/AccountSettingsTemplate/AccountInfo/index.js"],"names":[],"mappings":";AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAwJC;kBAhK4C,OAAO"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React, { useState, useCallback } from 'react';
|
|
2
|
+
import flatpickr from 'flatpickr';
|
|
2
3
|
import { Text, useTranslation, useUi } from '@weareconceptstudio/core';
|
|
3
4
|
import { FormBuilder } from '@weareconceptstudio/form';
|
|
4
5
|
import { AccountButton, WarningMessageForPopup } from '../../../../components';
|
|
@@ -22,40 +23,51 @@ const AccountInfo = ({ user, onAccountUpdate, displayFields = defaultDisplayFiel
|
|
|
22
23
|
handleSuccessPopup();
|
|
23
24
|
});
|
|
24
25
|
}, [onAccountUpdate, handleSuccessPopup]);
|
|
25
|
-
//!
|
|
26
|
-
const
|
|
26
|
+
//! Normalize date strings to ensure we submit formatted values instead of Date objects
|
|
27
|
+
const normalizeDateString = useCallback((dateString, format) => {
|
|
27
28
|
if (!dateString || typeof dateString !== 'string') {
|
|
28
29
|
return dateString;
|
|
29
30
|
}
|
|
31
|
+
const formatToken = format || 'Y-m-d';
|
|
32
|
+
const tryFormat = (value) => {
|
|
33
|
+
if (!value || !(value instanceof Date) || isNaN(value.getTime()))
|
|
34
|
+
return null;
|
|
35
|
+
return flatpickr.formatDate(value, formatToken);
|
|
36
|
+
};
|
|
37
|
+
const parsedWithFormat = format ? flatpickr.parseDate(dateString, format) : null;
|
|
38
|
+
if (parsedWithFormat) {
|
|
39
|
+
const formatted = tryFormat(parsedWithFormat);
|
|
40
|
+
if (formatted)
|
|
41
|
+
return formatted;
|
|
42
|
+
}
|
|
30
43
|
const dateMatch = dateString.match(/(\d{1,2})\s+(\w{3})\s+(\d{4})/i);
|
|
31
44
|
if (dateMatch) {
|
|
32
45
|
const [, day, month, year] = dateMatch;
|
|
33
46
|
const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
|
34
47
|
const monthIndex = monthNames.findIndex((m) => m.toLowerCase() === month.substring(0, 3).toLowerCase());
|
|
35
48
|
if (monthIndex !== -1) {
|
|
36
|
-
const parsedDate = new Date(parseInt(year), monthIndex, parseInt(day));
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
49
|
+
const parsedDate = new Date(parseInt(year, 10), monthIndex, parseInt(day, 10));
|
|
50
|
+
const formatted = tryFormat(parsedDate);
|
|
51
|
+
if (formatted)
|
|
52
|
+
return formatted;
|
|
40
53
|
}
|
|
41
54
|
}
|
|
42
55
|
const parsedDate = new Date(dateString);
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
46
|
-
return dateString;
|
|
56
|
+
const formatted = tryFormat(parsedDate);
|
|
57
|
+
return formatted || dateString;
|
|
47
58
|
}, []);
|
|
48
59
|
//! Transform initial values to handle date fields
|
|
49
60
|
const getInitialValues = useCallback(() => {
|
|
50
61
|
if (!user)
|
|
51
62
|
return {};
|
|
52
63
|
const initialValues = { ...user };
|
|
53
|
-
const
|
|
54
|
-
if (
|
|
55
|
-
|
|
64
|
+
const dateOfBirthField = formFields.find((field) => field.fieldType === 'date' && field.labelProps?.name === 'date_of_birth');
|
|
65
|
+
if (dateOfBirthField && initialValues.date_of_birth) {
|
|
66
|
+
const fieldFormat = dateOfBirthField.fieldProps?.dateFormat;
|
|
67
|
+
initialValues.date_of_birth = normalizeDateString(initialValues.date_of_birth, fieldFormat);
|
|
56
68
|
}
|
|
57
69
|
return initialValues;
|
|
58
|
-
}, [user, formFields,
|
|
70
|
+
}, [user, formFields, normalizeDateString]);
|
|
59
71
|
return (user && (React.createElement(AccountInfoStyle, { className: `account-info` },
|
|
60
72
|
React.createElement(Text, { text: `account.account_info.accountInformation`, className: `account-p account-p1 account-font-bold account-primary-color1` }),
|
|
61
73
|
!edit ? (React.createElement(React.Fragment, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/account/AccountSettingsTemplate/AccountInfo/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,gBAAgB,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAElE,MAAM,WAAW,GAAG,CAAC,EACpB,IAAI,EACJ,eAAe,EACf,aAAa,GAAG,oBAAoB,EACpC,UAAU,GAAG,iBAAiB,GAC9B,EAAE,EAAE;IACJ,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,EAAE,CAAC;IAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE,CAAC;IAEvC,SAAS;IACT,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExC,gBAAgB;IAChB,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC3C,SAAS,CACR,oBAAC,sBAAsB,IACtB,KAAK,EAAE,qDAAqD,EAC5D,WAAW,EAAE,2DAA2D,GACvE,EACF;YACC,SAAS,EAAE,cAAc;SACzB,CACD,CAAC;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,aAAa;IACb,MAAM,QAAQ,GAAG,WAAW,CAC3B,CAAC,MAAM,EAAE,EAAE;QACV,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACxC,OAAO,CAAC,KAAK,CAAC,CAAC;YACf,kBAAkB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACJ,CAAC,EACD,CAAC,eAAe,EAAE,kBAAkB,CAAC,CACrC,CAAC;IAEF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/account/AccountSettingsTemplate/AccountInfo/index.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@weareconceptstudio/account",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.4",
|
|
4
4
|
"description": "Concept Studio Account",
|
|
5
5
|
"author": "Concept Studio",
|
|
6
6
|
"license": "ISC",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"peerDependencies": {
|
|
24
24
|
"@weareconceptstudio/cart": "^0.0.3",
|
|
25
25
|
"@weareconceptstudio/core": "^0.4.7",
|
|
26
|
-
"@weareconceptstudio/form": "^0.5.
|
|
26
|
+
"@weareconceptstudio/form": "^0.5.1",
|
|
27
27
|
"classnames": "2.5.1",
|
|
28
28
|
"react": "^18.0.0 || ^19.0.0",
|
|
29
29
|
"react-dom": "^18.0.0 || ^19.0.0",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@weareconceptstudio/cart": "^0.0.3",
|
|
39
39
|
"@weareconceptstudio/core": "^0.4.7",
|
|
40
|
-
"@weareconceptstudio/form": "^0.5.
|
|
40
|
+
"@weareconceptstudio/form": "^0.5.1",
|
|
41
41
|
"rimraf": "6.0.1",
|
|
42
42
|
"typescript": "5.3.3",
|
|
43
43
|
"zustand": "^5.0.2"
|