@axelor/aos-mobile-core 7.0.3 → 7.1.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/lib/api/metafile-api.d.ts +2 -1
- package/lib/api/metafile-api.js +4 -1
- package/lib/api/metafile-api.js.map +1 -1
- package/lib/api/net-info-utils.d.ts +4 -0
- package/lib/api/net-info-utils.js +14 -0
- package/lib/api/net-info-utils.js.map +1 -1
- package/lib/apiProviders/config.d.ts +10 -0
- package/lib/apiProviders/config.js +27 -1
- package/lib/apiProviders/config.js.map +1 -1
- package/lib/apiProviders/utils.js +5 -0
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/RootNavigator.js +33 -2
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/auth/i18n/en.json +2 -0
- package/lib/auth/i18n/fr.json +2 -0
- package/lib/auth/screens/UserScreen.js +6 -1
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/components/external/Stopwatch/Stopwatch.js +7 -1
- package/lib/components/external/Stopwatch/Stopwatch.js.map +1 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.d.ts +5 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +31 -14
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/config/routes.d.ts +12 -6
- package/lib/config/routes.js +8 -4
- package/lib/config/routes.js.map +1 -1
- package/lib/features/authSlice.js +2 -0
- package/lib/features/authSlice.js.map +1 -1
- package/lib/i18n/translations/en.json +1 -1
- package/lib/i18n/translations/fr.json +1 -1
- package/lib/utils/formatters.d.ts +2 -0
- package/lib/utils/formatters.js +17 -0
- package/lib/utils/formatters.js.map +1 -1
- package/lib/utils/index.d.ts +2 -2
- package/lib/utils/index.js +2 -2
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/time.d.ts +1 -0
- package/lib/utils/time.js +3 -0
- package/lib/utils/time.js.map +1 -1
- package/package.json +3 -3
|
@@ -3,8 +3,9 @@ export declare function fetchFileDetails({ listFiles, isMetaFile }: {
|
|
|
3
3
|
listFiles: any;
|
|
4
4
|
isMetaFile: any;
|
|
5
5
|
}): Promise<any>;
|
|
6
|
-
export declare function uploadFile(file: DocumentPickerResponse, { baseUrl, jsessionId, token }: {
|
|
6
|
+
export declare function uploadFile(file: DocumentPickerResponse, { baseUrl, jsessionId, token, returnBase64String }: {
|
|
7
7
|
baseUrl: any;
|
|
8
8
|
jsessionId: any;
|
|
9
9
|
token: any;
|
|
10
|
+
returnBase64String: any;
|
|
10
11
|
}): Promise<any>;
|
package/lib/api/metafile-api.js
CHANGED
|
@@ -48,13 +48,16 @@ export async function fetchFileDetails({ listFiles, isMetaFile }) {
|
|
|
48
48
|
page: 0,
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
|
-
export async function uploadFile(file, { baseUrl, jsessionId, token }) {
|
|
51
|
+
export async function uploadFile(file, { baseUrl, jsessionId, token, returnBase64String }) {
|
|
52
52
|
if (file == null) {
|
|
53
53
|
return;
|
|
54
54
|
}
|
|
55
55
|
return new Promise(async (resolve, reject) => {
|
|
56
56
|
try {
|
|
57
57
|
const base64Data = await RNFS.readFile(file.uri, 'base64');
|
|
58
|
+
if (returnBase64String) {
|
|
59
|
+
resolve(`data:${file.type};base64,${base64Data}`);
|
|
60
|
+
}
|
|
58
61
|
const headers = {
|
|
59
62
|
'Content-Type': 'application/octet-stream',
|
|
60
63
|
'Content-Length': String(file.size),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,oBAAoB,EAAW,MAAM,iBAAiB,CAAC;AAE/D,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,MAAM,cAAc,GAAG,CAAC,SAAS,EAAc,EAAE;IAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,OAAO;YACL;gBACE,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC7B,MAAM,QAAQ,GAAa;wBACzB,SAAS,EAAE,IAAI;wBACf,QAAQ,EAAE,GAAG;wBACb,KAAK,EAAE,IAAI,CAAC,EAAE;qBACf,CAAC;oBAEF,OAAO,QAAQ,CAAC;gBAClB,CAAC,CAAC;aACH;SACF,CAAC;KACH;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC;IAC5D,MAAM,KAAK,GAAG,UAAU;QACtB,CAAC,CAAC,6BAA6B;QAC/B,CAAC,CAAC,2BAA2B,CAAC;IAEhC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC;QACnC,QAAQ,EAAE,eAAe;QACzB,oBAAoB,EAAE,IAAI;QAC1B,IAAI,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAA4B,EAC5B,EAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAC;
|
|
1
|
+
{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,oBAAoB,EAAW,MAAM,iBAAiB,CAAC;AAE/D,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,MAAM,cAAc,GAAG,CAAC,SAAS,EAAc,EAAE;IAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,OAAO;YACL;gBACE,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC7B,MAAM,QAAQ,GAAa;wBACzB,SAAS,EAAE,IAAI;wBACf,QAAQ,EAAE,GAAG;wBACb,KAAK,EAAE,IAAI,CAAC,EAAE;qBACf,CAAC;oBAEF,OAAO,QAAQ,CAAC;gBAClB,CAAC,CAAC;aACH;SACF,CAAC;KACH;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC;IAC5D,MAAM,KAAK,GAAG,UAAU;QACtB,CAAC,CAAC,6BAA6B;QAC/B,CAAC,CAAC,2BAA2B,CAAC;IAEhC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC;QACnC,QAAQ,EAAE,eAAe;QACzB,oBAAoB,EAAE,IAAI;QAC1B,IAAI,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAA4B,EAC5B,EAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,kBAAkB,EAAC;IAEhD,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO;KACR;IAED,OAAO,IAAI,OAAO,CAAM,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAE3D,IAAI,kBAAkB,EAAE;gBACtB,OAAO,CAAC,QAAQ,IAAI,CAAC,IAAI,WAAW,UAAU,EAAE,CAAC,CAAC;aACnD;YAED,MAAM,OAAO,GAAG;gBACd,cAAc,EAAE,0BAA0B;gBAC1C,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBACnC,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBAChC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC1B,cAAc,EAAE,KAAK;gBACrB,MAAM,EAAE,cAAc,KAAK,KAAK,UAAU,EAAE;aAC7C,CAAC;YAEF,MAAM,QAAQ,GAAQ,MAAM,WAAW,CAAC,KAAK,CAC3C,MAAM,EACN,GAAG,OAAO,iBAAiB,EAC3B,OAAO,EACP,UAAU,CACX,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE3C,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACxC,OAAO,CAAC,QAAQ,CAAC,CAAC;aACnB;iBAAM;gBACL,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAC;aACpC;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -26,4 +26,18 @@ export async function getNetInfo() {
|
|
|
26
26
|
return { isConnected: false };
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
|
+
export async function getTokenInfo() {
|
|
30
|
+
return axiosApiProvider
|
|
31
|
+
.get({ url: '/' })
|
|
32
|
+
.then(res => {
|
|
33
|
+
if (typeof res?.data === 'string' &&
|
|
34
|
+
res.data.includes('<form id="login-form"')) {
|
|
35
|
+
return { isTokenValid: false };
|
|
36
|
+
}
|
|
37
|
+
return { isTokenValid: res?.status !== 401 };
|
|
38
|
+
})
|
|
39
|
+
.catch(error => {
|
|
40
|
+
return { isTokenValid: error?.response?.status !== 401 };
|
|
41
|
+
});
|
|
42
|
+
}
|
|
29
43
|
//# sourceMappingURL=net-info-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"net-info-utils.js","sourceRoot":"","sources":["../../src/api/net-info-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAMjD,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,OAAO,gBAAgB;SACpB,GAAG,CAAC;QACH,GAAG,EAAE,yBAAyB;KAC/B,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAC,WAAW,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,EAAC,CAAC,CAAC;SACjD,KAAK,CAAC,GAAG,EAAE;QACV,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
1
|
+
{"version":3,"file":"net-info-utils.js","sourceRoot":"","sources":["../../src/api/net-info-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAMjD,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,OAAO,gBAAgB;SACpB,GAAG,CAAC;QACH,GAAG,EAAE,yBAAyB;KAC/B,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAC,WAAW,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,EAAC,CAAC,CAAC;SACjD,KAAK,CAAC,GAAG,EAAE;QACV,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACP,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,OAAO,gBAAgB;SACpB,GAAG,CAAC,EAAC,GAAG,EAAE,GAAG,EAAC,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,EAAE;QACV,IACE,OAAO,GAAG,EAAE,IAAI,KAAK,QAAQ;YAC7B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAC1C;YACA,OAAO,EAAC,YAAY,EAAE,KAAK,EAAC,CAAC;SAC9B;QACD,OAAO,EAAC,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,EAAC,CAAC;IAC7C,CAAC,CAAC;SACD,KAAK,CAAC,KAAK,CAAC,EAAE;QACb,OAAO,EAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
export declare class ApiProviderConfig {
|
|
2
2
|
static allowConnectionBlock: boolean;
|
|
3
|
+
private sessionExpired;
|
|
4
|
+
private refreshCallBack;
|
|
3
5
|
constructor();
|
|
6
|
+
register(callBack: any): void;
|
|
7
|
+
private updateState;
|
|
8
|
+
setSessionExpired(_sessionExpired: boolean): void;
|
|
9
|
+
getSessionExpired(): boolean;
|
|
4
10
|
}
|
|
11
|
+
export declare const apiProviderConfig: ApiProviderConfig;
|
|
12
|
+
export declare const useSessionExpired: () => {
|
|
13
|
+
sessionExpired: undefined;
|
|
14
|
+
};
|
|
@@ -15,8 +15,34 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
+
import { useEffect, useMemo, useState } from 'react';
|
|
18
19
|
export class ApiProviderConfig {
|
|
19
20
|
static allowConnectionBlock = false;
|
|
20
|
-
|
|
21
|
+
sessionExpired = false;
|
|
22
|
+
refreshCallBack;
|
|
23
|
+
constructor() {
|
|
24
|
+
this.refreshCallBack = () => { };
|
|
25
|
+
}
|
|
26
|
+
register(callBack) {
|
|
27
|
+
this.refreshCallBack = callBack;
|
|
28
|
+
}
|
|
29
|
+
updateState() {
|
|
30
|
+
this.refreshCallBack(this.sessionExpired);
|
|
31
|
+
}
|
|
32
|
+
setSessionExpired(_sessionExpired) {
|
|
33
|
+
this.sessionExpired = _sessionExpired;
|
|
34
|
+
this.updateState();
|
|
35
|
+
}
|
|
36
|
+
getSessionExpired() {
|
|
37
|
+
return this.sessionExpired;
|
|
38
|
+
}
|
|
21
39
|
}
|
|
40
|
+
export const apiProviderConfig = new ApiProviderConfig();
|
|
41
|
+
export const useSessionExpired = () => {
|
|
42
|
+
const [sessionExpired, setSessionExpired] = useState();
|
|
43
|
+
useEffect(() => {
|
|
44
|
+
apiProviderConfig.register(setSessionExpired);
|
|
45
|
+
}, []);
|
|
46
|
+
return useMemo(() => ({ sessionExpired: sessionExpired }), [sessionExpired]);
|
|
47
|
+
};
|
|
22
48
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/apiProviders/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/apiProviders/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAEnD,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,oBAAoB,GAAY,KAAK,CAAC;IAErC,cAAc,GAAY,KAAK,CAAC;IAChC,eAAe,CAAW;IAElC;QACE,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,QAAQ;QACf,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;IAClC,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAED,iBAAiB,CAAC,eAAwB;QACxC,IAAI,CAAC,cAAc,GAAG,eAAe,CAAC;QAEtC,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;;AAGH,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAEzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,EAAE,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE;QACb,iBAAiB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAChD,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;AAC7E,CAAC,CAAC"}
|
|
@@ -19,6 +19,7 @@ import Toast from 'react-native-toast-message';
|
|
|
19
19
|
import { checkNullString } from '@axelor/aos-mobile-ui';
|
|
20
20
|
import { traceError } from '../api/traceback-api';
|
|
21
21
|
import { i18nProvider } from '../i18n';
|
|
22
|
+
import { apiProviderConfig } from './config';
|
|
22
23
|
export const getApiResponseData = (response, { isArrayResponse = true }) => {
|
|
23
24
|
if (response.data && response.data.object != null) {
|
|
24
25
|
return response.data.object;
|
|
@@ -42,6 +43,10 @@ const manageError = (error, action, userId, { showErrorToast = true, errorTracin
|
|
|
42
43
|
if (error.response) {
|
|
43
44
|
const message = error?.response?.data?.messageStatus || error?.response?.statusText;
|
|
44
45
|
const code = error.response?.data?.codeStatus || error?.response?.status;
|
|
46
|
+
if (code === 401) {
|
|
47
|
+
apiProviderConfig.setSessionExpired(true);
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
45
50
|
if (errorTracing) {
|
|
46
51
|
traceError({
|
|
47
52
|
message: 'API request',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,4BAA4B,CAAC;AAC/C,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/app/RootNavigator.js
CHANGED
|
@@ -16,20 +16,25 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
19
|
-
import { useSelector } from 'react-redux';
|
|
19
|
+
import { useDispatch, useSelector } from 'react-redux';
|
|
20
20
|
import { createNativeStackNavigator } from '@react-navigation/native-stack';
|
|
21
21
|
import { useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { default as CoreNavigator } from '../navigator/Navigator';
|
|
23
|
-
import { getNetInfo } from '../api/net-info-utils';
|
|
23
|
+
import { getNetInfo, getTokenInfo } from '../api/net-info-utils';
|
|
24
24
|
import { useHeaderRegisters } from '../hooks/use-header-registers';
|
|
25
25
|
import LoginScreen from '../screens/LoginScreen';
|
|
26
26
|
import SessionManagementScreen from '../screens/SessionManagementScreen';
|
|
27
27
|
import { useHeaderBand } from '../header';
|
|
28
28
|
import { useTranslator } from '../i18n';
|
|
29
|
+
import { showToastMessage } from '../utils';
|
|
30
|
+
import { logout } from '../features/authSlice';
|
|
31
|
+
import { useSessionExpired } from '../apiProviders/config';
|
|
29
32
|
const { Navigator, Screen } = createNativeStackNavigator();
|
|
30
33
|
const RootNavigator = ({ modules, mainMenu, version, onRefresh, configuration, }) => {
|
|
31
34
|
const Colors = useThemeColor();
|
|
32
35
|
const I18n = useTranslator();
|
|
36
|
+
const dispatch = useDispatch();
|
|
37
|
+
const { sessionExpired } = useSessionExpired();
|
|
33
38
|
const { registerHeaderBand } = useHeaderBand();
|
|
34
39
|
const { logged } = useSelector(state => state.auth);
|
|
35
40
|
const modulesHeaderRegisters = useMemo(() => {
|
|
@@ -53,6 +58,32 @@ const RootNavigator = ({ modules, mainMenu, version, onRefresh, configuration, }
|
|
|
53
58
|
const interval = setInterval(checkInternetConnection, 2000);
|
|
54
59
|
return () => clearInterval(interval.current);
|
|
55
60
|
}, [checkInternetConnection]);
|
|
61
|
+
const handleSessionExpired = useCallback(() => {
|
|
62
|
+
showToastMessage({
|
|
63
|
+
type: 'error',
|
|
64
|
+
text1: I18n.t('Auth_Disconnected'),
|
|
65
|
+
text2: I18n.t('Auth_LooseConnectionWithServer'),
|
|
66
|
+
position: 'bottom',
|
|
67
|
+
});
|
|
68
|
+
dispatch(logout());
|
|
69
|
+
}, [I18n, dispatch]);
|
|
70
|
+
useEffect(() => {
|
|
71
|
+
const checkERPToken = async () => {
|
|
72
|
+
if (logged) {
|
|
73
|
+
const { isTokenValid } = await getTokenInfo();
|
|
74
|
+
if (!isTokenValid) {
|
|
75
|
+
handleSessionExpired();
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
};
|
|
79
|
+
const interval = setInterval(checkERPToken, 120000);
|
|
80
|
+
return () => clearInterval(interval.current);
|
|
81
|
+
}, [handleSessionExpired, logged]);
|
|
82
|
+
useEffect(() => {
|
|
83
|
+
if (sessionExpired) {
|
|
84
|
+
handleSessionExpired();
|
|
85
|
+
}
|
|
86
|
+
}, [handleSessionExpired, sessionExpired]);
|
|
56
87
|
return (<Navigator screenOptions={{ headerShown: false }}>
|
|
57
88
|
{!logged ? (configuration?.enableConnectionSessions ? (<Screen name="SessionManagementScreen" component={SessionManagementScreen} initialParams={{
|
|
58
89
|
version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RootNavigator.js","sourceRoot":"","sources":["../../src/app/RootNavigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"RootNavigator.js","sourceRoot":"","sources":["../../src/app/RootNavigator.js"],"names":[],"mappings":"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"}
|
package/lib/auth/i18n/en.json
CHANGED
|
@@ -20,6 +20,8 @@
|
|
|
20
20
|
"Auth_Delete_Session": "Delete session",
|
|
21
21
|
"Auth_InfoSession": "To connect to the mobile application, you must create a session by entering the url of your instance and your username and password. Once you have created your first session, you will be able to log in more easily by entering only the password. You can also manage a set of sessions.",
|
|
22
22
|
"Auth_Dev_Mode": "Test environment",
|
|
23
|
+
"Auth_Disconnected": "User disconnected",
|
|
24
|
+
"Auth_LooseConnectionWithServer": "Session with server expired.",
|
|
23
25
|
"User_User": "User",
|
|
24
26
|
"User_VirtualKeyboardConfig": "Hide virtual keyboard",
|
|
25
27
|
"User_ShowFilter": "Show filter",
|
package/lib/auth/i18n/fr.json
CHANGED
|
@@ -20,6 +20,8 @@
|
|
|
20
20
|
"Auth_Delete_Session": "Supprimer la session",
|
|
21
21
|
"Auth_InfoSession": "Pour vous connecter à l'application mobile, vous devez créer une session en indiquant l'url de votre instance ainsi que votre nom d'utilisateur et votre mot de passe. Une fois que vous aurez créé votre première session, vous pourrez vous connecter plus facilement en saisissant uniquement le mot de passe. Vous pouvez également gérer un ensemble de sessions.",
|
|
22
22
|
"Auth_Dev_Mode": "Environnement de test",
|
|
23
|
+
"Auth_Disconnected": "Utilisateur déconnecté",
|
|
24
|
+
"Auth_LooseConnectionWithServer": "La session avec le serveur a expirée.",
|
|
23
25
|
"User_User": "Utilisateur",
|
|
24
26
|
"User_VirtualKeyboardConfig": "Cacher le clavier virtuel",
|
|
25
27
|
"User_ShowFilter": "Afficher les filtres",
|
|
@@ -34,7 +34,7 @@ const UserScreen = ({ children }) => {
|
|
|
34
34
|
const { languageList } = useSelector(state => state.language);
|
|
35
35
|
const { baseConfig } = useSelector(state => state.config);
|
|
36
36
|
const { user, canModifyCompany } = useSelector(state => state.user);
|
|
37
|
-
const { setFilterConfig, setVirtualKeyboardConfig } = useConfig();
|
|
37
|
+
const { setFilterConfig, setVirtualKeyboardConfig, setNbDecimalDigitForQty } = useConfig();
|
|
38
38
|
useEffect(() => {
|
|
39
39
|
dispatch(fetchActiveUser(userId));
|
|
40
40
|
dispatch(fetchCompanies());
|
|
@@ -42,6 +42,11 @@ const UserScreen = ({ children }) => {
|
|
|
42
42
|
dispatch(fetchBaseConfig());
|
|
43
43
|
dispatch(fetchMobileSettings());
|
|
44
44
|
}, [dispatch, userId]);
|
|
45
|
+
useEffect(() => {
|
|
46
|
+
if (baseConfig?.nbDecimalDigitForQty != null) {
|
|
47
|
+
setNbDecimalDigitForQty(baseConfig?.nbDecimalDigitForQty);
|
|
48
|
+
}
|
|
49
|
+
}, [baseConfig, setNbDecimalDigitForQty]);
|
|
45
50
|
useEffect(() => {
|
|
46
51
|
const SMALL_SCREEN_HEIGHT = 300;
|
|
47
52
|
DeviceInfo.getManufacturer().then(manufacturer => setVirtualKeyboardConfig(manufacturer === 'Zebra Technologies'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EACL,IAAI,EACJ,WAAW,EACX,MAAM,EACN,MAAM,EACN,UAAU,EACV,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAE7E,MAAM,UAAU,GAAG,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;IAChC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,WAAW,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,EAAC,YAAY,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC5D,MAAM,EAAC,UAAU,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,EAAC,IAAI,EAAE,gBAAgB,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElE,MAAM,EAAC,eAAe,EAAE,wBAAwB,EAAC,
|
|
1
|
+
{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useMemo, useState } from 'react';
|
|
18
|
+
import React, { useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
20
|
import { Card, Icon, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import useTranslator from '../../../i18n/hooks/use-translator';
|
|
@@ -26,6 +26,12 @@ const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFo
|
|
|
26
26
|
const I18n = useTranslator();
|
|
27
27
|
const [state, setState] = useState(status);
|
|
28
28
|
const [time, setTime] = useState(startTime);
|
|
29
|
+
useEffect(() => {
|
|
30
|
+
setTime(startTime);
|
|
31
|
+
}, [startTime]);
|
|
32
|
+
useEffect(() => {
|
|
33
|
+
setState(status);
|
|
34
|
+
}, [status]);
|
|
29
35
|
const stopwatchStatus = useMemo(() => {
|
|
30
36
|
if (useObjectStatus) {
|
|
31
37
|
return status;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Stopwatch.js","sourceRoot":"","sources":["../../../../src/components/external/Stopwatch/Stopwatch.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Stopwatch.js","sourceRoot":"","sources":["../../../../src/components/external/Stopwatch/Stopwatch.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
interface UploadFileInputProps {
|
|
2
2
|
style?: any;
|
|
3
3
|
onUpload?: (file: any) => void;
|
|
4
|
+
returnBase64String?: boolean;
|
|
5
|
+
required?: boolean;
|
|
6
|
+
title?: string;
|
|
7
|
+
documentTypesAllowed?: 'images' | 'pdf' | 'allFiles';
|
|
4
8
|
}
|
|
5
|
-
declare const UploadFileInput: ({ style, onUpload, }: UploadFileInputProps) => JSX.Element;
|
|
9
|
+
declare const UploadFileInput: ({ style, onUpload, returnBase64String, required, documentTypesAllowed, title, }: UploadFileInputProps) => JSX.Element;
|
|
6
10
|
export default UploadFileInput;
|
|
@@ -15,21 +15,25 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useState } from 'react';
|
|
18
|
+
import React, { useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
20
|
import { useSelector } from 'react-redux';
|
|
21
21
|
import DocumentPicker from 'react-native-document-picker';
|
|
22
|
-
import { CircleButton, Text } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { CircleButton, Text, getCommonStyles, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
23
23
|
import { uploadFile } from '../../../api/metafile-api';
|
|
24
24
|
import { useTranslator } from '../../../i18n';
|
|
25
|
-
const UploadFileInput = ({ style, onUpload = console.log, }) => {
|
|
25
|
+
const UploadFileInput = ({ style, onUpload = console.log, returnBase64String = false, required = false, documentTypesAllowed = 'allFiles', title, }) => {
|
|
26
26
|
const I18n = useTranslator();
|
|
27
|
+
const Colors = useThemeColor();
|
|
27
28
|
const { baseUrl, token, jsessionId } = useSelector((state) => state.auth);
|
|
28
29
|
const [selectedFile, setSelectedFile] = useState(null);
|
|
30
|
+
const _required = useMemo(() => required && selectedFile == null, [required, selectedFile]);
|
|
31
|
+
const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
|
|
32
|
+
const styles = useMemo(() => getStyles(Colors, _required), [Colors, _required]);
|
|
29
33
|
const handleDocumentPick = async () => {
|
|
30
34
|
try {
|
|
31
35
|
const file = await DocumentPicker.pickSingle({
|
|
32
|
-
type:
|
|
36
|
+
type: DocumentPicker.types[documentTypesAllowed],
|
|
33
37
|
});
|
|
34
38
|
setSelectedFile(file);
|
|
35
39
|
handleFileUpload(file);
|
|
@@ -40,28 +44,41 @@ const UploadFileInput = ({ style, onUpload = console.log, }) => {
|
|
|
40
44
|
};
|
|
41
45
|
const handleFileUpload = async (file) => {
|
|
42
46
|
try {
|
|
43
|
-
const response = await uploadFile(file, {
|
|
47
|
+
const response = await uploadFile(file, {
|
|
48
|
+
baseUrl,
|
|
49
|
+
token,
|
|
50
|
+
jsessionId,
|
|
51
|
+
returnBase64String,
|
|
52
|
+
});
|
|
44
53
|
onUpload(response);
|
|
45
54
|
}
|
|
46
55
|
catch (error) {
|
|
47
56
|
console.log('Could not upload the file:', error);
|
|
48
57
|
}
|
|
49
58
|
};
|
|
50
|
-
return (<View style={[
|
|
59
|
+
return (<View style={[
|
|
60
|
+
styles.container,
|
|
61
|
+
commonStyles.filter,
|
|
62
|
+
commonStyles.filterSize,
|
|
63
|
+
commonStyles.filterAlign,
|
|
64
|
+
style,
|
|
65
|
+
]}>
|
|
51
66
|
<Text style={styles.fileName}>
|
|
52
|
-
{selectedFile
|
|
67
|
+
{selectedFile
|
|
68
|
+
? selectedFile.name
|
|
69
|
+
: title
|
|
70
|
+
? title
|
|
71
|
+
: I18n.t('Base_ChooseFile')}
|
|
53
72
|
</Text>
|
|
54
73
|
<CircleButton iconName="plus" size={30} onPress={handleDocumentPick}/>
|
|
55
74
|
</View>);
|
|
56
75
|
};
|
|
57
|
-
const
|
|
76
|
+
const getStyles = (Colors, _required) => StyleSheet.create({
|
|
58
77
|
container: {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
marginVertical: 5,
|
|
64
|
-
paddingHorizontal: 18,
|
|
78
|
+
borderColor: _required
|
|
79
|
+
? Colors.errorColor.background
|
|
80
|
+
: Colors.secondaryColor.background,
|
|
81
|
+
borderWidth: 1,
|
|
65
82
|
},
|
|
66
83
|
fileName: {
|
|
67
84
|
width: '90%',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"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"}
|
package/lib/config/routes.d.ts
CHANGED
|
@@ -4,10 +4,12 @@ declare namespace routes {
|
|
|
4
4
|
const App: string;
|
|
5
5
|
const AppBase: string;
|
|
6
6
|
const AppCrm: string;
|
|
7
|
-
const
|
|
7
|
+
const AppHeldesk: string;
|
|
8
|
+
const AppStock: string;
|
|
8
9
|
const AppSupplychain: string;
|
|
9
|
-
const EmailAddress: string;
|
|
10
10
|
const AppMobileSettings: string;
|
|
11
|
+
const TraceBack: string;
|
|
12
|
+
const EmailAddress: string;
|
|
11
13
|
const MailMessages: string;
|
|
12
14
|
}
|
|
13
15
|
namespace AOS7 {
|
|
@@ -17,14 +19,18 @@ declare namespace routes {
|
|
|
17
19
|
export { AppBase_1 as AppBase };
|
|
18
20
|
const AppCrm_1: string;
|
|
19
21
|
export { AppCrm_1 as AppCrm };
|
|
20
|
-
const
|
|
21
|
-
export {
|
|
22
|
+
const AppHeldesk_1: string;
|
|
23
|
+
export { AppHeldesk_1 as AppHeldesk };
|
|
24
|
+
const AppStock_1: string;
|
|
25
|
+
export { AppStock_1 as AppStock };
|
|
22
26
|
const AppSupplychain_1: string;
|
|
23
27
|
export { AppSupplychain_1 as AppSupplychain };
|
|
24
|
-
const EmailAddress_1: string;
|
|
25
|
-
export { EmailAddress_1 as EmailAddress };
|
|
26
28
|
const AppMobileSettings_1: string;
|
|
27
29
|
export { AppMobileSettings_1 as AppMobileSettings };
|
|
30
|
+
const TraceBack_1: string;
|
|
31
|
+
export { TraceBack_1 as TraceBack };
|
|
32
|
+
const EmailAddress_1: string;
|
|
33
|
+
export { EmailAddress_1 as EmailAddress };
|
|
28
34
|
const MailMessages_1: string;
|
|
29
35
|
export { MailMessages_1 as MailMessages };
|
|
30
36
|
}
|
package/lib/config/routes.js
CHANGED
|
@@ -20,20 +20,24 @@ const routes = {
|
|
|
20
20
|
App: '/ws/rest/com.axelor.apps.base.db.App',
|
|
21
21
|
AppBase: '/ws/rest/com.axelor.apps.base.db.AppBase',
|
|
22
22
|
AppCrm: '/ws/rest/com.axelor.apps.base.db.AppCrm',
|
|
23
|
-
|
|
23
|
+
AppHeldesk: '/ws/rest/com.axelor.app.base.db.AppHelpdesk',
|
|
24
|
+
AppStock: '/ws/rest/com.axelor.apps.base.db.AppStock',
|
|
24
25
|
AppSupplychain: '/ws/rest/com.axelor.apps.base.db.AppSupplychain',
|
|
25
|
-
EmailAddress: '/ws/rest/com.axelor.apps.message.db.EmailAddress',
|
|
26
26
|
AppMobileSettings: '/ws/rest/com.axelor.apps.base.db.AppMobileSettings',
|
|
27
|
+
TraceBack: '/ws/rest/com.axelor.exception.db.TraceBack',
|
|
28
|
+
EmailAddress: '/ws/rest/com.axelor.apps.message.db.EmailAddress',
|
|
27
29
|
MailMessages: '/ws/rest/com.axelor.mail.db.MailMessage/messages',
|
|
28
30
|
},
|
|
29
31
|
AOS7: {
|
|
30
32
|
App: '/ws/rest/com.axelor.studio.db.App',
|
|
31
33
|
AppBase: '/ws/rest/com.axelor.studio.db.AppBase',
|
|
32
34
|
AppCrm: '/ws/rest/com.axelor.studio.db.AppCrm',
|
|
35
|
+
AppHeldesk: '/ws/rest/com.axelor.studio.db.AppHelpdesk',
|
|
36
|
+
AppStock: '/ws/rest/com.axelor.studio.db.AppStock',
|
|
37
|
+
AppSupplychain: '/ws/rest/com.axelor.studio.db.AppSupplychain',
|
|
38
|
+
AppMobileSettings: '/ws/rest/com.axelor.studio.db.AppMobileSettings',
|
|
33
39
|
TraceBack: '/ws/rest/com.axelor.apps.base.db.TraceBack',
|
|
34
|
-
AppSupplychain: ' /ws/rest/com.axelor.studio.db.AppSupplychain',
|
|
35
40
|
EmailAddress: '/ws/rest/com.axelor.message.db.EmailAddress',
|
|
36
|
-
AppMobileSettings: '/ws/rest/com.axelor.studio.db.AppMobileSettings',
|
|
37
41
|
MailMessages: '/ws/messages',
|
|
38
42
|
},
|
|
39
43
|
};
|
package/lib/config/routes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/config/routes.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,MAAM,GAAG;IACb,IAAI,EAAE;QACJ,GAAG,EAAE,sCAAsC;QAC3C,OAAO,EAAE,0CAA0C;QACnD,MAAM,EAAE,yCAAyC;QACjD,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/config/routes.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,MAAM,GAAG;IACb,IAAI,EAAE;QACJ,GAAG,EAAE,sCAAsC;QAC3C,OAAO,EAAE,0CAA0C;QACnD,MAAM,EAAE,yCAAyC;QACjD,UAAU,EAAE,6CAA6C;QACzD,QAAQ,EAAE,2CAA2C;QACrD,cAAc,EAAE,iDAAiD;QACjE,iBAAiB,EAAE,oDAAoD;QACvE,SAAS,EAAE,4CAA4C;QACvD,YAAY,EAAE,kDAAkD;QAChE,YAAY,EAAE,kDAAkD;KACjE;IACD,IAAI,EAAE;QACJ,GAAG,EAAE,mCAAmC;QACxC,OAAO,EAAE,uCAAuC;QAChD,MAAM,EAAE,sCAAsC;QAC9C,UAAU,EAAE,2CAA2C;QACvD,QAAQ,EAAE,wCAAwC;QAClD,cAAc,EAAE,8CAA8C;QAC9D,iBAAiB,EAAE,iDAAiD;QACpE,SAAS,EAAE,4CAA4C;QACvD,YAAY,EAAE,6CAA6C;QAC3D,YAAY,EAAE,cAAc;KAC7B;CACF,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
|
19
19
|
import axios from 'axios';
|
|
20
20
|
import { getActiveUserInfo, loginApi } from '../api/login-api';
|
|
21
|
+
import { apiProviderConfig } from '../apiProviders/config';
|
|
21
22
|
import { saveUrlInStorage } from '../sessions';
|
|
22
23
|
import { checkNullString } from '../utils';
|
|
23
24
|
import { testUrl } from '../utils/api';
|
|
@@ -26,6 +27,7 @@ export const login = createAsyncThunk('auth/login', async ({ url, username, pass
|
|
|
26
27
|
const { token, jsessionId, requestInterceptorId, responseInterceptorId } = await loginApi(urlWithProtocol, username, password);
|
|
27
28
|
const { userId, applicationMode } = await getActiveUserInfo();
|
|
28
29
|
saveUrlInStorage(urlWithProtocol);
|
|
30
|
+
apiProviderConfig.setSessionExpired(false);
|
|
29
31
|
return {
|
|
30
32
|
url: urlWithProtocol,
|
|
31
33
|
token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"Base_Save": "Enregistrer",
|
|
19
19
|
"Base_Validate": "Valider",
|
|
20
20
|
"Base_Realize": "Réaliser",
|
|
21
|
-
"
|
|
21
|
+
"Base_AddContinue": "Ajouter et continuer",
|
|
22
22
|
"Base_Search": "Rechercher",
|
|
23
23
|
"Base_Add": "Ajouter",
|
|
24
24
|
"Base_Create": "Créer",
|
|
@@ -4,3 +4,5 @@ export declare function formatTime(dateInput: string, format: string): string;
|
|
|
4
4
|
export declare function formatDuration(duration: number, format: string): string;
|
|
5
5
|
export declare function formatScan(barcodeValue: any, barcodeType: any, config?: boolean): any;
|
|
6
6
|
export declare function formatURL(url: String): String;
|
|
7
|
+
export declare const getNowDateZonesISOString: () => string;
|
|
8
|
+
export declare const getDateZonesISOString: (dateString: string) => string;
|
package/lib/utils/formatters.js
CHANGED
|
@@ -95,4 +95,21 @@ function addEndSlash(url) {
|
|
|
95
95
|
}
|
|
96
96
|
return url + '/';
|
|
97
97
|
}
|
|
98
|
+
export const getNowDateZonesISOString = () => {
|
|
99
|
+
const now = new Date();
|
|
100
|
+
return getDateZonesISOString(now.toString());
|
|
101
|
+
};
|
|
102
|
+
export const getDateZonesISOString = (dateString) => {
|
|
103
|
+
const _date = new Date(dateString);
|
|
104
|
+
const year = _date.getFullYear();
|
|
105
|
+
const month = (_date.getMonth() + 1).toString().padStart(2, '0');
|
|
106
|
+
const day = _date.getDate().toString().padStart(2, '0');
|
|
107
|
+
const date = `${year}-${month}-${day}`;
|
|
108
|
+
const hours = _date.getHours().toString().padStart(2, '0');
|
|
109
|
+
const minutes = _date.getMinutes().toString().padStart(2, '0');
|
|
110
|
+
const seconds = _date.getSeconds().toString().padStart(2, '0');
|
|
111
|
+
const milliseconds = _date.getMilliseconds().toString().padStart(3, '0');
|
|
112
|
+
const time = `${hours}:${minutes}:${seconds}.${milliseconds}`;
|
|
113
|
+
return `${date}T${time}`;
|
|
114
|
+
};
|
|
98
115
|
//# sourceMappingURL=formatters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../../src/utils/formatters.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../../src/utils/formatters.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { updateAgendaItems } from './agenda';
|
|
2
2
|
export { isDate, isDateTime, getNextMonth, getPreviousMonth, diffDate, sameDate, incrementDate, } from './date';
|
|
3
3
|
export { displayItemName } from './displayers';
|
|
4
|
-
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, } from './formatters';
|
|
4
|
+
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, getNowDateZonesISOString, getDateZonesISOString, } from './formatters';
|
|
5
5
|
export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
|
|
6
6
|
export { filterList, filterListContain } from './list';
|
|
7
|
-
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, } from './time';
|
|
7
|
+
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, formatDurationToMiliseconds, } from './time';
|
|
8
8
|
export { areObjectsEquals, isEmpty, fetchJsonField, filterObjectsFields, pickFieldsOfObject, isPlainObject, } from './object';
|
|
9
9
|
export { showToastMessage } from './show-toast-message';
|
|
10
10
|
export { checkNullString, isHtml, splitInTwo, stringNoAccent } from './string';
|
package/lib/utils/index.js
CHANGED
|
@@ -18,10 +18,10 @@
|
|
|
18
18
|
export { updateAgendaItems } from './agenda';
|
|
19
19
|
export { isDate, isDateTime, getNextMonth, getPreviousMonth, diffDate, sameDate, incrementDate, } from './date';
|
|
20
20
|
export { displayItemName } from './displayers';
|
|
21
|
-
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, } from './formatters';
|
|
21
|
+
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, getNowDateZonesISOString, getDateZonesISOString, } from './formatters';
|
|
22
22
|
export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
|
|
23
23
|
export { filterList, filterListContain } from './list';
|
|
24
|
-
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, } from './time';
|
|
24
|
+
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, formatDurationToMiliseconds, } from './time';
|
|
25
25
|
export { areObjectsEquals, isEmpty, fetchJsonField, filterObjectsFields, pickFieldsOfObject, isPlainObject, } from './object';
|
|
26
26
|
export { showToastMessage } from './show-toast-message';
|
|
27
27
|
export { checkNullString, isHtml, splitInTwo, stringNoAccent } from './string';
|
package/lib/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,EACL,MAAM,EACN,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,EACL,MAAM,EACN,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAC,MAAM,QAAQ,CAAC;AACrD,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,2BAA2B,GAC5B,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAC,MAAM,UAAU,CAAC;AAC7E,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC"}
|
package/lib/utils/time.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export function formatTwoNumber(value: any): string;
|
|
2
2
|
export function getIntegerPart(value: any): string;
|
|
3
3
|
export function formatDuration(secondsValue: any, format?: string): string;
|
|
4
|
+
export function formatDurationToMiliseconds(duration: any): number;
|
|
4
5
|
export function calculateDiff(start: any, end: any): number;
|
package/lib/utils/time.js
CHANGED
|
@@ -52,6 +52,9 @@ export const formatDuration = (secondsValue, format = 'hh:mm:ss') => {
|
|
|
52
52
|
return `${getIntegerPart(days)}:${getIntegerPart(hours)}:${getIntegerPart(minutes)}:${getIntegerPart(seconds)}`;
|
|
53
53
|
}
|
|
54
54
|
};
|
|
55
|
+
export const formatDurationToMiliseconds = duration => {
|
|
56
|
+
return duration * 60 * 60;
|
|
57
|
+
};
|
|
55
58
|
export const calculateDiff = (start, end) => {
|
|
56
59
|
if (start == null) {
|
|
57
60
|
console.warn('the start date value cannot be null');
|
package/lib/utils/time.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/utils/time.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/utils/time.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "7.0
|
|
3
|
+
"version": "7.1.0",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -82,8 +82,8 @@
|
|
|
82
82
|
"vision-camera-code-scanner": "^0.2.0"
|
|
83
83
|
},
|
|
84
84
|
"dependencies": {
|
|
85
|
-
"@axelor/aos-mobile-error": "7.0
|
|
86
|
-
"@axelor/aos-mobile-ui": "7.0
|
|
85
|
+
"@axelor/aos-mobile-error": "7.1.0",
|
|
86
|
+
"@axelor/aos-mobile-ui": "7.1.0",
|
|
87
87
|
"@react-navigation/drawer": "6.6.3",
|
|
88
88
|
"@react-navigation/native": "6.1.7",
|
|
89
89
|
"@react-navigation/native-stack": "6.9.13",
|