@axelor/aos-mobile-core 9.1.12 → 9.2.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/apiProviders/Standard/ObjectFieldsProvider.d.ts +2 -2
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js.map +1 -1
- package/lib/app/RootNavigator.d.ts +9 -8
- package/lib/app/RootNavigator.js +20 -19
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/app/modules/types.d.ts +2 -4
- package/lib/auth/components/index.d.ts +1 -1
- package/lib/auth/components/index.js.map +1 -1
- package/lib/auth/components/molecules/DashboardsCard/DashboardsCard.d.ts +1 -1
- package/lib/auth/components/molecules/DashboardsCard/DashboardsCard.js +6 -11
- package/lib/auth/components/molecules/DashboardsCard/DashboardsCard.js.map +1 -1
- package/lib/auth/components/molecules/ShortcutsCard/ShortcutsCard.d.ts +2 -4
- package/lib/auth/components/molecules/ShortcutsCard/ShortcutsCard.js +19 -22
- package/lib/auth/components/molecules/ShortcutsCard/ShortcutsCard.js.map +1 -1
- package/lib/auth/components/molecules/UserCard/UserCard.d.ts +2 -3
- package/lib/auth/components/molecules/UserCard/UserCard.js +28 -45
- package/lib/auth/components/molecules/UserCard/UserCard.js.map +1 -1
- package/lib/auth/components/molecules/index.d.ts +3 -5
- package/lib/auth/components/molecules/index.js +0 -2
- package/lib/auth/components/molecules/index.js.map +1 -1
- package/lib/auth/hooks/use-auth-headers.d.ts +1 -1
- package/lib/auth/hooks/use-auth-headers.js +2 -0
- package/lib/auth/hooks/use-auth-headers.js.map +1 -1
- package/lib/auth/i18n/en.json +4 -0
- package/lib/auth/i18n/fr.json +4 -0
- package/lib/auth/index.d.ts +2 -0
- package/lib/auth/index.js +2 -0
- package/lib/auth/index.js.map +1 -1
- package/lib/auth/screens/SettingsScreen.d.ts +2 -4
- package/lib/auth/screens/SettingsScreen.js +49 -83
- package/lib/auth/screens/SettingsScreen.js.map +1 -1
- package/lib/auth/screens/UserScreen.d.ts +2 -4
- package/lib/auth/screens/UserScreen.js +13 -16
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/auth/screens/index.d.ts +2 -2
- package/lib/auth/screens/index.js.map +1 -1
- package/lib/auth/settings/SettingsProvider.d.ts +18 -0
- package/lib/auth/settings/SettingsProvider.js +73 -0
- package/lib/auth/settings/SettingsProvider.js.map +1 -0
- package/lib/auth/settings/index.d.ts +4 -0
- package/lib/auth/settings/index.js +22 -0
- package/lib/auth/settings/index.js.map +1 -0
- package/lib/auth/settings/settings.helper.d.ts +5 -0
- package/lib/{components/external/PlanningView/NavigationButton.js → auth/settings/settings.helper.js} +13 -17
- package/lib/auth/settings/settings.helper.js.map +1 -0
- package/lib/auth/settings/types.d.ts +36 -0
- package/lib/auth/settings/types.js +24 -0
- package/lib/auth/settings/types.js.map +1 -0
- package/lib/auth/settings/use-settings-register.d.ts +1 -0
- package/lib/auth/settings/use-settings-register.js +211 -0
- package/lib/auth/settings/use-settings-register.js.map +1 -0
- package/lib/auth/userScreen/UserScreenProvider.d.ts +15 -0
- package/lib/auth/userScreen/UserScreenProvider.js +64 -0
- package/lib/auth/userScreen/UserScreenProvider.js.map +1 -0
- package/lib/auth/userScreen/index.d.ts +3 -0
- package/lib/auth/userScreen/index.js +21 -0
- package/lib/auth/userScreen/index.js.map +1 -0
- package/lib/auth/userScreen/types.d.ts +14 -0
- package/lib/auth/userScreen/types.js +23 -0
- package/lib/auth/userScreen/types.js.map +1 -0
- package/lib/auth/userScreen/user-screen.helper.d.ts +5 -0
- package/lib/auth/userScreen/user-screen.helper.js +26 -0
- package/lib/auth/userScreen/user-screen.helper.js.map +1 -0
- package/lib/components/external/Camera/Camera.js +1 -1
- package/lib/components/external/Camera/CaptureButton.js +1 -1
- package/lib/components/external/Camera/CaptureButton.js.map +1 -1
- package/lib/components/external/PlanningView/PlanningView.d.ts +2 -1
- package/lib/components/external/PlanningView/PlanningView.js +21 -121
- package/lib/components/external/PlanningView/PlanningView.js.map +1 -1
- package/lib/components/external/PlanningView/agenda.helpers.d.ts +4 -13
- package/lib/components/external/PlanningView/agenda.helpers.js +27 -128
- package/lib/components/external/PlanningView/agenda.helpers.js.map +1 -1
- package/lib/components/external/Stopwatch/Stopwatch.js +28 -24
- package/lib/components/external/Stopwatch/Stopwatch.js.map +1 -1
- package/lib/components/external/Toast/ToastDisplay.d.ts +1 -1
- package/lib/components/external/Toast/ToastDisplay.js +46 -22
- package/lib/components/external/Toast/ToastDisplay.js.map +1 -1
- package/lib/components/molecules/DateDisplay/DateDisplay.js +1 -1
- package/lib/components/molecules/DatePicker/DatePicker.d.ts +2 -2
- package/lib/components/molecules/DatePicker/DatePicker.js +1 -1
- package/lib/components/molecules/DatePicker/DatePicker.js.map +1 -1
- package/lib/components/molecules/HeaderBand/HeaderBand.js +4 -9
- package/lib/components/molecules/HeaderBand/HeaderBand.js.map +1 -1
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.d.ts +1 -1
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js +12 -30
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js.map +1 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +39 -40
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/molecules/index.d.ts +0 -1
- package/lib/components/molecules/index.js +0 -1
- package/lib/components/molecules/index.js.map +1 -1
- package/lib/components/organisms/AOSImage/AOSImage.js +1 -1
- package/lib/components/organisms/AOSImage/AOSImage.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.d.ts +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +18 -15
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/organisms/FilterContainer/FilterContainer.js +11 -8
- package/lib/components/organisms/FilterContainer/FilterContainer.js.map +1 -1
- package/lib/components/organisms/PopupFilters/PopupFilters.js +8 -3
- package/lib/components/organisms/PopupFilters/PopupFilters.js.map +1 -1
- package/lib/components/organisms/SignatureInput/SignatureInput.js +15 -23
- package/lib/components/organisms/SignatureInput/SignatureInput.js.map +1 -1
- package/lib/components/pages/CustomFieldForm/CustomFieldForm.js +1 -0
- package/lib/components/pages/CustomFieldForm/CustomFieldForm.js.map +1 -1
- package/lib/components/pages/FormView/Components/Field.js +2 -10
- package/lib/components/pages/FormView/Components/Field.js.map +1 -1
- package/lib/components/pages/FormView/Components/Panel.js +8 -6
- package/lib/components/pages/FormView/Components/Panel.js.map +1 -1
- package/lib/components/pages/FormView/FormView.d.ts +2 -1
- package/lib/components/pages/FormView/FormView.js +20 -4
- package/lib/components/pages/FormView/FormView.js.map +1 -1
- package/lib/components/templates/PeriodInput/PeriodInput.js +7 -6
- package/lib/components/templates/PeriodInput/PeriodInput.js.map +1 -1
- package/lib/components/templates/SocialNetworkLinks/SocialNetworkLinks.d.ts +3 -2
- package/lib/components/templates/SocialNetworkLinks/SocialNetworkLinks.js +9 -16
- package/lib/components/templates/SocialNetworkLinks/SocialNetworkLinks.js.map +1 -1
- package/lib/dashboards/component/AOPChart/DynamicSearchForm.d.ts +4 -4
- package/lib/dashboards/component/AOPChart/DynamicSearchForm.js +23 -23
- package/lib/dashboards/component/AOPChart/DynamicSearchForm.js.map +1 -1
- package/lib/dashboards/view/DashboardView.js +1 -1
- package/lib/dashboards/view/DashboardView.js.map +1 -1
- package/lib/features/authSlice.d.ts +1 -1
- package/lib/forms/api.helpers.d.ts +1 -1
- package/lib/forms/display.helpers.d.ts +2 -2
- package/lib/forms/display.helpers.js.map +1 -1
- package/lib/forms/types.d.ts +5 -5
- package/lib/header/FilterProvider.js +2 -2
- package/lib/header/FilterProvider.js.map +1 -1
- package/lib/header/HeaderActionsProvider.d.ts +2 -2
- package/lib/header/HeaderActionsProvider.js.map +1 -1
- package/lib/header/utils.d.ts +1 -1
- package/lib/header/utils.js +2 -6
- package/lib/header/utils.js.map +1 -1
- package/lib/hooks/index.d.ts +2 -2
- package/lib/hooks/index.js +2 -2
- package/lib/hooks/index.js.map +1 -1
- package/lib/hooks/use-background-function.d.ts +1 -1
- package/lib/hooks/use-background-function.js +2 -2
- package/lib/hooks/use-background-function.js.map +1 -1
- package/lib/hooks/use-effect-debugger.d.ts +4 -3
- package/lib/hooks/use-effect-debugger.js.map +1 -1
- package/lib/hooks/use-header-registers.d.ts +1 -1
- package/lib/hooks/use-header-registers.js +1 -1
- package/lib/hooks/use-header-registers.js.map +1 -1
- package/lib/i18n/i18n.d.ts +1 -1
- package/lib/i18n/i18n.js +2 -1
- package/lib/i18n/i18n.js.map +1 -1
- package/lib/i18n/translations/en.json +4 -1
- package/lib/i18n/translations/fr.json +3 -0
- package/lib/loader/components/atoms/ProcessCard/ProcessCard.js +3 -5
- package/lib/loader/components/atoms/ProcessCard/ProcessCard.js.map +1 -1
- package/lib/navigator/Navigator.d.ts +4 -4
- package/lib/navigator/Navigator.js +45 -29
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/components/DrawerContent.js +51 -47
- package/lib/navigator/components/DrawerContent.js.map +1 -1
- package/lib/navigator/components/header/Header.d.ts +1 -2
- package/lib/navigator/components/header/Header.js +13 -35
- package/lib/navigator/components/header/Header.js.map +1 -1
- package/lib/navigator/components/header/HeaderButton.js +13 -6
- package/lib/navigator/components/header/HeaderButton.js.map +1 -1
- package/lib/navigator/components/header/HeaderOptionMenu.js +17 -3
- package/lib/navigator/components/header/HeaderOptionMenu.js.map +1 -1
- package/lib/navigator/components/header/HeaderOptionMenuItem.js +18 -15
- package/lib/navigator/components/header/HeaderOptionMenuItem.js.map +1 -1
- package/lib/navigator/components/menu/AuthMenu.js +9 -3
- package/lib/navigator/components/menu/AuthMenu.js.map +1 -1
- package/lib/navigator/components/menu/Menu.js +10 -4
- package/lib/navigator/components/menu/Menu.js.map +1 -1
- package/lib/navigator/components/menu/MenuIconButton.d.ts +3 -1
- package/lib/navigator/components/menu/MenuIconButton.js +60 -41
- package/lib/navigator/components/menu/MenuIconButton.js.map +1 -1
- package/lib/navigator/components/menu/MenuIconTile.d.ts +14 -0
- package/lib/navigator/components/menu/MenuIconTile.js +45 -0
- package/lib/navigator/components/menu/MenuIconTile.js.map +1 -0
- package/lib/navigator/components/menu/MenuItemEntry.d.ts +1 -1
- package/lib/navigator/components/menu/MenuItemEntry.js +30 -46
- package/lib/navigator/components/menu/MenuItemEntry.js.map +1 -1
- package/lib/navigator/components/menu/MenuItemList.js +13 -10
- package/lib/navigator/components/menu/MenuItemList.js.map +1 -1
- package/lib/navigator/components/menu/MenuSeparator.d.ts +1 -2
- package/lib/navigator/components/menu/MenuSeparator.js +16 -21
- package/lib/navigator/components/menu/MenuSeparator.js.map +1 -1
- package/lib/navigator/components/menu/SubMenuItem.js +1 -2
- package/lib/navigator/components/menu/SubMenuItem.js.map +1 -1
- package/lib/navigator/components/menu/SubMenuItemList.js +19 -4
- package/lib/navigator/components/menu/SubMenuItemList.js.map +1 -1
- package/lib/navigator/components/menu/index.d.ts +0 -1
- package/lib/navigator/components/menu/index.js +0 -1
- package/lib/navigator/components/menu/index.js.map +1 -1
- package/lib/navigator/helpers/index.d.ts +1 -0
- package/lib/navigator/helpers/index.js +1 -0
- package/lib/navigator/helpers/index.js.map +1 -1
- package/lib/navigator/helpers/module.helper.d.ts +3 -3
- package/lib/navigator/helpers/module.helper.js +3 -4
- package/lib/navigator/helpers/module.helper.js.map +1 -1
- package/lib/navigator/helpers/screen-orientation.helper.d.ts +6 -0
- package/lib/navigator/helpers/screen-orientation.helper.js +36 -0
- package/lib/navigator/helpers/screen-orientation.helper.js.map +1 -0
- package/lib/navigator/providers/module-navigator.d.ts +2 -2
- package/lib/navigator/providers/module-navigator.js +1 -3
- package/lib/navigator/providers/module-navigator.js.map +1 -1
- package/lib/screens/LoginScreen.d.ts +2 -4
- package/lib/screens/LoginScreen.js +45 -58
- package/lib/screens/LoginScreen.js.map +1 -1
- package/lib/screens/ProcessListScreen.js +1 -1
- package/lib/screens/ProcessListScreen.js.map +1 -1
- package/lib/screens/SessionManagementScreen.d.ts +2 -4
- package/lib/screens/SessionManagementScreen.js +15 -27
- package/lib/screens/SessionManagementScreen.js.map +1 -1
- package/lib/screens/index.js +0 -10
- package/lib/screens/index.js.map +1 -1
- package/lib/sessions/components/alerts/PopupCreateSession.d.ts +11 -10
- package/lib/sessions/components/alerts/PopupCreateSession.js +19 -32
- package/lib/sessions/components/alerts/PopupCreateSession.js.map +1 -1
- package/lib/sessions/components/alerts/PopupEditSession.d.ts +9 -8
- package/lib/sessions/components/alerts/PopupEditSession.js +9 -10
- package/lib/sessions/components/alerts/PopupEditSession.js.map +1 -1
- package/lib/sessions/components/alerts/PopupSession.d.ts +10 -9
- package/lib/sessions/components/alerts/PopupSession.js +9 -10
- package/lib/sessions/components/alerts/PopupSession.js.map +1 -1
- package/lib/sessions/components/display/LogoImage.d.ts +5 -5
- package/lib/sessions/components/display/LogoImage.js +16 -18
- package/lib/sessions/components/display/LogoImage.js.map +1 -1
- package/lib/sessions/components/display/SessionCard.d.ts +13 -10
- package/lib/sessions/components/display/SessionCard.js +53 -45
- package/lib/sessions/components/display/SessionCard.js.map +1 -1
- package/lib/sessions/components/display/SessionListCard.d.ts +14 -11
- package/lib/sessions/components/display/SessionListCard.js +24 -16
- package/lib/sessions/components/display/SessionListCard.js.map +1 -1
- package/lib/sessions/components/error/ErrorText.d.ts +5 -5
- package/lib/sessions/components/error/ErrorText.js +2 -4
- package/lib/sessions/components/error/ErrorText.js.map +1 -1
- package/lib/sessions/components/inputs/DefaultCheckbox.d.ts +1 -1
- package/lib/sessions/components/inputs/DefaultCheckbox.js +2 -10
- package/lib/sessions/components/inputs/DefaultCheckbox.js.map +1 -1
- package/lib/sessions/components/inputs/MfaCodeInput.d.ts +1 -1
- package/lib/sessions/components/inputs/MfaCodeInput.js +3 -14
- package/lib/sessions/components/inputs/MfaCodeInput.js.map +1 -1
- package/lib/sessions/components/inputs/PasswordInput.d.ts +9 -8
- package/lib/sessions/components/inputs/PasswordInput.js +7 -18
- package/lib/sessions/components/inputs/PasswordInput.js.map +1 -1
- package/lib/sessions/components/inputs/SessionInputs.d.ts +14 -13
- package/lib/sessions/components/inputs/SessionInputs.js +25 -48
- package/lib/sessions/components/inputs/SessionInputs.js.map +1 -1
- package/lib/sessions/components/inputs/SessionNameInput.d.ts +9 -8
- package/lib/sessions/components/inputs/SessionNameInput.js +6 -17
- package/lib/sessions/components/inputs/SessionNameInput.js.map +1 -1
- package/lib/sessions/components/inputs/UrlInput.d.ts +11 -10
- package/lib/sessions/components/inputs/UrlInput.js +8 -18
- package/lib/sessions/components/inputs/UrlInput.js.map +1 -1
- package/lib/sessions/components/inputs/UsernameInput.d.ts +11 -10
- package/lib/sessions/components/inputs/UsernameInput.js +7 -18
- package/lib/sessions/components/inputs/UsernameInput.js.map +1 -1
- package/lib/tools/ContactProvider.d.ts +1 -0
- package/lib/tools/ContactProvider.js +21 -22
- package/lib/tools/ContactProvider.js.map +1 -1
- package/lib/tools/LinkingProvider.d.ts +2 -2
- package/lib/tools/LinkingProvider.js +4 -0
- package/lib/tools/LinkingProvider.js.map +1 -1
- package/lib/utils/image.d.ts +2 -2
- package/lib/utils/image.js +1 -1
- package/lib/utils/image.js.map +1 -1
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.js +1 -0
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/registry.helper.d.ts +9 -0
- package/lib/{components/molecules/FocusScreen/FocusScreen.js → utils/registry.helper.js} +18 -17
- package/lib/utils/registry.helper.js.map +1 -0
- package/package.json +42 -46
- package/lib/auth/components/molecules/NavigationToolsButton/NavigationToolsButton.d.ts +0 -3
- package/lib/auth/components/molecules/NavigationToolsButton/NavigationToolsButton.js +0 -60
- package/lib/auth/components/molecules/NavigationToolsButton/NavigationToolsButton.js.map +0 -1
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.d.ts +0 -3
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js +0 -61
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js.map +0 -1
- package/lib/components/external/PlanningView/AgendaItemDisplay.d.ts +0 -8
- package/lib/components/external/PlanningView/AgendaItemDisplay.js +0 -81
- package/lib/components/external/PlanningView/AgendaItemDisplay.js.map +0 -1
- package/lib/components/external/PlanningView/DayDisplay.d.ts +0 -5
- package/lib/components/external/PlanningView/DayDisplay.js +0 -59
- package/lib/components/external/PlanningView/DayDisplay.js.map +0 -1
- package/lib/components/external/PlanningView/MonthDisplay.d.ts +0 -6
- package/lib/components/external/PlanningView/MonthDisplay.js +0 -46
- package/lib/components/external/PlanningView/MonthDisplay.js.map +0 -1
- package/lib/components/external/PlanningView/NavigationButton.d.ts +0 -7
- package/lib/components/external/PlanningView/NavigationButton.js.map +0 -1
- package/lib/components/molecules/FocusScreen/FocusScreen.d.ts +0 -12
- package/lib/components/molecules/FocusScreen/FocusScreen.js.map +0 -1
- package/lib/navigator/components/menu/MenuTitle.d.ts +0 -8
- package/lib/navigator/components/menu/MenuTitle.js +0 -55
- package/lib/navigator/components/menu/MenuTitle.js.map +0 -1
|
@@ -15,33 +15,23 @@
|
|
|
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, {
|
|
18
|
+
import React, { useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { KeyboardAvoidingView, StyleSheet, View } from 'react-native';
|
|
20
|
-
import { useDispatch } from 'react-redux';
|
|
21
20
|
import { Text, Screen } from '@axelor/aos-mobile-ui';
|
|
22
|
-
import {
|
|
21
|
+
import { useDispatch, useSelector } from '../redux/hooks';
|
|
23
22
|
import { clearError } from '../features/authSlice';
|
|
24
|
-
import {
|
|
23
|
+
import { LogoImage, MfaVerificationPopup, PopupCreateSession, PopupSession, SessionListCard, PopupEditSession, useSessions, } from '../sessions';
|
|
25
24
|
const SessionManagementScreen = ({ route }) => {
|
|
26
|
-
const testInstanceConfig = route?.params
|
|
27
|
-
const releaseInstanceConfig = route?.params?.releaseInstanceConfig;
|
|
28
|
-
const logoFile = route?.params?.logoFile;
|
|
25
|
+
const { testInstanceConfig, releaseInstanceConfig, logoFile } = route?.params ?? {};
|
|
29
26
|
const dispatch = useDispatch();
|
|
30
27
|
const modeDebug = useMemo(() => __DEV__, []);
|
|
31
28
|
const { sessionList, sessionDefault } = useSessions();
|
|
32
|
-
const showUrlInput = useMemo(() =>
|
|
33
|
-
if (modeDebug) {
|
|
34
|
-
return true;
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
return releaseInstanceConfig?.showUrlInput || true;
|
|
38
|
-
}
|
|
39
|
-
}, [modeDebug, releaseInstanceConfig?.showUrlInput]);
|
|
29
|
+
const showUrlInput = useMemo(() => modeDebug || (releaseInstanceConfig?.showUrlInput ?? true), [modeDebug, releaseInstanceConfig?.showUrlInput]);
|
|
40
30
|
const [isMounted, setIsMounted] = useState(false);
|
|
41
31
|
const [popupCreateIsOpen, setPopupCreateIsOpen] = useState(false);
|
|
42
32
|
const [popupConnectionIsOpen, setPopupConnectionIsOpen] = useState(false);
|
|
43
33
|
const [popupEditIsOpen, setPopupEditIsOpen] = useState(false);
|
|
44
|
-
const [session, setSession] = useState(sessionDefault
|
|
34
|
+
const [session, setSession] = useState(sessionDefault);
|
|
45
35
|
const { appVersion } = useSelector(state => state.auth);
|
|
46
36
|
useEffect(() => {
|
|
47
37
|
if (!popupCreateIsOpen && !popupConnectionIsOpen) {
|
|
@@ -50,9 +40,7 @@ const SessionManagementScreen = ({ route }) => {
|
|
|
50
40
|
}, [dispatch, popupConnectionIsOpen, popupCreateIsOpen]);
|
|
51
41
|
useEffect(() => {
|
|
52
42
|
setIsMounted(true);
|
|
53
|
-
return () =>
|
|
54
|
-
setIsMounted(false);
|
|
55
|
-
};
|
|
43
|
+
return () => setIsMounted(false);
|
|
56
44
|
}, []);
|
|
57
45
|
useEffect(() => {
|
|
58
46
|
if (sessionDefault != null && isMounted) {
|
|
@@ -64,19 +52,18 @@ const SessionManagementScreen = ({ route }) => {
|
|
|
64
52
|
setPopupCreateIsOpen(true);
|
|
65
53
|
}
|
|
66
54
|
}, [sessionList]);
|
|
67
|
-
const changeActiveSession = useCallback(_session => {
|
|
68
|
-
setSession(_session);
|
|
69
|
-
}, []);
|
|
70
55
|
return (<Screen>
|
|
71
|
-
<KeyboardAvoidingView
|
|
56
|
+
<KeyboardAvoidingView>
|
|
72
57
|
<View style={styles.container}>
|
|
73
58
|
<View style={styles.imageContainer}>
|
|
74
59
|
<LogoImage logoFile={logoFile} url={session?.url}/>
|
|
75
60
|
</View>
|
|
76
|
-
<SessionListCard logoFile={logoFile} sessionList={sessionList} changeActiveSession={
|
|
61
|
+
<SessionListCard logoFile={logoFile} sessionList={sessionList} changeActiveSession={setSession} openConnection={() => setPopupConnectionIsOpen(true)} openEdition={() => setPopupEditIsOpen(true)} openCreation={() => setPopupCreateIsOpen(true)} session={session}/>
|
|
77
62
|
<View style={styles.copyrightContainer}>
|
|
78
|
-
<Text
|
|
79
|
-
|
|
63
|
+
<Text writingType="important" fontSize={12}>
|
|
64
|
+
{`© 2005 - ${new Date().getFullYear()} Axelor. All rights reserved.`}
|
|
65
|
+
</Text>
|
|
66
|
+
<Text fontSize={12}>{`Version ${appVersion}`}</Text>
|
|
80
67
|
</View>
|
|
81
68
|
</View>
|
|
82
69
|
<PopupCreateSession sessionList={sessionList} visible={popupCreateIsOpen} handleVisibility={setPopupCreateIsOpen} showUrlInput={showUrlInput} modeDebug={modeDebug} testInstanceConfig={testInstanceConfig} releaseInstanceConfig={releaseInstanceConfig}/>
|
|
@@ -84,7 +71,7 @@ const SessionManagementScreen = ({ route }) => {
|
|
|
84
71
|
<PopupEditSession session={session} sessionList={sessionList} popupIsOpen={popupEditIsOpen} showUrlInput={showUrlInput} handleClose={() => {
|
|
85
72
|
setPopupConnectionIsOpen(false);
|
|
86
73
|
setPopupEditIsOpen(false);
|
|
87
|
-
}}
|
|
74
|
+
}}/>
|
|
88
75
|
<MfaVerificationPopup />
|
|
89
76
|
</KeyboardAvoidingView>
|
|
90
77
|
</Screen>);
|
|
@@ -101,6 +88,7 @@ const styles = StyleSheet.create({
|
|
|
101
88
|
},
|
|
102
89
|
copyrightContainer: {
|
|
103
90
|
alignItems: 'center',
|
|
91
|
+
gap: 4,
|
|
104
92
|
},
|
|
105
93
|
});
|
|
106
94
|
export default SessionManagementScreen;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionManagementScreen.js","sourceRoot":"","sources":["../../src/screens/SessionManagementScreen.
|
|
1
|
+
{"version":3,"file":"SessionManagementScreen.js","sourceRoot":"","sources":["../../src/screens/SessionManagementScreen.tsx"],"names":[],"mappings":"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"}
|
package/lib/screens/index.js
CHANGED
|
@@ -24,29 +24,19 @@ const baseScreens = {
|
|
|
24
24
|
title: 'Base_Barcode',
|
|
25
25
|
component: BarcodeDisplayScreen,
|
|
26
26
|
actionID: 'core_barcode_details',
|
|
27
|
-
options: {
|
|
28
|
-
shadedHeader: true,
|
|
29
|
-
},
|
|
30
27
|
},
|
|
31
28
|
JsonFieldScreen: {
|
|
32
29
|
title: 'Base_MetaJsonFields',
|
|
33
30
|
component: JsonFieldScreen,
|
|
34
31
|
actionID: 'core_metaJsonFields_details',
|
|
35
|
-
options: {
|
|
36
|
-
shadedHeader: true,
|
|
37
|
-
},
|
|
38
32
|
},
|
|
39
33
|
ProcessListScreen: {
|
|
40
34
|
title: 'Base_Loader_ProcessList',
|
|
41
35
|
component: ProcessListScreen,
|
|
42
|
-
options: {
|
|
43
|
-
shadedHeader: false,
|
|
44
|
-
},
|
|
45
36
|
},
|
|
46
37
|
ERPAccessScreen: {
|
|
47
38
|
title: 'Base_ERPAccesss',
|
|
48
39
|
component: ERPAccessScreen,
|
|
49
|
-
options: { shadedHeader: true },
|
|
50
40
|
isUsableOnShortcut: true,
|
|
51
41
|
},
|
|
52
42
|
};
|
package/lib/screens/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/screens/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAIhD,MAAM,WAAW,GAAgB;IAC/B,oBAAoB,EAAE;QACpB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,oBAAoB;QAC/B,QAAQ,EAAE,sBAAsB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/screens/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAIhD,MAAM,WAAW,GAAgB;IAC/B,oBAAoB,EAAE;QACpB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,oBAAoB;QAC/B,QAAQ,EAAE,sBAAsB;KACjC;IACD,eAAe,EAAE;QACf,KAAK,EAAE,qBAAqB;QAC5B,SAAS,EAAE,eAAe;QAC1B,QAAQ,EAAE,6BAA6B;KACxC;IACD,iBAAiB,EAAE;QACjB,KAAK,EAAE,yBAAyB;QAChC,SAAS,EAAE,iBAAiB;KAC7B;IACD,eAAe,EAAE;QACf,KAAK,EAAE,iBAAiB;QACxB,SAAS,EAAE,eAAe;QAC1B,kBAAkB,EAAE,IAAI;KACzB;CACF,CAAC;AAEF,eAAe,WAAW,CAAC;AAC3B,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,eAAe,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
export default PopupCreateSession;
|
|
2
|
-
declare function PopupCreateSession({ sessionList, visible, handleVisibility, showUrlInput, modeDebug, testInstanceConfig, releaseInstanceConfig, }: {
|
|
3
|
-
sessionList: any;
|
|
4
|
-
visible: any;
|
|
5
|
-
handleVisibility: any;
|
|
6
|
-
showUrlInput: any;
|
|
7
|
-
modeDebug: any;
|
|
8
|
-
testInstanceConfig: any;
|
|
9
|
-
releaseInstanceConfig: any;
|
|
10
|
-
}): React.JSX.Element;
|
|
11
1
|
import React from 'react';
|
|
2
|
+
import { Session } from '../../type';
|
|
3
|
+
declare const PopupCreateSession: ({ sessionList, visible, handleVisibility, showUrlInput, modeDebug, testInstanceConfig, releaseInstanceConfig, }: {
|
|
4
|
+
sessionList?: Session[];
|
|
5
|
+
visible?: boolean;
|
|
6
|
+
handleVisibility: (_v?: boolean) => void;
|
|
7
|
+
showUrlInput?: boolean;
|
|
8
|
+
modeDebug?: boolean;
|
|
9
|
+
testInstanceConfig?: any;
|
|
10
|
+
releaseInstanceConfig?: any;
|
|
11
|
+
}) => React.JSX.Element;
|
|
12
|
+
export default PopupCreateSession;
|
|
@@ -17,51 +17,39 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
|
-
import
|
|
20
|
+
import DeviceInfo from 'react-native-device-info';
|
|
21
21
|
import { Alert } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { useDispatch, useSelector } from '../../../redux/hooks';
|
|
23
|
+
import { login } from '../../../features/authSlice';
|
|
22
24
|
import { useTranslator } from '../../../i18n';
|
|
23
25
|
import { ErrorText, SessionInputs } from '../../components';
|
|
24
|
-
import {
|
|
25
|
-
import { getStorageUrl
|
|
26
|
-
|
|
27
|
-
const PopupCreateSession = ({ sessionList, visible, handleVisibility, showUrlInput, modeDebug, testInstanceConfig, releaseInstanceConfig, }) => {
|
|
26
|
+
import { sessionStorage } from '../../SessionStorage';
|
|
27
|
+
import { getStorageUrl } from '../../utils';
|
|
28
|
+
const PopupCreateSession = ({ sessionList, visible, handleVisibility, showUrlInput = false, modeDebug = false, testInstanceConfig, releaseInstanceConfig, }) => {
|
|
28
29
|
const I18n = useTranslator();
|
|
29
30
|
const dispatch = useDispatch();
|
|
30
31
|
const { loading, error, baseUrl } = useSelector(state => state.auth);
|
|
31
32
|
const urlStorage = useMemo(() => getStorageUrl(), []);
|
|
32
|
-
const defaultUrl = useMemo(() =>
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
if (baseUrl != null) {
|
|
37
|
-
return baseUrl;
|
|
38
|
-
}
|
|
39
|
-
if (modeDebug) {
|
|
40
|
-
return testInstanceConfig?.defaultUrl;
|
|
41
|
-
}
|
|
42
|
-
return releaseInstanceConfig?.url;
|
|
43
|
-
}, [
|
|
33
|
+
const defaultUrl = useMemo(() => urlStorage ??
|
|
34
|
+
baseUrl ??
|
|
35
|
+
(modeDebug ? testInstanceConfig?.defaultUrl : releaseInstanceConfig?.url), [
|
|
36
|
+
urlStorage,
|
|
44
37
|
baseUrl,
|
|
45
38
|
modeDebug,
|
|
46
39
|
releaseInstanceConfig?.url,
|
|
47
40
|
testInstanceConfig?.defaultUrl,
|
|
48
|
-
urlStorage,
|
|
49
41
|
]);
|
|
50
42
|
const [isBackground, setIsBackground] = useState(false);
|
|
51
43
|
const [isMounted, setIsMounted] = useState(false);
|
|
52
44
|
const [_session, setSession] = useState(null);
|
|
53
45
|
useEffect(() => {
|
|
54
46
|
setIsMounted(true);
|
|
55
|
-
return () =>
|
|
56
|
-
setIsMounted(false);
|
|
57
|
-
};
|
|
47
|
+
return () => setIsMounted(false);
|
|
58
48
|
}, []);
|
|
59
|
-
const onPressLogin = useCallback(session => {
|
|
60
|
-
dispatch(login({ ...session, closePopup: () => handleVisibility(false) })).then(res => {
|
|
49
|
+
const onPressLogin = useCallback((session) => {
|
|
50
|
+
dispatch(login({ ...session, closePopup: () => handleVisibility(false) })).then((res) => {
|
|
61
51
|
if (res.error == null && isMounted) {
|
|
62
|
-
sessionStorage.registerSession({
|
|
63
|
-
session,
|
|
64
|
-
});
|
|
52
|
+
sessionStorage.registerSession({ session });
|
|
65
53
|
}
|
|
66
54
|
});
|
|
67
55
|
}, [dispatch, handleVisibility, isMounted]);
|
|
@@ -86,9 +74,9 @@ const PopupCreateSession = ({ sessionList, visible, handleVisibility, showUrlInp
|
|
|
86
74
|
showUrlInput,
|
|
87
75
|
loading,
|
|
88
76
|
mode: 'creation',
|
|
89
|
-
showPopup:
|
|
90
|
-
setIsBackground(!
|
|
91
|
-
handleVisibility(
|
|
77
|
+
showPopup: (_v) => {
|
|
78
|
+
setIsBackground(!_v);
|
|
79
|
+
handleVisibility(_v ? true : undefined);
|
|
92
80
|
},
|
|
93
81
|
onValidation: onPressLogin,
|
|
94
82
|
saveBeforeScan: setSession,
|
|
@@ -104,10 +92,9 @@ const PopupCreateSession = ({ sessionList, visible, handleVisibility, showUrlInp
|
|
|
104
92
|
testInstanceConfig?.defaultPassword,
|
|
105
93
|
testInstanceConfig?.defaultUsername,
|
|
106
94
|
]);
|
|
107
|
-
if (isBackground)
|
|
95
|
+
if (isBackground)
|
|
108
96
|
return <SessionInputs hidden={true} {...inputProps}/>;
|
|
109
|
-
}
|
|
110
|
-
return (<Alert style={styles.alert} visible={visible} title={I18n.t('Base_Connection_CreateSession')} cancelButtonConfig={{
|
|
97
|
+
return (<Alert style={styles.alert} visible={visible ?? false} title={I18n.t('Base_Connection_CreateSession')} cancelButtonConfig={{
|
|
111
98
|
hide: loading || sessionList?.length <= 0,
|
|
112
99
|
showInHeader: true,
|
|
113
100
|
onPress: handleVisibility,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupCreateSession.js","sourceRoot":"","sources":["../../../../src/sessions/components/alerts/PopupCreateSession.
|
|
1
|
+
{"version":3,"file":"PopupCreateSession.js","sourceRoot":"","sources":["../../../../src/sessions/components/alerts/PopupCreateSession.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
export default PopupEditSession;
|
|
2
|
-
declare function PopupEditSession({ session, sessionList, popupIsOpen, handleClose, showUrlInput, }: {
|
|
3
|
-
session: any;
|
|
4
|
-
sessionList: any;
|
|
5
|
-
popupIsOpen: any;
|
|
6
|
-
handleClose: any;
|
|
7
|
-
showUrlInput: any;
|
|
8
|
-
}): React.JSX.Element;
|
|
9
1
|
import React from 'react';
|
|
2
|
+
import { Session } from '../../type';
|
|
3
|
+
declare const PopupEditSession: ({ session, sessionList, popupIsOpen, handleClose, showUrlInput, }: {
|
|
4
|
+
session?: Session;
|
|
5
|
+
sessionList?: Session[];
|
|
6
|
+
popupIsOpen?: boolean;
|
|
7
|
+
handleClose: () => void;
|
|
8
|
+
showUrlInput?: boolean;
|
|
9
|
+
}) => React.JSX.Element;
|
|
10
|
+
export default PopupEditSession;
|
|
@@ -17,22 +17,22 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
|
-
import { useSelector } from 'react-redux';
|
|
21
20
|
import { Alert } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { useSelector } from '../../../redux/hooks';
|
|
22
22
|
import { useTranslator } from '../../../i18n';
|
|
23
23
|
import { ErrorText, SessionInputs } from '../../components';
|
|
24
|
-
import { sessionStorage } from '
|
|
25
|
-
const PopupEditSession = ({ session, sessionList, popupIsOpen, handleClose, showUrlInput, }) => {
|
|
24
|
+
import { sessionStorage } from '../../SessionStorage';
|
|
25
|
+
const PopupEditSession = ({ session, sessionList, popupIsOpen = false, handleClose, showUrlInput = false, }) => {
|
|
26
26
|
const I18n = useTranslator();
|
|
27
27
|
const { loading, error } = useSelector(state => state.auth);
|
|
28
28
|
const [updateSession, setUpdateSession] = useState(session);
|
|
29
29
|
const [isBackground, setIsBackground] = useState(false);
|
|
30
|
-
const onpressUpdate = useCallback(_session => {
|
|
30
|
+
const onpressUpdate = useCallback((_session) => {
|
|
31
31
|
sessionStorage.registerSession({
|
|
32
|
-
session: {
|
|
32
|
+
session: { ..._session },
|
|
33
33
|
});
|
|
34
34
|
handleClose();
|
|
35
|
-
}, [handleClose
|
|
35
|
+
}, [handleClose]);
|
|
36
36
|
useEffect(() => {
|
|
37
37
|
if (popupIsOpen != null) {
|
|
38
38
|
setIsBackground(false);
|
|
@@ -47,13 +47,12 @@ const PopupEditSession = ({ session, sessionList, popupIsOpen, handleClose, show
|
|
|
47
47
|
showUrlInput,
|
|
48
48
|
loading,
|
|
49
49
|
mode: 'edition',
|
|
50
|
-
showPopup: value => setIsBackground(!value),
|
|
50
|
+
showPopup: (value) => setIsBackground(!value),
|
|
51
51
|
onValidation: onpressUpdate,
|
|
52
|
-
saveBeforeScan: value => setUpdateSession(_current => ({ ..._current, ...value })),
|
|
52
|
+
saveBeforeScan: (value) => setUpdateSession(_current => ({ ..._current, ...value })),
|
|
53
53
|
}), [loading, onpressUpdate, sessionList, showUrlInput, updateSession]);
|
|
54
|
-
if (isBackground)
|
|
54
|
+
if (isBackground)
|
|
55
55
|
return <SessionInputs hidden={true} {...inputProps}/>;
|
|
56
|
-
}
|
|
57
56
|
return (<Alert style={styles.alert} visible={popupIsOpen} title={I18n.t('Base_Connection_EditSession')} cancelButtonConfig={{
|
|
58
57
|
hide: sessionList?.length <= 0,
|
|
59
58
|
showInHeader: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupEditSession.js","sourceRoot":"","sources":["../../../../src/sessions/components/alerts/PopupEditSession.
|
|
1
|
+
{"version":3,"file":"PopupEditSession.js","sourceRoot":"","sources":["../../../../src/sessions/components/alerts/PopupEditSession.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
export default PopupSession;
|
|
2
|
-
declare function PopupSession({ sessionList, sessionActive, popupIsOpen, handleClose, showUrlInput, testInstanceConfig, }: {
|
|
3
|
-
sessionList: any;
|
|
4
|
-
sessionActive: any;
|
|
5
|
-
popupIsOpen: any;
|
|
6
|
-
handleClose: any;
|
|
7
|
-
showUrlInput: any;
|
|
8
|
-
testInstanceConfig: any;
|
|
9
|
-
}): React.JSX.Element;
|
|
10
1
|
import React from 'react';
|
|
2
|
+
import { Session } from '../../type';
|
|
3
|
+
declare const PopupSession: ({ sessionList, sessionActive, popupIsOpen, handleClose, showUrlInput, testInstanceConfig, }: {
|
|
4
|
+
sessionList?: Session[];
|
|
5
|
+
sessionActive?: Session;
|
|
6
|
+
popupIsOpen?: boolean;
|
|
7
|
+
handleClose?: () => void;
|
|
8
|
+
showUrlInput?: boolean;
|
|
9
|
+
testInstanceConfig?: any;
|
|
10
|
+
}) => React.JSX.Element;
|
|
11
|
+
export default PopupSession;
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
|
-
import { useDispatch, useSelector } from 'react-redux';
|
|
21
20
|
import { Alert, Icon, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
|
-
import {
|
|
21
|
+
import { useDispatch, useSelector } from '../../../redux/hooks';
|
|
23
22
|
import { login } from '../../../features/authSlice';
|
|
24
|
-
import {
|
|
25
|
-
|
|
23
|
+
import { ErrorText, SessionInputs } from '../../components';
|
|
24
|
+
import { sessionStorage } from '../../SessionStorage';
|
|
25
|
+
const PopupSession = ({ sessionList, sessionActive, popupIsOpen = false, handleClose, showUrlInput = false, testInstanceConfig, }) => {
|
|
26
26
|
const Colors = useThemeColor();
|
|
27
27
|
const dispatch = useDispatch();
|
|
28
28
|
const { loading, error } = useSelector(state => state.auth);
|
|
@@ -37,15 +37,14 @@ const PopupSession = ({ sessionList, sessionActive, popupIsOpen, handleClose, sh
|
|
|
37
37
|
}));
|
|
38
38
|
}, [dispatch, sessionActive]);
|
|
39
39
|
const deleteSession = useCallback(() => {
|
|
40
|
-
sessionStorage.removeSession({ sessionId: sessionActive
|
|
41
|
-
handleClose();
|
|
40
|
+
sessionStorage.removeSession({ sessionId: sessionActive.id });
|
|
41
|
+
handleClose?.();
|
|
42
42
|
}, [sessionActive, handleClose]);
|
|
43
43
|
useEffect(() => {
|
|
44
44
|
setIsOpen(popupIsOpen);
|
|
45
45
|
}, [popupIsOpen]);
|
|
46
|
-
if (sessionActive == null)
|
|
46
|
+
if (sessionActive == null)
|
|
47
47
|
return null;
|
|
48
|
-
}
|
|
49
48
|
return (<Alert style={styles.alert} visible={isOpen} title={sessionActive?.name} cancelButtonConfig={{
|
|
50
49
|
hide: loading,
|
|
51
50
|
showInHeader: true,
|
|
@@ -72,8 +71,8 @@ const styles = StyleSheet.create({
|
|
|
72
71
|
},
|
|
73
72
|
binIcon: {
|
|
74
73
|
position: 'absolute',
|
|
75
|
-
right:
|
|
76
|
-
bottom:
|
|
74
|
+
right: 5,
|
|
75
|
+
bottom: 15,
|
|
77
76
|
},
|
|
78
77
|
});
|
|
79
78
|
export default PopupSession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupSession.js","sourceRoot":"","sources":["../../../../src/sessions/components/alerts/PopupSession.
|
|
1
|
+
{"version":3,"file":"PopupSession.js","sourceRoot":"","sources":["../../../../src/sessions/components/alerts/PopupSession.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
declare
|
|
3
|
-
url?:
|
|
1
|
+
import React from 'react';
|
|
2
|
+
declare const LogoImage: ({ url, filePath, logoFile, }: {
|
|
3
|
+
url?: string;
|
|
4
4
|
filePath?: string;
|
|
5
5
|
logoFile?: any;
|
|
6
|
-
})
|
|
7
|
-
|
|
6
|
+
}) => React.JSX.Element;
|
|
7
|
+
export default LogoImage;
|
|
@@ -18,21 +18,31 @@
|
|
|
18
18
|
import axios from 'axios';
|
|
19
19
|
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
20
20
|
import { Image, StyleSheet } from 'react-native';
|
|
21
|
-
import { testUrl } from '../../../utils
|
|
22
|
-
import { checkNullString } from '../../../utils';
|
|
21
|
+
import { checkNullString, testUrl } from '../../../utils';
|
|
23
22
|
const axelorLogoPath = '../../../assets/Logo_Axelor.png';
|
|
24
|
-
|
|
23
|
+
async function generateImageSourceWithUrl(url, logoPath) {
|
|
24
|
+
if (checkNullString(url))
|
|
25
|
+
return undefined;
|
|
26
|
+
const _url = await testUrl(url)
|
|
27
|
+
.then(result => result)
|
|
28
|
+
.catch(() => undefined);
|
|
29
|
+
if (_url == null)
|
|
30
|
+
return undefined;
|
|
31
|
+
return { uri: `${_url}/img/${logoPath}` };
|
|
32
|
+
}
|
|
33
|
+
const LogoImage = ({ url, filePath = 'logo.png', logoFile, }) => {
|
|
25
34
|
const companyLogoFile = useRef(logoFile ?? require(axelorLogoPath)).current;
|
|
26
35
|
const [source, setSource] = useState(companyLogoFile);
|
|
27
|
-
const urlLogoSource = useMemo(() => checkNullString(url)
|
|
36
|
+
const urlLogoSource = useMemo(() => checkNullString(url)
|
|
37
|
+
? generateImageSourceWithUrl(url, filePath)
|
|
38
|
+
: undefined, [filePath, url]);
|
|
28
39
|
useEffect(() => {
|
|
29
40
|
if (urlLogoSource != null) {
|
|
30
41
|
axios
|
|
31
42
|
.head(urlLogoSource.uri)
|
|
32
43
|
.then(({ status }) => {
|
|
33
|
-
if (status === 200)
|
|
44
|
+
if (status === 200)
|
|
34
45
|
setSource(urlLogoSource);
|
|
35
|
-
}
|
|
36
46
|
})
|
|
37
47
|
.catch(() => setSource(companyLogoFile));
|
|
38
48
|
}
|
|
@@ -48,17 +58,5 @@ const styles = StyleSheet.create({
|
|
|
48
58
|
height: '100%',
|
|
49
59
|
},
|
|
50
60
|
});
|
|
51
|
-
async function generateImageSourceWithUrl(url, logoPath) {
|
|
52
|
-
if (checkNullString(url)) {
|
|
53
|
-
return null;
|
|
54
|
-
}
|
|
55
|
-
const _url = await testUrl(url)
|
|
56
|
-
.then(result => result)
|
|
57
|
-
.catch(() => { });
|
|
58
|
-
if (_url == null) {
|
|
59
|
-
return null;
|
|
60
|
-
}
|
|
61
|
-
return { uri: `${_url}/img/${logoPath}` };
|
|
62
|
-
}
|
|
63
61
|
export default LogoImage;
|
|
64
62
|
//# sourceMappingURL=LogoImage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogoImage.js","sourceRoot":"","sources":["../../../../src/sessions/components/display/LogoImage.
|
|
1
|
+
{"version":3,"file":"LogoImage.js","sourceRoot":"","sources":["../../../../src/sessions/components/display/LogoImage.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAClE,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,eAAe,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAExD,MAAM,cAAc,GAAG,iCAAiC,CAAC;AAEzD,KAAK,UAAU,0BAA0B,CAAC,GAAY,EAAE,QAAiB;IACvE,IAAI,eAAe,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAE3C,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAI,CAAC;SAC7B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC;SACtB,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAE1B,IAAI,IAAI,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IAEnC,OAAO,EAAC,GAAG,EAAE,GAAG,IAAI,QAAQ,QAAQ,EAAE,EAAC,CAAC;AAC1C,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,EACjB,GAAG,EACH,QAAQ,GAAG,UAAU,EACrB,QAAQ,GAKT,EAAE,EAAE;IACH,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IAE5E,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEtD,MAAM,aAAa,GAAQ,OAAO,CAChC,GAAG,EAAE,CACH,eAAe,CAAC,GAAG,CAAC;QAClB,CAAC,CAAC,0BAA0B,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC3C,CAAC,CAAC,SAAS,EACf,CAAC,QAAQ,EAAE,GAAG,CAAC,CAChB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;YAC1B,KAAK;iBACF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;iBACvB,IAAI,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE;gBACjB,IAAI,MAAM,KAAK,GAAG;oBAAE,SAAS,CAAC,aAAa,CAAC,CAAC;YAC/C,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,eAAe,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,EAAE,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC;IAErC,OAAO,CACL,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAG,CACxE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;KACf;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
export default SessionCard;
|
|
2
|
-
declare function SessionCard({ session, changeActiveSession, openConnection, openEdition, isUnactive, logoFile, handleRemove, }: {
|
|
3
|
-
session: any;
|
|
4
|
-
changeActiveSession: any;
|
|
5
|
-
openConnection: any;
|
|
6
|
-
openEdition: any;
|
|
7
|
-
isUnactive: any;
|
|
8
|
-
logoFile: any;
|
|
9
|
-
handleRemove?: any;
|
|
10
|
-
}): React.JSX.Element;
|
|
11
1
|
import React from 'react';
|
|
2
|
+
import { Session } from '../../type';
|
|
3
|
+
declare const SessionCard: ({ session, changeActiveSession, openConnection, openEdition, isUnactive, logoFile, handleRemove, }: {
|
|
4
|
+
session: Session;
|
|
5
|
+
changeActiveSession: (_v?: Session) => void;
|
|
6
|
+
openConnection: () => void;
|
|
7
|
+
openEdition: () => void;
|
|
8
|
+
isUnactive?: boolean;
|
|
9
|
+
logoFile?: any;
|
|
10
|
+
handleRemove?: (data: {
|
|
11
|
+
sessionId: string;
|
|
12
|
+
}) => void;
|
|
13
|
+
}) => React.JSX.Element;
|
|
14
|
+
export default SessionCard;
|