@arcblock/ux 2.5.37 → 2.5.39

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 (3) hide show
  1. package/lib/SessionManager/index.js +24 -5
  2. package/package.json +4 -4
  3. package/src/SessionManager/index.jsx +14 -3
package/lib/SessionManager/index.js CHANGED
@@ -92,8 +92,20 @@ const translations = {
92
92
  }
93
93
  };
94
94
 
95
+ const getConnectedAccounts = user => {
96
+ var _user$extraConfigs;
97
+
98
+ return (user === null || user === void 0 ? void 0 : user.connectedAccounts) || (user === null || user === void 0 ? void 0 : (_user$extraConfigs = user.extraConfigs) === null || _user$extraConfigs === void 0 ? void 0 : _user$extraConfigs.connectedAccounts) || [];
99
+ };
100
+
101
+ const getSourceProvider = user => {
102
+ var _user$extraConfigs2;
103
+
104
+ return (user === null || user === void 0 ? void 0 : user.sourceProvider) || (user === null || user === void 0 ? void 0 : (_user$extraConfigs2 = user.extraConfigs) === null || _user$extraConfigs2 === void 0 ? void 0 : _user$extraConfigs2.sourceProvider) || 'wallet';
105
+ };
106
+
95
107
  function SessionManager(_ref) {
96
- var _session$user, _session$user$avatar, _session$user3, _session$user3$extraC, _session$user4, _session$user4$extraC, _session$user5, _session$user5$extraC, _session$user6, _session$user7;
108
+ var _session$user, _session$user$avatar, _session$user3, _session$user4;
97
109
 
98
110
  let {
99
111
  session,
@@ -138,8 +150,8 @@ function SessionManager(_ref) {
138
150
  } = (0, _User.useDid)({
139
151
  session
140
152
  });
141
- const isRawWalletAccount = !((_session$user3 = session.user) !== null && _session$user3 !== void 0 && (_session$user3$extraC = _session$user3.extraConfigs) !== null && _session$user3$extraC !== void 0 && _session$user3$extraC.sourceProvider) || ((_session$user4 = session.user) === null || _session$user4 === void 0 ? void 0 : (_session$user4$extraC = _session$user4.extraConfigs) === null || _session$user4$extraC === void 0 ? void 0 : _session$user4$extraC.sourceProvider) === 'wallet';
142
- const connectedAccounts = ((_session$user5 = session.user) === null || _session$user5 === void 0 ? void 0 : (_session$user5$extraC = _session$user5.extraConfigs) === null || _session$user5$extraC === void 0 ? void 0 : _session$user5$extraC.connectedAccounts) || [];
153
+ const isRawWalletAccount = getSourceProvider(session.user) === 'wallet';
154
+ const connectedAccounts = getConnectedAccounts(session.user);
143
155
  let hasBindWallet = false;
144
156
  let hasBindAccount = false;
145
157
 
@@ -330,8 +342,8 @@ function SessionManager(_ref) {
330
342
  className: "session-manager-user-name",
331
343
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
332
344
  children: session.user.fullName
333
- }), !!showRole && ((currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user6 = session.user) === null || _session$user6 === void 0 ? void 0 : _session$user6.role.toUpperCase())) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
334
- label: (currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user7 = session.user) === null || _session$user7 === void 0 ? void 0 : _session$user7.role.toUpperCase()),
345
+ }), !!showRole && ((currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user3 = session.user) === null || _session$user3 === void 0 ? void 0 : _session$user3.role.toUpperCase())) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
346
+ label: (currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user4 = session.user) === null || _session$user4 === void 0 ? void 0 : _session$user4.role.toUpperCase()),
335
347
  size: "small",
336
348
  variant: "outlined",
337
349
  sx: {
@@ -436,10 +448,17 @@ SessionManager.propTypes = {
436
448
  fullName: _propTypes.default.string,
437
449
  email: _propTypes.default.string,
438
450
  avatar: _propTypes.default.string,
451
+ sourceProvider: _propTypes.default.string,
452
+ connectedAccounts: _propTypes.default.arrayOf(_propTypes.default.shape({
453
+ provider: _propTypes.default.string.isRequired,
454
+ did: _propTypes.default.string.isRequired,
455
+ id: _propTypes.default.string
456
+ })),
439
457
  passports: _propTypes.default.arrayOf(_propTypes.default.shape({
440
458
  name: _propTypes.default.string.isRequired,
441
459
  title: _propTypes.default.string.isRequired
442
460
  })),
461
+ // Deprecated
443
462
  extraConfigs: _propTypes.default.object
444
463
  }),
445
464
  login: _propTypes.default.func.isRequired,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arcblock/ux",
3
- "version": "2.5.37",
3
+ "version": "2.5.39",
4
4
  "description": "Common used react components for arcblock products",
5
5
  "keywords": [
6
6
  "react",
@@ -45,11 +45,11 @@
45
45
  "peerDependencies": {
46
46
  "react": ">=18.1.0"
47
47
  },
48
- "gitHead": "a9b7e67d865d357033de1128887368d35dc1d866",
48
+ "gitHead": "04d1c08b749669f4c109c74459d51df49bf361a0",
49
49
  "dependencies": {
50
50
  "@arcblock/did-motif": "^1.1.10",
51
- "@arcblock/icons": "^2.5.37",
52
- "@arcblock/react-hooks": "^2.5.37",
51
+ "@arcblock/icons": "^2.5.39",
52
+ "@arcblock/react-hooks": "^2.5.39",
53
53
  "@babel/plugin-syntax-dynamic-import": "^7.8.3",
54
54
  "@emotion/react": "^11.10.4",
55
55
  "@emotion/styled": "^11.10.4",
package/src/SessionManager/index.jsx CHANGED
@@ -51,6 +51,9 @@ const translations = {
51
51
  },
52
52
  };
53
53
 
54
+ const getConnectedAccounts = (user) => user?.connectedAccounts || user?.extraConfigs?.connectedAccounts || [];
55
+ const getSourceProvider = (user) => user?.sourceProvider || user?.extraConfigs?.sourceProvider || 'wallet';
56
+
54
57
  function SessionManager({
55
58
  session,
56
59
  locale,
@@ -85,9 +88,8 @@ function SessionManager({
85
88
  const browser = useBrowser();
86
89
  const { walletDid } = useDid({ session });
87
90
 
88
- const isRawWalletAccount =
89
- !session.user?.extraConfigs?.sourceProvider || session.user?.extraConfigs?.sourceProvider === 'wallet';
90
- const connectedAccounts = session.user?.extraConfigs?.connectedAccounts || [];
91
+ const isRawWalletAccount = getSourceProvider(session.user) === 'wallet';
92
+ const connectedAccounts = getConnectedAccounts(session.user);
91
93
  let hasBindWallet = false;
92
94
  let hasBindAccount = false;
93
95
  if (isRawWalletAccount) {
@@ -355,12 +357,21 @@ SessionManager.propTypes = {
355
357
  fullName: PropTypes.string,
356
358
  email: PropTypes.string,
357
359
  avatar: PropTypes.string,
360
+ sourceProvider: PropTypes.string,
361
+ connectedAccounts: PropTypes.arrayOf(
362
+ PropTypes.shape({
363
+ provider: PropTypes.string.isRequired,
364
+ did: PropTypes.string.isRequired,
365
+ id: PropTypes.string,
366
+ })
367
+ ),
358
368
  passports: PropTypes.arrayOf(
359
369
  PropTypes.shape({
360
370
  name: PropTypes.string.isRequired,
361
371
  title: PropTypes.string.isRequired,
362
372
  })
363
373
  ),
374
+ // Deprecated
364
375
  extraConfigs: PropTypes.object,
365
376
  }),
366
377
  login: PropTypes.func.isRequired,