@deix/rossini-core 2.1.3 → 2.1.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.
- package/lib/components/i18n/Link.d.ts.map +1 -1
- package/lib/components/i18n/Link.js +7 -2
- package/lib/components/layout/components/Sidebar/Sidebar.d.ts.map +1 -1
- package/lib/components/layout/components/Sidebar/Sidebar.js +2 -7
- package/lib/components/provider/UserInfoProvider.d.ts.map +1 -1
- package/lib/components/provider/UserInfoProvider.js +0 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/components/i18n/Link.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,MAAM,WAAW,SACf,SAAQ,IAAI,CAAC,cAAc,CAAC,OAAO,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,IAAI,oCAAqC,SAAS,
|
|
1
|
+
{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/components/i18n/Link.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,MAAM,WAAW,SACf,SAAQ,IAAI,CAAC,cAAc,CAAC,OAAO,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,IAAI,oCAAqC,SAAS,sBAiBvD,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -7,11 +7,16 @@ const Link = ({ locale, href, ...otherProps }) => {
|
|
|
7
7
|
const targetLocale = locale || currentLocale;
|
|
8
8
|
let localizedHref;
|
|
9
9
|
if (typeof href === 'string') {
|
|
10
|
-
|
|
10
|
+
if (href.startsWith('/')) {
|
|
11
|
+
localizedHref = `/${targetLocale}${href}`;
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
localizedHref = href;
|
|
15
|
+
}
|
|
11
16
|
}
|
|
12
17
|
else {
|
|
13
18
|
localizedHref = { ...href };
|
|
14
|
-
if (href.pathname) {
|
|
19
|
+
if (href.pathname && href.pathname.startsWith('/')) {
|
|
15
20
|
localizedHref.pathname = `/${targetLocale}${href.pathname}`;
|
|
16
21
|
}
|
|
17
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sidebar.d.ts","sourceRoot":"","sources":["../../../../../src/components/layout/components/Sidebar/Sidebar.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,YAAY,EAAY,MAAM,OAAO,CAAC;AAsBtD,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAEL,MAAM,EACN,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAIrC,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAAC;IAClC;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC;IAC9C;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AACD,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"Sidebar.d.ts","sourceRoot":"","sources":["../../../../../src/components/layout/components/Sidebar/Sidebar.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,YAAY,EAAY,MAAM,OAAO,CAAC;AAsBtD,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAEL,MAAM,EACN,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAIrC,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAAC;IAClC;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC;IAC9C;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AACD,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CA8YnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -56,11 +56,6 @@ const Sidebar = ({ links, open, isMobile, logo, onClose, }) => {
|
|
|
56
56
|
};
|
|
57
57
|
// Function to generate sidebar items. To be called recursively
|
|
58
58
|
const handler = (links, options) => {
|
|
59
|
-
links.forEach((link) => {
|
|
60
|
-
console.log(!link.allowedGroups ||
|
|
61
|
-
link.allowedGroups.length < 1 ||
|
|
62
|
-
userInfo?.groups?.some((g) => link.allowedGroups?.includes(g)));
|
|
63
|
-
});
|
|
64
59
|
if (open) {
|
|
65
60
|
// Render all items with their labels
|
|
66
61
|
return links
|
|
@@ -74,7 +69,7 @@ const Sidebar = ({ links, open, isMobile, logo, onClose, }) => {
|
|
|
74
69
|
})
|
|
75
70
|
.filter(isLinkVisible)
|
|
76
71
|
.map((link) => {
|
|
77
|
-
const selected = pathname.startsWith(
|
|
72
|
+
const selected = !link.subPages && pathname.startsWith(link.path);
|
|
78
73
|
if (!link.subPages) {
|
|
79
74
|
// Open menu, no subPages
|
|
80
75
|
return (React.createElement(Link, { key: link.id, href: { pathname: link.path } },
|
|
@@ -110,7 +105,7 @@ const Sidebar = ({ links, open, isMobile, logo, onClose, }) => {
|
|
|
110
105
|
}
|
|
111
106
|
// open menu, with subPages
|
|
112
107
|
return (React.createElement("div", { key: link.id },
|
|
113
|
-
React.createElement(Link, { href: { pathname: link.path } },
|
|
108
|
+
React.createElement(Link, { href: { pathname: link.subPages[0].path } },
|
|
114
109
|
React.createElement(ListItemButton, { key: link.id, selected: selected, sx: {
|
|
115
110
|
paddingLeft: 3,
|
|
116
111
|
paddingTop: 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserInfoProvider.d.ts","sourceRoot":"","sources":["../../../src/components/provider/UserInfoProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"UserInfoProvider.d.ts","sourceRoot":"","sources":["../../../src/components/provider/UserInfoProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAWD,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,QAAA,MAAM,gBAAgB,wCAInB,qBAAqB,sBAWvB,CAAC;AAEF,eAAO,MAAM,WAAW,4BAAoC,CAAC;AAE7D,eAAe,gBAAgB,CAAC"}
|
|
@@ -4,7 +4,6 @@ import { createContext, useContext } from 'react';
|
|
|
4
4
|
import axios from 'axios';
|
|
5
5
|
const getUserInfo = async (url = '/oauth2/userinfo') => {
|
|
6
6
|
const fetch = axios.get(url).then((result) => {
|
|
7
|
-
console.log('User Info', result.data);
|
|
8
7
|
return result.data;
|
|
9
8
|
});
|
|
10
9
|
return await fetch;
|