@axelor/aos-mobile-core 6.5.4 → 6.5.6
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 +3 -1
- package/lib/api/metafile-api.js +10 -2
- package/lib/api/metafile-api.js.map +1 -1
- package/lib/api/mobile-config-api.js +9 -15
- package/lib/api/mobile-config-api.js.map +1 -1
- package/lib/apiProviders/utils.d.ts +7 -7
- package/lib/apiProviders/utils.js +35 -12
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/Module.d.ts +15 -2
- package/lib/auth/api/user-api.js +5 -3
- package/lib/auth/api/user-api.js.map +1 -1
- package/lib/auth/features/companySlice.d.ts +1 -1
- package/lib/auth/features/configSlice.d.ts +1 -1
- package/lib/auth/features/languageSlice.d.ts +1 -1
- package/lib/auth/features/userSlice.d.ts +1 -1
- package/lib/auth/features/userSlice.js +7 -5
- package/lib/auth/features/userSlice.js.map +1 -1
- package/lib/auth/index.js +1 -0
- package/lib/auth/index.js.map +1 -1
- package/lib/auth/models/objectFields.js +14 -0
- package/lib/auth/models/objectFields.js.map +1 -1
- package/lib/components/external/Stopwatch/Stopwatch.d.ts +6 -1
- package/lib/components/external/Stopwatch/Stopwatch.js +53 -15
- package/lib/components/external/Stopwatch/Stopwatch.js.map +1 -1
- package/lib/components/external/Timer/Timer.d.ts +3 -2
- package/lib/components/external/Timer/Timer.js +5 -4
- package/lib/components/external/Timer/Timer.js.map +1 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.d.ts +11 -2
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +128 -19
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.d.ts +2 -1
- package/lib/components/organisms/DateInput/DateInput.js +8 -5
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js +1 -1
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js.map +1 -1
- package/lib/features/attachedFilesSlice.d.ts +1 -1
- package/lib/features/authSlice.d.ts +1 -1
- package/lib/features/cameraScannerSlice.d.ts +1 -1
- package/lib/features/cameraSlice.d.ts +1 -1
- package/lib/features/mailMessageSlice.d.ts +1 -1
- package/lib/features/menuConfigSlice.d.ts +1 -1
- package/lib/features/metafileSlice.d.ts +1 -1
- package/lib/features/mobileConfigSlice.d.ts +1 -1
- package/lib/features/onlineSlice.d.ts +1 -1
- package/lib/features/scannerSlice.d.ts +1 -1
- package/lib/header/HeaderActionsProvider.d.ts +3 -4
- package/lib/header/HeaderActionsProvider.js +16 -10
- package/lib/header/HeaderActionsProvider.js.map +1 -1
- package/lib/header/index.d.ts +2 -1
- package/lib/header/index.js +2 -1
- package/lib/header/index.js.map +1 -1
- package/lib/i18n/component/Translator.d.ts +1 -1
- package/lib/i18n/hooks/use-translator.d.ts +1 -1
- package/lib/i18n/hooks/use-translator.js +3 -1
- package/lib/i18n/hooks/use-translator.js.map +1 -1
- package/lib/i18n/translations/en.json +20 -0
- package/lib/i18n/translations/fr.json +20 -0
- package/lib/navigator/Navigator.d.ts +1 -1
- package/lib/navigator/Navigator.js +19 -7
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.js +38 -18
- package/lib/navigator/drawer/DrawerContent.js.map +1 -1
- package/lib/navigator/drawer/Header.js +26 -6
- package/lib/navigator/drawer/Header.js.map +1 -1
- package/lib/navigator/drawer/Menu.js +31 -14
- package/lib/navigator/drawer/Menu.js.map +1 -1
- package/lib/navigator/drawer/MenuItem.d.ts +8 -5
- package/lib/navigator/drawer/MenuItem.js +11 -51
- package/lib/navigator/drawer/MenuItem.js.map +1 -1
- package/lib/navigator/drawer/MenuItemEntry.d.ts +12 -0
- package/lib/navigator/drawer/MenuItemEntry.js +89 -0
- package/lib/navigator/drawer/MenuItemEntry.js.map +1 -0
- package/lib/navigator/drawer/SubMenuItem.d.ts +7 -0
- package/lib/navigator/drawer/SubMenuItem.js +34 -0
- package/lib/navigator/drawer/SubMenuItem.js.map +1 -0
- package/lib/navigator/drawer/SubMenuItemList.d.ts +10 -0
- package/lib/navigator/drawer/SubMenuItemList.js +46 -0
- package/lib/navigator/drawer/SubMenuItemList.js.map +1 -0
- package/lib/navigator/menu.helper.d.ts +9 -0
- package/lib/navigator/menu.helper.js +92 -0
- package/lib/navigator/menu.helper.js.map +1 -1
- package/lib/navigator/module.helper.js.map +1 -1
- package/lib/redux/store.d.ts +1 -1
- package/lib/tools/ContactProvider.d.ts +9 -0
- package/lib/tools/ContactProvider.js +98 -0
- package/lib/tools/ContactProvider.js.map +1 -0
- package/lib/tools/contact.helper.d.ts +21 -0
- package/lib/tools/contact.helper.js +136 -0
- package/lib/tools/contact.helper.js.map +1 -0
- package/lib/tools/index.d.ts +1 -0
- package/lib/tools/index.js +1 -0
- package/lib/tools/index.js.map +1 -1
- package/lib/utils/date.d.ts +16 -0
- package/lib/utils/date.js +41 -0
- package/lib/utils/date.js.map +1 -1
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/package.json +9 -7
|
@@ -3,8 +3,10 @@ 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>;
|
|
12
|
+
export declare function deleteMetaFile(fileId: number): Promise<any>;
|
package/lib/api/metafile-api.js
CHANGED
|
@@ -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 { createStandardSearch } from '../apiProviders';
|
|
18
|
+
import { axiosApiProvider, createStandardSearch, } from '../apiProviders';
|
|
19
19
|
import RNFS from 'react-native-fs';
|
|
20
20
|
import RNFetchBlob from 'rn-fetch-blob';
|
|
21
21
|
const createCriteria = (listFiles) => {
|
|
@@ -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),
|
|
@@ -79,4 +82,9 @@ export async function uploadFile(file, { baseUrl, jsessionId, token }) {
|
|
|
79
82
|
}
|
|
80
83
|
});
|
|
81
84
|
}
|
|
85
|
+
export async function deleteMetaFile(fileId) {
|
|
86
|
+
return axiosApiProvider.delete({
|
|
87
|
+
url: `ws/rest/com.axelor.meta.db.MetaFile/${fileId}`,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
82
90
|
//# sourceMappingURL=metafile-api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,oBAAoB,GAErB,MAAM,iBAAiB,CAAC;AAEzB,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;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAc;IACjD,OAAO,gBAAgB,CAAC,MAAM,CAAC;QAC7B,GAAG,EAAE,uCAAuC,MAAM,EAAE;KACrD,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -16,9 +16,6 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { axiosApiProvider } from '../apiProviders';
|
|
19
|
-
function emptyResponse() {
|
|
20
|
-
return { data: { data: [] } };
|
|
21
|
-
}
|
|
22
19
|
export async function getMobileConfigs() {
|
|
23
20
|
return axiosApiProvider
|
|
24
21
|
.post({
|
|
@@ -31,26 +28,23 @@ export async function getMobileConfigs() {
|
|
|
31
28
|
operator: '=',
|
|
32
29
|
value: 'mobile-settings',
|
|
33
30
|
},
|
|
31
|
+
{
|
|
32
|
+
fieldName: 'active',
|
|
33
|
+
operator: '=',
|
|
34
|
+
value: true,
|
|
35
|
+
},
|
|
34
36
|
],
|
|
35
37
|
},
|
|
36
|
-
fields: ['
|
|
38
|
+
fields: ['id'],
|
|
37
39
|
},
|
|
38
40
|
})
|
|
39
41
|
.then(res => {
|
|
40
|
-
if ((res?.
|
|
41
|
-
|
|
42
|
-
return axiosApiProvider
|
|
43
|
-
.get({
|
|
42
|
+
if (Array.isArray(res?.data?.data) && res?.data?.data?.length > 0) {
|
|
43
|
+
return axiosApiProvider.get({
|
|
44
44
|
url: '/ws/rest/com.axelor.apps.mobilesettings.db.MobileConfig',
|
|
45
|
-
})
|
|
46
|
-
.then(_res => {
|
|
47
|
-
if (_res?.status === 0 || _res?.status === 200) {
|
|
48
|
-
return _res;
|
|
49
|
-
}
|
|
50
|
-
return emptyResponse();
|
|
51
45
|
});
|
|
52
46
|
}
|
|
53
|
-
return
|
|
47
|
+
return { data: { data: [] } };
|
|
54
48
|
});
|
|
55
49
|
}
|
|
56
50
|
//# sourceMappingURL=mobile-config-api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-config-api.js","sourceRoot":"","sources":["../../src/api/mobile-config-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEjD,
|
|
1
|
+
{"version":3,"file":"mobile-config-api.js","sourceRoot":"","sources":["../../src/api/mobile-config-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,OAAO,gBAAgB;SACpB,IAAI,CAAC;QACJ,GAAG,EAAE,6CAA6C;QAClD,IAAI,EAAE;YACJ,IAAI,EAAE;gBACJ,QAAQ,EAAE;oBACR;wBACE,SAAS,EAAE,MAAM;wBACjB,QAAQ,EAAE,GAAG;wBACb,KAAK,EAAE,iBAAiB;qBACzB;oBACD;wBACE,SAAS,EAAE,QAAQ;wBACnB,QAAQ,EAAE,GAAG;wBACb,KAAK,EAAE,IAAI;qBACZ;iBACF;aACF;YACD,MAAM,EAAE,CAAC,IAAI,CAAC;SACf;KACF,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,EAAE;QACV,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE;YACjE,OAAO,gBAAgB,CAAC,GAAG,CAAC;gBAC1B,GAAG,EAAE,yDAAyD;aAC/D,CAAC,CAAC;SACJ;QAED,OAAO,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,EAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -4,7 +4,7 @@ export declare const getApiResponseData: (response: any, { isArrayResponse }: {
|
|
|
4
4
|
export declare const getFirstData: (data: any) => any;
|
|
5
5
|
export declare const handlerError: (message: any, { getState }: {
|
|
6
6
|
getState?: () => void;
|
|
7
|
-
},
|
|
7
|
+
}, options: any) => (error: any) => any;
|
|
8
8
|
interface ApiHandlerProps {
|
|
9
9
|
fetchFunction: (data: any) => Promise<any>;
|
|
10
10
|
data: any;
|
|
@@ -14,12 +14,12 @@ interface ApiHandlerProps {
|
|
|
14
14
|
showToast?: boolean;
|
|
15
15
|
isArrayResponse?: boolean;
|
|
16
16
|
returnTotal?: boolean;
|
|
17
|
+
returnResponseMessage?: boolean;
|
|
18
|
+
};
|
|
19
|
+
errorOptions?: {
|
|
20
|
+
showErrorToast?: boolean;
|
|
21
|
+
errorTracing?: boolean;
|
|
17
22
|
};
|
|
18
|
-
errorOptions?: errorOptionsProps;
|
|
19
|
-
}
|
|
20
|
-
interface errorOptionsProps {
|
|
21
|
-
showErrorToast?: boolean;
|
|
22
|
-
errorTracing?: boolean;
|
|
23
23
|
}
|
|
24
|
-
export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions
|
|
24
|
+
export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions, errorOptions, }: ApiHandlerProps) => Promise<any>;
|
|
25
25
|
export {};
|
|
@@ -27,6 +27,7 @@ export const getApiResponseData = (response, { isArrayResponse = true }) => {
|
|
|
27
27
|
: getFirstData(response?.data?.data);
|
|
28
28
|
};
|
|
29
29
|
const getApiResponseMessage = response => response?.data?.messageStatus || response?.statusTxt;
|
|
30
|
+
const getApiResponseCode = response => response?.data?.codeStatus || response?.status;
|
|
30
31
|
const getApiResponseTotal = response => response?.data?.total || 0;
|
|
31
32
|
export const getFirstData = data => {
|
|
32
33
|
if (data instanceof Array) {
|
|
@@ -57,17 +58,16 @@ const manageError = (error, action, userId, { showErrorToast = true, errorTracin
|
|
|
57
58
|
text2: `${i18nProvider.i18n.t('Base_Failed_To')} ${i18nProvider.i18n.t(action)}: ${message}.`,
|
|
58
59
|
});
|
|
59
60
|
}
|
|
61
|
+
return null;
|
|
60
62
|
}
|
|
61
63
|
};
|
|
62
|
-
export const handlerError = (message, { getState = () => { } },
|
|
63
|
-
return error => manageError(error, message, getUser({ getState }),
|
|
64
|
-
showErrorToast,
|
|
65
|
-
errorTracing,
|
|
66
|
-
});
|
|
64
|
+
export const handlerError = (message, { getState = () => { } }, options) => {
|
|
65
|
+
return error => manageError(error, message, getUser({ getState }), options);
|
|
67
66
|
};
|
|
68
|
-
const manageSucess = (response, action, { showToast = false, isArrayResponse, returnTotal = false }) => {
|
|
67
|
+
const manageSucess = (response, action, { showToast = false, isArrayResponse, returnTotal = false, returnResponseMessage = false, }) => {
|
|
69
68
|
const data = getApiResponseData(response, { isArrayResponse });
|
|
70
69
|
const message = getApiResponseMessage(response);
|
|
70
|
+
const code = getApiResponseCode(response);
|
|
71
71
|
const total = getApiResponseTotal(response);
|
|
72
72
|
if (showToast) {
|
|
73
73
|
Toast.show({
|
|
@@ -78,14 +78,37 @@ const manageSucess = (response, action, { showToast = false, isArrayResponse, re
|
|
|
78
78
|
text2: `${message ? message : i18nProvider.i18n.t(action)}.`,
|
|
79
79
|
});
|
|
80
80
|
}
|
|
81
|
-
|
|
81
|
+
if (returnResponseMessage) {
|
|
82
|
+
return { total, data, message, code };
|
|
83
|
+
}
|
|
84
|
+
if (returnTotal) {
|
|
85
|
+
return total;
|
|
86
|
+
}
|
|
87
|
+
return data;
|
|
82
88
|
};
|
|
83
|
-
const handlerSuccess = (action,
|
|
84
|
-
return response => manageSucess(response, action,
|
|
89
|
+
const handlerSuccess = (action, options) => {
|
|
90
|
+
return response => manageSucess(response, action, options);
|
|
85
91
|
};
|
|
86
|
-
export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions
|
|
92
|
+
export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions = {
|
|
93
|
+
showToast: false,
|
|
94
|
+
isArrayResponse: false,
|
|
95
|
+
returnTotal: false,
|
|
96
|
+
returnResponseMessage: false,
|
|
97
|
+
}, errorOptions = { showErrorToast: true, errorTracing: true }, }) => {
|
|
87
98
|
return fetchFunction(data)
|
|
88
|
-
.
|
|
89
|
-
|
|
99
|
+
.then(res => {
|
|
100
|
+
if (res?.data?.status === -1) {
|
|
101
|
+
throw {
|
|
102
|
+
response: {
|
|
103
|
+
status: 403,
|
|
104
|
+
statusText: `${res.data.data?.title}: ${res.data.data?.message}`,
|
|
105
|
+
},
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
return handlerSuccess(action, responseOptions)(res);
|
|
110
|
+
}
|
|
111
|
+
})
|
|
112
|
+
.catch(handlerError(action, { getState }, errorOptions));
|
|
90
113
|
};
|
|
91
114
|
//# sourceMappingURL=utils.js.map
|
|
@@ -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,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,EAAC,eAAe,GAAG,IAAI,EAAC,EAAE,EAAE;IACvE,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE;QACjD,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;KAC7B;IACD,OAAO,eAAe;QACpB,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI;QACtB,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,QAAQ,CAAC,EAAE,CACvC,QAAQ,EAAE,IAAI,EAAE,aAAa,IAAI,QAAQ,EAAE,SAAS,CAAC;AAEvD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE;IACjC,IAAI,IAAI,YAAY,KAAK,EAAE;QACzB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,EAAC,QAAQ,EAAwB,EAAE,EAAE;IACpD,OAAO,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAClB,KAAK,EACL,MAAM,EACN,MAAM,EACN,EAAC,cAAc,GAAG,IAAI,EAAE,YAAY,GAAG,IAAI,EAAC,EAC5C,EAAE;IACF,IAAI,KAAK,CAAC,QAAQ,EAAE;QAClB,MAAM,OAAO,GACX,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,IAAI,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC;QACtE,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,IAAI,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC;QAEzE,IAAI,YAAY,EAAE;YAChB,UAAU,CAAC;gBACT,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;gBACxD,MAAM;aACP,CAAC,CAAC;SACJ;QAED,IAAI,cAAc,EAAE;YAClB,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,QAAQ;gBAClB,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,SAAS,IAAI,EAAE;gBACtB,KAAK,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CACpE,MAAM,CACP,KAAK,OAAO,GAAG;aACjB,CAAC,CAAC;SACJ;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/app/Module.d.ts
CHANGED
|
@@ -1,14 +1,27 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { Reducer } from '@reduxjs/toolkit';
|
|
3
3
|
import { Schema } from 'yup';
|
|
4
|
-
|
|
4
|
+
interface MenuBase {
|
|
5
5
|
title: string;
|
|
6
6
|
icon: string;
|
|
7
|
-
screen: string;
|
|
8
7
|
disabled?: boolean;
|
|
9
8
|
parent?: string;
|
|
10
9
|
order?: number;
|
|
11
10
|
}
|
|
11
|
+
interface MenuWithSubMenus extends MenuBase {
|
|
12
|
+
subMenus: {
|
|
13
|
+
[subMenuKey: string]: SubMenu;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
interface MenuWithScreen extends MenuBase {
|
|
17
|
+
screen: string;
|
|
18
|
+
}
|
|
19
|
+
interface RootMenuWithScreen extends MenuWithScreen {
|
|
20
|
+
isDefault?: boolean;
|
|
21
|
+
}
|
|
22
|
+
export type Menu = MenuWithSubMenus | RootMenuWithScreen;
|
|
23
|
+
export interface SubMenu extends MenuWithScreen {
|
|
24
|
+
}
|
|
12
25
|
interface ScreenOptions {
|
|
13
26
|
shadedHeader: boolean;
|
|
14
27
|
}
|
package/lib/auth/api/user-api.js
CHANGED
|
@@ -15,10 +15,12 @@
|
|
|
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 { axiosApiProvider } from '../../apiProviders';
|
|
18
|
+
import { axiosApiProvider, createStandardFetch } from '../../apiProviders';
|
|
19
19
|
export async function getLoggedUser(userId) {
|
|
20
|
-
return
|
|
21
|
-
|
|
20
|
+
return createStandardFetch({
|
|
21
|
+
model: 'com.axelor.auth.db.User',
|
|
22
|
+
id: userId,
|
|
23
|
+
fieldKey: 'auth_user',
|
|
22
24
|
});
|
|
23
25
|
}
|
|
24
26
|
export async function postUser(user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-api.js","sourceRoot":"","sources":["../../../src/auth/api/user-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"user-api.js","sourceRoot":"","sources":["../../../src/auth/api/user-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEzE,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAM;IACxC,OAAO,mBAAmB,CAAC;QACzB,KAAK,EAAE,yBAAyB;QAChC,EAAE,EAAE,MAAM;QACV,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAI;IACjC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,kCAAkC;QACvC,IAAI,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC;KACnB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -34,7 +34,13 @@ export const updateActiveUser = createAsyncThunk('user/updateActiveUser', async
|
|
|
34
34
|
action: 'Auth_SliceAction_UpdateActiveUser',
|
|
35
35
|
getState,
|
|
36
36
|
responseOptions: { isArrayResponse: false },
|
|
37
|
-
})
|
|
37
|
+
}).then(() => handlerApiCall({
|
|
38
|
+
fetchFunction: getLoggedUser,
|
|
39
|
+
data: user.id,
|
|
40
|
+
action: 'Auth_SliceAction_FetchActiveUser',
|
|
41
|
+
getState,
|
|
42
|
+
responseOptions: { isArrayResponse: false },
|
|
43
|
+
}));
|
|
38
44
|
});
|
|
39
45
|
const initialState = {
|
|
40
46
|
loadingUser: true,
|
|
@@ -66,11 +72,7 @@ const userSlice = createSlice({
|
|
|
66
72
|
state.canModifyCompany = true;
|
|
67
73
|
}
|
|
68
74
|
});
|
|
69
|
-
builder.addCase(updateActiveUser.pending, state => {
|
|
70
|
-
state.loadingUser = true;
|
|
71
|
-
});
|
|
72
75
|
builder.addCase(updateActiveUser.fulfilled, (state, action) => {
|
|
73
|
-
state.loadingUser = false;
|
|
74
76
|
state.user = action.payload;
|
|
75
77
|
if (state.user.activeCompany == null) {
|
|
76
78
|
state.canModifyCompany = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userSlice.js","sourceRoot":"","sources":["../../../src/auth/features/userSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAExD,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAC7C,sBAAsB,EACtB,KAAK,WAAW,MAAM,EAAE,EAAC,QAAQ,EAAC;IAChC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,aAAa;QAC5B,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,uBAAuB,EACvB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,QAAQ;QACvB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,mCAAmC;QAC3C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"userSlice.js","sourceRoot":"","sources":["../../../src/auth/features/userSlice.js"],"names":[],"mappings":"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"}
|
package/lib/auth/index.js
CHANGED
package/lib/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;SAChB;KACF;IACD,OAAO,EAAE;QACP,UAAU,EAAE;YACV,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,cAAc,EAAE;YACd,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,cAAc;SAC1B;KACF;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,YAAY;KAChB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,aAAa,EAAC;QAChC,eAAe,EAAE,cAAc;KAChC;CACF,CAAC;AAEF,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC;AACtB,cAAc,gCAAgC,CAAC"}
|
|
@@ -21,5 +21,19 @@ export const auth_modelAPI = {
|
|
|
21
21
|
code: schemaContructor.string(),
|
|
22
22
|
name: schemaContructor.string(),
|
|
23
23
|
}),
|
|
24
|
+
auth_user: schemaContructor.object({
|
|
25
|
+
fullName: schemaContructor.string(),
|
|
26
|
+
name: schemaContructor.string(),
|
|
27
|
+
activeCompany: schemaContructor.subObject(),
|
|
28
|
+
'activeCompany.currency': schemaContructor.subObject(),
|
|
29
|
+
'activeCompany.currency.symbol': schemaContructor.string(),
|
|
30
|
+
activeTeam: schemaContructor.subObject(),
|
|
31
|
+
workshopStockLocation: schemaContructor.subObject(),
|
|
32
|
+
roles: schemaContructor.array(),
|
|
33
|
+
group: schemaContructor.subObject(),
|
|
34
|
+
employee: schemaContructor.subObject(),
|
|
35
|
+
language: schemaContructor.string(),
|
|
36
|
+
todayDateT: schemaContructor.string(),
|
|
37
|
+
}),
|
|
24
38
|
};
|
|
25
39
|
//# sourceMappingURL=objectFields.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../../src/auth/models/objectFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAe,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;KAChC,CAAC;CACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../../src/auth/models/objectFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAe,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;KAChC,CAAC;IACF,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,aAAa,EAAE,gBAAgB,CAAC,SAAS,EAAE;QAC3C,wBAAwB,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtD,+BAA+B,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC1D,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACxC,qBAAqB,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnD,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE;QAC/B,KAAK,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnC,QAAQ,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE;KACtC,CAAC;CACH,CAAC"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
interface StopwatchProps {
|
|
2
2
|
startTime: number;
|
|
3
3
|
status: number;
|
|
4
|
+
getTimerState?: () => {
|
|
5
|
+
status: number;
|
|
6
|
+
time: number;
|
|
7
|
+
};
|
|
4
8
|
timerFormat: string;
|
|
5
9
|
disable?: boolean;
|
|
6
10
|
disablePlay?: boolean;
|
|
@@ -13,6 +17,7 @@ interface StopwatchProps {
|
|
|
13
17
|
onPause: () => void;
|
|
14
18
|
onStop: () => void;
|
|
15
19
|
onCancel?: () => void;
|
|
20
|
+
useObjectStatus?: boolean;
|
|
16
21
|
}
|
|
17
|
-
declare const Stopwatch: ({ startTime, status, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, }: StopwatchProps) => JSX.Element;
|
|
22
|
+
declare const Stopwatch: ({ startTime, status, getTimerState, timerFormat, disable, disablePlay, disablePause, disableStop, disableCancel, hideCancel, style, onPlay, onPause, onStop, onCancel, useObjectStatus, }: StopwatchProps) => JSX.Element;
|
|
18
23
|
export default Stopwatch;
|
|
@@ -15,20 +15,51 @@
|
|
|
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';
|
|
19
|
-
import { StyleSheet, View } from 'react-native';
|
|
18
|
+
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
19
|
+
import { AppState, 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';
|
|
22
22
|
import { StopwatchType } from '../../../types';
|
|
23
23
|
import { Timer } from '../../external';
|
|
24
|
-
const
|
|
24
|
+
const APP_STATE = {
|
|
25
|
+
inactiveRegex: /inactive|background/,
|
|
26
|
+
activeMode: 'active',
|
|
27
|
+
};
|
|
28
|
+
const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, getTimerState = () => ({ status: null, time: null }), timerFormat, disable = false, disablePlay = false, disablePause = false, disableStop = false, disableCancel = false, hideCancel = false, style, onPlay = () => { }, onPause = () => { }, onStop = () => { }, onCancel = () => { }, useObjectStatus = false, }) => {
|
|
29
|
+
const appState = useRef(AppState.currentState);
|
|
25
30
|
const Colors = useThemeColor();
|
|
26
31
|
const I18n = useTranslator();
|
|
27
32
|
const [state, setState] = useState(status);
|
|
28
33
|
const [time, setTime] = useState(startTime);
|
|
34
|
+
useEffect(() => {
|
|
35
|
+
const subscription = AppState.addEventListener('change', nextAppState => {
|
|
36
|
+
if (appState.current.match(APP_STATE.inactiveRegex) &&
|
|
37
|
+
nextAppState === APP_STATE.activeMode) {
|
|
38
|
+
const { status: _status, time: _time } = getTimerState();
|
|
39
|
+
_status != null && setState(_status);
|
|
40
|
+
_time != null && setTime(_time);
|
|
41
|
+
}
|
|
42
|
+
appState.current = nextAppState;
|
|
43
|
+
});
|
|
44
|
+
return () => {
|
|
45
|
+
subscription.remove();
|
|
46
|
+
};
|
|
47
|
+
}, [appState, getTimerState]);
|
|
48
|
+
useEffect(() => {
|
|
49
|
+
setTime(startTime);
|
|
50
|
+
}, [startTime]);
|
|
51
|
+
useEffect(() => {
|
|
52
|
+
setState(status);
|
|
53
|
+
}, [status]);
|
|
54
|
+
const stopwatchStatus = useMemo(() => {
|
|
55
|
+
if (useObjectStatus) {
|
|
56
|
+
return status;
|
|
57
|
+
}
|
|
58
|
+
return state;
|
|
59
|
+
}, [state, status, useObjectStatus]);
|
|
29
60
|
const borderStyle = useMemo(() => {
|
|
30
|
-
return getStyles(StopwatchType.getStatusBorderColor(
|
|
31
|
-
}, [Colors,
|
|
61
|
+
return getStyles(StopwatchType.getStatusBorderColor(stopwatchStatus, Colors)).border;
|
|
62
|
+
}, [Colors, stopwatchStatus]);
|
|
32
63
|
const handlePlayBtn = () => {
|
|
33
64
|
setState(StopwatchType.status.InProgress);
|
|
34
65
|
onPlay();
|
|
@@ -46,27 +77,34 @@ const Stopwatch = ({ startTime = 0, status = StopwatchType.status.Ready, timerFo
|
|
|
46
77
|
setTime(0);
|
|
47
78
|
onCancel();
|
|
48
79
|
};
|
|
80
|
+
const TimerButton = ({ name, disabled, onPress, }) => {
|
|
81
|
+
return (<Icon name={name} size={25} color={disabled
|
|
82
|
+
? Colors.secondaryColor.background_light
|
|
83
|
+
: Colors.secondaryColor_dark.background} touchable={!disabled} onPress={onPress} style={styles.btn}/>);
|
|
84
|
+
};
|
|
49
85
|
return (<Card style={[styles.container, borderStyle, style]}>
|
|
50
86
|
<View style={styles.row}>
|
|
51
87
|
<Text style={styles.status}>
|
|
52
|
-
{StopwatchType.getStatus(
|
|
88
|
+
{StopwatchType.getStatus(stopwatchStatus, I18n)}
|
|
53
89
|
</Text>
|
|
54
90
|
<Icon name="stopwatch" size={18} style={styles.icon}/>
|
|
55
91
|
</View>
|
|
56
92
|
<View style={styles.row}>
|
|
57
93
|
<View style={styles.btnContainer}>
|
|
58
|
-
{
|
|
94
|
+
{stopwatchStatus !== StopwatchType.status.InProgress && (<TimerButton name="play" disabled={disable ||
|
|
59
95
|
disablePlay ||
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
{
|
|
63
|
-
<
|
|
96
|
+
stopwatchStatus === StopwatchType.status.InProgress ||
|
|
97
|
+
stopwatchStatus === StopwatchType.status.Finished} onPress={handlePlayBtn}/>)}
|
|
98
|
+
{stopwatchStatus === StopwatchType.status.InProgress && (<TimerButton name="pause" disabled={disable || disablePause} onPress={handlePauseBtn}/>)}
|
|
99
|
+
<TimerButton name="power-off" disabled={disable ||
|
|
64
100
|
disableStop ||
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
{!hideCancel && (<
|
|
101
|
+
stopwatchStatus === StopwatchType.status.Ready ||
|
|
102
|
+
stopwatchStatus === StopwatchType.status.Finished} onPress={handleStopBtn}/>
|
|
103
|
+
{!hideCancel && (<TimerButton name="undo" disabled={disable ||
|
|
104
|
+
disableCancel ||
|
|
105
|
+
stopwatchStatus === StopwatchType.status.Ready} onPress={handleCancelBtn}/>)}
|
|
68
106
|
</View>
|
|
69
|
-
<Timer time={time}
|
|
107
|
+
<Timer time={time} addCount={timeToAdd => setTime(_current => _current + timeToAdd)} style={styles.timer} isPaused={stopwatchStatus !== StopwatchType.status.InProgress} timerFormat={timerFormat}/>
|
|
70
108
|
</View>
|
|
71
109
|
</Card>);
|
|
72
110
|
};
|
|
@@ -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,9 +1,10 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
1
2
|
interface TimerProps {
|
|
2
3
|
time: number;
|
|
3
4
|
timerFormat: string;
|
|
4
5
|
style?: any;
|
|
5
6
|
isPaused?: boolean;
|
|
6
|
-
|
|
7
|
+
addCount: (value: any) => void;
|
|
7
8
|
}
|
|
8
|
-
declare function Timer({ style, timerFormat, time, isPaused,
|
|
9
|
+
declare function Timer({ style, timerFormat, time, isPaused, addCount, }: TimerProps): JSX.Element;
|
|
9
10
|
export default Timer;
|
|
@@ -19,7 +19,8 @@ import React, { useEffect, useCallback, useMemo } from 'react';
|
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
20
|
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { formatDuration } from '../../../utils/formatters';
|
|
22
|
-
|
|
22
|
+
const ONE_SECOND = 1000;
|
|
23
|
+
function Timer({ style, timerFormat, time = 0, isPaused = true, addCount, }) {
|
|
23
24
|
const interval = React.useRef(null);
|
|
24
25
|
const Colors = useThemeColor();
|
|
25
26
|
const styles = useMemo(() => {
|
|
@@ -30,13 +31,13 @@ function Timer({ style, timerFormat, time = 0, isPaused = true, onCount, }) {
|
|
|
30
31
|
console.warn('Timer: something went wrong');
|
|
31
32
|
return;
|
|
32
33
|
}
|
|
33
|
-
|
|
34
|
-
}, [
|
|
34
|
+
addCount(ONE_SECOND);
|
|
35
|
+
}, [addCount, time]);
|
|
35
36
|
useEffect(() => {
|
|
36
37
|
if (isPaused) {
|
|
37
38
|
return;
|
|
38
39
|
}
|
|
39
|
-
interval.current = setInterval(counterHandle,
|
|
40
|
+
interval.current = setInterval(counterHandle, ONE_SECOND);
|
|
40
41
|
return () => clearInterval(interval.current);
|
|
41
42
|
}, [counterHandle, isPaused, time]);
|
|
42
43
|
return (<View style={[styles.timer, style]}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Timer.js","sourceRoot":"","sources":["../../../../src/components/external/Timer/Timer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Timer.js","sourceRoot":"","sources":["../../../../src/components/external/Timer/Timer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AAEzD,MAAM,UAAU,GAAG,IAAI,CAAC;AAUxB,SAAS,KAAK,CAAC,EACb,KAAK,EACL,WAAW,EACX,IAAI,GAAG,CAAC,EACR,QAAQ,GAAG,IAAI,EACf,QAAQ,GACG;IACX,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;QACrC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAC5C,OAAO;SACR;QACD,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAErB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,EAAE;YACZ,OAAO;SACR;QAED,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC1D,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAEpC,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CACjC;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,IAAI,CACrE;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CACzB,UAAU,CAAC,MAAM,CAAC;IAChB,KAAK,EAAE;QACL,UAAU,EAAE,CAAC;QACb,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;KACrB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,UAAU;KAC7C;CACF,CAAC,CAAC;AAEL,eAAe,KAAK,CAAC"}
|