@dexteel/mesf-core 3.7.1 → 3.8.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.
|
@@ -5,6 +5,7 @@ export declare const useUserContext: () => {
|
|
|
5
5
|
userId: number | null;
|
|
6
6
|
defaultAreaId: string | number | null;
|
|
7
7
|
defaultAreaName: string | null;
|
|
8
|
+
userLoged: boolean;
|
|
8
9
|
};
|
|
9
10
|
actions: import("@reduxjs/toolkit").CaseReducerActions<{
|
|
10
11
|
setUserId(state: import("immer/dist/internal").WritableDraft<{
|
|
@@ -12,6 +13,7 @@ export declare const useUserContext: () => {
|
|
|
12
13
|
userId: number | null;
|
|
13
14
|
defaultAreaId: string | number | null;
|
|
14
15
|
defaultAreaName: string | null;
|
|
16
|
+
userLoged: boolean;
|
|
15
17
|
}>, { payload }: {
|
|
16
18
|
payload: any;
|
|
17
19
|
type: string;
|
|
@@ -21,6 +23,7 @@ export declare const useUserContext: () => {
|
|
|
21
23
|
userId: number | null;
|
|
22
24
|
defaultAreaId: string | number | null;
|
|
23
25
|
defaultAreaName: string | null;
|
|
26
|
+
userLoged: boolean;
|
|
24
27
|
}>, { payload }: {
|
|
25
28
|
payload: any;
|
|
26
29
|
type: string;
|
|
@@ -30,6 +33,7 @@ export declare const useUserContext: () => {
|
|
|
30
33
|
userId: number | null;
|
|
31
34
|
defaultAreaId: string | number | null;
|
|
32
35
|
defaultAreaName: string | null;
|
|
36
|
+
userLoged: boolean;
|
|
33
37
|
}>, { payload }: {
|
|
34
38
|
payload: any;
|
|
35
39
|
type: string;
|
|
@@ -39,6 +43,17 @@ export declare const useUserContext: () => {
|
|
|
39
43
|
userId: number | null;
|
|
40
44
|
defaultAreaId: string | number | null;
|
|
41
45
|
defaultAreaName: string | null;
|
|
46
|
+
userLoged: boolean;
|
|
47
|
+
}>, { payload }: {
|
|
48
|
+
payload: any;
|
|
49
|
+
type: string;
|
|
50
|
+
}): void;
|
|
51
|
+
setUserLoged(state: import("immer/dist/internal").WritableDraft<{
|
|
52
|
+
userLastName: string;
|
|
53
|
+
userId: number | null;
|
|
54
|
+
defaultAreaId: string | number | null;
|
|
55
|
+
defaultAreaName: string | null;
|
|
56
|
+
userLoged: boolean;
|
|
42
57
|
}>, { payload }: {
|
|
43
58
|
payload: any;
|
|
44
59
|
type: string;
|
package/dist/index.esm.js
CHANGED
|
@@ -4787,6 +4787,27 @@ var MESApiService = /** @class */ (function () {
|
|
|
4787
4787
|
});
|
|
4788
4788
|
});
|
|
4789
4789
|
};
|
|
4790
|
+
MESApiService.prototype.uploadFiles = function (selectedFiles, folderName) {
|
|
4791
|
+
if (folderName === void 0) { folderName = ""; }
|
|
4792
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
4793
|
+
var formData, _i, selectedFiles_1, file;
|
|
4794
|
+
return __generator(this, function (_a) {
|
|
4795
|
+
formData = new FormData();
|
|
4796
|
+
for (_i = 0, selectedFiles_1 = selectedFiles; _i < selectedFiles_1.length; _i++) {
|
|
4797
|
+
file = selectedFiles_1[_i];
|
|
4798
|
+
formData.append('files', file, file.name);
|
|
4799
|
+
}
|
|
4800
|
+
formData.append('folderName', folderName);
|
|
4801
|
+
return [2 /*return*/, fetch(this.config.API_PROCEDURE_URL + '/uploadFiles', {
|
|
4802
|
+
method: 'POST',
|
|
4803
|
+
headers: {
|
|
4804
|
+
Authorization: 'Bearer ' + this.TOKEN
|
|
4805
|
+
},
|
|
4806
|
+
body: formData
|
|
4807
|
+
}).then(function (res) { return res.json(); })];
|
|
4808
|
+
});
|
|
4809
|
+
});
|
|
4810
|
+
};
|
|
4790
4811
|
MESApiService.prototype.call = function (procedure, parameters, database) {
|
|
4791
4812
|
if (database === void 0) { database = ''; }
|
|
4792
4813
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -5215,44 +5236,95 @@ function ChangePassword(props) {
|
|
|
5215
5236
|
React__default.createElement(Button, { onClick: handleOk, color: "primary", disabled: !canChange }, "Change Password"))));
|
|
5216
5237
|
}
|
|
5217
5238
|
|
|
5239
|
+
var UserInitialState = {
|
|
5240
|
+
userLastName: "",
|
|
5241
|
+
userId: null,
|
|
5242
|
+
defaultAreaId: null,
|
|
5243
|
+
defaultAreaName: "",
|
|
5244
|
+
userLoged: false
|
|
5245
|
+
};
|
|
5246
|
+
var UserReducer = createSlice({
|
|
5247
|
+
name: "__",
|
|
5248
|
+
initialState: UserInitialState,
|
|
5249
|
+
reducers: {
|
|
5250
|
+
setUserId: function (state, _a) {
|
|
5251
|
+
var payload = _a.payload;
|
|
5252
|
+
state.userId = payload;
|
|
5253
|
+
},
|
|
5254
|
+
setUserLastName: function (state, _a) {
|
|
5255
|
+
var payload = _a.payload;
|
|
5256
|
+
state.userLastName = payload;
|
|
5257
|
+
},
|
|
5258
|
+
setDefaultAreaId: function (state, _a) {
|
|
5259
|
+
var payload = _a.payload;
|
|
5260
|
+
state.defaultAreaId = payload;
|
|
5261
|
+
},
|
|
5262
|
+
setDefaultAreaName: function (state, _a) {
|
|
5263
|
+
var payload = _a.payload;
|
|
5264
|
+
state.defaultAreaName = payload;
|
|
5265
|
+
},
|
|
5266
|
+
setUserLoged: function (state, _a) {
|
|
5267
|
+
var payload = _a.payload;
|
|
5268
|
+
state.userLoged = payload;
|
|
5269
|
+
}
|
|
5270
|
+
}
|
|
5271
|
+
});
|
|
5272
|
+
|
|
5273
|
+
var UserContext = createContext({
|
|
5274
|
+
state: UserReducer.getInitialState(),
|
|
5275
|
+
actions: UserReducer.actions
|
|
5276
|
+
});
|
|
5277
|
+
var useUserContext = function () { return useContext(UserContext); };
|
|
5278
|
+
var UserProvider = function (_a) {
|
|
5279
|
+
var children = _a.children;
|
|
5280
|
+
var _b = useComplexState({
|
|
5281
|
+
initialState: UserReducer.getInitialState(),
|
|
5282
|
+
reducers: UserReducer.caseReducers
|
|
5283
|
+
}), state = _b[0], actions = _b[1];
|
|
5284
|
+
return (React__default.createElement(UserContext.Provider, { value: { state: state, actions: actions } }, children));
|
|
5285
|
+
};
|
|
5286
|
+
|
|
5218
5287
|
function useToken() {
|
|
5288
|
+
var setUserLoged = useUserContext().actions.setUserLoged;
|
|
5219
5289
|
var getToken = function () {
|
|
5220
|
-
var tokenString = localStorage.getItem(
|
|
5290
|
+
var tokenString = localStorage.getItem("userMESData");
|
|
5221
5291
|
var userToken = JSON.parse(tokenString);
|
|
5222
5292
|
return userToken === null || userToken === void 0 ? void 0 : userToken.token;
|
|
5223
5293
|
};
|
|
5224
5294
|
var _a = useState(getToken()), token = _a[0], setToken = _a[1];
|
|
5225
|
-
// TODO: userToken typings
|
|
5226
5295
|
var saveToken = function (userToken) {
|
|
5227
|
-
localStorage.setItem(
|
|
5296
|
+
localStorage.setItem("userMESData", JSON.stringify(userToken));
|
|
5228
5297
|
setToken(userToken.token);
|
|
5229
5298
|
};
|
|
5230
5299
|
var clearUserData = function () {
|
|
5231
|
-
localStorage.removeItem(
|
|
5300
|
+
localStorage.removeItem("userMESData");
|
|
5232
5301
|
setToken(undefined);
|
|
5233
5302
|
};
|
|
5234
5303
|
var getUserName = function () {
|
|
5235
|
-
var sessionData = localStorage.getItem(
|
|
5304
|
+
var sessionData = localStorage.getItem("userMESData");
|
|
5236
5305
|
var userData = JSON.parse(sessionData);
|
|
5237
|
-
return ((userData || {}).lastName ||
|
|
5306
|
+
return (((userData || {}).lastName || "") +
|
|
5307
|
+
", " +
|
|
5308
|
+
((userData || {}).firstName || ""));
|
|
5238
5309
|
};
|
|
5239
5310
|
var getFirstName = function () {
|
|
5240
|
-
var sessionData = localStorage.getItem(
|
|
5311
|
+
var sessionData = localStorage.getItem("userMESData");
|
|
5241
5312
|
var userData = JSON.parse(sessionData);
|
|
5242
|
-
return (
|
|
5313
|
+
return (userData || {}).firstName || "";
|
|
5243
5314
|
};
|
|
5244
5315
|
var getLastName = function () {
|
|
5245
|
-
var sessionData = localStorage.getItem(
|
|
5316
|
+
var sessionData = localStorage.getItem("userMESData");
|
|
5246
5317
|
var userData = JSON.parse(sessionData);
|
|
5247
|
-
return (
|
|
5318
|
+
return (userData || {}).lastName || "";
|
|
5248
5319
|
};
|
|
5249
5320
|
var getUserId = function () {
|
|
5250
|
-
var sessionData = localStorage.getItem(
|
|
5321
|
+
var sessionData = localStorage.getItem("userMESData");
|
|
5251
5322
|
var userData = JSON.parse(sessionData);
|
|
5252
|
-
|
|
5323
|
+
setUserLoged(true);
|
|
5324
|
+
return (userData || {}).id || -1;
|
|
5253
5325
|
};
|
|
5254
5326
|
var hasPermission = function (permissionId) {
|
|
5255
|
-
var sessionData = localStorage.getItem(
|
|
5327
|
+
var sessionData = localStorage.getItem("userMESData");
|
|
5256
5328
|
if (sessionData === undefined)
|
|
5257
5329
|
return false;
|
|
5258
5330
|
var userData = JSON.parse(sessionData);
|
|
@@ -5621,8 +5693,10 @@ function Logout() {
|
|
|
5621
5693
|
var clearToken = useContext(AuthContext).clearToken;
|
|
5622
5694
|
var navigate = useNavigate();
|
|
5623
5695
|
var _a = useSearchParams(), params = _a[0]; _a[1];
|
|
5696
|
+
var setUserLoged = useUserContext().actions.setUserLoged;
|
|
5624
5697
|
var logout = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
5625
5698
|
return __generator(this, function (_a) {
|
|
5699
|
+
setUserLoged(false);
|
|
5626
5700
|
clearToken();
|
|
5627
5701
|
navigate("/?".concat(params.toString()));
|
|
5628
5702
|
return [2 /*return*/];
|
|
@@ -5669,49 +5743,6 @@ var AssetProvider = function (_a) {
|
|
|
5669
5743
|
return (React__default.createElement(AssetContext.Provider, { value: { state: state, actions: actions } }, children));
|
|
5670
5744
|
};
|
|
5671
5745
|
|
|
5672
|
-
var UserInitialState = {
|
|
5673
|
-
userLastName: "",
|
|
5674
|
-
userId: null,
|
|
5675
|
-
defaultAreaId: null,
|
|
5676
|
-
defaultAreaName: ""
|
|
5677
|
-
};
|
|
5678
|
-
var UserReducer = createSlice({
|
|
5679
|
-
name: "__",
|
|
5680
|
-
initialState: UserInitialState,
|
|
5681
|
-
reducers: {
|
|
5682
|
-
setUserId: function (state, _a) {
|
|
5683
|
-
var payload = _a.payload;
|
|
5684
|
-
state.userId = payload;
|
|
5685
|
-
},
|
|
5686
|
-
setUserLastName: function (state, _a) {
|
|
5687
|
-
var payload = _a.payload;
|
|
5688
|
-
state.userLastName = payload;
|
|
5689
|
-
},
|
|
5690
|
-
setDefaultAreaId: function (state, _a) {
|
|
5691
|
-
var payload = _a.payload;
|
|
5692
|
-
state.defaultAreaId = payload;
|
|
5693
|
-
},
|
|
5694
|
-
setDefaultAreaName: function (state, _a) {
|
|
5695
|
-
var payload = _a.payload;
|
|
5696
|
-
state.defaultAreaName = payload;
|
|
5697
|
-
}
|
|
5698
|
-
}
|
|
5699
|
-
});
|
|
5700
|
-
|
|
5701
|
-
var UserContext = createContext({
|
|
5702
|
-
state: UserReducer.getInitialState(),
|
|
5703
|
-
actions: UserReducer.actions
|
|
5704
|
-
});
|
|
5705
|
-
var useUserContext = function () { return useContext(UserContext); };
|
|
5706
|
-
var UserProvider = function (_a) {
|
|
5707
|
-
var children = _a.children;
|
|
5708
|
-
var _b = useComplexState({
|
|
5709
|
-
initialState: UserReducer.getInitialState(),
|
|
5710
|
-
reducers: UserReducer.caseReducers
|
|
5711
|
-
}), state = _b[0], actions = _b[1];
|
|
5712
|
-
return (React__default.createElement(UserContext.Provider, { value: { state: state, actions: actions } }, children));
|
|
5713
|
-
};
|
|
5714
|
-
|
|
5715
5746
|
var RouterContext = React__default.createContext(function () { return React__default.createElement(React__default.Fragment, null); });
|
|
5716
5747
|
var ConfigurationContext = React__default.createContext([
|
|
5717
5748
|
[],
|
|
@@ -5749,6 +5780,7 @@ function Header(_a) {
|
|
|
5749
5780
|
var CustomNavbar = useContext(NavbarContext);
|
|
5750
5781
|
var userName = useState(getUserName())[0];
|
|
5751
5782
|
var searchAssets = useSearchAssets().searchAssets;
|
|
5783
|
+
var userLoged = useUserContext().state.userLoged;
|
|
5752
5784
|
var tick = function () {
|
|
5753
5785
|
setDate(new Date());
|
|
5754
5786
|
};
|
|
@@ -5760,9 +5792,9 @@ function Header(_a) {
|
|
|
5760
5792
|
clearTimeout(timerID);
|
|
5761
5793
|
};
|
|
5762
5794
|
});
|
|
5763
|
-
useEffect(function () { if (showAreaSelector) {
|
|
5795
|
+
useEffect(function () { if (showAreaSelector && userLoged) {
|
|
5764
5796
|
searchAssets();
|
|
5765
|
-
} }, []);
|
|
5797
|
+
} }, [userLoged]);
|
|
5766
5798
|
return (React__default.createElement(Navbar, { variant: "dark", expand: "lg", className: "mes-primary-color mes-menu-top" },
|
|
5767
5799
|
React__default.createElement(Container, { fluid: true },
|
|
5768
5800
|
React__default.createElement(Navbar.Brand, { as: Link, to: "/home" }, "MESF"),
|
|
@@ -3,12 +3,14 @@ export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
|
|
|
3
3
|
userId: number | null;
|
|
4
4
|
defaultAreaId: number | string | null;
|
|
5
5
|
defaultAreaName: string | null;
|
|
6
|
+
userLoged: boolean;
|
|
6
7
|
}, {
|
|
7
8
|
setUserId(state: import("immer/dist/internal").WritableDraft<{
|
|
8
9
|
userLastName: string;
|
|
9
10
|
userId: number | null;
|
|
10
11
|
defaultAreaId: number | string | null;
|
|
11
12
|
defaultAreaName: string | null;
|
|
13
|
+
userLoged: boolean;
|
|
12
14
|
}>, { payload }: {
|
|
13
15
|
payload: any;
|
|
14
16
|
type: string;
|
|
@@ -18,6 +20,7 @@ export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
|
|
|
18
20
|
userId: number | null;
|
|
19
21
|
defaultAreaId: number | string | null;
|
|
20
22
|
defaultAreaName: string | null;
|
|
23
|
+
userLoged: boolean;
|
|
21
24
|
}>, { payload }: {
|
|
22
25
|
payload: any;
|
|
23
26
|
type: string;
|
|
@@ -27,6 +30,7 @@ export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
|
|
|
27
30
|
userId: number | null;
|
|
28
31
|
defaultAreaId: number | string | null;
|
|
29
32
|
defaultAreaName: string | null;
|
|
33
|
+
userLoged: boolean;
|
|
30
34
|
}>, { payload }: {
|
|
31
35
|
payload: any;
|
|
32
36
|
type: string;
|
|
@@ -36,6 +40,17 @@ export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
|
|
|
36
40
|
userId: number | null;
|
|
37
41
|
defaultAreaId: number | string | null;
|
|
38
42
|
defaultAreaName: string | null;
|
|
43
|
+
userLoged: boolean;
|
|
44
|
+
}>, { payload }: {
|
|
45
|
+
payload: any;
|
|
46
|
+
type: string;
|
|
47
|
+
}): void;
|
|
48
|
+
setUserLoged(state: import("immer/dist/internal").WritableDraft<{
|
|
49
|
+
userLastName: string;
|
|
50
|
+
userId: number | null;
|
|
51
|
+
defaultAreaId: number | string | null;
|
|
52
|
+
defaultAreaName: string | null;
|
|
53
|
+
userLoged: boolean;
|
|
39
54
|
}>, { payload }: {
|
|
40
55
|
payload: any;
|
|
41
56
|
type: string;
|
|
@@ -28,6 +28,7 @@ export declare class MESApiService {
|
|
|
28
28
|
changePassword(userId: string, password: string): Promise<any>;
|
|
29
29
|
authenticate(userName: string, password: string): Promise<any>;
|
|
30
30
|
loginWithAzureAD(accessToken: string): Promise<any>;
|
|
31
|
+
uploadFiles(selectedFiles: File[], folderName?: string): Promise<any>;
|
|
31
32
|
call(procedure: string, parameters: any[], database?: string): Promise<any>;
|
|
32
33
|
callJSON(procedure: string, parameters: any[], database?: string): Promise<any>;
|
|
33
34
|
import(procedure: string, parameters: any[], files: any[], uniqueFile: any, database?: string): Promise<any>;
|