@axelor/aos-mobile-core 7.0.3 → 7.0.5
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 +13 -1
- package/lib/api/metafile-api.js +19 -5
- 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/api/model-api.d.ts +4 -0
- package/lib/api/model-api.js +28 -0
- package/lib/api/model-api.js.map +1 -0
- package/lib/apiProviders/utils.d.ts +7 -7
- package/lib/apiProviders/utils.js +31 -23
- 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/i18n/en.json +0 -16
- package/lib/auth/i18n/fr.json +0 -16
- 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/Camera/Camera.js +15 -5
- package/lib/components/external/Camera/Camera.js.map +1 -1
- package/lib/components/external/Camera/CaptureButton.d.ts +2 -1
- package/lib/components/external/Camera/CaptureButton.js +3 -3
- package/lib/components/external/Camera/CaptureButton.js.map +1 -1
- package/lib/components/external/Stopwatch/Stopwatch.d.ts +5 -1
- package/lib/components/external/Stopwatch/Stopwatch.js +41 -11
- 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/CameraButton/CameraButton.d.ts +12 -0
- package/lib/components/molecules/CameraButton/CameraButton.js +87 -0
- package/lib/components/molecules/CameraButton/CameraButton.js.map +1 -0
- package/lib/components/molecules/UploadFileInput/UploadFileInput.d.ts +13 -2
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +183 -20
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/molecules/index.d.ts +1 -3
- package/lib/components/molecules/index.js +1 -3
- package/lib/components/molecules/index.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/organisms/HeaderOptionsMenu/HeaderOptionsMenu.d.ts +2 -1
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js +5 -4
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js.map +1 -1
- package/lib/components/organisms/index.d.ts +1 -6
- package/lib/components/organisms/index.js +1 -6
- package/lib/components/organisms/index.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/components/templates/index.d.ts +0 -3
- package/lib/components/templates/index.js +0 -3
- package/lib/components/templates/index.js.map +1 -1
- package/lib/config/routes.d.ts +16 -16
- package/lib/features/attachedFilesSlice.d.ts +1 -1
- package/lib/features/authSlice.d.ts +1 -1
- package/lib/features/cameraScannerSlice.d.ts +2 -2
- package/lib/features/cameraScannerSlice.js +4 -1
- package/lib/features/cameraScannerSlice.js.map +1 -1
- package/lib/features/cameraSlice.d.ts +13 -4
- package/lib/features/cameraSlice.js +4 -1
- package/lib/features/cameraSlice.js.map +1 -1
- package/lib/features/mailMessageSlice.d.ts +1 -1
- package/lib/features/menuConfigSlice.d.ts +1 -1
- package/lib/features/metaModuleSlice.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 +2 -2
- package/lib/features/scannerSlice.js +4 -1
- package/lib/features/scannerSlice.js.map +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/hooks.d.ts +15 -1
- package/lib/header/hooks.js +28 -2
- package/lib/header/hooks.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/header/types.d.ts +1 -0
- 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 +35 -4
- package/lib/i18n/translations/fr.json +35 -4
- package/lib/index.d.ts +2 -2
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/lib/navigator/Navigator.d.ts +1 -1
- package/lib/navigator/Navigator.js +21 -25
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.js +39 -21
- 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.d.ts +2 -1
- package/lib/navigator/drawer/Menu.js +42 -17
- 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.d.ts +5 -0
- package/lib/navigator/module.helper.js +37 -1
- package/lib/navigator/module.helper.js.map +1 -1
- package/lib/redux/store.d.ts +1 -1
- package/lib/screens/BarcodeDisplayScreen.d.ts +4 -0
- package/lib/screens/BarcodeDisplayScreen.js +54 -0
- package/lib/screens/BarcodeDisplayScreen.js.map +1 -0
- package/lib/screens/LoginScreen.js +47 -73
- package/lib/screens/LoginScreen.js.map +1 -1
- package/lib/screens/SessionManagementScreen.js +41 -21
- package/lib/screens/SessionManagementScreen.js.map +1 -1
- package/lib/screens/index.d.ts +38 -0
- package/lib/screens/index.js +47 -0
- package/lib/screens/index.js.map +1 -0
- package/lib/sessions/SessionStorage.d.ts +4 -5
- package/lib/sessions/SessionStorage.js +30 -22
- package/lib/sessions/SessionStorage.js.map +1 -1
- package/lib/sessions/components/alerts/PopupCreateSession.d.ts +10 -0
- package/lib/sessions/components/alerts/PopupCreateSession.js +137 -0
- package/lib/sessions/components/alerts/PopupCreateSession.js.map +1 -0
- package/lib/sessions/components/alerts/PopupEditSession.d.ts +8 -0
- package/lib/sessions/components/alerts/PopupEditSession.js +84 -0
- package/lib/sessions/components/alerts/PopupEditSession.js.map +1 -0
- package/lib/sessions/components/alerts/PopupSession.d.ts +9 -0
- package/lib/sessions/components/alerts/PopupSession.js +84 -0
- package/lib/sessions/components/alerts/PopupSession.js.map +1 -0
- package/lib/sessions/components/alerts/index.d.ts +3 -0
- package/lib/sessions/components/alerts/index.js +21 -0
- package/lib/sessions/components/alerts/index.js.map +1 -0
- package/lib/sessions/components/buttons/DisabledButton.d.ts +7 -0
- package/lib/{components/molecules/LoginButton/LoginButton.js → sessions/components/buttons/DisabledButton.js} +5 -5
- package/lib/sessions/components/buttons/DisabledButton.js.map +1 -0
- package/lib/sessions/components/buttons/LoginButton.js +24 -0
- package/lib/sessions/components/buttons/LoginButton.js.map +1 -0
- package/lib/sessions/components/buttons/UpdateButton.d.ts +6 -0
- package/lib/sessions/components/buttons/UpdateButton.js +24 -0
- package/lib/sessions/components/buttons/UpdateButton.js.map +1 -0
- package/lib/sessions/components/buttons/index.d.ts +3 -0
- package/lib/sessions/components/buttons/index.js +21 -0
- package/lib/sessions/components/buttons/index.js.map +1 -0
- package/lib/sessions/components/display/LogoImage.js.map +1 -0
- package/lib/sessions/components/display/SessionCard.d.ts +9 -0
- package/lib/sessions/components/display/SessionCard.js +185 -0
- package/lib/sessions/components/display/SessionCard.js.map +1 -0
- package/lib/sessions/components/display/SessionListCard.d.ts +10 -0
- package/lib/sessions/components/display/SessionListCard.js +75 -0
- package/lib/sessions/components/display/SessionListCard.js.map +1 -0
- package/lib/sessions/components/display/index.d.ts +3 -0
- package/lib/sessions/components/display/index.js +21 -0
- package/lib/sessions/components/display/index.js.map +1 -0
- package/lib/{components/molecules/ErrorText → sessions/components/error}/ErrorText.js +2 -2
- package/lib/sessions/components/error/ErrorText.js.map +1 -0
- package/lib/sessions/components/error/index.d.ts +1 -0
- package/lib/sessions/components/error/index.js +19 -0
- package/lib/sessions/components/error/index.js.map +1 -0
- package/lib/sessions/components/index.d.ts +5 -0
- package/lib/sessions/components/index.js +23 -0
- package/lib/sessions/components/index.js.map +1 -0
- package/lib/sessions/components/inputs/DefaultCheckbox.d.ts +8 -0
- package/lib/sessions/components/inputs/DefaultCheckbox.js +36 -0
- package/lib/sessions/components/inputs/DefaultCheckbox.js.map +1 -0
- package/lib/{components/organisms/PasswordInput → sessions/components/inputs}/PasswordInput.d.ts +2 -1
- package/lib/{components/organisms/PasswordInput → sessions/components/inputs}/PasswordInput.js +5 -2
- package/lib/sessions/components/inputs/PasswordInput.js.map +1 -0
- package/lib/sessions/components/inputs/SessionInputs.d.ts +13 -0
- package/lib/sessions/components/inputs/SessionInputs.js +180 -0
- package/lib/sessions/components/inputs/SessionInputs.js.map +1 -0
- package/lib/{components/organisms/SessionNameInput → sessions/components/inputs}/SessionNameInput.d.ts +2 -1
- package/lib/{components/organisms/SessionNameInput → sessions/components/inputs}/SessionNameInput.js +5 -2
- package/lib/sessions/components/inputs/SessionNameInput.js.map +1 -0
- package/lib/{components/organisms/UrlInput → sessions/components/inputs}/UrlInput.d.ts +2 -1
- package/lib/{components/organisms/UrlInput → sessions/components/inputs}/UrlInput.js +14 -3
- package/lib/sessions/components/inputs/UrlInput.js.map +1 -0
- package/lib/{components/organisms/UsernameInput → sessions/components/inputs}/UsernameInput.js +10 -2
- package/lib/sessions/components/inputs/UsernameInput.js.map +1 -0
- package/lib/sessions/components/inputs/index.d.ts +6 -0
- package/lib/sessions/components/inputs/index.js +24 -0
- package/lib/sessions/components/inputs/index.js.map +1 -0
- package/lib/sessions/hook.d.ts +1 -1
- package/lib/sessions/hook.js +5 -5
- package/lib/sessions/hook.js.map +1 -1
- package/lib/sessions/index.d.ts +2 -1
- package/lib/sessions/index.js +2 -1
- package/lib/sessions/index.js.map +1 -1
- package/lib/sessions/type.d.ts +2 -1
- package/lib/sessions/type.js.map +1 -1
- package/lib/sessions/utils.d.ts +2 -1
- package/lib/sessions/utils.js +26 -7
- package/lib/sessions/utils.js.map +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 +12 -10
- package/lib/components/molecules/ErrorText/ErrorText.js.map +0 -1
- package/lib/components/molecules/LoginButton/LoginButton.js.map +0 -1
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.d.ts +0 -4
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.js +0 -44
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.js.map +0 -1
- package/lib/components/organisms/LogoImage/LogoImage.js.map +0 -1
- package/lib/components/organisms/PasswordInput/PasswordInput.js.map +0 -1
- package/lib/components/organisms/SessionButtons/SessionButtons.d.ts +0 -17
- package/lib/components/organisms/SessionButtons/SessionButtons.js +0 -93
- package/lib/components/organisms/SessionButtons/SessionButtons.js.map +0 -1
- package/lib/components/organisms/SessionNameInput/SessionNameInput.js.map +0 -1
- package/lib/components/organisms/UrlInput/UrlInput.js.map +0 -1
- package/lib/components/organisms/UsernameInput/UsernameInput.js.map +0 -1
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.d.ts +0 -10
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.js +0 -171
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.js.map +0 -1
- package/lib/components/templates/PopupSession/PopupSession.d.ts +0 -8
- package/lib/components/templates/PopupSession/PopupSession.js +0 -135
- package/lib/components/templates/PopupSession/PopupSession.js.map +0 -1
- package/lib/components/templates/PopupSessionList/PopupSessionList.d.ts +0 -7
- package/lib/components/templates/PopupSessionList/PopupSessionList.js +0 -107
- package/lib/components/templates/PopupSessionList/PopupSessionList.js.map +0 -1
- /package/lib/{components/molecules/LoginButton → sessions/components/buttons}/LoginButton.d.ts +0 -0
- /package/lib/{components/organisms/LogoImage → sessions/components/display}/LogoImage.d.ts +0 -0
- /package/lib/{components/organisms/LogoImage → sessions/components/display}/LogoImage.js +0 -0
- /package/lib/{components/molecules/ErrorText → sessions/components/error}/ErrorText.d.ts +0 -0
- /package/lib/{components/organisms/UsernameInput → sessions/components/inputs}/UsernameInput.d.ts +0 -0
|
@@ -3,8 +3,20 @@ 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 uploadBase64(file: {
|
|
13
|
+
base64: string;
|
|
14
|
+
name: string;
|
|
15
|
+
size: number;
|
|
16
|
+
type: string;
|
|
17
|
+
}, { baseUrl, jsessionId, token }: {
|
|
18
|
+
baseUrl: any;
|
|
19
|
+
jsessionId: any;
|
|
20
|
+
token: any;
|
|
21
|
+
}): Promise<any>;
|
|
22
|
+
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,22 @@ 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
|
+
if (file == null) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const base64Data = await RNFS.readFile(file.uri, 'base64');
|
|
56
|
+
if (returnBase64String) {
|
|
57
|
+
return `data:${file.type};base64,${base64Data}`;
|
|
58
|
+
}
|
|
59
|
+
return uploadBase64({ ...file, base64: base64Data }, { baseUrl, jsessionId, token });
|
|
60
|
+
}
|
|
61
|
+
export async function uploadBase64(file, { baseUrl, jsessionId, token }) {
|
|
52
62
|
if (file == null) {
|
|
53
63
|
return;
|
|
54
64
|
}
|
|
55
65
|
return new Promise(async (resolve, reject) => {
|
|
56
66
|
try {
|
|
57
|
-
const base64Data = await RNFS.readFile(file.uri, 'base64');
|
|
58
67
|
const headers = {
|
|
59
68
|
'Content-Type': 'application/octet-stream',
|
|
60
69
|
'Content-Length': String(file.size),
|
|
@@ -65,13 +74,13 @@ export async function uploadFile(file, { baseUrl, jsessionId, token }) {
|
|
|
65
74
|
'x-csrf-token': token,
|
|
66
75
|
Cookie: `CSRF-TOKEN=${token}; ${jsessionId}`,
|
|
67
76
|
};
|
|
68
|
-
const response = await RNFetchBlob.fetch('POST', `${baseUrl}ws/files/upload`, headers,
|
|
77
|
+
const response = await RNFetchBlob.fetch('POST', `${baseUrl}ws/files/upload`, headers, file.base64);
|
|
69
78
|
const metaFile = JSON.parse(response.data);
|
|
70
79
|
if (Object.keys(metaFile).includes('id')) {
|
|
71
80
|
resolve(metaFile);
|
|
72
81
|
}
|
|
73
82
|
else {
|
|
74
|
-
throw Error('
|
|
83
|
+
throw Error('No metafile created');
|
|
75
84
|
}
|
|
76
85
|
}
|
|
77
86
|
catch (error) {
|
|
@@ -79,4 +88,9 @@ export async function uploadFile(file, { baseUrl, jsessionId, token }) {
|
|
|
79
88
|
}
|
|
80
89
|
});
|
|
81
90
|
}
|
|
91
|
+
export async function deleteMetaFile(fileId) {
|
|
92
|
+
return axiosApiProvider.delete({
|
|
93
|
+
url: `ws/rest/com.axelor.meta.db.MetaFile/${fileId}`,
|
|
94
|
+
});
|
|
95
|
+
}
|
|
82
96
|
//# 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":"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"}
|
|
@@ -17,9 +17,6 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import { axiosApiProvider } from '../apiProviders';
|
|
19
19
|
import { RouterProvider } from '../config';
|
|
20
|
-
function emptyResponse() {
|
|
21
|
-
return { data: { data: [] } };
|
|
22
|
-
}
|
|
23
20
|
export async function getMobileConfigs() {
|
|
24
21
|
const route = await RouterProvider.get('App');
|
|
25
22
|
return axiosApiProvider
|
|
@@ -33,26 +30,23 @@ export async function getMobileConfigs() {
|
|
|
33
30
|
operator: '=',
|
|
34
31
|
value: 'mobile-settings',
|
|
35
32
|
},
|
|
33
|
+
{
|
|
34
|
+
fieldName: 'active',
|
|
35
|
+
operator: '=',
|
|
36
|
+
value: true,
|
|
37
|
+
},
|
|
36
38
|
],
|
|
37
39
|
},
|
|
38
|
-
fields: ['
|
|
40
|
+
fields: ['id'],
|
|
39
41
|
},
|
|
40
42
|
})
|
|
41
43
|
.then(res => {
|
|
42
|
-
if ((res?.
|
|
43
|
-
|
|
44
|
-
return axiosApiProvider
|
|
45
|
-
.get({
|
|
44
|
+
if (Array.isArray(res?.data?.data) && res?.data?.data?.length > 0) {
|
|
45
|
+
return axiosApiProvider.get({
|
|
46
46
|
url: '/ws/rest/com.axelor.apps.mobilesettings.db.MobileConfig',
|
|
47
|
-
})
|
|
48
|
-
.then(_res => {
|
|
49
|
-
if (_res?.status === 0 || _res?.status === 200) {
|
|
50
|
-
return _res;
|
|
51
|
-
}
|
|
52
|
-
return emptyResponse();
|
|
53
47
|
});
|
|
54
48
|
}
|
|
55
|
-
return
|
|
49
|
+
return { data: { data: [] } };
|
|
56
50
|
});
|
|
57
51
|
}
|
|
58
52
|
//# 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;AACjD,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC,
|
|
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;AACjD,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAE9C,OAAO,gBAAgB;SACpB,IAAI,CAAC;QACJ,GAAG,EAAE,GAAG,KAAK,SAAS;QACtB,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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Axelor Business Solutions
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2023 Axelor (<http://axelor.com>).
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU Affero General Public License, version 3,
|
|
8
|
+
* as published by the Free Software Foundation.
|
|
9
|
+
*
|
|
10
|
+
* This program is distributed in the hope that it will be useful,
|
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
* GNU Affero General Public License for more details.
|
|
14
|
+
*
|
|
15
|
+
* You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
import { getModelApi } from '../apiProviders';
|
|
19
|
+
export async function fetchModel({ model, modelId, }) {
|
|
20
|
+
if (model == null || modelId == null) {
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
return getModelApi()
|
|
24
|
+
.get({ modelName: model, id: modelId })
|
|
25
|
+
.then(res => res?.data?.data)
|
|
26
|
+
.then(data => (Array.isArray(data) && data.length > 0 ? data[0] : null));
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=model-api.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-api.js","sourceRoot":"","sources":["../../src/api/model-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAC/B,KAAK,EACL,OAAO,GAIR;IACC,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,EAAE;QACpC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,WAAW,EAAE;SACjB,GAAG,CAAC,EAAC,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAC,CAAC;SACpC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC;SAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7E,CAAC"}
|
|
@@ -5,7 +5,7 @@ export declare const getApiResponseData: (response: any, { isArrayResponse }: {
|
|
|
5
5
|
export declare const getFirstData: (data: any) => any;
|
|
6
6
|
export declare const handlerError: (message: any, { getState }: {
|
|
7
7
|
getState?: () => void;
|
|
8
|
-
},
|
|
8
|
+
}, options: any) => (error: any) => any;
|
|
9
9
|
interface ApiHandlerProps {
|
|
10
10
|
fetchFunction: (data: any) => Promise<any>;
|
|
11
11
|
data: any;
|
|
@@ -16,14 +16,14 @@ interface ApiHandlerProps {
|
|
|
16
16
|
isArrayResponse?: boolean;
|
|
17
17
|
returnTotal?: boolean;
|
|
18
18
|
resturnTotalWithData?: boolean;
|
|
19
|
+
returnResponseMessage?: boolean;
|
|
20
|
+
};
|
|
21
|
+
errorOptions?: {
|
|
22
|
+
showErrorToast?: boolean;
|
|
23
|
+
errorTracing?: boolean;
|
|
19
24
|
};
|
|
20
|
-
errorOptions?: errorOptionsProps;
|
|
21
|
-
}
|
|
22
|
-
interface errorOptionsProps {
|
|
23
|
-
showErrorToast?: boolean;
|
|
24
|
-
errorTracing?: boolean;
|
|
25
25
|
}
|
|
26
|
-
export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions
|
|
26
|
+
export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions, errorOptions, }: ApiHandlerProps) => Promise<any>;
|
|
27
27
|
type InfiniteScrollStateKeys = {
|
|
28
28
|
loading: string;
|
|
29
29
|
moreLoading: string;
|
|
@@ -28,6 +28,7 @@ export const getApiResponseData = (response, { isArrayResponse = true }) => {
|
|
|
28
28
|
: getFirstData(response?.data?.data);
|
|
29
29
|
};
|
|
30
30
|
const getApiResponseMessage = response => response?.data?.messageStatus || response?.statusTxt;
|
|
31
|
+
const getApiResponseCode = response => response?.data?.codeStatus || response?.status;
|
|
31
32
|
const getApiResponseTotal = response => response?.data?.total || 0;
|
|
32
33
|
export const getFirstData = data => {
|
|
33
34
|
if (data instanceof Array) {
|
|
@@ -58,17 +59,16 @@ const manageError = (error, action, userId, { showErrorToast = true, errorTracin
|
|
|
58
59
|
text2: `${i18nProvider.i18n.t('Base_Failed_To')} ${i18nProvider.i18n.t(action)}: ${message}.`,
|
|
59
60
|
});
|
|
60
61
|
}
|
|
62
|
+
return null;
|
|
61
63
|
}
|
|
62
64
|
};
|
|
63
|
-
export const handlerError = (message, { getState = () => { } },
|
|
64
|
-
return error => manageError(error, message, getUser({ getState }),
|
|
65
|
-
showErrorToast,
|
|
66
|
-
errorTracing,
|
|
67
|
-
});
|
|
65
|
+
export const handlerError = (message, { getState = () => { } }, options) => {
|
|
66
|
+
return error => manageError(error, message, getUser({ getState }), options);
|
|
68
67
|
};
|
|
69
|
-
const manageSucess = (response, action, { showToast = false, isArrayResponse, returnTotal = false, resturnTotalWithData = false, }) => {
|
|
68
|
+
const manageSucess = (response, action, { showToast = false, isArrayResponse, returnTotal = false, resturnTotalWithData = false, returnResponseMessage = false, }) => {
|
|
70
69
|
const data = getApiResponseData(response, { isArrayResponse });
|
|
71
70
|
const message = getApiResponseMessage(response);
|
|
71
|
+
const code = getApiResponseCode(response);
|
|
72
72
|
const total = getApiResponseTotal(response);
|
|
73
73
|
if (showToast) {
|
|
74
74
|
Toast.show({
|
|
@@ -79,31 +79,39 @@ const manageSucess = (response, action, { showToast = false, isArrayResponse, re
|
|
|
79
79
|
text2: `${message ? message : i18nProvider.i18n.t(action)}.`,
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
|
-
if (resturnTotalWithData) {
|
|
83
|
-
return { total, data };
|
|
82
|
+
if (resturnTotalWithData || returnResponseMessage) {
|
|
83
|
+
return { total, data, message, code };
|
|
84
84
|
}
|
|
85
85
|
if (returnTotal) {
|
|
86
86
|
return total;
|
|
87
87
|
}
|
|
88
88
|
return data;
|
|
89
89
|
};
|
|
90
|
-
const handlerSuccess = (action,
|
|
91
|
-
return response => manageSucess(response, action,
|
|
92
|
-
showToast,
|
|
93
|
-
isArrayResponse,
|
|
94
|
-
returnTotal,
|
|
95
|
-
resturnTotalWithData,
|
|
96
|
-
});
|
|
90
|
+
const handlerSuccess = (action, options) => {
|
|
91
|
+
return response => manageSucess(response, action, options);
|
|
97
92
|
};
|
|
98
|
-
export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions
|
|
93
|
+
export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions = {
|
|
94
|
+
showToast: false,
|
|
95
|
+
isArrayResponse: false,
|
|
96
|
+
returnTotal: false,
|
|
97
|
+
resturnTotalWithData: false,
|
|
98
|
+
returnResponseMessage: false,
|
|
99
|
+
}, errorOptions = { showErrorToast: true, errorTracing: true }, }) => {
|
|
99
100
|
return fetchFunction(data)
|
|
100
|
-
.
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
.then(res => {
|
|
102
|
+
if (res?.data?.status === -1) {
|
|
103
|
+
throw {
|
|
104
|
+
response: {
|
|
105
|
+
status: 403,
|
|
106
|
+
statusText: `${res.data.data?.title}: ${res.data.data?.message}`,
|
|
107
|
+
},
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
return handlerSuccess(action, responseOptions)(res);
|
|
112
|
+
}
|
|
113
|
+
})
|
|
114
|
+
.catch(handlerError(action, { getState }, errorOptions));
|
|
107
115
|
};
|
|
108
116
|
export const manageInfiteScrollState = (state, action, status, keys, manageTotal = false, parseData = data => data) => {
|
|
109
117
|
const data = parseData(manageTotal ? action.payload?.data : action.payload);
|
|
@@ -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;AAGrC,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,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;gBACrD,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/i18n/en.json
CHANGED
|
@@ -1,24 +1,8 @@
|
|
|
1
1
|
{
|
|
2
|
-
"Auth_LOGIN": "Login",
|
|
3
|
-
"Auth_LOGOUT": "Logout",
|
|
4
|
-
"Auth_Password": "Password",
|
|
5
|
-
"Auth_URL": "URL",
|
|
6
|
-
"Auth_Username": "Username",
|
|
7
2
|
"Auth_Error": "Error",
|
|
8
3
|
"Auth_Warning": "Warning",
|
|
9
4
|
"Auth_CannotOpenFile": "Cannot open file",
|
|
10
5
|
"Auth_Close": "Close",
|
|
11
|
-
"Auth_Session": "Session",
|
|
12
|
-
"Auth_Session_Name": "Session name",
|
|
13
|
-
"Auth_Save_Session": "Save session",
|
|
14
|
-
"Auth_Change_Session": "Change session",
|
|
15
|
-
"Auth_Saved_Sessions": "Saved sessions",
|
|
16
|
-
"Auth_Session_Name_Aleary_Exist": "Session name already exists",
|
|
17
|
-
"Auth_Create_Session": "Create a session",
|
|
18
|
-
"Auth_No_Active_Session": "No active session",
|
|
19
|
-
"Auth_Choose_Session": "Choose a session",
|
|
20
|
-
"Auth_Delete_Session": "Delete session",
|
|
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
6
|
"Auth_Dev_Mode": "Test environment",
|
|
23
7
|
"User_User": "User",
|
|
24
8
|
"User_VirtualKeyboardConfig": "Hide virtual keyboard",
|
package/lib/auth/i18n/fr.json
CHANGED
|
@@ -1,24 +1,8 @@
|
|
|
1
1
|
{
|
|
2
|
-
"Auth_LOGIN": "Se connecter",
|
|
3
|
-
"Auth_LOGOUT": "Se déconnecter",
|
|
4
|
-
"Auth_Password": "Mot de passe",
|
|
5
|
-
"Auth_URL": "URL",
|
|
6
|
-
"Auth_Username": "Nom utilisateur",
|
|
7
2
|
"Auth_Error": "Erreur",
|
|
8
3
|
"Auth_Warning": "Attention",
|
|
9
4
|
"Auth_CannotOpenFile": "Impossible d'ouvrir le fichier",
|
|
10
5
|
"Auth_Close": "Fermer",
|
|
11
|
-
"Auth_Session": "Session",
|
|
12
|
-
"Auth_Session_Name": "Nom de la session",
|
|
13
|
-
"Auth_Save_Session": "Sauvegarder la session",
|
|
14
|
-
"Auth_Change_Session": "Changer de session",
|
|
15
|
-
"Auth_Saved_Sessions": "Sessions enregistrées",
|
|
16
|
-
"Auth_Session_Name_Aleary_Exist": "Ce nom de session existe déjà",
|
|
17
|
-
"Auth_Create_Session": "Créer une session",
|
|
18
|
-
"Auth_No_Active_Session": "Aucune session active",
|
|
19
|
-
"Auth_Choose_Session": "Choisir une session",
|
|
20
|
-
"Auth_Delete_Session": "Supprimer la session",
|
|
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
6
|
"Auth_Dev_Mode": "Environnement de test",
|
|
23
7
|
"User_User": "Utilisateur",
|
|
24
8
|
"User_VirtualKeyboardConfig": "Cacher le clavier virtuel",
|
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"}
|
|
@@ -25,13 +25,14 @@ import { Icon, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
|
25
25
|
import { disableCamera, takePhoto, useCameraSelector, } from '../../../features/cameraSlice';
|
|
26
26
|
import CaptureButton from './CaptureButton';
|
|
27
27
|
const CONTENT_SPACING = 40;
|
|
28
|
+
const PHOTO_TYPE = 'jpeg';
|
|
28
29
|
const SAFE_BOTTOM = Platform.select({
|
|
29
30
|
ios: StaticSafeAreaInsets.safeAreaInsetsBottom,
|
|
30
31
|
}) ?? 0;
|
|
31
32
|
const SAFE_AREA_PADDING = {
|
|
32
33
|
paddingLeft: StaticSafeAreaInsets.safeAreaInsetsLeft + CONTENT_SPACING,
|
|
33
|
-
paddingTop: StaticSafeAreaInsets.safeAreaInsetsTop + CONTENT_SPACING,
|
|
34
|
-
paddingRight: StaticSafeAreaInsets.safeAreaInsetsRight + CONTENT_SPACING,
|
|
34
|
+
paddingTop: StaticSafeAreaInsets.safeAreaInsetsTop + CONTENT_SPACING * 1.5,
|
|
35
|
+
paddingRight: StaticSafeAreaInsets.safeAreaInsetsRight + CONTENT_SPACING / 2,
|
|
35
36
|
paddingBottom: SAFE_BOTTOM + CONTENT_SPACING,
|
|
36
37
|
};
|
|
37
38
|
const BUTTON_SIZE = 40;
|
|
@@ -84,7 +85,16 @@ const Camera = () => {
|
|
|
84
85
|
}, []);
|
|
85
86
|
const onMediaCapture = useCallback(async (photo) => {
|
|
86
87
|
const photoData = await RNFS.readFile(photo.path, 'base64');
|
|
87
|
-
|
|
88
|
+
const { size } = await RNFS.stat(photo.path);
|
|
89
|
+
dispatch(takePhoto({
|
|
90
|
+
name: `camera.${PHOTO_TYPE}`,
|
|
91
|
+
pictureExtention: PHOTO_TYPE,
|
|
92
|
+
dateTime: new Date().toISOString(),
|
|
93
|
+
type: `image/${PHOTO_TYPE}`,
|
|
94
|
+
size: size,
|
|
95
|
+
base64: photoData,
|
|
96
|
+
fullBase64: `data:image/${PHOTO_TYPE};base64,${photoData}`,
|
|
97
|
+
}));
|
|
88
98
|
dispatch(disableCamera());
|
|
89
99
|
}, [dispatch]);
|
|
90
100
|
useEffect(() => {
|
|
@@ -110,7 +120,7 @@ const Camera = () => {
|
|
|
110
120
|
<Icon style={styles.button} name={'times'} color={Colors.backgroundColor} size={24} touchable={true} onPress={() => dispatch(disableCamera())}/>
|
|
111
121
|
</View>
|
|
112
122
|
<View style={styles.captureButton}>
|
|
113
|
-
<CaptureButton camera={camera} onMediaCaptured={onMediaCapture} flash={flash} enabled={isEnabled}/>
|
|
123
|
+
<CaptureButton camera={camera} onMediaCaptured={onMediaCapture} flash={flash} enabled={isEnabled} type={PHOTO_TYPE}/>
|
|
114
124
|
</View>
|
|
115
125
|
</View>);
|
|
116
126
|
};
|
|
@@ -125,7 +135,7 @@ const styles = StyleSheet.create({
|
|
|
125
135
|
zIndex: 850,
|
|
126
136
|
},
|
|
127
137
|
camera: {
|
|
128
|
-
height: Dimensions.get('
|
|
138
|
+
height: Dimensions.get('screen').height,
|
|
129
139
|
width: Dimensions.get('window').width,
|
|
130
140
|
position: 'absolute',
|
|
131
141
|
top: 0,
|