@axelor/aos-mobile-core 6.5.2 → 7.0.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/login-api.d.ts +4 -1
- package/lib/api/login-api.js +5 -2
- package/lib/api/login-api.js.map +1 -1
- package/lib/api/mail-message-api.js +3 -1
- package/lib/api/mail-message-api.js.map +1 -1
- package/lib/api/mobile-config-api.js +3 -1
- package/lib/api/mobile-config-api.js.map +1 -1
- package/lib/api/traceback-api.d.ts +1 -1
- package/lib/api/traceback-api.js +5 -3
- package/lib/api/traceback-api.js.map +1 -1
- package/lib/apiProviders/Action/ActionApiProvider.d.ts +1 -0
- package/lib/apiProviders/Action/AosActionApi.d.ts +1 -0
- package/lib/apiProviders/Action/AosActionApi.js +14 -5
- package/lib/apiProviders/Action/AosActionApi.js.map +1 -1
- package/lib/apiProviders/Action/GatewayActionApi.d.ts +1 -0
- package/lib/apiProviders/Action/GatewayActionApi.js +18 -15
- package/lib/apiProviders/Action/GatewayActionApi.js.map +1 -1
- package/lib/apiProviders/Action/index.d.ts +1 -1
- package/lib/apiProviders/Action/utils.d.ts +10 -1
- package/lib/apiProviders/Model/AopModelApi.d.ts +14 -7
- package/lib/apiProviders/Model/AopModelApi.js +21 -8
- package/lib/apiProviders/Model/AopModelApi.js.map +1 -1
- package/lib/apiProviders/Model/GatewayModelApi.d.ts +18 -7
- package/lib/apiProviders/Model/GatewayModelApi.js +37 -22
- package/lib/apiProviders/Model/GatewayModelApi.js.map +1 -1
- package/lib/apiProviders/Model/ModelApiProvider.d.ts +16 -10
- package/lib/apiProviders/Model/utils.d.ts +6 -1
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js +2 -1
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js.map +1 -1
- package/lib/apiProviders/config.d.ts +4 -0
- package/lib/apiProviders/config.js +22 -0
- package/lib/apiProviders/config.js.map +1 -0
- package/lib/apiProviders/index.d.ts +1 -1
- package/lib/apiProviders/index.js +1 -1
- package/lib/apiProviders/index.js.map +1 -1
- package/lib/apiProviders/utils.d.ts +15 -1
- package/lib/apiProviders/utils.js +70 -7
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/Application.d.ts +10 -10
- package/lib/app/Application.js +10 -2
- package/lib/app/Application.js.map +1 -1
- package/lib/app/ContextedApplication.d.ts +5 -11
- package/lib/app/ContextedApplication.js +14 -8
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/app/ContextsProvider.d.ts +5 -2
- package/lib/app/ContextsProvider.js +7 -4
- package/lib/app/ContextsProvider.js.map +1 -1
- package/lib/app/RootNavigator.d.ts +1 -2
- package/lib/app/RootNavigator.js +25 -33
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/app/types.d.ts +14 -0
- package/lib/app/types.js +19 -0
- package/lib/app/types.js.map +1 -0
- package/lib/auth/api/config-api.js +10 -11
- package/lib/auth/api/config-api.js.map +1 -1
- package/lib/auth/hooks/use-auth-headers.js +35 -2
- package/lib/auth/hooks/use-auth-headers.js.map +1 -1
- package/lib/auth/i18n/en.json +14 -1
- package/lib/auth/i18n/fr.json +13 -0
- package/lib/auth/screens/SettingsScreen.d.ts +1 -2
- package/lib/auth/screens/SettingsScreen.js +14 -9
- package/lib/auth/screens/SettingsScreen.js.map +1 -1
- package/lib/auth/screens/UserScreen.d.ts +1 -2
- package/lib/auth/screens/UserScreen.js +13 -10
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/components/external/Camera/Camera.js +6 -3
- package/lib/components/external/Camera/Camera.js.map +1 -1
- package/lib/components/external/CameraScanner/CameraScanner.js +6 -3
- package/lib/components/external/CameraScanner/CameraScanner.js.map +1 -1
- package/lib/components/external/PlanningView/PlanningView.d.ts +3 -1
- package/lib/components/external/PlanningView/PlanningView.js +35 -4
- package/lib/components/external/PlanningView/PlanningView.js.map +1 -1
- package/lib/components/external/Scanner/Scanner.js +21 -17
- package/lib/components/external/Scanner/Scanner.js.map +1 -1
- package/lib/components/external/Stopwatch/Stopwatch.d.ts +2 -1
- package/lib/components/external/Stopwatch/Stopwatch.js +20 -12
- package/lib/components/external/Stopwatch/Stopwatch.js.map +1 -1
- package/lib/components/molecules/ErrorText/ErrorText.d.ts +2 -1
- package/lib/components/molecules/ErrorText/ErrorText.js +8 -2
- package/lib/components/molecules/ErrorText/ErrorText.js.map +1 -1
- package/lib/components/molecules/HeaderBand/HeaderBand.d.ts +8 -0
- package/lib/components/molecules/HeaderBand/HeaderBand.js +51 -0
- package/lib/components/molecules/HeaderBand/HeaderBand.js.map +1 -0
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.d.ts +2 -1
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js +13 -4
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js.map +1 -1
- package/lib/components/molecules/LoginButton/LoginButton.d.ts +2 -1
- package/lib/components/molecules/LoginButton/LoginButton.js +8 -4
- package/lib/components/molecules/LoginButton/LoginButton.js.map +1 -1
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.d.ts +4 -0
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.js +44 -0
- package/lib/components/molecules/SessionNumberIndicator/SessionNumberIndicator.js.map +1 -0
- package/lib/components/molecules/index.d.ts +2 -0
- package/lib/components/molecules/index.js +2 -0
- package/lib/components/molecules/index.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +16 -6
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/organisms/HeaderBandList/HeaderBandList.d.ts +2 -0
- package/lib/components/organisms/HeaderBandList/HeaderBandList.js +36 -0
- package/lib/components/organisms/HeaderBandList/HeaderBandList.js.map +1 -0
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js +3 -3
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js.map +1 -1
- package/lib/components/organisms/LogoImage/LogoImage.d.ts +4 -2
- package/lib/components/organisms/LogoImage/LogoImage.js +34 -22
- package/lib/components/organisms/LogoImage/LogoImage.js.map +1 -1
- package/lib/components/organisms/PasswordInput/PasswordInput.d.ts +2 -1
- package/lib/components/organisms/PasswordInput/PasswordInput.js +8 -5
- package/lib/components/organisms/PasswordInput/PasswordInput.js.map +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.d.ts +9 -2
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +5 -3
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/lib/components/organisms/SessionButtons/SessionButtons.d.ts +17 -0
- package/lib/components/organisms/SessionButtons/SessionButtons.js +90 -0
- package/lib/components/organisms/SessionButtons/SessionButtons.js.map +1 -0
- package/lib/components/organisms/SessionNameInput/SessionNameInput.d.ts +8 -0
- package/lib/components/organisms/SessionNameInput/SessionNameInput.js +36 -0
- package/lib/components/organisms/SessionNameInput/SessionNameInput.js.map +1 -0
- package/lib/components/organisms/UrlInput/UrlInput.d.ts +3 -1
- package/lib/components/organisms/UrlInput/UrlInput.js +6 -4
- package/lib/components/organisms/UrlInput/UrlInput.js.map +1 -1
- package/lib/components/organisms/UsernameInput/UsernameInput.d.ts +3 -1
- package/lib/components/organisms/UsernameInput/UsernameInput.js +6 -4
- package/lib/components/organisms/UsernameInput/UsernameInput.js.map +1 -1
- package/lib/components/organisms/index.d.ts +3 -1
- package/lib/components/organisms/index.js +3 -1
- package/lib/components/organisms/index.js.map +1 -1
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js +4 -5
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js.map +1 -1
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.d.ts +10 -0
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.js +171 -0
- package/lib/components/templates/PopupCreateSession/PopupCreateSession.js.map +1 -0
- package/lib/components/templates/PopupMinimalRequiredVersion/PopupMinimalRequiredVersion.d.ts +5 -0
- package/lib/components/templates/PopupMinimalRequiredVersion/PopupMinimalRequiredVersion.js +64 -0
- package/lib/components/templates/PopupMinimalRequiredVersion/PopupMinimalRequiredVersion.js.map +1 -0
- package/lib/components/templates/PopupSession/PopupSession.d.ts +8 -0
- package/lib/components/templates/PopupSession/PopupSession.js +135 -0
- package/lib/components/templates/PopupSession/PopupSession.js.map +1 -0
- package/lib/components/templates/PopupSessionList/PopupSessionList.d.ts +7 -0
- package/lib/components/templates/PopupSessionList/PopupSessionList.js +107 -0
- package/lib/components/templates/PopupSessionList/PopupSessionList.js.map +1 -0
- package/lib/components/templates/index.d.ts +4 -0
- package/lib/components/templates/index.js +4 -0
- package/lib/components/templates/index.js.map +1 -1
- package/lib/config/RouterProvider.d.ts +8 -0
- package/lib/config/RouterProvider.js +49 -0
- package/lib/config/RouterProvider.js.map +1 -0
- package/lib/config/index.d.ts +1 -0
- package/lib/config/index.js +19 -0
- package/lib/config/index.js.map +1 -0
- package/lib/config/routes.d.ts +31 -0
- package/lib/config/routes.js +41 -0
- package/lib/config/routes.js.map +1 -0
- package/lib/features/authSlice.d.ts +31 -14
- package/lib/features/authSlice.js +29 -6
- package/lib/features/authSlice.js.map +1 -1
- package/lib/header/HeaderActionsProvider.js +1 -1
- package/lib/header/HeaderActionsProvider.js.map +1 -1
- package/lib/header/HeaderBandContext.d.ts +10 -0
- package/lib/header/HeaderBandContext.js +58 -0
- package/lib/header/HeaderBandContext.js.map +1 -0
- package/lib/header/header-band-context.helper.d.ts +5 -0
- package/lib/header/header-band-context.helper.js +44 -0
- package/lib/header/header-band-context.helper.js.map +1 -0
- package/lib/header/index.d.ts +3 -1
- package/lib/header/index.js +2 -0
- package/lib/header/index.js.map +1 -1
- package/lib/header/types.d.ts +10 -0
- package/lib/i18n/translations/en.json +6 -1
- package/lib/i18n/translations/fr.json +6 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/navigator/Navigator.d.ts +3 -2
- package/lib/navigator/Navigator.js +14 -4
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.d.ts +3 -2
- package/lib/navigator/drawer/DrawerContent.js +29 -6
- package/lib/navigator/drawer/DrawerContent.js.map +1 -1
- package/lib/navigator/drawer/Header.js +6 -3
- package/lib/navigator/drawer/Header.js.map +1 -1
- package/lib/navigator/drawer/MenuIconButton.js +6 -2
- package/lib/navigator/drawer/MenuIconButton.js.map +1 -1
- package/lib/navigator/module.helper.js +1 -1
- package/lib/navigator/module.helper.js.map +1 -1
- package/lib/screens/LoginScreen.js +76 -52
- package/lib/screens/LoginScreen.js.map +1 -1
- package/lib/screens/SessionManagementScreen.d.ts +4 -0
- package/lib/screens/SessionManagementScreen.js +97 -0
- package/lib/screens/SessionManagementScreen.js.map +1 -0
- package/lib/sessions/SessionStorage.d.ts +22 -0
- package/lib/sessions/SessionStorage.js +93 -0
- package/lib/sessions/SessionStorage.js.map +1 -0
- package/lib/sessions/hook.d.ts +5 -0
- package/lib/sessions/hook.js +37 -0
- package/lib/sessions/hook.js.map +1 -0
- package/lib/sessions/index.d.ts +4 -0
- package/lib/sessions/index.js +22 -0
- package/lib/sessions/index.js.map +1 -0
- package/lib/sessions/type.d.ts +7 -0
- package/lib/{utils/storage-keys.js → sessions/type.js} +1 -1
- package/lib/sessions/type.js.map +1 -0
- package/lib/sessions/utils.d.ts +4 -0
- package/lib/sessions/utils.js +34 -0
- package/lib/sessions/utils.js.map +1 -0
- package/lib/utils/api.js +1 -3
- package/lib/utils/api.js.map +1 -1
- package/lib/utils/filter.js +6 -8
- package/lib/utils/filter.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/lib/utils/list.d.ts +0 -1
- package/lib/utils/list.js +0 -13
- package/lib/utils/list.js.map +1 -1
- package/lib/utils/object.js +1 -1
- package/lib/utils/object.js.map +1 -1
- package/lib/utils/string.js +2 -2
- package/lib/utils/string.js.map +1 -1
- package/package.json +5 -5
- package/lib/components/organisms/AutoCompleteSearchInput/AutoCompleteSearchInput.d.ts +0 -19
- package/lib/components/organisms/AutoCompleteSearchInput/AutoCompleteSearchInput.js +0 -58
- package/lib/components/organisms/AutoCompleteSearchInput/AutoCompleteSearchInput.js.map +0 -1
- package/lib/utils/storage-keys.d.ts +0 -1
- package/lib/utils/storage-keys.js.map +0 -1
|
@@ -16,7 +16,7 @@
|
|
|
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 } from 'react-native';
|
|
19
|
+
import { Dimensions, Platform } from 'react-native';
|
|
20
20
|
import { createDrawerNavigator } from '@react-navigation/drawer';
|
|
21
21
|
import { createStackNavigator } from '@react-navigation/stack';
|
|
22
22
|
import { useThemeColor } from '@axelor/aos-mobile-ui';
|
|
@@ -37,7 +37,7 @@ export const ModuleNavigatorContext = createContext({
|
|
|
37
37
|
modulesMenus: {},
|
|
38
38
|
modulesScreens: {},
|
|
39
39
|
});
|
|
40
|
-
const Navigator = ({ modules, mainMenu,
|
|
40
|
+
const Navigator = ({ modules, mainMenu, onRefresh, version, versionCheckConfig, }) => {
|
|
41
41
|
const { user } = useSelector(state => state.user);
|
|
42
42
|
const { restrictedMenus } = useSelector(state => state.menuConfig);
|
|
43
43
|
const { mobileConfigs } = useSelector(state => state.mobileConfig);
|
|
@@ -63,6 +63,7 @@ const Navigator = ({ modules, mainMenu, showModulesSubtitle = false, onRefresh,
|
|
|
63
63
|
AttachedFilesScreen: {
|
|
64
64
|
title: 'Base_AttachedFiles',
|
|
65
65
|
component: AttachedFilesScreen,
|
|
66
|
+
actionID: 'core_attachedFiles_details',
|
|
66
67
|
options: {
|
|
67
68
|
shadedHeader: false,
|
|
68
69
|
},
|
|
@@ -79,7 +80,16 @@ const Navigator = ({ modules, mainMenu, showModulesSubtitle = false, onRefresh,
|
|
|
79
80
|
const ModulesScreensStackNavigator = useCallback(({ initialRouteName, ...rest }) => (<Stack.Navigator {...rest} initialRouteName={initialRouteName}>
|
|
80
81
|
{Object.entries(modulesScreens).map(([key, { component, title, actionID, options = { shadedHeader: true } },]) => {
|
|
81
82
|
return (<Stack.Screen key={key} name={key} component={component} options={{
|
|
82
|
-
headerStyle:
|
|
83
|
+
headerStyle: [
|
|
84
|
+
{
|
|
85
|
+
elevation: 0,
|
|
86
|
+
},
|
|
87
|
+
Platform.OS === 'ios' && !options?.shadedHeader
|
|
88
|
+
? {
|
|
89
|
+
shadowOpacity: 0,
|
|
90
|
+
}
|
|
91
|
+
: null,
|
|
92
|
+
],
|
|
83
93
|
headerLeft: () => null,
|
|
84
94
|
headerRight: () => null,
|
|
85
95
|
headerTitleStyle: { width: '100%' },
|
|
@@ -96,7 +106,7 @@ const Navigator = ({ modules, mainMenu, showModulesSubtitle = false, onRefresh,
|
|
|
96
106
|
backgroundColor: Colors.backgroundColor,
|
|
97
107
|
width: isLargeScreen ? windowWidth * 0.5 : windowWidth * 0.8,
|
|
98
108
|
},
|
|
99
|
-
}} drawerContent={props => (<DrawerContent {...props} modules={enabledModule} onModuleClick={changeActiveModule}
|
|
109
|
+
}} drawerContent={props => (<DrawerContent {...props} modules={enabledModule} onModuleClick={changeActiveModule} onRefresh={onRefresh} version={version} versionCheckConfig={versionCheckConfig}/>)}>
|
|
100
110
|
{Object.entries(modulesMenus).map(([key, menu]) => (<Drawer.Screen key={key} name={key} options={{
|
|
101
111
|
title: getMenuTitle(menu, { I18n }),
|
|
102
112
|
}}>
|
|
@@ -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,UAAU,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export default DrawerContent;
|
|
2
|
-
declare function DrawerContent({ state, modules, navigation, onModuleClick,
|
|
2
|
+
declare function DrawerContent({ state, modules, navigation, onModuleClick, onRefresh, version, versionCheckConfig, }: {
|
|
3
3
|
state: any;
|
|
4
4
|
modules: any;
|
|
5
5
|
navigation: any;
|
|
6
6
|
onModuleClick: any;
|
|
7
|
-
showModulesSubtitle?: boolean;
|
|
8
7
|
onRefresh: any;
|
|
8
|
+
version: any;
|
|
9
|
+
versionCheckConfig: any;
|
|
9
10
|
}): 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 { IconButton, PopUp, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { IconButton, PopUp, Text, useThemeColor, useConfig, } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { ModuleNavigatorContext } from '../Navigator';
|
|
23
23
|
import MenuIconButton from './MenuIconButton';
|
|
24
24
|
import Menu from './Menu';
|
|
@@ -30,12 +30,16 @@ import { CommonActions, DrawerActions } from '@react-navigation/native';
|
|
|
30
30
|
import AuthMenuIconButton from './AuthMenuIconButton';
|
|
31
31
|
import { useDispatch } from '../../redux/hooks';
|
|
32
32
|
import { logout } from '../../features/authSlice';
|
|
33
|
-
|
|
33
|
+
import { useSelector } from 'react-redux';
|
|
34
|
+
import { PopupMinimalRequiredVersion } from '../../components';
|
|
35
|
+
const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, version, versionCheckConfig, }) => {
|
|
34
36
|
useEffect(() => {
|
|
35
37
|
navigation.dispatch(_state => {
|
|
36
38
|
return CommonActions.reset({
|
|
37
39
|
..._state,
|
|
38
|
-
routes: modules
|
|
40
|
+
routes: modules
|
|
41
|
+
?.filter(_module => _module.menus)
|
|
42
|
+
?.flatMap(_module => {
|
|
39
43
|
const moduleMenus = _module.menus;
|
|
40
44
|
return Object.entries(moduleMenus)
|
|
41
45
|
.map((item, index) => ({
|
|
@@ -52,9 +56,21 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, showModulesS
|
|
|
52
56
|
const Colors = useThemeColor();
|
|
53
57
|
const I18n = useTranslator();
|
|
54
58
|
const dispatch = useDispatch();
|
|
59
|
+
const { showSubtitles } = useConfig();
|
|
55
60
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
56
61
|
const secondaryMenusLeft = useRef(new Animated.Value(0)).current;
|
|
57
62
|
const { activeModule } = useContext(ModuleNavigatorContext);
|
|
63
|
+
const { mobileSettings } = useSelector(_state => _state.config);
|
|
64
|
+
const mobileVersion = Number(version.replace(/\D/g, ''));
|
|
65
|
+
const minimalRequiredVersion = useMemo(() => {
|
|
66
|
+
const formattedRequiredApp = mobileSettings?.minimalRequiredMobileAppVersion?.replace(/\D/g, '');
|
|
67
|
+
if (formattedRequiredApp?.length === 3) {
|
|
68
|
+
return formattedRequiredApp;
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
}, [mobileSettings]);
|
|
58
74
|
const innerMenuIsVisible = useMemo(() => activeModule.name !== authModule.name, [activeModule]);
|
|
59
75
|
const drawerModules = useMemo(() => modules
|
|
60
76
|
.filter(moduleHasMenus)
|
|
@@ -115,17 +131,21 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, showModulesS
|
|
|
115
131
|
</View>
|
|
116
132
|
</PopUp>);
|
|
117
133
|
}
|
|
134
|
+
if (versionCheckConfig?.activate === true &&
|
|
135
|
+
mobileVersion < minimalRequiredVersion) {
|
|
136
|
+
return (<PopupMinimalRequiredVersion versionCheckConfig={versionCheckConfig} onRefresh={onRefresh}/>);
|
|
137
|
+
}
|
|
118
138
|
return (<SafeAreaView style={styles.container}>
|
|
119
139
|
{externalMenuIsVisible && (<View style={styles.iconsContainer}>
|
|
120
140
|
<View>
|
|
121
141
|
{drawerModules.map(_module => (<View key={_module.name} style={styles.menuItemContainer}>
|
|
122
|
-
<MenuIconButton key={_module.title} icon={_module.icon} subtitle={
|
|
142
|
+
<MenuIconButton key={_module.title} icon={_module.icon} subtitle={showSubtitles && I18n.t(_module.subtitle)} disabled={_module.disabled} color={_module === activeModule
|
|
123
143
|
? Colors.primaryColor.background_light
|
|
124
144
|
: null} onPress={() => onModuleClick(_module.name)}/>
|
|
125
145
|
</View>))}
|
|
126
146
|
</View>
|
|
127
147
|
<View style={styles.otherIconsContainer}>
|
|
128
|
-
<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={
|
|
148
|
+
<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={handleAuthModuleClick}/>
|
|
129
149
|
</View>
|
|
130
150
|
</View>)}
|
|
131
151
|
<View style={styles.menusContainer}>
|
|
@@ -142,7 +162,7 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, showModulesS
|
|
|
142
162
|
left: innerMenuPosition,
|
|
143
163
|
},
|
|
144
164
|
]}>
|
|
145
|
-
<Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={!externalMenuIsVisible ? (<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={
|
|
165
|
+
<Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={!externalMenuIsVisible ? (<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={handleAuthModuleClick}/>) : null} onItemClick={externalMenuIsVisible
|
|
146
166
|
? () => { }
|
|
147
167
|
: () => onModuleClick(drawerModules[0]?.name)}/>
|
|
148
168
|
</Animated.View>
|
|
@@ -185,6 +205,9 @@ const getStyles = Colors => StyleSheet.create({
|
|
|
185
205
|
width: '100%',
|
|
186
206
|
height: '100%',
|
|
187
207
|
elevation: 4,
|
|
208
|
+
shadowOpacity: 0.5,
|
|
209
|
+
shadowColor: Colors.secondaryColor.background,
|
|
210
|
+
shadowOffset: { width: 0, height: 0 },
|
|
188
211
|
},
|
|
189
212
|
subMenuContainer: {
|
|
190
213
|
padding: 8,
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerContent.js"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useMemo } from 'react';
|
|
19
|
-
import { Dimensions, StyleSheet, View } from 'react-native';
|
|
19
|
+
import { Dimensions, Platform, StyleSheet, View } from 'react-native';
|
|
20
20
|
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import DrawerToggleButton from './DrawerToggleButton';
|
|
22
22
|
import BackIcon from './BackIcon';
|
|
@@ -34,7 +34,7 @@ const Header = ({ mainScreen, title, actionID = null, shadedHeader = true }) =>
|
|
|
34
34
|
{mainScreen ? (<DrawerToggleButton tintColor={Colors.primaryColor.background}/>) : (<BackIcon tintColor={Colors.primaryColor.background}/>)}
|
|
35
35
|
<View>
|
|
36
36
|
<Text fontSize={20} adjustsFontSizeToFit={true} numberOfLines={1}>
|
|
37
|
-
{I18n.t(title)}
|
|
37
|
+
{headerOptions?.headerTitle || I18n.t(title)}
|
|
38
38
|
</Text>
|
|
39
39
|
</View>
|
|
40
40
|
</View>
|
|
@@ -49,7 +49,7 @@ const getHeaderStyles = Colors => StyleSheet.create({
|
|
|
49
49
|
header: {
|
|
50
50
|
position: 'absolute',
|
|
51
51
|
top: 0,
|
|
52
|
-
left: -15,
|
|
52
|
+
left: Platform.OS === 'ios' ? -Dimensions.get('window').width * 0.5 : -15,
|
|
53
53
|
backgroundColor: Colors.backgroundColor,
|
|
54
54
|
height: '100%',
|
|
55
55
|
width: Dimensions.get('screen').width,
|
|
@@ -60,6 +60,9 @@ const getHeaderStyles = Colors => StyleSheet.create({
|
|
|
60
60
|
},
|
|
61
61
|
shadedHeader: {
|
|
62
62
|
elevation: 3,
|
|
63
|
+
shadowOpacity: 0.5,
|
|
64
|
+
shadowColor: Colors.secondaryColor.background,
|
|
65
|
+
shadowOffset: { width: 0, height: 2 },
|
|
63
66
|
},
|
|
64
67
|
options: {
|
|
65
68
|
flexDirection: 'row',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Header.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Header.js"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React from 'react';
|
|
18
|
+
import React, { useMemo } from 'react';
|
|
19
19
|
import { StyleSheet, TouchableOpacity, View } from 'react-native';
|
|
20
20
|
import { Icon, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
const WIDTH = 54;
|
|
@@ -24,6 +24,7 @@ const DEFAULT_RADIUS = 8;
|
|
|
24
24
|
const ROUNDED_RADIUS = WIDTH / 2;
|
|
25
25
|
const MenuIconButton = ({ style, icon, onPress, color, subtitle, rounded = false, disabled = false, }) => {
|
|
26
26
|
const Colors = useThemeColor();
|
|
27
|
+
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
27
28
|
return (<TouchableOpacity onPress={onPress} disabled={disabled} activeOpacity={0.95}>
|
|
28
29
|
<View style={[
|
|
29
30
|
styles.container,
|
|
@@ -46,13 +47,16 @@ const MenuIconButton = ({ style, icon, onPress, color, subtitle, rounded = false
|
|
|
46
47
|
</Text>)}
|
|
47
48
|
</TouchableOpacity>);
|
|
48
49
|
};
|
|
49
|
-
const
|
|
50
|
+
const getStyles = Colors => StyleSheet.create({
|
|
50
51
|
container: {
|
|
51
52
|
width: WIDTH,
|
|
52
53
|
height: HEIGHT,
|
|
53
54
|
flexDirection: 'row',
|
|
54
55
|
justifyContent: 'center',
|
|
55
56
|
elevation: 2,
|
|
57
|
+
shadowOpacity: 0.5,
|
|
58
|
+
shadowColor: Colors.secondaryColor.background,
|
|
59
|
+
shadowOffset: { width: 0, height: 0 },
|
|
56
60
|
},
|
|
57
61
|
moduleSubtitle: {
|
|
58
62
|
fontSize: 10,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuIconButton.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuIconButton.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MenuIconButton.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuIconButton.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAChE,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEhE,MAAM,KAAK,GAAG,EAAE,CAAC;AACjB,MAAM,MAAM,GAAG,EAAE,CAAC;AAClB,MAAM,cAAc,GAAG,CAAC,CAAC;AACzB,MAAM,cAAc,GAAG,KAAK,GAAG,CAAC,CAAC;AAEjC,MAAM,cAAc,GAAG,CAAC,EACtB,KAAK,EACL,IAAI,EACJ,OAAO,EACP,KAAK,EACL,QAAQ,EACR,OAAO,GAAG,KAAK,EACf,QAAQ,GAAG,KAAK,GACjB,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,OAAO,CACL,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,aAAa,CAAC,CAAC,IAAI,CAAC,CACpB;MAAA,CAAC,IAAI,CACH,KAAK,CAAC,CAAC;YACL,MAAM,CAAC,SAAS;YAChB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,EAAC;YACzD;gBACE,eAAe,EAAE,QAAQ;oBACvB,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB;oBACxC,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,MAAM,CAAC,eAAe;aAC3B;YACD,KAAK;SACN,CAAC,CACF;QAAA,CAAC,IAAI,CACH,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,IAAI,CAAC,CAAC,IAAI,CAAC,CACX,KAAK,CAAC,CACJ,QAAQ;YACN,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU;YAClC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAC1C,EAEL;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,QAAQ,IAAI,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CACnD;UAAA,CAAC,QAAQ,CACX;QAAA,EAAE,IAAI,CAAC,CACR,CACH;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CACzB,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,QAAQ;QACxB,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,GAAG;QAClB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;QAC7C,YAAY,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;KACpC;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC,CAAC;AAEL,eAAe,cAAc,CAAC"}
|
|
@@ -30,7 +30,7 @@ export function filterAuthorizedModules(modules, mobileConfigs, user) {
|
|
|
30
30
|
if (mobileConfigForModule == null || mobileConfigForModule.length === 0) {
|
|
31
31
|
authorizedModules.push(_module);
|
|
32
32
|
}
|
|
33
|
-
else if (mobileConfigForModule[0].
|
|
33
|
+
else if (mobileConfigForModule[0].isAppEnabled) {
|
|
34
34
|
if (mobileConfigForModule[0].authorizedRoles == null ||
|
|
35
35
|
mobileConfigForModule[0].authorizedRoles.length === 0) {
|
|
36
36
|
authorizedModules.push(_module);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.helper.js","sourceRoot":"","sources":["../../src/navigator/module.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,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,IACE,OAAO,IAAI,IAAI;QACf,aAAa,IAAI,IAAI;QACrB,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAC7B,aAAa,EAAE,MAAM,KAAK,CAAC,EAC3B;QACA,OAAO,OAAO,CAAC;KAChB;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAE7B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACxB,MAAM,qBAAqB,GAAG,aAAa,EAAE,MAAM,CACjD,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAC3C,CAAC;QAEF,IAAI,qBAAqB,IAAI,IAAI,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE;YACvE,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACjC;aAAM,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"module.helper.js","sourceRoot":"","sources":["../../src/navigator/module.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,32 +15,34 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useEffect, useMemo, useState } from 'react';
|
|
19
|
-
import { ActivityIndicator, StyleSheet, View, Dimensions
|
|
20
|
-
import { useThemeColor, Text, Screen } from '@axelor/aos-mobile-ui';
|
|
21
|
-
import { ErrorText, LoginButton, LogoImage, PasswordInput, UrlInput, UsernameInput, } from '../components';
|
|
18
|
+
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
|
+
import { ActivityIndicator, StyleSheet, View, Dimensions } from 'react-native';
|
|
22
20
|
import { useDispatch, useSelector } from 'react-redux';
|
|
23
|
-
import {
|
|
21
|
+
import { useThemeColor, Text, Screen, KeyboardAvoidingScrollView, } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { ErrorText, LoginButton, LogoImage, PasswordInput, UrlInput, UsernameInput, } from '../components';
|
|
23
|
+
import { isUrlValid, login } from '../features/authSlice';
|
|
24
24
|
import { useScannedValueByKey, useScannerSelector, } from '../features/scannerSlice';
|
|
25
25
|
import { useCameraScannerValueByKey } from '../features/cameraScannerSlice';
|
|
26
26
|
import { useScanActivator, useScannerDeviceActivator, } from '../hooks/use-scan-activator';
|
|
27
27
|
import { checkNullString } from '../utils';
|
|
28
|
-
import {
|
|
29
|
-
import
|
|
28
|
+
import { sessionStorage, useSessions, getStorageUrl } from '../sessions';
|
|
29
|
+
import DeviceInfo from 'react-native-device-info';
|
|
30
30
|
const urlScanKey = 'login_url';
|
|
31
31
|
const LoginScreen = ({ route }) => {
|
|
32
|
+
const appVersion = route?.params?.version;
|
|
33
|
+
const testInstanceConfig = route?.params?.testInstanceConfig;
|
|
34
|
+
const releaseInstanceConfig = route?.params?.releaseInstanceConfig;
|
|
35
|
+
const logoFile = route?.params?.logoFile;
|
|
36
|
+
const Colors = useThemeColor();
|
|
37
|
+
const dispatch = useDispatch();
|
|
32
38
|
const { loading, error, baseUrl } = useSelector(state => state.auth);
|
|
33
39
|
const { isEnabled, scanKey } = useScannerSelector();
|
|
34
40
|
const scannedValue = useScannedValueByKey(urlScanKey);
|
|
35
41
|
const scanData = useCameraScannerValueByKey(urlScanKey);
|
|
36
42
|
const { enable: onScanPress } = useScanActivator(urlScanKey);
|
|
37
43
|
const { enable: enableScanner } = useScannerDeviceActivator(urlScanKey);
|
|
38
|
-
const
|
|
39
|
-
const
|
|
40
|
-
const releaseInstanceConfig = route?.params?.releaseInstanceConfig;
|
|
41
|
-
const urlStorage = storage.getItem(URL_STORAGE_KEY);
|
|
42
|
-
const Colors = useThemeColor();
|
|
43
|
-
const dispatch = useDispatch();
|
|
44
|
+
const { sessionActive } = useSessions();
|
|
45
|
+
const urlStorage = useMemo(() => getStorageUrl(), []);
|
|
44
46
|
const modeDebug = useMemo(() => __DEV__, []);
|
|
45
47
|
const showUrlInput = useMemo(() => {
|
|
46
48
|
if (modeDebug) {
|
|
@@ -68,60 +70,76 @@ const LoginScreen = ({ route }) => {
|
|
|
68
70
|
releaseInstanceConfig?.url,
|
|
69
71
|
testInstanceConfig?.defaultUrl,
|
|
70
72
|
]);
|
|
73
|
+
const [showRequiredFields, setShowRequiredFields] = useState(false);
|
|
71
74
|
const [url, setUrl] = useState(defaultUrl || '');
|
|
72
75
|
const [username, setUsername] = useState(modeDebug ? testInstanceConfig?.defaultUsername : '');
|
|
73
76
|
const [password, setPassword] = useState(modeDebug ? testInstanceConfig?.defaultPassword : '');
|
|
77
|
+
const parseQrCode = useCallback(scanValue => {
|
|
78
|
+
if (scanValue.includes('username') === true) {
|
|
79
|
+
const parseScannnedData = JSON.parse(scanValue);
|
|
80
|
+
setUrl(parseScannnedData.url);
|
|
81
|
+
setUsername(parseScannnedData.username);
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
setUrl(scanValue);
|
|
85
|
+
}
|
|
86
|
+
}, []);
|
|
74
87
|
const disabledLogin = useMemo(() => checkNullString(url) ||
|
|
75
88
|
checkNullString(username) ||
|
|
76
89
|
checkNullString(password) ||
|
|
77
90
|
loading, [loading, password, url, username]);
|
|
78
91
|
useEffect(() => {
|
|
79
92
|
if (scannedValue) {
|
|
80
|
-
|
|
81
|
-
const parseScannnedData = JSON.parse(scannedValue);
|
|
82
|
-
setUrl(parseScannnedData.url);
|
|
83
|
-
setUsername(parseScannnedData.username);
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
setUrl(scannedValue);
|
|
87
|
-
}
|
|
93
|
+
parseQrCode(scannedValue);
|
|
88
94
|
}
|
|
89
95
|
else if (scanData?.value != null) {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
96
|
+
parseQrCode(scanData?.value);
|
|
97
|
+
}
|
|
98
|
+
}, [parseQrCode, scanData, scannedValue]);
|
|
99
|
+
const onPressLogin = useCallback(() => {
|
|
100
|
+
dispatch(login({ url, username, password }));
|
|
101
|
+
sessionStorage.addSession({
|
|
102
|
+
session: {
|
|
103
|
+
id: DeviceInfo.getApplicationName(),
|
|
104
|
+
url: url,
|
|
105
|
+
username: username,
|
|
106
|
+
isActive: true,
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
}, [dispatch, password, url, username]);
|
|
110
|
+
const handleTestUrl = useCallback(() => {
|
|
111
|
+
dispatch(isUrlValid({ url }));
|
|
112
|
+
}, [dispatch, url]);
|
|
113
|
+
useEffect(() => {
|
|
114
|
+
if (sessionActive != null) {
|
|
115
|
+
setUrl(sessionActive.url);
|
|
116
|
+
setUsername(sessionActive.username);
|
|
117
|
+
setPassword(modeDebug ? testInstanceConfig?.defaultPassword : '');
|
|
98
118
|
}
|
|
99
|
-
}, [
|
|
119
|
+
}, [modeDebug, sessionActive, testInstanceConfig?.defaultPassword]);
|
|
100
120
|
return (<Screen>
|
|
101
|
-
<
|
|
102
|
-
<
|
|
103
|
-
<View style={styles.
|
|
104
|
-
<
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
{showUrlInput && (<UrlInput value={url} onChange={setUrl} readOnly={loading} onScanPress={onScanPress} onSelection={enableScanner} scanIconColor={isEnabled && scanKey === urlScanKey
|
|
121
|
+
<KeyboardAvoidingScrollView keyboardOffset={{ ios: 0, android: 0 }} style={styles.scroll}>
|
|
122
|
+
<View style={styles.container}>
|
|
123
|
+
<View style={styles.imageContainer}>
|
|
124
|
+
<LogoImage url={url} logoFile={logoFile}/>
|
|
125
|
+
</View>
|
|
126
|
+
<ErrorText error={error} style={styles.card}/>
|
|
127
|
+
{showUrlInput && (<UrlInput value={url} onChange={setUrl} readOnly={loading} onScanPress={onScanPress} onSelection={enableScanner} onEndFocus={handleTestUrl} scanIconColor={isEnabled && scanKey === urlScanKey
|
|
109
128
|
? Colors.primaryColor.background
|
|
110
|
-
: Colors.secondaryColor_dark.background}/>)}
|
|
111
|
-
|
|
129
|
+
: Colors.secondaryColor_dark.background} showRequiredFields={showRequiredFields}/>)}
|
|
130
|
+
<UsernameInput value={username} onChange={setUsername} readOnly={loading} showScanIcon={!showUrlInput} onScanPress={onScanPress} onSelection={enableScanner} scanIconColor={isEnabled && scanKey === urlScanKey
|
|
112
131
|
? Colors.primaryColor.background
|
|
113
|
-
: Colors.secondaryColor_dark.background}/>
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
</View>
|
|
132
|
+
: Colors.secondaryColor_dark.background} showRequiredFields={showRequiredFields}/>
|
|
133
|
+
<PasswordInput value={password} onChange={setPassword} readOnly={loading} showRequiredFields={showRequiredFields}/>
|
|
134
|
+
<View>
|
|
135
|
+
{loading ? (<ActivityIndicator size="large"/>) : (<LoginButton onPress={onPressLogin} onDisabledPress={() => setShowRequiredFields(true)} disabled={disabledLogin}/>)}
|
|
136
|
+
</View>
|
|
137
|
+
<View style={styles.copyright}>
|
|
138
|
+
<Text>{`© 2005 - ${new Date().getFullYear()} Axelor. All rights reserved.`}</Text>
|
|
139
|
+
<Text>{`Version ${appVersion}`}</Text>
|
|
122
140
|
</View>
|
|
123
|
-
</
|
|
124
|
-
</
|
|
141
|
+
</View>
|
|
142
|
+
</KeyboardAvoidingScrollView>
|
|
125
143
|
</Screen>);
|
|
126
144
|
};
|
|
127
145
|
const styles = StyleSheet.create({
|
|
@@ -134,7 +152,7 @@ const styles = StyleSheet.create({
|
|
|
134
152
|
alignItems: 'center',
|
|
135
153
|
width: '100%',
|
|
136
154
|
height: '15%',
|
|
137
|
-
marginTop: Dimensions.get('window').height < 500 ? '
|
|
155
|
+
marginTop: Dimensions.get('window').height < 500 ? '10%' : '40%',
|
|
138
156
|
marginBottom: '10%',
|
|
139
157
|
},
|
|
140
158
|
copyright: {
|
|
@@ -143,6 +161,12 @@ const styles = StyleSheet.create({
|
|
|
143
161
|
width: '100%',
|
|
144
162
|
bottom: 0,
|
|
145
163
|
},
|
|
164
|
+
card: {
|
|
165
|
+
width: '90%',
|
|
166
|
+
},
|
|
167
|
+
scroll: {
|
|
168
|
+
height: null,
|
|
169
|
+
},
|
|
146
170
|
});
|
|
147
171
|
export default LoginScreen;
|
|
148
172
|
//# sourceMappingURL=LoginScreen.js.map
|
|
@@ -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,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"LoginScreen.js","sourceRoot":"","sources":["../../src/screens/LoginScreen.js"],"names":[],"mappings":"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"}
|