@axelor/aos-mobile-core 6.5.0 → 7.0.0
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 +5 -1
- package/lib/api/login-api.js +7 -4
- 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 +8 -1
- package/lib/apiProviders/utils.js +59 -12
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/Application.d.ts +8 -1
- package/lib/app/Application.js +9 -2
- package/lib/app/Application.js.map +1 -1
- package/lib/app/ContextedApplication.d.ts +3 -2
- 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/Module.d.ts +2 -0
- package/lib/app/RootNavigator.d.ts +1 -2
- package/lib/app/RootNavigator.js +33 -34
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/auth/api/config-api.d.ts +1 -5
- package/lib/auth/api/config-api.js +11 -21
- package/lib/auth/api/config-api.js.map +1 -1
- package/lib/auth/features/companySlice.js +1 -1
- package/lib/auth/features/companySlice.js.map +1 -1
- package/lib/auth/features/configSlice.js +2 -2
- package/lib/auth/features/configSlice.js.map +1 -1
- package/lib/auth/features/languageSlice.js +1 -1
- package/lib/auth/features/languageSlice.js.map +1 -1
- package/lib/auth/features/userSlice.js +2 -2
- package/lib/auth/features/userSlice.js.map +1 -1
- package/lib/auth/hooks/use-auth-headers.d.ts +1 -0
- package/lib/auth/hooks/use-auth-headers.js +81 -0
- package/lib/auth/hooks/use-auth-headers.js.map +1 -0
- package/lib/auth/i18n/en.json +21 -2
- package/lib/auth/i18n/fr.json +20 -1
- package/lib/auth/index.js +3 -0
- package/lib/auth/index.js.map +1 -1
- package/lib/auth/screens/SettingsScreen.d.ts +1 -2
- package/lib/auth/screens/SettingsScreen.js +26 -10
- 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 -16
- 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 +29 -21
- 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 +3 -2
- package/lib/components/molecules/ErrorText/ErrorText.js +30 -7
- 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 +3 -1
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js +18 -9
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js.map +1 -1
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.d.ts +3 -1
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js +18 -33
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js.map +1 -1
- package/lib/components/molecules/LoginButton/LoginButton.d.ts +3 -1
- package/lib/components/molecules/LoginButton/LoginButton.js +10 -5
- package/lib/components/molecules/LoginButton/LoginButton.js.map +1 -1
- package/lib/components/molecules/MailMessageReadIcon/MailMessageReadIcon.d.ts +4 -0
- package/lib/components/molecules/MailMessageReadIcon/MailMessageReadIcon.js +10 -6
- package/lib/components/molecules/MailMessageReadIcon/MailMessageReadIcon.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 -1
- package/lib/components/molecules/index.js +2 -1
- package/lib/components/molecules/index.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +12 -4
- 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.d.ts +2 -3
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js +31 -36
- 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/MailMessageCard/MailMessageCard.d.ts +1 -2
- package/lib/components/organisms/MailMessageCard/MailMessageCard.js +2 -2
- package/lib/components/organisms/MailMessageCard/MailMessageCard.js.map +1 -1
- package/lib/components/organisms/MailMessageCommentCard/MailMessageCommentCard.d.ts +1 -1
- package/lib/components/organisms/MailMessageCommentCard/MailMessageCommentCard.js +3 -1
- package/lib/components/organisms/MailMessageCommentCard/MailMessageCommentCard.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 +10 -2
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +15 -13
- 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.d.ts +1 -2
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js +6 -5
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js.map +1 -1
- package/lib/components/templates/MailMessageView/MailMessageView.d.ts +1 -2
- package/lib/components/templates/MailMessageView/MailMessageView.js +38 -24
- package/lib/components/templates/MailMessageView/MailMessageView.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/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 +3 -0
- package/lib/components/templates/index.js +3 -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 +28 -0
- package/lib/config/routes.js +39 -0
- package/lib/config/routes.js.map +1 -0
- package/lib/features/attachedFilesSlice.js +3 -3
- package/lib/features/attachedFilesSlice.js.map +1 -1
- package/lib/features/authSlice.d.ts +32 -12
- package/lib/features/authSlice.js +56 -10
- package/lib/features/authSlice.js.map +1 -1
- package/lib/features/mailMessageSlice.js +10 -10
- package/lib/features/mailMessageSlice.js.map +1 -1
- package/lib/features/menuConfigSlice.js +1 -1
- package/lib/features/menuConfigSlice.js.map +1 -1
- package/lib/features/metafileSlice.js +1 -1
- package/lib/features/metafileSlice.js.map +1 -1
- package/lib/features/mobileConfigSlice.js +1 -1
- package/lib/features/mobileConfigSlice.js.map +1 -1
- package/lib/header/HeaderActionsProvider.d.ts +15 -0
- package/lib/header/HeaderActionsProvider.js +60 -0
- package/lib/header/HeaderActionsProvider.js.map +1 -0
- 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/hooks.d.ts +37 -0
- package/lib/header/hooks.js +105 -0
- package/lib/header/hooks.js.map +1 -0
- package/lib/header/index.d.ts +5 -0
- package/lib/header/index.js +22 -0
- package/lib/header/index.js.map +1 -0
- package/lib/header/types.d.ts +32 -0
- package/lib/header/types.js +19 -0
- package/lib/header/types.js.map +1 -0
- package/lib/header/utils.d.ts +3 -0
- package/lib/header/utils.js +51 -0
- package/lib/header/utils.js.map +1 -0
- package/lib/hooks/use-header-registers.d.ts +1 -0
- package/lib/{components/molecules/IconSettings/IconSettings.js → hooks/use-header-registers.js} +3 -13
- package/lib/hooks/use-header-registers.js.map +1 -0
- package/lib/hooks/use-navigation.d.ts +1 -0
- package/lib/hooks/use-navigation.js +22 -0
- package/lib/hooks/use-navigation.js.map +1 -0
- package/lib/hooks/use-scan-activator.d.ts +9 -0
- package/lib/hooks/use-scan-activator.js +60 -0
- package/lib/hooks/use-scan-activator.js.map +1 -0
- package/lib/i18n/component/Translator.d.ts +3 -1
- package/lib/i18n/translations/en.json +26 -1
- package/lib/i18n/translations/fr.json +26 -1
- package/lib/index.d.ts +5 -0
- package/lib/index.js +5 -0
- package/lib/index.js.map +1 -1
- package/lib/navigator/Navigator.d.ts +1 -2
- package/lib/navigator/Navigator.js +24 -37
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.d.ts +1 -2
- package/lib/navigator/drawer/DrawerContent.js +12 -6
- package/lib/navigator/drawer/DrawerContent.js.map +1 -1
- package/lib/navigator/drawer/Header.d.ts +7 -0
- package/lib/navigator/drawer/Header.js +74 -0
- package/lib/navigator/drawer/Header.js.map +1 -0
- 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/AttachedFilesScreen.d.ts +1 -2
- package/lib/screens/AttachedFilesScreen.js +2 -2
- package/lib/screens/AttachedFilesScreen.js.map +1 -1
- package/lib/screens/LoginScreen.js +89 -54
- package/lib/screens/LoginScreen.js.map +1 -1
- package/lib/screens/MailMessageScreen.d.ts +1 -2
- package/lib/screens/MailMessageScreen.js +2 -2
- package/lib/screens/MailMessageScreen.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/sessions/type.js +19 -0
- 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.d.ts +2 -0
- package/lib/utils/api.js +45 -0
- package/lib/utils/api.js.map +1 -0
- package/lib/utils/filter.js +6 -8
- package/lib/utils/filter.js.map +1 -1
- package/lib/utils/formatters.js +16 -0
- package/lib/utils/formatters.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.d.ts +1 -1
- package/lib/utils/string.js +3 -3
- package/lib/utils/string.js.map +1 -1
- package/package.json +5 -5
- package/lib/components/molecules/IconSettings/IconSettings.d.ts +0 -4
- package/lib/components/molecules/IconSettings/IconSettings.js.map +0 -1
- 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
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export * from "./Model";
|
|
2
2
|
export * from "./Action";
|
|
3
3
|
export * from "./Standard";
|
|
4
|
-
export { getApiResponseData, getFirstData, handlerApiCall, handlerError } from "./utils";
|
|
4
|
+
export { getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState } from "./utils";
|
|
@@ -18,5 +18,5 @@
|
|
|
18
18
|
export * from './Model';
|
|
19
19
|
export * from './Action';
|
|
20
20
|
export * from './Standard';
|
|
21
|
-
export { getApiResponseData, getFirstData, handlerApiCall, handlerError, } from './utils';
|
|
21
|
+
export { getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState, } from './utils';
|
|
22
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,uBAAuB,GACxB,MAAM,SAAS,CAAC"}
|
|
@@ -14,6 +14,7 @@ interface ApiHandlerProps {
|
|
|
14
14
|
showToast?: boolean;
|
|
15
15
|
isArrayResponse?: boolean;
|
|
16
16
|
returnTotal?: boolean;
|
|
17
|
+
resturnTotalWithData?: boolean;
|
|
17
18
|
};
|
|
18
19
|
errorOptions?: errorOptionsProps;
|
|
19
20
|
}
|
|
@@ -21,5 +22,11 @@ interface errorOptionsProps {
|
|
|
21
22
|
showErrorToast?: boolean;
|
|
22
23
|
errorTracing?: boolean;
|
|
23
24
|
}
|
|
24
|
-
export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions: { showToast, isArrayResponse, returnTotal, }, errorOptions, }: ApiHandlerProps) => Promise<any>;
|
|
25
|
+
export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions: { showToast, isArrayResponse, returnTotal, resturnTotalWithData, }, errorOptions, }: ApiHandlerProps) => Promise<any>;
|
|
26
|
+
export declare const manageInfiteScrollState: (state: any, action: any, status: 'pending' | 'fulfilled' | 'rejected', keys: {
|
|
27
|
+
loading: string;
|
|
28
|
+
moreLoading: string;
|
|
29
|
+
list: string;
|
|
30
|
+
isListEnd: string;
|
|
31
|
+
}) => any;
|
|
25
32
|
export {};
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import Toast from 'react-native-toast-message';
|
|
19
19
|
import { traceError } from '../api/traceback-api';
|
|
20
|
+
import { i18nProvider } from '../i18n';
|
|
20
21
|
export const getApiResponseData = (response, { isArrayResponse = true }) => {
|
|
21
22
|
if (response.data && response.data.object != null) {
|
|
22
23
|
return response.data.object;
|
|
@@ -25,7 +26,6 @@ export const getApiResponseData = (response, { isArrayResponse = true }) => {
|
|
|
25
26
|
? response?.data?.data
|
|
26
27
|
: getFirstData(response?.data?.data);
|
|
27
28
|
};
|
|
28
|
-
const getApiResponseCode = response => response?.data?.codeStatus || response?.status;
|
|
29
29
|
const getApiResponseMessage = response => response?.data?.messageStatus || response?.statusTxt;
|
|
30
30
|
const getApiResponseTotal = response => response?.data?.total || 0;
|
|
31
31
|
export const getFirstData = data => {
|
|
@@ -53,8 +53,8 @@ const manageError = (error, action, userId, { showErrorToast = true, errorTracin
|
|
|
53
53
|
type: 'error',
|
|
54
54
|
position: 'bottom',
|
|
55
55
|
bottomOffset: 20,
|
|
56
|
-
text1:
|
|
57
|
-
text2:
|
|
56
|
+
text1: `${i18nProvider.i18n.t('Auth_Error')} ${code}`,
|
|
57
|
+
text2: `${i18nProvider.i18n.t('Base_Failed_To')} ${i18nProvider.i18n.t(action)}: ${message}.`,
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
}
|
|
@@ -65,9 +65,8 @@ export const handlerError = (message, { getState = () => { } }, { showErrorToast
|
|
|
65
65
|
errorTracing,
|
|
66
66
|
});
|
|
67
67
|
};
|
|
68
|
-
const manageSucess = (response, { showToast = false, isArrayResponse, returnTotal = false }) => {
|
|
68
|
+
const manageSucess = (response, action, { showToast = false, isArrayResponse, returnTotal = false, resturnTotalWithData = false, }) => {
|
|
69
69
|
const data = getApiResponseData(response, { isArrayResponse });
|
|
70
|
-
const code = getApiResponseCode(response);
|
|
71
70
|
const message = getApiResponseMessage(response);
|
|
72
71
|
const total = getApiResponseTotal(response);
|
|
73
72
|
if (showToast) {
|
|
@@ -75,18 +74,66 @@ const manageSucess = (response, { showToast = false, isArrayResponse, returnTota
|
|
|
75
74
|
type: 'success',
|
|
76
75
|
position: 'bottom',
|
|
77
76
|
bottomOffset: 20,
|
|
78
|
-
text1:
|
|
79
|
-
text2: `${message ? message :
|
|
77
|
+
text1: i18nProvider.i18n.t('Base_Success'),
|
|
78
|
+
text2: `${message ? message : i18nProvider.i18n.t(action)}.`,
|
|
80
79
|
});
|
|
81
80
|
}
|
|
82
|
-
|
|
81
|
+
if (resturnTotalWithData) {
|
|
82
|
+
return { total, data };
|
|
83
|
+
}
|
|
84
|
+
if (returnTotal) {
|
|
85
|
+
return total;
|
|
86
|
+
}
|
|
87
|
+
return data;
|
|
83
88
|
};
|
|
84
|
-
const handlerSuccess = ({ showToast, isArrayResponse, returnTotal }) => {
|
|
85
|
-
return response => manageSucess(response,
|
|
89
|
+
const handlerSuccess = (action, { showToast, isArrayResponse, returnTotal, resturnTotalWithData }) => {
|
|
90
|
+
return response => manageSucess(response, action, {
|
|
91
|
+
showToast,
|
|
92
|
+
isArrayResponse,
|
|
93
|
+
returnTotal,
|
|
94
|
+
resturnTotalWithData,
|
|
95
|
+
});
|
|
86
96
|
};
|
|
87
|
-
export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions: { showToast = false, isArrayResponse = false, returnTotal = false, }, errorOptions = { showErrorToast: true, errorTracing: true }, }) => {
|
|
97
|
+
export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions: { showToast = false, isArrayResponse = false, returnTotal = false, resturnTotalWithData = false, }, errorOptions = { showErrorToast: true, errorTracing: true }, }) => {
|
|
88
98
|
return fetchFunction(data)
|
|
89
99
|
.catch(handlerError(action, { getState }, errorOptions))
|
|
90
|
-
.then(handlerSuccess(
|
|
100
|
+
.then(handlerSuccess(action, {
|
|
101
|
+
showToast,
|
|
102
|
+
isArrayResponse,
|
|
103
|
+
returnTotal,
|
|
104
|
+
resturnTotalWithData,
|
|
105
|
+
}));
|
|
106
|
+
};
|
|
107
|
+
export const manageInfiteScrollState = (state, action, status, keys) => {
|
|
108
|
+
if (status === 'pending') {
|
|
109
|
+
if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
|
|
110
|
+
state[keys.loading] = true;
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
state[keys.moreLoading] = true;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
if (status === 'fulfilled') {
|
|
117
|
+
state[keys.loading] = false;
|
|
118
|
+
state[keys.moreLoading] = false;
|
|
119
|
+
if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
|
|
120
|
+
state[keys.list] = action.payload;
|
|
121
|
+
state[keys.isListEnd] = false;
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
if (Array.isArray(action.payload)) {
|
|
125
|
+
state[keys.isListEnd] = false;
|
|
126
|
+
state[keys.list] = [...state[keys.list], ...action.payload];
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
state[keys.isListEnd] = true;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (status === 'rejected') {
|
|
134
|
+
state[keys.loading] = false;
|
|
135
|
+
state[keys.moreLoading] = false;
|
|
136
|
+
}
|
|
137
|
+
return state;
|
|
91
138
|
};
|
|
92
139
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,4BAA4B,CAAC;AAC/C,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/app/Application.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Theme, Writing } from '@axelor/aos-mobile-ui';
|
|
1
|
+
import { Theme, ThemeColors, Writing, WritingStyles } from '@axelor/aos-mobile-ui';
|
|
2
2
|
import { Module } from './Module';
|
|
3
3
|
interface proxy {
|
|
4
4
|
defaultUrl: string;
|
|
@@ -14,6 +14,13 @@ interface appConfig {
|
|
|
14
14
|
releaseInstanceConfig: releaseConfig;
|
|
15
15
|
defaultLanguage: string;
|
|
16
16
|
defaultRequestLimit: number;
|
|
17
|
+
enableConnectionSessions: boolean;
|
|
18
|
+
allowInternetConnectionBlock: boolean;
|
|
19
|
+
retrocompatibilityAOS6: boolean;
|
|
20
|
+
showModulesSubtitle: boolean;
|
|
21
|
+
themeColorsConfig: ThemeColors;
|
|
22
|
+
writingStylesConfig: WritingStyles;
|
|
23
|
+
logoFile?: any;
|
|
17
24
|
}
|
|
18
25
|
interface ApplicationProps {
|
|
19
26
|
modules: Module[];
|
package/lib/app/Application.js
CHANGED
|
@@ -19,12 +19,19 @@ import React, { useRef } from 'react';
|
|
|
19
19
|
import ContextsProvider from './ContextsProvider';
|
|
20
20
|
import ContextedApplication from './ContextedApplication';
|
|
21
21
|
import { authModule } from '../auth';
|
|
22
|
+
import { RouterProvider } from '../config';
|
|
23
|
+
import { ApiProviderConfig } from '../apiProviders/config';
|
|
22
24
|
const Application = ({ modules: modulesProvided, mainMenu, additionalsReducers, version, themes, defaultTheme, writingThemes, defaultWritingTheme, showModulesSubtitle = false, configuration, }) => {
|
|
23
25
|
const modules = useRef([authModule, ...modulesProvided]).current;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
+
RouterProvider.enableRetrocompatibilityWithAOSv6(configuration?.retrocompatibilityAOS6);
|
|
27
|
+
ApiProviderConfig.allowConnectionBlock =
|
|
28
|
+
configuration.allowInternetConnectionBlock;
|
|
29
|
+
return (<ContextsProvider modules={modules} additionalsReducers={additionalsReducers} defaultTheme={defaultTheme} themes={themes} defaultWritingTheme={defaultWritingTheme} writingThemes={writingThemes} defaultLanguage={configuration?.defaultLanguage} defaultRequestLimit={configuration?.defaultRequestLimit} themeColorsConfig={configuration?.themeColorsConfig} writingStylesConfig={configuration?.writingStylesConfig} showModulesSubtitle={configuration?.showModulesSubtitle ?? showModulesSubtitle}>
|
|
30
|
+
<ContextedApplication modules={modules} mainMenu={mainMenu} version={version} configuration={{
|
|
26
31
|
testInstanceConfig: configuration?.testInstanceConfig,
|
|
27
32
|
releaseInstanceConfig: configuration?.releaseInstanceConfig,
|
|
33
|
+
enableConnectionSessions: configuration?.enableConnectionSessions,
|
|
34
|
+
logoFile: configuration?.logoFile,
|
|
28
35
|
}}/>
|
|
29
36
|
</ContextsProvider>);
|
|
30
37
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../src/app/Application.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,MAAM,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../src/app/Application.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,MAAM,EAAC,MAAM,OAAO,CAAC;AAQpC,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AACzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAwCzD,MAAM,WAAW,GAAG,CAAC,EACnB,OAAO,EAAE,eAAe,EACxB,QAAQ,EACR,mBAAmB,EACnB,OAAO,EACP,MAAM,EACN,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,mBAAmB,GAAG,KAAK,EAC3B,aAAa,GACI,EAAE,EAAE;IACrB,MAAM,OAAO,GAAa,MAAM,CAAC,CAAC,UAAU,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC;IAE3E,cAAc,CAAC,iCAAiC,CAC9C,aAAa,EAAE,sBAAsB,CACtC,CAAC;IAEF,iBAAiB,CAAC,oBAAoB;QACpC,aAAa,CAAC,4BAA4B,CAAC;IAE7C,OAAO,CACL,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,mBAAmB,CAAC,CAAC,mBAAmB,CAAC,CACzC,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,MAAM,CAAC,CAAC,MAAM,CAAC,CACf,mBAAmB,CAAC,CAAC,mBAAmB,CAAC,CACzC,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,eAAe,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAChD,mBAAmB,CAAC,CAAC,aAAa,EAAE,mBAAmB,CAAC,CACxD,iBAAiB,CAAC,CAAC,aAAa,EAAE,iBAAiB,CAAC,CACpD,mBAAmB,CAAC,CAAC,aAAa,EAAE,mBAAmB,CAAC,CACxD,mBAAmB,CAAC,CAClB,aAAa,EAAE,mBAAmB,IAAI,mBAAmB,CAC1D,CACD;MAAA,CAAC,oBAAoB,CACnB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,aAAa,CAAC,CAAC;YACb,kBAAkB,EAAE,aAAa,EAAE,kBAAkB;YACrD,qBAAqB,EAAE,aAAa,EAAE,qBAAqB;YAC3D,wBAAwB,EAAE,aAAa,EAAE,wBAAwB;YACjE,QAAQ,EAAE,aAAa,EAAE,QAAQ;SAClC,CAAC,EAEN;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -11,13 +11,14 @@ interface releaseConfig {
|
|
|
11
11
|
interface instanceConfig {
|
|
12
12
|
testInstanceConfig: proxy;
|
|
13
13
|
releaseInstanceConfig: releaseConfig;
|
|
14
|
+
enableConnectionSessions: boolean;
|
|
15
|
+
logoFile?: any;
|
|
14
16
|
}
|
|
15
17
|
interface ContextedApplicationProps {
|
|
16
18
|
modules: Module[];
|
|
17
19
|
mainMenu?: string;
|
|
18
20
|
version: string;
|
|
19
|
-
showModulesSubtitle: boolean;
|
|
20
21
|
configuration?: instanceConfig;
|
|
21
22
|
}
|
|
22
|
-
declare const ContextedApplication: ({ modules, mainMenu, version,
|
|
23
|
+
declare const ContextedApplication: ({ modules, mainMenu, version, configuration, }: ContextedApplicationProps) => JSX.Element;
|
|
23
24
|
export default ContextedApplication;
|
|
@@ -15,22 +15,24 @@
|
|
|
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, { useCallback, useMemo, useState } from 'react';
|
|
18
|
+
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet } from 'react-native';
|
|
20
20
|
import Toast, { BaseToast, ErrorToast } from 'react-native-toast-message';
|
|
21
21
|
import { NavigationContainer } from '@react-navigation/native';
|
|
22
22
|
import axios from 'axios';
|
|
23
|
-
import { LoadingIndicator,
|
|
23
|
+
import { LoadingIndicator, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
24
24
|
import { ErrorBoundary } from '@axelor/aos-mobile-error';
|
|
25
25
|
import RootNavigator from './RootNavigator';
|
|
26
26
|
import Translator from '../i18n/component/Translator';
|
|
27
|
-
import {
|
|
27
|
+
import { getActiveUserInfo } from '../api/login-api';
|
|
28
28
|
import ErrorScreen from '../screens/ErrorScreen';
|
|
29
|
-
import { Camera, CameraScanner, Scanner } from '../components';
|
|
30
|
-
|
|
29
|
+
import { Camera, CameraScanner, HeaderBandList, Scanner } from '../components';
|
|
30
|
+
import { RouterProvider } from '../config';
|
|
31
|
+
const ContextedApplication = ({ modules, mainMenu, version, configuration, }) => {
|
|
31
32
|
const Colors = useThemeColor();
|
|
32
33
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
33
34
|
const [, setRefresh] = useState(false);
|
|
35
|
+
const [tracebackRoute, setTracebackRoute] = useState('');
|
|
34
36
|
const toastConfig = {
|
|
35
37
|
success: (props) => (<BaseToast {...props} style={[styles.success, styles.toast]} contentContainerStyle={styles.toastContent} text1Style={styles.title} text2Style={styles.detail} text2NumberOfLines={3}/>),
|
|
36
38
|
error: (props) => (<ErrorToast {...props} style={[styles.error, styles.toast]} contentContainerStyle={styles.toastContent} text1Style={styles.title} text2Style={styles.detail} text2NumberOfLines={3}/>),
|
|
@@ -38,16 +40,20 @@ const ContextedApplication = ({ modules, mainMenu, version, showModulesSubtitle
|
|
|
38
40
|
const traceBackPutMethod = useCallback(({ additionalURL, data }) => {
|
|
39
41
|
return axios.put(additionalURL, { data: data });
|
|
40
42
|
}, []);
|
|
43
|
+
useEffect(() => {
|
|
44
|
+
RouterProvider.get('TraceBack').then(setTracebackRoute);
|
|
45
|
+
}, []);
|
|
46
|
+
const getActiveUserId = useCallback(() => getActiveUserInfo().then(({ userId }) => userId), []);
|
|
41
47
|
return (<>
|
|
42
48
|
<Camera />
|
|
43
49
|
<CameraScanner />
|
|
44
50
|
<Scanner />
|
|
45
51
|
<Translator />
|
|
46
|
-
<ErrorBoundary errorScreen={ErrorScreen} userIdfetcher={getActiveUserId} putMethod={traceBackPutMethod}>
|
|
52
|
+
<ErrorBoundary errorScreen={ErrorScreen} userIdfetcher={getActiveUserId} putMethod={traceBackPutMethod} additionalURL={tracebackRoute}>
|
|
47
53
|
<NavigationContainer>
|
|
48
|
-
<
|
|
54
|
+
<HeaderBandList />
|
|
49
55
|
<LoadingIndicator />
|
|
50
|
-
<RootNavigator modules={modules} mainMenu={mainMenu} version={version}
|
|
56
|
+
<RootNavigator modules={modules} mainMenu={mainMenu} version={version} onRefresh={() => setRefresh(_current => !_current)} configuration={configuration}/>
|
|
51
57
|
</NavigationContainer>
|
|
52
58
|
</ErrorBoundary>
|
|
53
59
|
<Toast config={toastConfig}/>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Theme, Writing } from '@axelor/aos-mobile-ui';
|
|
2
|
+
import { Theme, Writing, ThemeColors, WritingStyles } from '@axelor/aos-mobile-ui';
|
|
3
3
|
import { Module } from './Module';
|
|
4
4
|
interface ContextsProviderProps {
|
|
5
5
|
modules: Module[];
|
|
@@ -11,6 +11,9 @@ interface ContextsProviderProps {
|
|
|
11
11
|
children: React.ReactNode;
|
|
12
12
|
defaultLanguage: string;
|
|
13
13
|
defaultRequestLimit: number;
|
|
14
|
+
themeColorsConfig?: ThemeColors;
|
|
15
|
+
writingStylesConfig?: WritingStyles;
|
|
16
|
+
showModulesSubtitle?: boolean;
|
|
14
17
|
}
|
|
15
|
-
declare const ContextsProvider: ({ modules, additionalsReducers, themes, defaultTheme, writingThemes, defaultWritingTheme, children, defaultLanguage, defaultRequestLimit, }: ContextsProviderProps) => JSX.Element;
|
|
18
|
+
declare const ContextsProvider: ({ modules, additionalsReducers, themes, defaultTheme, writingThemes, defaultWritingTheme, children, defaultLanguage, defaultRequestLimit, themeColorsConfig, writingStylesConfig, showModulesSubtitle, }: ContextsProviderProps) => JSX.Element;
|
|
16
19
|
export default ContextsProvider;
|
|
@@ -27,8 +27,9 @@ import { addModuleModels } from './context.helper';
|
|
|
27
27
|
import { objectFieldsProvider } from '../apiProviders';
|
|
28
28
|
import { requestBuilder } from '../apiProviders/Standard/requests.helper';
|
|
29
29
|
import { core_modelAPI } from '../models';
|
|
30
|
+
import { HeaderBandProvider } from '../header';
|
|
30
31
|
const ApplicationContext = createContext(null);
|
|
31
|
-
const ContextsProvider = ({ modules, additionalsReducers, themes, defaultTheme, writingThemes, defaultWritingTheme, children, defaultLanguage = 'en', defaultRequestLimit = 10, }) => {
|
|
32
|
+
const ContextsProvider = ({ modules, additionalsReducers, themes, defaultTheme, writingThemes, defaultWritingTheme, children, defaultLanguage = 'en', defaultRequestLimit = 10, themeColorsConfig, writingStylesConfig, showModulesSubtitle = false, }) => {
|
|
32
33
|
const [loading, setLoading] = useState(true);
|
|
33
34
|
const appTranslations = useMemo(() => modules
|
|
34
35
|
.filter(_module => _module.translations)
|
|
@@ -77,9 +78,11 @@ const ContextsProvider = ({ modules, additionalsReducers, themes, defaultTheme,
|
|
|
77
78
|
return (<ApplicationContext.Provider value={{}}>
|
|
78
79
|
<Provider store={store}>
|
|
79
80
|
<OutsideAlerterProvider>
|
|
80
|
-
<ThemeProvider themes={themes} defaultTheme={defaultTheme}>
|
|
81
|
-
<WritingThemeProvider themes={writingThemes} defaultTheme={defaultWritingTheme}>
|
|
82
|
-
<ConfigProvider
|
|
81
|
+
<ThemeProvider themes={themes} defaultTheme={defaultTheme} themeColorsConfig={themeColorsConfig}>
|
|
82
|
+
<WritingThemeProvider themes={writingThemes} defaultTheme={defaultWritingTheme} writingStylesConfig={writingStylesConfig}>
|
|
83
|
+
<ConfigProvider showModulesSubtitle={showModulesSubtitle}>
|
|
84
|
+
<HeaderBandProvider>{children}</HeaderBandProvider>
|
|
85
|
+
</ConfigProvider>
|
|
83
86
|
</WritingThemeProvider>
|
|
84
87
|
</ThemeProvider>
|
|
85
88
|
</OutsideAlerterProvider>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextsProvider.js","sourceRoot":"","sources":["../../src/app/ContextsProvider.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACzE,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AACrC,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,aAAa,EACb,oBAAoB,
|
|
1
|
+
{"version":3,"file":"ContextsProvider.js","sourceRoot":"","sources":["../../src/app/ContextsProvider.tsx"],"names":[],"mappings":"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"}
|
package/lib/app/Module.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ interface ScreenOptions {
|
|
|
15
15
|
export interface Screen {
|
|
16
16
|
component: React.FC<any>;
|
|
17
17
|
title: string;
|
|
18
|
+
actionID?: string;
|
|
18
19
|
options?: ScreenOptions;
|
|
19
20
|
}
|
|
20
21
|
export interface ObjectFields {
|
|
@@ -29,6 +30,7 @@ export interface Models {
|
|
|
29
30
|
objectFields?: ObjectFields;
|
|
30
31
|
sortFields?: SortFields;
|
|
31
32
|
searchFields?: SearchFields;
|
|
33
|
+
headerRegisters?: Function;
|
|
32
34
|
}
|
|
33
35
|
export interface Module {
|
|
34
36
|
name: string;
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
export default RootNavigator;
|
|
2
|
-
declare function RootNavigator({ modules, mainMenu, version,
|
|
2
|
+
declare function RootNavigator({ modules, mainMenu, version, onRefresh, configuration, }: {
|
|
3
3
|
modules: any;
|
|
4
4
|
mainMenu: any;
|
|
5
5
|
version: any;
|
|
6
|
-
showModulesSubtitle?: boolean;
|
|
7
6
|
onRefresh: any;
|
|
8
7
|
configuration: any;
|
|
9
8
|
}): JSX.Element;
|
package/lib/app/RootNavigator.js
CHANGED
|
@@ -15,58 +15,57 @@
|
|
|
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, { useCallback, useEffect } from 'react';
|
|
18
|
+
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
19
19
|
import { useSelector } from 'react-redux';
|
|
20
20
|
import { createNativeStackNavigator } from '@react-navigation/native-stack';
|
|
21
|
-
import
|
|
21
|
+
import { useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { default as CoreNavigator } from '../navigator/Navigator';
|
|
23
|
-
import { useConfig, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
24
23
|
import { getNetInfo } from '../api/net-info-utils';
|
|
25
|
-
import
|
|
24
|
+
import { useHeaderRegisters } from '../hooks/use-header-registers';
|
|
25
|
+
import LoginScreen from '../screens/LoginScreen';
|
|
26
|
+
import SessionManagementScreen from '../screens/SessionManagementScreen';
|
|
27
|
+
import { useHeaderBand } from '../header';
|
|
28
|
+
import { useTranslator } from '../i18n';
|
|
26
29
|
const { Navigator, Screen } = createNativeStackNavigator();
|
|
27
|
-
const RootNavigator = ({ modules, mainMenu, version,
|
|
30
|
+
const RootNavigator = ({ modules, mainMenu, version, onRefresh, configuration, }) => {
|
|
28
31
|
const Colors = useThemeColor();
|
|
29
32
|
const I18n = useTranslator();
|
|
30
|
-
const {
|
|
33
|
+
const { registerHeaderBand } = useHeaderBand();
|
|
31
34
|
const { logged } = useSelector(state => state.auth);
|
|
32
|
-
const
|
|
35
|
+
const modulesHeaderRegisters = useMemo(() => {
|
|
36
|
+
return modules
|
|
37
|
+
.filter(_module => _module.models?.headerRegisters)
|
|
38
|
+
.map(_module => _module.models.headerRegisters);
|
|
39
|
+
}, [modules]);
|
|
40
|
+
useHeaderRegisters(modulesHeaderRegisters);
|
|
41
|
+
const AppNavigator = useCallback(() => (<CoreNavigator modules={modules} mainMenu={mainMenu} onRefresh={onRefresh}/>), [modules, mainMenu, onRefresh]);
|
|
33
42
|
const checkInternetConnection = useCallback(async () => {
|
|
34
43
|
const { isConnected } = await getNetInfo();
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
if (isHeaderIndicatorVisible) {
|
|
44
|
-
setHeaderIndicatorState({
|
|
45
|
-
text: I18n.t('Base_Connected'),
|
|
46
|
-
color: Colors.primaryColor.background,
|
|
47
|
-
textColor: 'white',
|
|
48
|
-
});
|
|
49
|
-
setIsHeaderIndicatorVisible(false);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
}, [
|
|
53
|
-
I18n,
|
|
54
|
-
Colors.primaryColor,
|
|
55
|
-
Colors.secondaryColor,
|
|
56
|
-
isHeaderIndicatorVisible,
|
|
57
|
-
setIsHeaderIndicatorVisible,
|
|
58
|
-
setHeaderIndicatorState,
|
|
59
|
-
]);
|
|
44
|
+
registerHeaderBand({
|
|
45
|
+
key: 'noInternetConnection',
|
|
46
|
+
text: I18n.t('Base_NoConnection'),
|
|
47
|
+
color: Colors.secondaryColor,
|
|
48
|
+
order: 15,
|
|
49
|
+
showIf: !isConnected,
|
|
50
|
+
});
|
|
51
|
+
}, [Colors, I18n, registerHeaderBand]);
|
|
60
52
|
useEffect(() => {
|
|
61
53
|
const interval = setInterval(checkInternetConnection, 2000);
|
|
62
54
|
return () => clearInterval(interval.current);
|
|
63
55
|
}, [checkInternetConnection]);
|
|
64
56
|
return (<Navigator screenOptions={{ headerShown: false }}>
|
|
65
|
-
{!logged ? (<Screen name="
|
|
57
|
+
{!logged ? (configuration?.enableConnectionSessions ? (<Screen name="SessionManagementScreen" component={SessionManagementScreen} initialParams={{
|
|
58
|
+
version,
|
|
59
|
+
testInstanceConfig: configuration?.testInstanceConfig,
|
|
60
|
+
releaseInstanceConfig: configuration?.releaseInstanceConfig,
|
|
61
|
+
enableConnectionSessions: configuration?.enableConnectionSessions,
|
|
62
|
+
logoFile: configuration?.logoFile,
|
|
63
|
+
}}/>) : (<Screen name="LoginScreen" component={LoginScreen} initialParams={{
|
|
66
64
|
version,
|
|
67
65
|
testInstanceConfig: configuration?.testInstanceConfig,
|
|
68
66
|
releaseInstanceConfig: configuration?.releaseInstanceConfig,
|
|
69
|
-
|
|
67
|
+
logoFile: configuration?.logoFile,
|
|
68
|
+
}}/>)) : (<Screen name="AppNavigator" component={AppNavigator}/>)}
|
|
70
69
|
</Navigator>);
|
|
71
70
|
};
|
|
72
71
|
export default RootNavigator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RootNavigator.js","sourceRoot":"","sources":["../../src/app/RootNavigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"RootNavigator.js","sourceRoot":"","sources":["../../src/app/RootNavigator.js"],"names":[],"mappings":"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"}
|
|
@@ -16,40 +16,30 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { axiosApiProvider } from '../../apiProviders';
|
|
19
|
+
import { RouterProvider } from '../../config';
|
|
19
20
|
export async function getBaseConfig() {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
});
|
|
21
|
+
const route = await RouterProvider.get('AppBase');
|
|
22
|
+
return axiosApiProvider.get({ url: route });
|
|
23
23
|
}
|
|
24
24
|
export async function getMobileSettings() {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
url: '/ws/rest/com.axelor.apps.base.db.AppMobileSettings/',
|
|
28
|
-
})
|
|
29
|
-
.then(res => {
|
|
25
|
+
const route = await RouterProvider.get('AppMobileSettings');
|
|
26
|
+
return axiosApiProvider.get({ url: route }).then(res => {
|
|
30
27
|
if (res?.data?.status !== 0) {
|
|
31
28
|
return {
|
|
32
29
|
data: {
|
|
33
30
|
data: [
|
|
34
31
|
{
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
32
|
+
isTrackerMessageEnabled: true,
|
|
33
|
+
isVerifyCustomerDeliveryLineEnabled: false,
|
|
34
|
+
isVerifyInventoryLineEnabled: false,
|
|
35
|
+
isVerifySupplierArrivalLineEnabled: false,
|
|
36
|
+
isVerifyInternalMoveLineEnabled: false,
|
|
38
37
|
},
|
|
39
38
|
],
|
|
40
39
|
},
|
|
41
40
|
};
|
|
42
41
|
}
|
|
43
|
-
return
|
|
44
|
-
data: {
|
|
45
|
-
data: [
|
|
46
|
-
{
|
|
47
|
-
isTrackerMessageOnCrmApp: true,
|
|
48
|
-
...res?.data?.data[0],
|
|
49
|
-
},
|
|
50
|
-
],
|
|
51
|
-
},
|
|
52
|
-
};
|
|
42
|
+
return res;
|
|
53
43
|
});
|
|
54
44
|
}
|
|
55
45
|
//# sourceMappingURL=config-api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-api.js","sourceRoot":"","sources":["../../../src/auth/api/config-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-api.js","sourceRoot":"","sources":["../../../src/auth/api/config-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAElD,OAAO,gBAAgB,CAAC,GAAG,CAAC,EAAC,GAAG,EAAE,KAAK,EAAC,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAE5D,OAAO,gBAAgB,CAAC,GAAG,CAAC,EAAC,GAAG,EAAE,KAAK,EAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACnD,IAAI,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO;gBACL,IAAI,EAAE;oBACJ,IAAI,EAAE;wBACJ;4BACE,uBAAuB,EAAE,IAAI;4BAC7B,mCAAmC,EAAE,KAAK;4BAC1C,4BAA4B,EAAE,KAAK;4BACnC,kCAAkC,EAAE,KAAK;4BACzC,+BAA+B,EAAE,KAAK;yBACvC;qBACF;iBACF;aACF,CAAC;SACH;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -22,7 +22,7 @@ export const fetchCompanies = createAsyncThunk('company/fetchCompany', async fun
|
|
|
22
22
|
return handlerApiCall({
|
|
23
23
|
fetchFunction: searchCompany,
|
|
24
24
|
data,
|
|
25
|
-
action: '
|
|
25
|
+
action: 'Auth_SliceAction_FetchCompanies',
|
|
26
26
|
getState,
|
|
27
27
|
responseOptions: { isArrayResponse: true },
|
|
28
28
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"companySlice.js","sourceRoot":"","sources":["../../../src/auth/features/companySlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAC5C,sBAAsB,EACtB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,aAAa;QAC5B,IAAI;QACJ,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"companySlice.js","sourceRoot":"","sources":["../../../src/auth/features/companySlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAC5C,sBAAsB,EACtB,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,aAAa;QAC5B,IAAI;QACJ,MAAM,EAAE,iCAAiC;QACzC,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,EAAE;CAChB,CAAC;AAEF,MAAM,YAAY,GAAG,WAAW,CAAC;IAC/B,IAAI,EAAE,SAAS;IACf,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC9C,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1D,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC"}
|