@multiplatform.one/backoffice 7.42.0 → 7.44.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/dist/cjs/chrome/user-session.cjs +2 -3
- package/dist/cjs/chrome/user-session.native.js +8 -4
- package/dist/cjs/chrome/user-session.native.js.map +1 -1
- package/dist/esm/chrome/user-session.mjs +2 -3
- package/dist/esm/chrome/user-session.mjs.map +1 -1
- package/dist/esm/chrome/user-session.native.js +8 -4
- package/dist/esm/chrome/user-session.native.js.map +1 -1
- package/dist/jsx/chrome/user-session.mjs +2 -3
- package/dist/jsx/chrome/user-session.mjs.map +1 -1
- package/dist/jsx/chrome/user-session.native.js +8 -4
- package/dist/jsx/chrome/user-session.native.js.map +1 -1
- package/package.json +12 -12
- package/src/chrome/UserMenu.screen.spec.tsx +27 -0
- package/src/chrome/user-session.tsx +12 -6
- package/src/report/queryReportFilterBar.spec.tsx +1 -1
- package/src/shared/sessionUser.spec.tsx +32 -0
- package/types/chrome/user-session.d.ts.map +1 -1
|
@@ -49,12 +49,11 @@ async function fetchSessionUserInfo(app, config) {
|
|
|
49
49
|
fullName: user
|
|
50
50
|
};
|
|
51
51
|
if (!user) throw new Error("No session user");
|
|
52
|
-
const
|
|
52
|
+
const bits = await app.call().get("frappe.client.get_value", {
|
|
53
53
|
doctype: "User",
|
|
54
54
|
filters: user,
|
|
55
55
|
fieldname: ["full_name", "user_image", "email"]
|
|
56
|
-
});
|
|
57
|
-
const bits = res.payload?.message ?? {};
|
|
56
|
+
}).then(res => res.payload?.message ?? {}).catch(() => ({}));
|
|
58
57
|
return {
|
|
59
58
|
user,
|
|
60
59
|
fullName: bits.full_name || user,
|
|
@@ -56,8 +56,7 @@ function resolveUserImageUrl(userImage, baseURL) {
|
|
|
56
56
|
return `${baseURL.replace(/\/+$/, "")}${userImage.startsWith("/") ? "" : "/"}${userImage}`;
|
|
57
57
|
}
|
|
58
58
|
async function fetchSessionUserInfo(app, config) {
|
|
59
|
-
var _config_baseURL
|
|
60
|
-
var _res_payload;
|
|
59
|
+
var _config_baseURL;
|
|
61
60
|
var user = await (0, import_sessionUser.loadSessionUser)(config);
|
|
62
61
|
var baseURL = (_config_baseURL = config.baseURL) !== null && _config_baseURL !== void 0 ? _config_baseURL : "";
|
|
63
62
|
if (user === "Guest") return {
|
|
@@ -65,12 +64,17 @@ async function fetchSessionUserInfo(app, config) {
|
|
|
65
64
|
fullName: user
|
|
66
65
|
};
|
|
67
66
|
if (!user) throw new Error("No session user");
|
|
68
|
-
var
|
|
67
|
+
var bits = await app.call().get("frappe.client.get_value", {
|
|
69
68
|
doctype: "User",
|
|
70
69
|
filters: user,
|
|
71
70
|
fieldname: ["full_name", "user_image", "email"]
|
|
71
|
+
}).then(function (res) {
|
|
72
|
+
var _ref;
|
|
73
|
+
var _res_payload;
|
|
74
|
+
return (_ref = (_res_payload = res.payload) === null || _res_payload === void 0 ? void 0 : _res_payload.message) !== null && _ref !== void 0 ? _ref : {};
|
|
75
|
+
}).catch(function () {
|
|
76
|
+
return {};
|
|
72
77
|
});
|
|
73
|
-
var bits = (_ref = (_res_payload = res.payload) === null || _res_payload === void 0 ? void 0 : _res_payload.message) !== null && _ref !== void 0 ? _ref : {};
|
|
74
78
|
return {
|
|
75
79
|
user,
|
|
76
80
|
fullName: bits.full_name || user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["to","__toESM","mod","isNodeMode","target","__create","__getProtoOf","__copyProps","__esModule","__defProp","value","enumerable","__toCommonJS","user_session_exports","__export","clearSessionUserCache","resolveUserImageUrl","useSessionUserInfo","module","exports","import_react","require","import_frappe_ui","import_react2","import_sessionUser","import_useFrappeApp","sessionCache","Map","clear","clearSessionIdentityCache","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","_config_baseURL","
|
|
1
|
+
{"version":3,"names":["to","__toESM","mod","isNodeMode","target","__create","__getProtoOf","__copyProps","__esModule","__defProp","value","enumerable","__toCommonJS","user_session_exports","__export","clearSessionUserCache","resolveUserImageUrl","useSessionUserInfo","module","exports","import_react","require","import_frappe_ui","import_react2","import_sessionUser","import_useFrappeApp","sessionCache","Map","clear","clearSessionIdentityCache","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","_config_baseURL","user","loadSessionUser","fullName","Error","bits","call","get","doctype","filters","fieldname","then","res","_ref","_res_payload","payload","message","catch","full_name","email","includes","imageUrl","user_image","useFrappeApp","useFrappeConfig","revision","useSessionRevision","key","sessionUserKey","info","setInfo","useState","loading","setLoading","error","setError","useEffect","fixtures","cancelled"],"sources":["../../../src/chrome/user-session.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -20,12 +20,11 @@ async function fetchSessionUserInfo(app, config) {
|
|
|
20
20
|
fullName: user
|
|
21
21
|
};
|
|
22
22
|
if (!user) throw new Error("No session user");
|
|
23
|
-
const
|
|
23
|
+
const bits = await app.call().get("frappe.client.get_value", {
|
|
24
24
|
doctype: "User",
|
|
25
25
|
filters: user,
|
|
26
26
|
fieldname: ["full_name", "user_image", "email"]
|
|
27
|
-
});
|
|
28
|
-
const bits = res.payload?.message ?? {};
|
|
27
|
+
}).then(res => res.payload?.message ?? {}).catch(() => ({}));
|
|
29
28
|
return {
|
|
30
29
|
user,
|
|
31
30
|
fullName: bits.full_name || user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useFrappeConfig","useEffect","useMemo","useState","clearSessionIdentityCache","loadSessionUser","sessionUserKey","useSessionRevision","useFrappeApp","sessionCache","Map","clearSessionUserCache","clear","resolveUserImageUrl","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","user","fullName","Error","
|
|
1
|
+
{"version":3,"names":["useFrappeConfig","useEffect","useMemo","useState","clearSessionIdentityCache","loadSessionUser","sessionUserKey","useSessionRevision","useFrappeApp","sessionCache","Map","clearSessionUserCache","clear","resolveUserImageUrl","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","user","fullName","Error","bits","call","get","doctype","filters","fieldname","then","res","payload","message","catch","full_name","email","includes","imageUrl","user_image","useSessionUserInfo","revision","key","info","setInfo","loading","setLoading","error","setError","fixtures","cancelled","promise","set","delete","value","err"],"sources":["../../../src/chrome/user-session.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -14,8 +14,7 @@ function resolveUserImageUrl(userImage, baseURL) {
|
|
|
14
14
|
return `${baseURL.replace(/\/+$/, "")}${userImage.startsWith("/") ? "" : "/"}${userImage}`;
|
|
15
15
|
}
|
|
16
16
|
async function fetchSessionUserInfo(app, config) {
|
|
17
|
-
var _config_baseURL
|
|
18
|
-
var _res_payload;
|
|
17
|
+
var _config_baseURL;
|
|
19
18
|
var user = await loadSessionUser(config);
|
|
20
19
|
var baseURL = (_config_baseURL = config.baseURL) !== null && _config_baseURL !== void 0 ? _config_baseURL : "";
|
|
21
20
|
if (user === "Guest") return {
|
|
@@ -23,12 +22,17 @@ async function fetchSessionUserInfo(app, config) {
|
|
|
23
22
|
fullName: user
|
|
24
23
|
};
|
|
25
24
|
if (!user) throw new Error("No session user");
|
|
26
|
-
var
|
|
25
|
+
var bits = await app.call().get("frappe.client.get_value", {
|
|
27
26
|
doctype: "User",
|
|
28
27
|
filters: user,
|
|
29
28
|
fieldname: ["full_name", "user_image", "email"]
|
|
29
|
+
}).then(function (res) {
|
|
30
|
+
var _ref;
|
|
31
|
+
var _res_payload;
|
|
32
|
+
return (_ref = (_res_payload = res.payload) === null || _res_payload === void 0 ? void 0 : _res_payload.message) !== null && _ref !== void 0 ? _ref : {};
|
|
33
|
+
}).catch(function () {
|
|
34
|
+
return {};
|
|
30
35
|
});
|
|
31
|
-
var bits = (_ref = (_res_payload = res.payload) === null || _res_payload === void 0 ? void 0 : _res_payload.message) !== null && _ref !== void 0 ? _ref : {};
|
|
32
36
|
return {
|
|
33
37
|
user,
|
|
34
38
|
fullName: bits.full_name || user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useFrappeConfig","useEffect","useMemo","useState","clearSessionIdentityCache","loadSessionUser","sessionUserKey","useSessionRevision","useFrappeApp","sessionCache","Map","clearSessionUserCache","clear","resolveUserImageUrl","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","_config_baseURL","
|
|
1
|
+
{"version":3,"names":["React","useFrappeConfig","useEffect","useMemo","useState","clearSessionIdentityCache","loadSessionUser","sessionUserKey","useSessionRevision","useFrappeApp","sessionCache","Map","clearSessionUserCache","clear","resolveUserImageUrl","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","_config_baseURL","user","fullName","Error","bits","call","get","doctype","filters","fieldname","then","res","_ref","_res_payload","payload","message","catch","full_name","email","includes","imageUrl","user_image","useSessionUserInfo","revision","key","info","setInfo","loading","setLoading","error","setError","fixtures","cancelled","promise","set","delete","value","err"],"sources":["../../../src/chrome/user-session.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -20,12 +20,11 @@ async function fetchSessionUserInfo(app, config) {
|
|
|
20
20
|
fullName: user
|
|
21
21
|
};
|
|
22
22
|
if (!user) throw new Error("No session user");
|
|
23
|
-
const
|
|
23
|
+
const bits = await app.call().get("frappe.client.get_value", {
|
|
24
24
|
doctype: "User",
|
|
25
25
|
filters: user,
|
|
26
26
|
fieldname: ["full_name", "user_image", "email"]
|
|
27
|
-
});
|
|
28
|
-
const bits = res.payload?.message ?? {};
|
|
27
|
+
}).then(res => res.payload?.message ?? {}).catch(() => ({}));
|
|
29
28
|
return {
|
|
30
29
|
user,
|
|
31
30
|
fullName: bits.full_name || user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useFrappeConfig","useEffect","useMemo","useState","clearSessionIdentityCache","loadSessionUser","sessionUserKey","useSessionRevision","useFrappeApp","sessionCache","Map","clearSessionUserCache","clear","resolveUserImageUrl","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","user","fullName","Error","
|
|
1
|
+
{"version":3,"names":["useFrappeConfig","useEffect","useMemo","useState","clearSessionIdentityCache","loadSessionUser","sessionUserKey","useSessionRevision","useFrappeApp","sessionCache","Map","clearSessionUserCache","clear","resolveUserImageUrl","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","user","fullName","Error","bits","call","get","doctype","filters","fieldname","then","res","payload","message","catch","full_name","email","includes","imageUrl","user_image","useSessionUserInfo","revision","key","info","setInfo","loading","setLoading","error","setError","fixtures","cancelled","promise","set","delete","value","err"],"sources":["../../../src/chrome/user-session.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -56,8 +56,7 @@ function resolveUserImageUrl(userImage, baseURL) {
|
|
|
56
56
|
return `${baseURL.replace(/\/+$/, "")}${userImage.startsWith("/") ? "" : "/"}${userImage}`;
|
|
57
57
|
}
|
|
58
58
|
async function fetchSessionUserInfo(app, config) {
|
|
59
|
-
var _config_baseURL
|
|
60
|
-
var _res_payload;
|
|
59
|
+
var _config_baseURL;
|
|
61
60
|
var user = await (0, import_sessionUser.loadSessionUser)(config);
|
|
62
61
|
var baseURL = (_config_baseURL = config.baseURL) !== null && _config_baseURL !== void 0 ? _config_baseURL : "";
|
|
63
62
|
if (user === "Guest") return {
|
|
@@ -65,12 +64,17 @@ async function fetchSessionUserInfo(app, config) {
|
|
|
65
64
|
fullName: user
|
|
66
65
|
};
|
|
67
66
|
if (!user) throw new Error("No session user");
|
|
68
|
-
var
|
|
67
|
+
var bits = await app.call().get("frappe.client.get_value", {
|
|
69
68
|
doctype: "User",
|
|
70
69
|
filters: user,
|
|
71
70
|
fieldname: ["full_name", "user_image", "email"]
|
|
71
|
+
}).then(function (res) {
|
|
72
|
+
var _ref;
|
|
73
|
+
var _res_payload;
|
|
74
|
+
return (_ref = (_res_payload = res.payload) === null || _res_payload === void 0 ? void 0 : _res_payload.message) !== null && _ref !== void 0 ? _ref : {};
|
|
75
|
+
}).catch(function () {
|
|
76
|
+
return {};
|
|
72
77
|
});
|
|
73
|
-
var bits = (_ref = (_res_payload = res.payload) === null || _res_payload === void 0 ? void 0 : _res_payload.message) !== null && _ref !== void 0 ? _ref : {};
|
|
74
78
|
return {
|
|
75
79
|
user,
|
|
76
80
|
fullName: bits.full_name || user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","user_session_exports","clearSessionUserCache","resolveUserImageUrl","useSessionUserInfo","module","exports","import_react","require","import_frappe_ui","import_react2","import_sessionUser","import_useFrappeApp","sessionCache","Map","clear","clearSessionIdentityCache","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","_config_baseURL","
|
|
1
|
+
{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","user_session_exports","clearSessionUserCache","resolveUserImageUrl","useSessionUserInfo","module","exports","import_react","require","import_frappe_ui","import_react2","import_sessionUser","import_useFrappeApp","sessionCache","Map","clear","clearSessionIdentityCache","userImage","baseURL","test","replace","startsWith","fetchSessionUserInfo","app","config","_config_baseURL","user","loadSessionUser","fullName","Error","bits","doctype","filters","fieldname","then","res","_ref","_res_payload","payload","message","catch","full_name"],"sources":["../../../src/chrome/user-session.tsx"],"sourcesContent":[null],"mappings":"AASA,YAAS;;AACT,IAAAA,QAAS,GAAAC,MAAW,CAAAC,MAAA;AACpB,IAAAC,SAAA,GAAAF,MAAA,CAAAG,cAAA;AAAA,IACEC,gBAAA,GAAAJ,MAAA,CAAAK,wBAAA;AAAA,IACAC,iBAAA,GAAAN,MAAA,CAAAO,mBAAA;AAAA,IACAC,YAAA,GAAAR,MAAA,CAAAS,cAAA;AAAA,IACAC,YAAA,GAAAV,MAAA,CAAAW,SAAA,CAAAC,cAAA;AAAA,IAAAC,QACK,GAAAA,CAAAC,MAAA,EAAAC,GAAA;EACP,SAASC,IAAA,IAAAD,GAAA,EAiBTb,SAAM,CAAAY,MAAA,EAAeE,IAAA;IAAAC,GAAA,EAAAF,GAAA,CAAAC,IAAI;IAAsCE,UAAA;EAAA;AAGxD;AACL,IAAAC,WAAa,GAAAA,CAAAC,EAAM,EAAAC,IAAA,EAAAC,MAAA,EAAAC,IAAA;EACnB,IAAAF,IAAA,WAAAA,IAAA,KAA0B,mBAAAA,IAAA;IAC5B,SAAAG,GAAA,IAAAlB,iBAAA,CAAAe,IAAA,GAGO,IAAS,CAAAX,YAAA,CAAAe,IAAA,CACdL,EAAA,EAAAI,GAAA,KACAA,GAAA,KACoBF,MAAA,EACfpB,SAAW,CAAAkB,EAAA,EAAAI,GAAO;MAAAP,GAAA,EAAAA,CAAA,KAAAI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAnB,gBAAA,CAAAiB,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;EAEvB;EACA,OAAOE,EAAA;AACT;AAEA,IAAAM,OAAA,GAAAA,CAAeC,GAAA,EAAAC,UAAA,EAAAd,MACb,MACAA,MAC0B,GAAAa,GAAA,WAAA5B,QAAA,CAAAS,YAAA,CAAAmB,GAAA,SAAAR,WAAA;AAC1B;AACA;AACA;AACA;AAMAS,UAAM,IAAO,CAAAD,GAAA,IAAM,CAChBA,GAAA,CAAAE,UAC+B,GAAA3B,SAAA,CAAAY,MAAA,WAA2B;EAAAgB,KAAA,EAAAH,GAAA;EAAAT,UAAA;AAAA,KAAAJ,MAAA,EAAAa,GAChD;AACA,IACTI,YAAY,GAAAJ,GAAA,IAAAR,WAAa,CAAAjB,SAAc,CAAO;EAAA4B,KAAA;AAAA,IAAAH,GAAA;AAAA,IAC/CK,oBACkB;AAErBnB,QAAA,CAAOmB,oBAAA;EAAAC,qBACL,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,mBACe,EAAAA,CAAA,KAAAA,mBAAa;EAAAC,kBAChB,EAAAA,CAAA,KAAUA;AAA4B;AACIC,MACxD,CAAAC,OAAA,GAAAN,YAAA,CAAAC,oBAAA;AACF,IAAAM,YAAA,GAAAZ,OAAA,CAAAa,OAAA;AAGO,IAAAC,gBAAS,GAAAD,OAId;AACA,IAAAE,aAAY,GAAAF,OAAa;AACzB,IAAAG,kBAAe,GAAAH,OAAA,CAAgB;AAC/B,IAAAI,mBAAiB,GAAAJ,OAAA,mCAAmB;AACpC,IAAAK,YAAY,kBAAS,IAAeC,GAAA,EAAM;AAC1C,SAAOZ,qBAAiBA,CAAA;EACxBW,YAAO,CAAAE,KAAS;EAChB,IAAAJ,kBAAsB,CAAAK,yBAAyC;AAE/D;AACE,SAAKb,mBAAkBA,CAAAc,SAAO,EAAAC,OAAU;EACtC,KAAAD,SAAQ,SAAS;EACjB,0BAAgB,CAAAE,IAAA,CAAAF,SAAA,UAAAA,SAAA;EAChB,UAAAC,OAAA,CAAAE,OAAA,eAAAH,SAAA,CAAAI,UAAA,mBAAAJ,SAAA;AAAA;AAEF,eAAIK,oBAAYA,CAAAC,GAAA,EAAAC,MAAA;EAChB,IAAAC,eAAc;EACd,IAAAC,IAAK,SAAS,IAAAf,kBAAA,CAAAgB,eAAA,EAAAH,MAAA;EACZ,IAAAN,OAAA,GAAU,CAAAO,eAAA,GAAAD,MAAqB,CAAKN,OAAM,cAAAO,eAAA,cAAAA,eAAA;EAC1C,IAAAC,IAAA,YAAa,EAAI,OAAK;IACtBA,IAAA;IACEE,QAAI,EAAAF;EAA0D;EAC/D,IACH,CAAAA,IAAA,YAAAG,KAAA;EACA,IAAAC,IAAA,GAAQ,MAASP,GAAA,CAAA7B,IAAA,GAAAR,GAAA;IACjB6C,OAAA,QAAe;IACfC,OAAA,EAASN,IAAA;IACTO,SACG,GACC,WAAI,EACJ,YAAQ,EACR;EAGA,GAAAC,IAAA,CAAI,UAAAC,GAAW;IACf,IAAAC,IAAA;IACA,IAAAC,YAAW;IACb,OAAC,CAAAD,IAAA,IAAAC,YAAA,GAAAF,GAAA,CAAAG,OAAA,cAAAD,YAAA,uBAAAA,YAAA,CAAAE,OAAA,cAAAH,IAAA,cAAAA,IAAA;EACH,GAAAI,KAAA,CAAO,YAAM;IACX;EAAY,EACd;EACF,OAAI;IAEJd,IAAA;IACFE,QAAA,EAAAE,IAAA,CAAAW,SAAA,IAAAf,IAAA","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@multiplatform.one/backoffice",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.44.0",
|
|
4
4
|
"description": "Embeddable Frappe desk recreation (backoffice) for the multiplatform.one stack",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"backoffice",
|
|
@@ -71,21 +71,21 @@
|
|
|
71
71
|
"access": "public"
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@multiplatform.one/components": "^7.
|
|
75
|
-
"@multiplatform.one/forms": "^7.
|
|
76
|
-
"@multiplatform.one/frappe": "^7.
|
|
77
|
-
"@multiplatform.one/frappe-ui": "^7.
|
|
78
|
-
"@multiplatform.one/i18n": "^7.
|
|
79
|
-
"@multiplatform.one/platform": "^7.
|
|
80
|
-
"@multiplatform.one/store": "^7.
|
|
81
|
-
"@multiplatform.one/table": "^7.
|
|
82
|
-
"@multiplatform.one/theme": "^7.
|
|
74
|
+
"@multiplatform.one/components": "^7.44.0",
|
|
75
|
+
"@multiplatform.one/forms": "^7.44.0",
|
|
76
|
+
"@multiplatform.one/frappe": "^7.44.0",
|
|
77
|
+
"@multiplatform.one/frappe-ui": "^7.44.0",
|
|
78
|
+
"@multiplatform.one/i18n": "^7.44.0",
|
|
79
|
+
"@multiplatform.one/platform": "^7.44.0",
|
|
80
|
+
"@multiplatform.one/store": "^7.44.0",
|
|
81
|
+
"@multiplatform.one/table": "^7.44.0",
|
|
82
|
+
"@multiplatform.one/theme": "^7.44.0",
|
|
83
83
|
"@phosphor-icons/react": "^2.1.10",
|
|
84
84
|
"tamagui": "2.7.6"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
|
-
"@multiplatform.one/config": "7.
|
|
88
|
-
"@multiplatform.one/test-utils": "7.
|
|
87
|
+
"@multiplatform.one/config": "7.44.0",
|
|
88
|
+
"@multiplatform.one/test-utils": "7.44.0",
|
|
89
89
|
"@tamagui/build": "2.7.6",
|
|
90
90
|
"@testing-library/react": "^16.3.3",
|
|
91
91
|
"@types/react-dom": "^19.2.3",
|
|
@@ -9,6 +9,7 @@ import { UserMenu } from "./UserMenu";
|
|
|
9
9
|
|
|
10
10
|
let host = 0;
|
|
11
11
|
let loggedUser: string | null = "jane@example.com";
|
|
12
|
+
let userReadStatus = 200;
|
|
12
13
|
let calls: string[] = [];
|
|
13
14
|
|
|
14
15
|
function json(body: unknown, status = 200) {
|
|
@@ -22,6 +23,7 @@ beforeEach(() => {
|
|
|
22
23
|
host += 1;
|
|
23
24
|
calls = [];
|
|
24
25
|
loggedUser = "jane@example.com";
|
|
26
|
+
userReadStatus = 200;
|
|
25
27
|
vi.stubGlobal("fetch", async (input: string | URL | Request) => {
|
|
26
28
|
const url = new URL(String(input instanceof Request ? input.url : input));
|
|
27
29
|
calls.push(url.pathname);
|
|
@@ -29,6 +31,7 @@ beforeEach(() => {
|
|
|
29
31
|
return loggedUser ? json({ message: loggedUser }) : json({ exc_type: "Forbidden" }, 403);
|
|
30
32
|
}
|
|
31
33
|
if (url.pathname === "/api/method/frappe.client.get_value") {
|
|
34
|
+
if (userReadStatus !== 200) return json({ exc_type: "PermissionError" }, userReadStatus);
|
|
32
35
|
return json({
|
|
33
36
|
message: {
|
|
34
37
|
full_name: "Jane Cooper",
|
|
@@ -141,6 +144,30 @@ describe("UserMenu", () => {
|
|
|
141
144
|
expect(screen.queryByText("Jane Cooper")).toBeNull();
|
|
142
145
|
});
|
|
143
146
|
|
|
147
|
+
// frappe's client.get_value checks doctype-level read, which User grants to
|
|
148
|
+
// System Manager only: a Keycloak-provisioned Website User (FZ-7755) or a
|
|
149
|
+
// desk user without that role is refused their own User record.
|
|
150
|
+
it("keeps a signed-in user whose User record the bench refuses in the menu", async () => {
|
|
151
|
+
userReadStatus = 403;
|
|
152
|
+
renderMenu();
|
|
153
|
+
expect(await screen.findByRole("button", { name: "User menu" })).toBeTruthy();
|
|
154
|
+
expect(screen.queryByRole("button", { name: "Log in" })).toBeNull();
|
|
155
|
+
expect(screen.getAllByText("jane@example.com").length).toBeGreaterThan(0);
|
|
156
|
+
expect(item("Log Out")).toBeTruthy();
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
it("shows the user menu once the host login returns, even when the User record is refused", async () => {
|
|
160
|
+
loggedUser = "Guest";
|
|
161
|
+
userReadStatus = 403;
|
|
162
|
+
const login = vi.fn(async () => {
|
|
163
|
+
loggedUser = "jane@example.com";
|
|
164
|
+
});
|
|
165
|
+
renderMenu({ auth: { login } });
|
|
166
|
+
fireEvent.click(await screen.findByRole("button", { name: "Log in" }));
|
|
167
|
+
expect(await screen.findByRole("button", { name: "User menu" })).toBeTruthy();
|
|
168
|
+
expect(screen.queryByRole("button", { name: "Log in" })).toBeNull();
|
|
169
|
+
});
|
|
170
|
+
|
|
144
171
|
it("toggles the scheme through the host appearance adapter", async () => {
|
|
145
172
|
const setScheme = vi.fn();
|
|
146
173
|
renderMenu({ appearance: { scheme: "dark", setScheme } });
|
|
@@ -61,12 +61,18 @@ async function fetchSessionUserInfo(
|
|
|
61
61
|
if (!user) throw new Error("No session user");
|
|
62
62
|
// Param format probed against the bench: filters takes the plain docname,
|
|
63
63
|
// fieldname a JSON array (the http client JSON-encodes non-string params).
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
64
|
+
// The profile read is decoration, never identity: frappe grants doctype-level
|
|
65
|
+
// User read to System Manager only, so every other signed-in user (a
|
|
66
|
+
// Keycloak-provisioned Website User included) gets 403 here (FZ-7755).
|
|
67
|
+
const bits = await app
|
|
68
|
+
.call()
|
|
69
|
+
.get<{ message?: UserDocBits }>("frappe.client.get_value", {
|
|
70
|
+
doctype: "User",
|
|
71
|
+
filters: user,
|
|
72
|
+
fieldname: ["full_name", "user_image", "email"],
|
|
73
|
+
})
|
|
74
|
+
.then((res) => res.payload?.message ?? {})
|
|
75
|
+
.catch((): UserDocBits => ({}));
|
|
70
76
|
return {
|
|
71
77
|
user,
|
|
72
78
|
fullName: bits.full_name || user,
|
|
@@ -100,7 +100,7 @@ describe("QueryReportFilterBar", () => {
|
|
|
100
100
|
const clear = screen.getByTestId("query-report-clear-owner");
|
|
101
101
|
expect(clear.getAttribute("tabindex")).toBe("-1");
|
|
102
102
|
const field = screen.getByRole("textbox", { name: /owner/i });
|
|
103
|
-
const box = field.closest("
|
|
103
|
+
const box = field.closest("[data-mp-input-box]");
|
|
104
104
|
expect(box).toBeTruthy();
|
|
105
105
|
expect(box?.contains(clear)).toBe(true);
|
|
106
106
|
});
|
|
@@ -13,6 +13,7 @@ import { useSessionUserId } from "./useSessionUserId";
|
|
|
13
13
|
let run = 0;
|
|
14
14
|
let reads = 0;
|
|
15
15
|
let status = 200;
|
|
16
|
+
let userReadStatus = 200;
|
|
16
17
|
function Consumers() {
|
|
17
18
|
const workspaces = useWorkspaces();
|
|
18
19
|
const { info, loading } = useSessionUserInfo();
|
|
@@ -39,6 +40,7 @@ beforeEach(() => {
|
|
|
39
40
|
run += 1;
|
|
40
41
|
reads = 0;
|
|
41
42
|
status = 200;
|
|
43
|
+
userReadStatus = 200;
|
|
42
44
|
vi.stubGlobal("fetch", async (input: string | URL | Request) => {
|
|
43
45
|
const url = new URL(String(input instanceof Request ? input.url : input));
|
|
44
46
|
let body: unknown = { data: [], message: {} };
|
|
@@ -50,6 +52,12 @@ beforeEach(() => {
|
|
|
50
52
|
headers: { "content-type": "application/json" },
|
|
51
53
|
});
|
|
52
54
|
}
|
|
55
|
+
if (url.pathname.endsWith("frappe.client.get_value") && userReadStatus !== 200) {
|
|
56
|
+
return new Response(JSON.stringify({ exc_type: "PermissionError" }), {
|
|
57
|
+
status: userReadStatus,
|
|
58
|
+
headers: { "content-type": "application/json" },
|
|
59
|
+
});
|
|
60
|
+
}
|
|
53
61
|
return new Response(JSON.stringify(body), { headers: { "content-type": "application/json" } });
|
|
54
62
|
});
|
|
55
63
|
});
|
|
@@ -117,3 +125,27 @@ it("updates mounted consumers when session caches are cleared", async () => {
|
|
|
117
125
|
expect(screen.getByTestId("session").textContent).not.toContain("reader@example.test"),
|
|
118
126
|
);
|
|
119
127
|
});
|
|
128
|
+
|
|
129
|
+
// The auth return (FZ-7755): the host clears session caches when the
|
|
130
|
+
// Keycloak session lands, and every mounted consumer must name the new user,
|
|
131
|
+
// including the header's profile read, which a Website User or a desk user
|
|
132
|
+
// without System Manager is refused (403 on frappe.client.get_value User).
|
|
133
|
+
it("names the signed-in user in every consumer after the auth return, User read refused", async () => {
|
|
134
|
+
status = 403;
|
|
135
|
+
userReadStatus = 403;
|
|
136
|
+
renderWithProviders(<Tree />);
|
|
137
|
+
await waitFor(() =>
|
|
138
|
+
expect(screen.getByTestId("session").textContent).toContain('"loading":false'),
|
|
139
|
+
);
|
|
140
|
+
expect(screen.getByTestId("session").textContent).not.toContain("reader@example.test");
|
|
141
|
+
status = 200;
|
|
142
|
+
act(() => clearSessionUserCache());
|
|
143
|
+
await waitFor(() =>
|
|
144
|
+
expect(JSON.parse(screen.getByTestId("session").textContent ?? "{}")).toMatchObject({
|
|
145
|
+
workspace: "reader@example.test",
|
|
146
|
+
user: "reader@example.test",
|
|
147
|
+
id: "reader@example.test",
|
|
148
|
+
loading: false,
|
|
149
|
+
}),
|
|
150
|
+
);
|
|
151
|
+
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-session.d.ts","sourceRoot":"","sources":["../../src/chrome/user-session.tsx"],"names":[],"mappings":"AAmBA,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAUD,4EAA4E;AAC5E,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED,+EAA+E;AAC/E,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,SAAS,CAKpB;
|
|
1
|
+
{"version":3,"file":"user-session.d.ts","sourceRoot":"","sources":["../../src/chrome/user-session.tsx"],"names":[],"mappings":"AAmBA,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAUD,4EAA4E;AAC5E,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED,+EAA+E;AAC/E,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,SAAS,CAKpB;AAgCD,0EAA0E;AAC1E,wBAAgB,kBAAkB,IAAI;IACpC,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CA4CA"}
|