infinity-forge 8.6.0 → 8.6.2
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/system/context/auth/components/private-page/index.js +1 -2
- package/dist/system/context/auth/components/private-page/index.js.map +1 -1
- package/dist/system/context/infra-injection/interfaces.d.ts +1 -0
- package/dist/system/hooks/menu/use-load-menu.js +14 -11
- package/dist/system/hooks/menu/use-load-menu.js.map +1 -1
- package/dist/ui/utils/http/api.js +6 -7
- package/dist/ui/utils/http/api.js.map +1 -1
- package/package.json +1 -1
|
@@ -46,8 +46,7 @@ var context_1 = require("../../context.js");
|
|
|
46
46
|
function PrivatePage(props) {
|
|
47
47
|
var _a, _b, _c, _d;
|
|
48
48
|
var _e = (0, react_1.useState)(false), interceptorIsReady = _e[0], setInterceptorIsReady = _e[1];
|
|
49
|
-
var
|
|
50
|
-
var _f = (0, context_1.useAuthAdmin)(), user = _f.user, roles = _f.roles, roleUser = _f.roleUser, signOut = _f.signOut, ForbiddenCompoent = _f.ForbiddenCompoent;
|
|
49
|
+
var _f = (0, context_1.useAuthAdmin)(), user = _f.user, roles = _f.roles, roleUser = _f.roleUser, ForbiddenCompoent = _f.ForbiddenCompoent;
|
|
51
50
|
var hasAccess = props.roles && props.roles.length > 0 ? props.roles.includes(roleUser) : true;
|
|
52
51
|
// useEffect(() => {
|
|
53
52
|
// let interceptorId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/system/context/auth/components/private-page/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/system/context/auth/components/private-page/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -46,22 +46,25 @@ function useLoadMenu(props) {
|
|
|
46
46
|
return (0, ui_1.useQuery)({
|
|
47
47
|
queryKey: 'RemoteMenu' + JSON.stringify(((_a = InjectedRemotes === null || InjectedRemotes === void 0 ? void 0 : InjectedRemotes.menu) === null || _a === void 0 ? void 0 : _a.menu) || {}),
|
|
48
48
|
queryFn: function () { return __awaiter(_this, void 0, void 0, function () {
|
|
49
|
-
var response;
|
|
50
|
-
var _a;
|
|
51
|
-
return __generator(this, function (
|
|
52
|
-
switch (
|
|
49
|
+
var menu, response;
|
|
50
|
+
var _a, _b, _c;
|
|
51
|
+
return __generator(this, function (_d) {
|
|
52
|
+
switch (_d.label) {
|
|
53
53
|
case 0:
|
|
54
|
-
console.log("??", InjectedRemotes);
|
|
55
54
|
if (InjectedRemotes === null || InjectedRemotes === void 0 ? void 0 : InjectedRemotes.menu) {
|
|
56
55
|
return [2 /*return*/, (_a = InjectedRemotes === null || InjectedRemotes === void 0 ? void 0 : InjectedRemotes.menu) === null || _a === void 0 ? void 0 : _a.menu];
|
|
57
56
|
}
|
|
58
|
-
|
|
59
|
-
return [4 /*yield*/, (0
|
|
60
|
-
url: 'Menu',
|
|
61
|
-
method: 'get',
|
|
62
|
-
})];
|
|
57
|
+
if (!((_b = InjectedRemotes === null || InjectedRemotes === void 0 ? void 0 : InjectedRemotes.menu) === null || _b === void 0 ? void 0 : _b.fetcher)) return [3 /*break*/, 2];
|
|
58
|
+
return [4 /*yield*/, ((_c = InjectedRemotes === null || InjectedRemotes === void 0 ? void 0 : InjectedRemotes.menu) === null || _c === void 0 ? void 0 : _c.fetcher())];
|
|
63
59
|
case 1:
|
|
64
|
-
|
|
60
|
+
menu = _d.sent();
|
|
61
|
+
return [2 /*return*/, menu];
|
|
62
|
+
case 2: return [4 /*yield*/, (0, ui_1.api)({
|
|
63
|
+
url: 'Menu',
|
|
64
|
+
method: 'get',
|
|
65
|
+
})];
|
|
66
|
+
case 3:
|
|
67
|
+
response = _d.sent();
|
|
65
68
|
return [2 /*return*/, response];
|
|
66
69
|
}
|
|
67
70
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-load-menu.js","sourceRoot":"","sources":["../../../../src/system/hooks/menu/use-load-menu.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,
|
|
1
|
+
{"version":3,"file":"use-load-menu.js","sourceRoot":"","sources":["../../../../src/system/hooks/menu/use-load-menu.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,kCA0BC;AAxCD,2BAAyD;AAEzD,mCAA4C;AAY5C,SAAgB,WAAW,CAAC,KAAmD;IAA/E,iBA0BC;;IAzBS,IAAA,eAAe,GAAK,IAAA,0BAAiB,GAAE,gBAAxB,CAAwB;IAE/C,OAAO,IAAA,aAAQ,EAAC;QACd,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,0CAAE,IAAI,KAAI,EAAE,CAAC;QAC1E,OAAO,EAAE;;;;;;wBACP,IAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,EAAE,CAAC;4BAC1B,sBAAO,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,0CAAE,IAAI,EAAA;wBACpC,CAAC;6BAEE,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,0CAAE,OAAO,CAAA,EAA9B,wBAA8B;wBACjB,qBAAM,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,0CAAE,OAAO,EAAE,CAAA,EAAA;;wBAA9C,IAAI,GAAI,SAAsC;wBAEpD,sBAAO,IAAI,EAAA;4BAGI,qBAAM,IAAA,QAAG,EAAC;4BACzB,GAAG,EAAE,MAAM;4BACX,MAAM,EAAE,KAAK;yBACd,CAAC,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBAEF,sBAAO,QAAsB,EAAA;;;aAC9B;QACD,OAAO,EAAE,OAAO,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAA,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,CAAC,IAAI;QACtE,WAAW,EAAE,IAAI;KAClB,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -52,22 +52,21 @@ var ui_1 = require("../../../ui/index.js");
|
|
|
52
52
|
function api(params, pathApi) {
|
|
53
53
|
return __awaiter(this, void 0, void 0, function () {
|
|
54
54
|
var serverHostName, url, storageToken, headers, urlHost, response;
|
|
55
|
-
var _a, _b, _c;
|
|
56
|
-
return __generator(this, function (
|
|
57
|
-
switch (
|
|
55
|
+
var _a, _b, _c, _d;
|
|
56
|
+
return __generator(this, function (_e) {
|
|
57
|
+
switch (_e.label) {
|
|
58
58
|
case 0:
|
|
59
59
|
serverHostName = "";
|
|
60
60
|
if (params === null || params === void 0 ? void 0 : params.serverContext) {
|
|
61
|
-
serverHostName = (_b =
|
|
61
|
+
serverHostName = (_c = (_b = (_a = params === null || params === void 0 ? void 0 : params.serverContext) === null || _a === void 0 ? void 0 : _a.req) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c.host;
|
|
62
62
|
}
|
|
63
|
-
console.log({ serverHostName: serverHostName }, "@@@@2");
|
|
64
63
|
url = (params === null || params === void 0 ? void 0 : params.fullPath) ? params.url : process.env.httpClientURL
|
|
65
64
|
? params.url
|
|
66
65
|
: pathApi
|
|
67
66
|
? pathApi + params.url
|
|
68
67
|
: "".concat(process.env.api).concat(params.url);
|
|
69
68
|
storageToken = process.browser && ui_1.cookies.get('token');
|
|
70
|
-
headers = __assign(__assign({}, params === null || params === void 0 ? void 0 : params.headers), { Authorization: ((
|
|
69
|
+
headers = __assign(__assign({}, params === null || params === void 0 ? void 0 : params.headers), { Authorization: ((_d = params === null || params === void 0 ? void 0 : params.headers) === null || _d === void 0 ? void 0 : _d.Authorization) || "Bearer ".concat((storageToken === null || storageToken === void 0 ? void 0 : storageToken.value) || '') });
|
|
71
70
|
if (process.env.tenant) {
|
|
72
71
|
try {
|
|
73
72
|
if (process.env.tenant === "true") {
|
|
@@ -91,7 +90,7 @@ function api(params, pathApi) {
|
|
|
91
90
|
}
|
|
92
91
|
return [4 /*yield*/, ui_1.http.request(__assign(__assign({}, params), { headers: headers, url: url }))];
|
|
93
92
|
case 1:
|
|
94
|
-
response =
|
|
93
|
+
response = _e.sent();
|
|
95
94
|
return [2 /*return*/, response];
|
|
96
95
|
}
|
|
97
96
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/ui/utils/http/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/ui/utils/http/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA,kBA0CC;AA5DD,2BAAiD;AAkBjD,SAAsB,GAAG,CAAU,MAAmB,EAAE,OAAgB;;;;;;;oBAClE,cAAc,GAAG,EAAE,CAAC;oBAExB,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,EAAG,CAAC;wBAC1B,cAAc,GAAG,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,0CAAE,GAAG,0CAAE,OAAO,0CAAE,IAAI,CAAA;oBAC5D,CAAC;oBAEK,GAAG,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa;wBACnE,CAAC,CAAC,MAAM,CAAC,GAAG;wBACZ,CAAC,CAAC,OAAO;4BACT,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG;4BACtB,CAAC,CAAC,UAAG,OAAO,CAAC,GAAG,CAAC,GAAG,SAAG,MAAM,CAAC,GAAG,CAAE,CAAA;oBAE/B,YAAY,GAAG,OAAO,CAAC,OAAO,IAAI,YAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAEtD,OAAO,yBACR,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,KAClB,aAAa,EAAE,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,aAAa,KAAI,iBAAU,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,KAAI,EAAE,CAAE,GACvF,CAAA;oBAED,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;wBACvB,IAAI,CAAC;4BACH,IAAG,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gCACjC,IAAG,cAAc,EAAE,CAAC;oCAClB,OAAO,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAA;gCACpC,CAAC;qCAAK,CAAC;oCACL,IAAG,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;wCAC3B,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAA;wCACpD,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAA;oCAC7B,CAAC;gCACH,CAAC;4BACH,CAAC;iCAAK,CAAC;gCACL,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAA;4BACxC,CAAC;wBACH,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAA;wBAC1D,CAAC;oBACH,CAAC;oBAEgB,qBAAM,SAAI,CAAC,OAAO,uBAAM,MAAM,KAAE,OAAO,SAAA,EAAE,GAAG,EAAE,GAAG,IAAG,EAAA;;oBAA/D,QAAQ,GAAG,SAAoD;oBAErE,sBAAO,QAAa,EAAA;;;;CACrB"}
|