@axelor/aos-mobile-core 6.4.0 → 6.4.1
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/mobile-config-api.js +30 -5
- package/lib/api/mobile-config-api.js.map +1 -1
- package/lib/app/ContextedApplication.js +5 -3
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/app/RootNavigator.d.ts +2 -1
- package/lib/app/RootNavigator.js +2 -2
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/auth/screens/UserScreen.js +1 -1
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/components/external/Camera/Camera.js +1 -1
- package/lib/components/external/Camera/Camera.js.map +1 -1
- package/lib/components/external/CameraScanner/CameraScanner.d.ts +1 -9
- package/lib/components/external/CameraScanner/CameraScanner.js +26 -28
- package/lib/components/external/CameraScanner/CameraScanner.js.map +1 -1
- package/lib/components/external/PlanningView/PlanningView.js +7 -9
- package/lib/components/external/PlanningView/PlanningView.js.map +1 -1
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js +10 -13
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js.map +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.d.ts +1 -2
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +12 -28
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/lib/features/cameraScannerSlice.d.ts +18 -0
- package/lib/features/cameraScannerSlice.js +53 -0
- package/lib/features/cameraScannerSlice.js.map +1 -0
- package/lib/features/index.d.ts +1 -0
- package/lib/features/index.js +1 -0
- package/lib/features/index.js.map +1 -1
- package/lib/i18n/translations/en.json +4 -1
- package/lib/i18n/translations/fr.json +4 -1
- package/lib/navigator/Navigator.d.ts +2 -1
- package/lib/navigator/Navigator.js +18 -4
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/BackIcon.js +6 -3
- package/lib/navigator/drawer/BackIcon.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.d.ts +2 -1
- package/lib/navigator/drawer/DrawerContent.js +18 -13
- package/lib/navigator/drawer/DrawerContent.js.map +1 -1
- package/lib/navigator/drawer/DrawerToggleButton.js +6 -3
- package/lib/navigator/drawer/DrawerToggleButton.js.map +1 -1
- package/lib/navigator/module.helper.d.ts +1 -0
- package/lib/navigator/module.helper.js +8 -2
- package/lib/navigator/module.helper.js.map +1 -1
- package/lib/screens/LoginScreen.js +34 -41
- package/lib/screens/LoginScreen.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
interface Barcode {
|
|
2
|
+
value: string;
|
|
3
|
+
type: string;
|
|
4
|
+
}
|
|
5
|
+
interface CameraScannerSliceState {
|
|
6
|
+
isEnabled: boolean;
|
|
7
|
+
cameraKey: string | null;
|
|
8
|
+
barcode: Barcode | null;
|
|
9
|
+
}
|
|
10
|
+
export declare const enableCameraScanner: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "cameraScanner/enableCameraScanner">, scanBarcode: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "cameraScanner/scanBarcode">, disableCameraScanner: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"cameraScanner/disableCameraScanner">;
|
|
11
|
+
export declare const useCameraScannerSelector: () => CameraScannerSliceState;
|
|
12
|
+
export declare const useCameraScannerValueByKey: (key: string) => Barcode | null;
|
|
13
|
+
declare const _default: import("redux").Reducer<{
|
|
14
|
+
isEnabled: boolean;
|
|
15
|
+
cameraKey: any;
|
|
16
|
+
barcode: any;
|
|
17
|
+
}, import("redux").AnyAction>;
|
|
18
|
+
export default _default;
|
|
@@ -0,0 +1,53 @@
|
|
|
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 { useMemo } from 'react';
|
|
19
|
+
import { useSelector } from 'react-redux';
|
|
20
|
+
import { createSlice } from '@reduxjs/toolkit';
|
|
21
|
+
const cameraScannerSlice = createSlice({
|
|
22
|
+
name: 'cameraScanner',
|
|
23
|
+
initialState: {
|
|
24
|
+
isEnabled: false,
|
|
25
|
+
cameraKey: null,
|
|
26
|
+
barcode: null,
|
|
27
|
+
},
|
|
28
|
+
reducers: {
|
|
29
|
+
enableCameraScanner(state, action) {
|
|
30
|
+
state.isEnabled = true;
|
|
31
|
+
state.cameraKey = action.payload;
|
|
32
|
+
state.barcode = null;
|
|
33
|
+
},
|
|
34
|
+
scanBarcode(state, action) {
|
|
35
|
+
state.isEnabled = false;
|
|
36
|
+
state.barcode = action.payload;
|
|
37
|
+
},
|
|
38
|
+
disableCameraScanner(state) {
|
|
39
|
+
state.isEnabled = false;
|
|
40
|
+
state.cameraKey = null;
|
|
41
|
+
state.barcode = null;
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
export const { enableCameraScanner, scanBarcode, disableCameraScanner } = cameraScannerSlice.actions;
|
|
46
|
+
const selectCameraScanner = state => state.cameraScanner;
|
|
47
|
+
export const useCameraScannerSelector = () => useSelector(selectCameraScanner);
|
|
48
|
+
export const useCameraScannerValueByKey = key => {
|
|
49
|
+
const { cameraKey, barcode } = useCameraScannerSelector();
|
|
50
|
+
return useMemo(() => (key === cameraKey ? barcode : null), [cameraKey, key, barcode]);
|
|
51
|
+
};
|
|
52
|
+
export default cameraScannerSlice.reducer;
|
|
53
|
+
//# sourceMappingURL=cameraScannerSlice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cameraScannerSlice.js","sourceRoot":"","sources":["../../src/features/cameraScannerSlice.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAa7C,MAAM,kBAAkB,GAAG,WAAW,CAAC;IACrC,IAAI,EAAE,eAAe;IACrB,YAAY,EAAE;QACZ,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;KACd;IACD,QAAQ,EAAE;QACR,mBAAmB,CAAC,KAAK,EAAE,MAAM;YAC/B,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACvB,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;YACjC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC;QACD,WAAW,CAAC,KAAK,EAAE,MAAM;YACvB,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QACjC,CAAC;QACD,oBAAoB,CAAC,KAAK;YACxB,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACvB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC;KACF;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAC,mBAAmB,EAAE,WAAW,EAAE,oBAAoB,EAAC,GACnE,kBAAkB,CAAC,OAAO,CAAC;AAE7B,MAAM,mBAAmB,GAAG,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC;AAEzD,MAAM,CAAC,MAAM,wBAAwB,GAAkC,GAAG,EAAE,CAC1E,WAAW,CAAC,mBAAmB,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,0BAA0B,GAEjB,GAAG,CAAC,EAAE;IAC1B,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,wBAAwB,EAAE,CAAC;IACxD,OAAO,OAAO,CACZ,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAC1C,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,CAC1B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC,OAAO,CAAC"}
|
package/lib/features/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { attachedFilesReducer as attachedFiles } from "./attachedFilesSlice";
|
|
2
2
|
export { authReducer as auth } from "./authSlice";
|
|
3
|
+
export { default as cameraScanner } from "./cameraScannerSlice";
|
|
3
4
|
export { default as camera } from "./cameraSlice";
|
|
4
5
|
export { mailMessagesReducer as mailMessages } from "./mailMessageSlice";
|
|
5
6
|
export { menuConfigReducer as menuConfig } from "./menuConfigSlice";
|
package/lib/features/index.js
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
export { attachedFilesReducer as attachedFiles } from './attachedFilesSlice';
|
|
19
19
|
export { authReducer as auth } from './authSlice';
|
|
20
|
+
export { default as cameraScanner } from './cameraScannerSlice';
|
|
20
21
|
export { default as camera } from './cameraSlice';
|
|
21
22
|
export { mailMessagesReducer as mailMessages } from './mailMessageSlice';
|
|
22
23
|
export { menuConfigReducer as menuConfig } from './menuConfigSlice';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/features/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,oBAAoB,IAAI,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAC,WAAW,IAAI,IAAI,EAAC,MAAM,aAAa,CAAC;AAChD,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,mBAAmB,IAAI,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAC,iBAAiB,IAAI,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAC,eAAe,IAAI,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAC,mBAAmB,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/features/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,oBAAoB,IAAI,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAC,WAAW,IAAI,IAAI,EAAC,MAAM,aAAa,CAAC;AAChD,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,mBAAmB,IAAI,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAC,iBAAiB,IAAI,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAC,eAAe,IAAI,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAC,mBAAmB,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,gBAAgB,CAAC"}
|
|
@@ -48,5 +48,8 @@
|
|
|
48
48
|
"Stopwatch_Status_Paused": "Paused",
|
|
49
49
|
"Stopwatch_Status_Finished": "Finished",
|
|
50
50
|
"Stopwatch_Status_Canceled": "Canceled",
|
|
51
|
-
"Stopwatch_TimerFormat": "mm:ss"
|
|
51
|
+
"Stopwatch_TimerFormat": "mm:ss",
|
|
52
|
+
"Base_Information": "Information",
|
|
53
|
+
"Base_Refresh": "Refresh application",
|
|
54
|
+
"Base_Logout": "Log out"
|
|
52
55
|
}
|
|
@@ -48,5 +48,8 @@
|
|
|
48
48
|
"Stopwatch_Status_Paused": "En pause",
|
|
49
49
|
"Stopwatch_Status_Finished": "Terminé",
|
|
50
50
|
"Stopwatch_Status_Canceled": "Annulé",
|
|
51
|
-
"Stopwatch_TimerFormat": "mm:ss"
|
|
51
|
+
"Stopwatch_TimerFormat": "mm:ss",
|
|
52
|
+
"Base_Information": "Information",
|
|
53
|
+
"Base_Refresh": "Actualiser l'application",
|
|
54
|
+
"Base_Logout": "Déconnexion"
|
|
52
55
|
}
|
|
@@ -5,8 +5,9 @@ export const ModuleNavigatorContext: React.Context<{
|
|
|
5
5
|
}>;
|
|
6
6
|
export default Navigator;
|
|
7
7
|
import React from "react";
|
|
8
|
-
declare function Navigator({ modules, mainMenu, showModulesSubtitle }: {
|
|
8
|
+
declare function Navigator({ modules, mainMenu, showModulesSubtitle, onRefresh, }: {
|
|
9
9
|
modules: any;
|
|
10
10
|
mainMenu: any;
|
|
11
11
|
showModulesSubtitle?: boolean;
|
|
12
|
+
onRefresh: any;
|
|
12
13
|
}): JSX.Element;
|
|
@@ -16,9 +16,10 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { createContext, useCallback, useEffect, useMemo, useState, } from 'react';
|
|
19
|
+
import { Dimensions, StyleSheet } from 'react-native';
|
|
19
20
|
import { createDrawerNavigator } from '@react-navigation/drawer';
|
|
20
21
|
import { createStackNavigator } from '@react-navigation/stack';
|
|
21
|
-
import { useThemeColor
|
|
22
|
+
import { useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
23
|
import DrawerContent from './drawer/DrawerContent';
|
|
23
24
|
import { filterAuthorizedModules, getDefaultModule, moduleHasMenus, updateAccessibleMenus, } from './module.helper';
|
|
24
25
|
import { getMenuTitle } from './menu.helper';
|
|
@@ -30,7 +31,6 @@ import { fetchMenuConfig } from '../features/menuConfigSlice';
|
|
|
30
31
|
import { fetchMobileConfig } from '../features/mobileConfigSlice';
|
|
31
32
|
import AttachedFilesScreen from '../screens/AttachedFilesScreen';
|
|
32
33
|
import MailMessageScreen from '../screens/MailMessageScreen';
|
|
33
|
-
import { Dimensions } from 'react-native';
|
|
34
34
|
const Drawer = createDrawerNavigator();
|
|
35
35
|
const Stack = createStackNavigator();
|
|
36
36
|
export const ModuleNavigatorContext = createContext({
|
|
@@ -38,7 +38,7 @@ export const ModuleNavigatorContext = createContext({
|
|
|
38
38
|
modulesMenus: {},
|
|
39
39
|
modulesScreens: {},
|
|
40
40
|
});
|
|
41
|
-
const Navigator = ({ modules, mainMenu, showModulesSubtitle = false }) => {
|
|
41
|
+
const Navigator = ({ modules, mainMenu, showModulesSubtitle = false, onRefresh, }) => {
|
|
42
42
|
const { user } = useSelector(state => state.user);
|
|
43
43
|
const { restrictedMenus } = useSelector(state => state.menuConfig);
|
|
44
44
|
const { mobileConfigs } = useSelector(state => state.mobileConfig);
|
|
@@ -105,7 +105,7 @@ const Navigator = ({ modules, mainMenu, showModulesSubtitle = false }) => {
|
|
|
105
105
|
backgroundColor: Colors.backgroundColor,
|
|
106
106
|
width: isLargeScreen ? windowWidth * 0.5 : windowWidth * 0.8,
|
|
107
107
|
},
|
|
108
|
-
}} drawerContent={props => (<DrawerContent {...props} modules={enabledModule} onModuleClick={changeActiveModule} showModulesSubtitle={showModulesSubtitle}/>)}>
|
|
108
|
+
}} drawerContent={props => (<DrawerContent {...props} modules={enabledModule} onModuleClick={changeActiveModule} showModulesSubtitle={showModulesSubtitle} onRefresh={onRefresh}/>)}>
|
|
109
109
|
{Object.entries(modulesMenus).map(([key, menu]) => (<Drawer.Screen key={key} name={key} options={{
|
|
110
110
|
title: getMenuTitle(menu, { I18n }),
|
|
111
111
|
}}>
|
|
@@ -114,5 +114,19 @@ const Navigator = ({ modules, mainMenu, showModulesSubtitle = false }) => {
|
|
|
114
114
|
</Drawer.Navigator>
|
|
115
115
|
</ModuleNavigatorContext.Provider>);
|
|
116
116
|
};
|
|
117
|
+
const getHeaderStyles = Colors => StyleSheet.create({
|
|
118
|
+
headerTitle: {
|
|
119
|
+
color: Colors.text,
|
|
120
|
+
marginLeft: -14,
|
|
121
|
+
},
|
|
122
|
+
headerColor: {
|
|
123
|
+
backgroundColor: Colors.backgroundColor,
|
|
124
|
+
elevation: 3,
|
|
125
|
+
},
|
|
126
|
+
listScreenHeaderStyle: {
|
|
127
|
+
backgroundColor: Colors.backgroundColor,
|
|
128
|
+
elevation: 0,
|
|
129
|
+
},
|
|
130
|
+
});
|
|
117
131
|
export default Navigator;
|
|
118
132
|
//# sourceMappingURL=Navigator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"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"}
|
|
@@ -16,16 +16,19 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React from 'react';
|
|
19
|
-
import { StyleSheet } from 'react-native';
|
|
19
|
+
import { StyleSheet, TouchableOpacity } from 'react-native';
|
|
20
20
|
import { StackActions, useNavigation } from '@react-navigation/native';
|
|
21
21
|
import { Icon } from '@axelor/aos-mobile-ui';
|
|
22
22
|
const BackIcon = ({ tintColor }) => {
|
|
23
23
|
const navigation = useNavigation();
|
|
24
|
-
return (<
|
|
24
|
+
return (<TouchableOpacity onPress={() => navigation.dispatch(StackActions.pop())} style={styles.icon}>
|
|
25
|
+
<Icon name="angle-left" size={26} color={tintColor}/>
|
|
26
|
+
</TouchableOpacity>);
|
|
25
27
|
};
|
|
26
28
|
const styles = StyleSheet.create({
|
|
27
29
|
icon: {
|
|
28
|
-
|
|
30
|
+
paddingLeft: 14,
|
|
31
|
+
paddingRight: 28,
|
|
29
32
|
},
|
|
30
33
|
});
|
|
31
34
|
export default BackIcon;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BackIcon.js","sourceRoot":"","sources":["../../../src/navigator/drawer/BackIcon.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"BackIcon.js","sourceRoot":"","sources":["../../../src/navigator/drawer/BackIcon.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAC,IAAI,EAAC,MAAM,uBAAuB,CAAC;AAE3C,MAAM,QAAQ,GAAG,CAAC,EAAC,SAAS,EAAC,EAAE,EAAE;IAC/B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,OAAO,CACL,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,CACvD,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB;MAAA,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,EACrD;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;KACjB;CACF,CAAC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export default DrawerContent;
|
|
2
|
-
declare function DrawerContent({ state, modules, navigation, onModuleClick, showModulesSubtitle, }: {
|
|
2
|
+
declare function DrawerContent({ state, modules, navigation, onModuleClick, showModulesSubtitle, onRefresh, }: {
|
|
3
3
|
state: any;
|
|
4
4
|
modules: any;
|
|
5
5
|
navigation: any;
|
|
6
6
|
onModuleClick: any;
|
|
7
7
|
showModulesSubtitle?: boolean;
|
|
8
|
+
onRefresh: any;
|
|
8
9
|
}): JSX.Element;
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
import React, { useRef, useContext, useMemo, useEffect, useCallback, } from 'react';
|
|
19
19
|
import { StyleSheet, View, Animated, TouchableOpacity } from 'react-native';
|
|
20
20
|
import { SafeAreaView } from 'react-native-safe-area-context';
|
|
21
|
-
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { IconButton, PopUp, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { ModuleNavigatorContext } from '../Navigator';
|
|
23
23
|
import MenuIconButton from './MenuIconButton';
|
|
24
24
|
import Menu from './Menu';
|
|
@@ -28,9 +28,12 @@ import useTranslator from '../../i18n/hooks/use-translator';
|
|
|
28
28
|
import { authModule } from '../../auth';
|
|
29
29
|
import { CommonActions, DrawerActions } from '@react-navigation/native';
|
|
30
30
|
import AuthMenuIconButton from './AuthMenuIconButton';
|
|
31
|
-
|
|
31
|
+
import { useDispatch } from '../../redux/hooks';
|
|
32
|
+
import { logout } from '../../features/authSlice';
|
|
33
|
+
const DrawerContent = ({ state, modules, navigation, onModuleClick, showModulesSubtitle = false, onRefresh, }) => {
|
|
32
34
|
const Colors = useThemeColor();
|
|
33
35
|
const I18n = useTranslator();
|
|
36
|
+
const dispatch = useDispatch();
|
|
34
37
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
35
38
|
const secondaryMenusLeft = useRef(new Animated.Value(0)).current;
|
|
36
39
|
const { activeModule } = useContext(ModuleNavigatorContext);
|
|
@@ -85,18 +88,12 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, showModulesS
|
|
|
85
88
|
}
|
|
86
89
|
};
|
|
87
90
|
if (numberOfModules(drawerModules) === 0) {
|
|
88
|
-
return (<
|
|
89
|
-
<View style={styles.
|
|
90
|
-
<
|
|
91
|
-
|
|
92
|
-
</View>
|
|
91
|
+
return (<PopUp visible={true} title={I18n.t('Base_Information')} data={I18n.t('Base_NoAppConfigured')}>
|
|
92
|
+
<View style={styles.btnContainer}>
|
|
93
|
+
<IconButton title={I18n.t('Base_Refresh')} iconName="refresh" FontAwesome5={false} color={Colors.secondaryColor} onPress={onRefresh} style={styles.btn}/>
|
|
94
|
+
<IconButton title={I18n.t('Base_Logout')} iconName="power-off" color={Colors.errorColor} onPress={() => dispatch(logout())} style={styles.btn}/>
|
|
93
95
|
</View>
|
|
94
|
-
|
|
95
|
-
<Text style={styles.primaryMenuTitle}>
|
|
96
|
-
{I18n.t('Base_NoAppConfigured')}
|
|
97
|
-
</Text>
|
|
98
|
-
</View>
|
|
99
|
-
</SafeAreaView>);
|
|
96
|
+
</PopUp>);
|
|
100
97
|
}
|
|
101
98
|
return (<SafeAreaView style={styles.container}>
|
|
102
99
|
{externalMenuIsVisible && (<View style={styles.iconsContainer}>
|
|
@@ -172,6 +169,14 @@ const getStyles = Colors => StyleSheet.create({
|
|
|
172
169
|
subMenuContainer: {
|
|
173
170
|
padding: 8,
|
|
174
171
|
},
|
|
172
|
+
btnContainer: {
|
|
173
|
+
flexDirection: 'column',
|
|
174
|
+
justifyContent: 'center',
|
|
175
|
+
alignItems: 'center',
|
|
176
|
+
},
|
|
177
|
+
btn: {
|
|
178
|
+
width: '100%',
|
|
179
|
+
},
|
|
175
180
|
});
|
|
176
181
|
export default DrawerContent;
|
|
177
182
|
//# sourceMappingURL=DrawerContent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerContent.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,MAAM,EACN,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,GACZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerContent.js"],"names":[],"mappings":"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"}
|
|
@@ -16,16 +16,19 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React from 'react';
|
|
19
|
-
import { StyleSheet } from 'react-native';
|
|
19
|
+
import { StyleSheet, TouchableOpacity } from 'react-native';
|
|
20
20
|
import { DrawerActions, useNavigation } from '@react-navigation/native';
|
|
21
21
|
import { Icon } from '@axelor/aos-mobile-ui';
|
|
22
22
|
const DrawerToggleButton = ({ tintColor }) => {
|
|
23
23
|
const navigation = useNavigation();
|
|
24
|
-
return (<
|
|
24
|
+
return (<TouchableOpacity onPress={() => navigation.dispatch(DrawerActions.toggleDrawer())} style={styles.icon}>
|
|
25
|
+
<Icon name="stream" size={26} color={tintColor}/>
|
|
26
|
+
</TouchableOpacity>);
|
|
25
27
|
};
|
|
26
28
|
const styles = StyleSheet.create({
|
|
27
29
|
icon: {
|
|
28
|
-
|
|
30
|
+
paddingLeft: 14,
|
|
31
|
+
paddingRight: 28,
|
|
29
32
|
},
|
|
30
33
|
});
|
|
31
34
|
export default DrawerToggleButton;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerToggleButton.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerToggleButton.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"DrawerToggleButton.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerToggleButton.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,IAAI,EAAC,MAAM,uBAAuB,CAAC;AAE3C,MAAM,kBAAkB,GAAG,CAAC,EAAC,SAAS,EAAC,EAAE,EAAE;IACzC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,OAAO,CACL,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,CAAC,CACjE,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB;MAAA,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,EACjD;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;KACjB;CACF,CAAC,CAAC;AAEH,eAAe,kBAAkB,CAAC"}
|
|
@@ -5,3 +5,4 @@ export function updateAccessibleMenus(_module: any, restrictedMenus: any, user:
|
|
|
5
5
|
export function moduleInMenuFooter(_module: any): boolean;
|
|
6
6
|
export function getDefaultModule(modules: any, mainMenu: any): any;
|
|
7
7
|
export function numberOfModules(modules: any): any;
|
|
8
|
+
export function authModuleFilter(_module: any): boolean;
|
|
@@ -18,7 +18,10 @@
|
|
|
18
18
|
import { isMenuEnabled } from './menu.helper';
|
|
19
19
|
import { userHaveAccessToConfig } from './roles.helper';
|
|
20
20
|
export function filterAuthorizedModules(modules, mobileConfigs, user) {
|
|
21
|
-
if (modules == null ||
|
|
21
|
+
if (modules == null ||
|
|
22
|
+
mobileConfigs == null ||
|
|
23
|
+
!Array.isArray(mobileConfigs) ||
|
|
24
|
+
mobileConfigs?.length === 0) {
|
|
22
25
|
return modules;
|
|
23
26
|
}
|
|
24
27
|
const authorizedModules = [];
|
|
@@ -75,7 +78,7 @@ export function getDefaultModule(modules, mainMenu) {
|
|
|
75
78
|
return firstModulesWithMenus(modules);
|
|
76
79
|
}
|
|
77
80
|
export function numberOfModules(modules) {
|
|
78
|
-
return modules.filter(moduleHasMenus).length;
|
|
81
|
+
return modules.filter(authModuleFilter).filter(moduleHasMenus).length;
|
|
79
82
|
}
|
|
80
83
|
function modulesContainsMenu(modules, menuKey) {
|
|
81
84
|
return modules
|
|
@@ -92,4 +95,7 @@ function firstModulesWithMenus(modules) {
|
|
|
92
95
|
.filter(_module => _module.menus)
|
|
93
96
|
.find(_module => Object.keys(_module.menus).length > 0);
|
|
94
97
|
}
|
|
98
|
+
export function authModuleFilter(_module) {
|
|
99
|
+
return _module.name !== 'Auth';
|
|
100
|
+
}
|
|
95
101
|
//# sourceMappingURL=module.helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.helper.js","sourceRoot":"","sources":["../../src/navigator/module.helper.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,sBAAsB,EAAC,MAAM,gBAAgB,CAAC;AAEtD,MAAM,UAAU,uBAAuB,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI;IAClE,
|
|
1
|
+
{"version":3,"file":"module.helper.js","sourceRoot":"","sources":["../../src/navigator/module.helper.js"],"names":[],"mappings":"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"}
|
|
@@ -16,19 +16,19 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useEffect, useState } from 'react';
|
|
19
|
-
import { ActivityIndicator, StyleSheet, View, Dimensions } from 'react-native';
|
|
20
|
-
import { useThemeColor, Text, Screen
|
|
21
|
-
import {
|
|
19
|
+
import { ActivityIndicator, StyleSheet, View, Dimensions, KeyboardAvoidingView, Platform, ScrollView, } from 'react-native';
|
|
20
|
+
import { useThemeColor, Text, Screen } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { ErrorText, LoginButton, LogoImage, PasswordInput, UrlInput, UsernameInput, } from '../components';
|
|
22
22
|
import { useDispatch, useSelector } from 'react-redux';
|
|
23
23
|
import { login } from '../features/authSlice';
|
|
24
24
|
import { enableScan, useScannedValueByKey, useScannerSelector, } from '../features/scannerSlice';
|
|
25
|
+
import { enableCameraScanner, useCameraScannerValueByKey, } from '../features/cameraScannerSlice';
|
|
25
26
|
const urlScanKey = 'login_url';
|
|
26
27
|
const LoginScreen = ({ route }) => {
|
|
27
28
|
const { loading, error } = useSelector(state => state.auth);
|
|
28
|
-
const [camScan, setCamScan] = useState(false);
|
|
29
|
-
const [scanData, setScanData] = useState(null);
|
|
30
29
|
const { isEnabled, scanKey } = useScannerSelector();
|
|
31
30
|
const scannedValue = useScannedValueByKey(urlScanKey);
|
|
31
|
+
const scanData = useCameraScannerValueByKey(urlScanKey);
|
|
32
32
|
const appVersion = route?.params?.version;
|
|
33
33
|
const Colors = useThemeColor();
|
|
34
34
|
const dispatch = useDispatch();
|
|
@@ -46,69 +46,62 @@ const LoginScreen = ({ route }) => {
|
|
|
46
46
|
setUrl(scannedValue);
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
-
else if (scanData
|
|
49
|
+
else if (scanData?.value != null) {
|
|
50
50
|
if (scanData.value.includes('username') === true) {
|
|
51
51
|
const parseScannnedData = JSON.parse(scanData.value);
|
|
52
52
|
setUrl(parseScannnedData.url);
|
|
53
53
|
setUsername(parseScannnedData.username);
|
|
54
|
-
setCamScan(false);
|
|
55
54
|
}
|
|
56
55
|
else {
|
|
57
56
|
setUrl(scanData.value);
|
|
58
|
-
setCamScan(false);
|
|
59
57
|
}
|
|
60
58
|
}
|
|
61
59
|
}, [scanData, scannedValue]);
|
|
62
|
-
return (<Screen
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
</View>
|
|
71
|
-
<UrlInput value={url} onChange={setUrl} readOnly={loading} onScanPress={() => setCamScan(true)} onSelection={() => {
|
|
60
|
+
return (<Screen>
|
|
61
|
+
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
|
|
62
|
+
<ScrollView>
|
|
63
|
+
<View style={styles.container}>
|
|
64
|
+
<View style={styles.imageContainer}>
|
|
65
|
+
<LogoImage url={url}/>
|
|
66
|
+
</View>
|
|
67
|
+
<UrlInput value={url} onChange={setUrl} readOnly={loading} onScanPress={() => dispatch(enableCameraScanner(urlScanKey))} onSelection={() => {
|
|
72
68
|
dispatch(enableScan(urlScanKey));
|
|
73
69
|
}} scanIconColor={isEnabled && scanKey === urlScanKey
|
|
74
70
|
? Colors.primaryColor.background
|
|
75
71
|
: Colors.secondaryColor_dark.background}/>
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
72
|
+
<UsernameInput value={username} onChange={setUsername} readOnly={loading}/>
|
|
73
|
+
<PasswordInput value={password} onChange={setPassword} readOnly={loading}/>
|
|
74
|
+
<View>
|
|
75
|
+
{loading ? (<ActivityIndicator size="large"/>) : (<LoginButton onPress={() => dispatch(login({ url, username, password }))} disabled={loading}/>)}
|
|
76
|
+
</View>
|
|
77
|
+
<View>{error && <ErrorText message={error.message}/>}</View>
|
|
78
|
+
<View style={styles.copyright}>
|
|
79
|
+
<Text>{`© 2005 - ${new Date().getFullYear()} Axelor. All rights reserved.`}</Text>
|
|
80
|
+
<Text>{`Version ${appVersion}`}</Text>
|
|
81
|
+
</View>
|
|
82
|
+
</View>
|
|
83
|
+
</ScrollView>
|
|
84
|
+
</KeyboardAvoidingView>
|
|
85
85
|
</Screen>);
|
|
86
86
|
};
|
|
87
87
|
const styles = StyleSheet.create({
|
|
88
88
|
container: {
|
|
89
|
-
|
|
89
|
+
marginTop: '15%',
|
|
90
|
+
alignItems: 'center',
|
|
91
|
+
height: Dimensions.get('window').height * 0.95,
|
|
90
92
|
},
|
|
91
93
|
imageContainer: {
|
|
92
94
|
alignItems: 'center',
|
|
93
95
|
width: '100%',
|
|
94
96
|
height: '15%',
|
|
95
|
-
marginTop: Dimensions.get('window').height < 500 ? '
|
|
97
|
+
marginTop: Dimensions.get('window').height < 500 ? '15%' : '40%',
|
|
96
98
|
marginBottom: '10%',
|
|
97
99
|
},
|
|
98
|
-
imageSize: {
|
|
99
|
-
flex: 1,
|
|
100
|
-
},
|
|
101
|
-
buttonContainer: {
|
|
102
|
-
flex: 1,
|
|
103
|
-
},
|
|
104
|
-
errorContainer: {
|
|
105
|
-
flex: 1,
|
|
106
|
-
},
|
|
107
100
|
copyright: {
|
|
108
|
-
alignSelf: 'center',
|
|
109
|
-
alignItems: 'center',
|
|
110
101
|
position: 'absolute',
|
|
111
|
-
|
|
102
|
+
alignItems: 'center',
|
|
103
|
+
width: '100%',
|
|
104
|
+
bottom: 0,
|
|
112
105
|
},
|
|
113
106
|
});
|
|
114
107
|
export default LoginScreen;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginScreen.js","sourceRoot":"","sources":["../../src/screens/LoginScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"LoginScreen.js","sourceRoot":"","sources":["../../src/screens/LoginScreen.js"],"names":[],"mappings":"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"}
|