@axelor/aos-mobile-core 8.1.17 → 8.1.19
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.js +2 -2
- package/lib/api/login-api.js.map +1 -1
- package/lib/apiProviders/index.d.ts +3 -3
- package/lib/apiProviders/index.js +3 -3
- package/lib/apiProviders/index.js.map +1 -1
- package/lib/auth/index.d.ts +2 -1
- package/lib/auth/index.js +2 -1
- package/lib/auth/index.js.map +1 -1
- package/lib/components/external/Scanner/Scanner.js +6 -14
- package/lib/components/external/Scanner/Scanner.js.map +1 -1
- package/lib/i18n/translations/en.json +6 -4
- package/lib/i18n/translations/fr.json +6 -4
- package/lib/navigator/drawer/Menu.js +2 -8
- package/lib/navigator/drawer/Menu.js.map +1 -1
- package/lib/navigator/drawer/MenuIconButton.js +2 -8
- package/lib/navigator/drawer/MenuIconButton.js.map +1 -1
- package/lib/navigator/drawer/MenuItemEntry.js +2 -8
- package/lib/navigator/drawer/MenuItemEntry.js.map +1 -1
- package/lib/navigator/drawer/MenuTitle.js +2 -7
- package/lib/navigator/drawer/MenuTitle.js.map +1 -1
- package/lib/navigator/menu.helper.d.ts +1 -1
- package/lib/navigator/menu.helper.js +33 -10
- package/lib/navigator/menu.helper.js.map +1 -1
- package/package.json +3 -3
package/lib/api/login-api.js
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import axios from 'axios';
|
|
19
19
|
import { fieldsParserMiddleware, provider, translationMiddleware, } from '../apiProviders';
|
|
20
|
-
const
|
|
20
|
+
const LOGIN_PATH = 'callback';
|
|
21
21
|
const SESSION_REGEX = /JSESSIONID=\w+/g;
|
|
22
22
|
const getJsessionId = (cookie) => {
|
|
23
23
|
return cookie?.match(SESSION_REGEX)?.[0];
|
|
@@ -43,7 +43,7 @@ export function initAxiosWithHeaders(res, url) {
|
|
|
43
43
|
}
|
|
44
44
|
export async function loginApi(url, username, password) {
|
|
45
45
|
return axios
|
|
46
|
-
.post(`${url}${
|
|
46
|
+
.post(`${url}${LOGIN_PATH}`, { username, password })
|
|
47
47
|
.then(res => initAxiosWithHeaders(res, url));
|
|
48
48
|
}
|
|
49
49
|
export async function logoutApi() {
|
package/lib/api/login-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-api.js","sourceRoot":"","sources":["../../src/api/login-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,sBAAsB,EACtB,QAAQ,EACR,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,
|
|
1
|
+
{"version":3,"file":"login-api.js","sourceRoot":"","sources":["../../src/api/login-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,sBAAsB,EACtB,QAAQ,EACR,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,UAAU,GAAG,UAAU,CAAC;AAC9B,MAAM,aAAa,GAAG,iBAAiB,CAAC;AAExC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE;IACvC,OAAO,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,EACzB,oBAAoB,EACpB,qBAAqB,GAItB;IACC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACvD,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAQ,EAAE,GAAW;IACxD,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IAED,MAAM,oBAAoB,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACnE,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC;QACrB,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC;QAEvC,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CACxE,sBAAsB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CACzD,CAAC;IAEF,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC;IAE/B,OAAO,EAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,qBAAqB,EAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,GAAW,EACX,QAAgB,EAChB,QAAgB;IAOhB,OAAO,KAAK;SACT,IAAI,CAAC,GAAG,GAAG,GAAG,UAAU,EAAE,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC,CAAC;SACjD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACxD,OAAO;QACL,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAChC,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI;KACnD,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export * from "./Model";
|
|
2
1
|
export * from "./Action";
|
|
2
|
+
export * from "./Model";
|
|
3
3
|
export * from "./Standard";
|
|
4
4
|
export * from "./middlewares";
|
|
5
|
-
export { apiProviderConfig } from "./config";
|
|
6
|
-
export { getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState
|
|
5
|
+
export { apiProviderConfig, ApiProviderConfig } from "./config";
|
|
6
|
+
export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState } from "./utils";
|
|
@@ -15,10 +15,10 @@
|
|
|
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
|
-
export * from './Model';
|
|
19
18
|
export * from './Action';
|
|
19
|
+
export * from './Model';
|
|
20
20
|
export * from './Standard';
|
|
21
21
|
export * from './middlewares';
|
|
22
|
-
export {
|
|
23
|
-
export {
|
|
22
|
+
export { apiProviderConfig, ApiProviderConfig } from './config';
|
|
23
|
+
export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState, } from './utils';
|
|
24
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC9D,OAAO,EACL,4BAA4B,EAC5B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,uBAAuB,GACxB,MAAM,SAAS,CAAC"}
|
package/lib/auth/index.d.ts
CHANGED
package/lib/auth/index.js
CHANGED
|
@@ -58,7 +58,8 @@ export const authModule = {
|
|
|
58
58
|
},
|
|
59
59
|
requiredConfig: ['AppBase', 'AppMobileSettings'],
|
|
60
60
|
};
|
|
61
|
-
export * from './screens';
|
|
62
61
|
export * from './api';
|
|
62
|
+
export * from './components';
|
|
63
63
|
export * from './features/asyncFunctionsIndex';
|
|
64
|
+
export * from './screens';
|
|
64
65
|
//# sourceMappingURL=index.js.map
|
package/lib/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;SAChB;KACF;IACD,OAAO,EAAE;QACP,UAAU,EAAE;YACV,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,cAAc,EAAE;YACd,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,cAAc;SAC1B;KACF;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,YAAY;KAChB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,aAAa,EAAC;QAChC,eAAe,EAAE,cAAc;KAChC;IACD,cAAc,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC;CACjD,CAAC;AAEF,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;SAChB;KACF;IACD,OAAO,EAAE;QACP,UAAU,EAAE;YACV,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,cAAc,EAAE;YACd,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,cAAc;SAC1B;KACF;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,YAAY;KAChB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,aAAa,EAAC;QAChC,eAAe,EAAE,cAAc;KAChC;IACD,cAAc,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC;CACjD,CAAC;AAEF,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,WAAW,CAAC"}
|
|
@@ -20,11 +20,10 @@ import { DeviceEventEmitter, Platform } from 'react-native';
|
|
|
20
20
|
import DataWedgeIntents from 'react-native-datawedge-intents';
|
|
21
21
|
import DeviceInfo from 'react-native-device-info';
|
|
22
22
|
import { useDispatch } from '../../../redux/hooks';
|
|
23
|
-
import { scanValue
|
|
23
|
+
import { scanValue } from '../../../features/scannerSlice';
|
|
24
24
|
import { DATAWEDGE_API } from './path.helpers';
|
|
25
25
|
import { castScanIntent, castVersionIntent, formatBarcode, isScanIntent, isVersionIntent, } from './intent.helpers';
|
|
26
26
|
const Scanner = () => {
|
|
27
|
-
const { isEnabled } = useScannerSelector();
|
|
28
27
|
const dispatch = useDispatch();
|
|
29
28
|
const appConfig = useMemo(() => ({
|
|
30
29
|
profileName: `${DeviceInfo.getApplicationName().replaceAll(' ', '_')}${__DEV__ ? '_demo' : ''}`,
|
|
@@ -105,19 +104,12 @@ const Scanner = () => {
|
|
|
105
104
|
}, [determineVersion, registerBroadcastReceiver]);
|
|
106
105
|
useEffect(() => {
|
|
107
106
|
if (Platform.OS !== 'ios') {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
};
|
|
113
|
-
}
|
|
107
|
+
const listener = DeviceEventEmitter.addListener('datawedge_broadcast_intent', broadcastReceiver);
|
|
108
|
+
return () => {
|
|
109
|
+
listener.remove();
|
|
110
|
+
};
|
|
114
111
|
}
|
|
115
|
-
}, [
|
|
116
|
-
broadcastReceiver,
|
|
117
|
-
determineVersion,
|
|
118
|
-
isEnabled,
|
|
119
|
-
registerBroadcastReceiver,
|
|
120
|
-
]);
|
|
112
|
+
}, [broadcastReceiver]);
|
|
121
113
|
return null;
|
|
122
114
|
};
|
|
123
115
|
export default Scanner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/components/external/Scanner/Scanner.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/components/external/Scanner/Scanner.tsx"],"names":[],"mappings":"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"}
|
|
@@ -71,10 +71,12 @@
|
|
|
71
71
|
"Base_Success": "Success",
|
|
72
72
|
"Base_Failed_To": "Failed to",
|
|
73
73
|
"Base_Offline_Mode": "The internet connection is disabled",
|
|
74
|
-
"
|
|
75
|
-
"
|
|
76
|
-
"
|
|
77
|
-
"
|
|
74
|
+
"Base_Compatibility_ErrorTooLow": "This menu entry requires a version higher than {{downToVersion}}. (currently {{moduleVersion}})",
|
|
75
|
+
"Base_Compatibility_ErrorTooLowDetails": "This menu entry is not compatible with the current web ERP configuration. This menu entry requires the {{moduleName}} application to be installed on the web instance with a version higher than {{downToVersion}}. The installed web version of the application is currently {{moduleVersion}}.",
|
|
76
|
+
"Base_Compatibility_ErrorTooHigh": "This menu entry requires a version lower than {{upToVersion}}. (currently {{moduleVersion}})",
|
|
77
|
+
"Base_Compatibility_ErrorTooHighDetails": "This menu entry is not compatible with the current web ERP configuration. This menu entry requires the {{moduleName}} application to be installed on the web instance with a version lower than {{upToVersion}}. The installed web version of the application is currently {{moduleVersion}}.",
|
|
78
|
+
"Base_Compatibility_NotFound": "The web application {{moduleName}} cannot be found.",
|
|
79
|
+
"Base_Compatibility_NotFoundDetails": "This menu entry is not compatible with the current web ERP configuration. This menu entry requires the {{moduleName}} application to be installed on the web instance with a version higher than {{downToVersion}} and strictly lower than {{upToVersion}}. The application is not installed on the web instance",
|
|
78
80
|
"Base_Connection_Login": "Login",
|
|
79
81
|
"Base_Connection_SessionName": "Session name",
|
|
80
82
|
"Base_Connection_Url": "Url",
|
|
@@ -71,10 +71,12 @@
|
|
|
71
71
|
"Base_Success": "Succès",
|
|
72
72
|
"Base_Failed_To": "N'a pas réussi à effectuer l'action :",
|
|
73
73
|
"Base_Offline_Mode": "La connexion internet est désactivée",
|
|
74
|
-
"
|
|
75
|
-
"
|
|
76
|
-
"
|
|
77
|
-
"
|
|
74
|
+
"Base_Compatibility_ErrorTooLow": "Cette entrée de menu nécessite une version supérieure à {{downToVersion}}. (actuellement {{moduleVersion}})",
|
|
75
|
+
"Base_Compatibility_ErrorTooLowDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{moduleName}} soit installée sur l'instance web avec une version supérieure à {{downToVersion}}. La version web installée de l'application est actuellement la {{moduleVersion}}.",
|
|
76
|
+
"Base_Compatibility_ErrorTooHigh": "Cette entrée de menu nécessite une version inférieure à {{upToVersion}}. (actuellement {{moduleVersion}})",
|
|
77
|
+
"Base_Compatibility_ErrorTooHighDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{moduleName}} soit installée sur l'instance web avec une version inférieure à {{upToVersion}}. La version web installée de l'application est actuellement la {{moduleVersion}}.",
|
|
78
|
+
"Base_Compatibility_NotFound": "L'application web {{moduleName}} est introuvable.",
|
|
79
|
+
"Base_Compatibility_NotFoundDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{moduleName}} soit installée sur l'instance web avec une version supérieure à {{downToVersion}} et strictement inférieure à {{upToVersion}}. L'application n'est pas installée sur l'instance web.",
|
|
78
80
|
"Base_Connection_Login": "Se connecter",
|
|
79
81
|
"Base_Connection_SessionName": "Nom de la session",
|
|
80
82
|
"Base_Connection_Url": "Url",
|
|
@@ -20,9 +20,8 @@ import { View, StyleSheet, ScrollView } from 'react-native';
|
|
|
20
20
|
import { CommonActions, DrawerActions } from '@react-navigation/native';
|
|
21
21
|
import { Text, WarningCard } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import MenuItem from './MenuItem';
|
|
23
|
-
import { findIndexAndRouteOfMenu, getMenuTitle, hasSubMenus, isMenuIncompatible,
|
|
23
|
+
import { findIndexAndRouteOfMenu, getCompatibilityError, getMenuTitle, hasSubMenus, isMenuIncompatible, } from '../menu.helper';
|
|
24
24
|
import useTranslator from '../../i18n/hooks/use-translator';
|
|
25
|
-
import { formatCompatibilityToDisplay } from '../module.helper';
|
|
26
25
|
const MenuItemList = ({ state, navigation, activeModule, onItemClick, disabled, }) => {
|
|
27
26
|
const generateSubRoutes = menuItem => {
|
|
28
27
|
if (hasSubMenus(menuItem)) {
|
|
@@ -72,18 +71,13 @@ const MenuItemList = ({ state, navigation, activeModule, onItemClick, disabled,
|
|
|
72
71
|
const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatibility, }) => {
|
|
73
72
|
const I18n = useTranslator();
|
|
74
73
|
const title = useMemo(() => getMenuTitle(activeModule, { I18n }), [I18n, activeModule]);
|
|
75
|
-
const moduleNotFound = useMemo(() => isModuleNotFound(compatibility), [compatibility]);
|
|
76
74
|
const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
|
|
77
75
|
return (<View style={styles.menuContainer}>
|
|
78
76
|
<ScrollView contentContainerStyle={styles.moduleMenuContainer} showsVerticalScrollIndicator={false}>
|
|
79
77
|
<View style={styles.menuTitleContainer}>
|
|
80
78
|
<Text style={styles.menuTitle}>{title}</Text>
|
|
81
79
|
</View>
|
|
82
|
-
{compatibilityError && (<WarningCard errorMessage={I18n
|
|
83
|
-
? 'Base_Compatibility_NotFoundDetails'
|
|
84
|
-
: 'Base_Compatibility_ErrorDetails', {
|
|
85
|
-
compatibility: formatCompatibilityToDisplay(compatibility),
|
|
86
|
-
})}/>)}
|
|
80
|
+
{compatibilityError && (<WarningCard errorMessage={getCompatibilityError(compatibility, I18n)}/>)}
|
|
87
81
|
<MenuItemList state={state} navigation={navigation} activeModule={activeModule} onItemClick={onItemClick} disabled={compatibilityError}/>
|
|
88
82
|
</ScrollView>
|
|
89
83
|
<View style={styles.authMenuIcon}>{authMenu}</View>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Menu.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,IAAI,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EACL,uBAAuB,EACvB,YAAY,EACZ,WAAW,EACX,kBAAkB,
|
|
1
|
+
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Menu.js"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,7 @@ import React, { useMemo } from 'react';
|
|
|
19
19
|
import { Dimensions, StyleSheet, TouchableOpacity, View } from 'react-native';
|
|
20
20
|
import { Icon, InfoBubble, Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useTranslator } from '../../i18n';
|
|
22
|
-
import {
|
|
23
|
-
import { formatCompatibilityToDisplay } from '../module.helper';
|
|
22
|
+
import { getCompatibilityError, isMenuIncompatible } from '../menu.helper';
|
|
24
23
|
const WIDTH = 54;
|
|
25
24
|
const HEIGHT = 54;
|
|
26
25
|
const DEFAULT_RADIUS = 8;
|
|
@@ -29,7 +28,6 @@ const MenuIconButton = ({ style, icon, onPress, color, subtitle, rounded = false
|
|
|
29
28
|
const Colors = useThemeColor();
|
|
30
29
|
const I18n = useTranslator();
|
|
31
30
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
32
|
-
const moduleNotFound = useMemo(() => isModuleNotFound(compatibility), [compatibility]);
|
|
33
31
|
const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
|
|
34
32
|
return (<TouchableOpacity onPress={onPress} disabled={disabled || compatibilityError} activeOpacity={0.95}>
|
|
35
33
|
<View style={[
|
|
@@ -47,11 +45,7 @@ const MenuIconButton = ({ style, icon, onPress, color, subtitle, rounded = false
|
|
|
47
45
|
<Icon size={32} name={icon} color={disabled
|
|
48
46
|
? Colors.secondaryColor.background
|
|
49
47
|
: Colors.secondaryColor_dark.background}/>
|
|
50
|
-
{compatibilityError && (<InfoBubble style={styles.infoBubble} usePopup={true} iconName="exclamation-triangle-fill" badgeColor={Colors.errorColor} textIndicationStyle={styles.textIndicationStyle} indication={I18n
|
|
51
|
-
? 'Base_Compatibility_NotFoundDetails'
|
|
52
|
-
: 'Base_Compatibility_ErrorDetails', {
|
|
53
|
-
compatibility: formatCompatibilityToDisplay(compatibility),
|
|
54
|
-
})}/>)}
|
|
48
|
+
{compatibilityError && (<InfoBubble style={styles.infoBubble} usePopup={true} iconName="exclamation-triangle-fill" badgeColor={Colors.errorColor} textIndicationStyle={styles.textIndicationStyle} indication={getCompatibilityError(compatibility, I18n)}/>)}
|
|
55
49
|
</View>
|
|
56
50
|
{subtitle && (<Text style={styles.moduleSubtitle} numberOfLines={1}>
|
|
57
51
|
{subtitle}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuIconButton.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuIconButton.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"MenuIconButton.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuIconButton.js"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,8 @@
|
|
|
18
18
|
import React, { useMemo } from 'react';
|
|
19
19
|
import { View, StyleSheet, TouchableOpacity } from 'react-native';
|
|
20
20
|
import { Icon, Text, WarningCard, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
|
-
import {
|
|
21
|
+
import { getCompatibilityError, isMenuIncompatible } from '../menu.helper';
|
|
22
22
|
import { useTranslator } from '../../i18n';
|
|
23
|
-
import { formatCompatibilityToDisplay } from '../module.helper';
|
|
24
23
|
const MenuItemEntry = ({ icon, title, compatibility, onPress = _route => { }, isActive = false, disabled = false, isDropdown = false, dropdown = false, iconSize = 24, style, }) => {
|
|
25
24
|
const Colors = useThemeColor();
|
|
26
25
|
const I18n = useTranslator();
|
|
@@ -32,7 +31,6 @@ const MenuItemEntry = ({ icon, title, compatibility, onPress = _route => { }, is
|
|
|
32
31
|
dropdown,
|
|
33
32
|
isActive,
|
|
34
33
|
]);
|
|
35
|
-
const moduleNotFound = useMemo(() => isModuleNotFound(compatibility), [compatibility]);
|
|
36
34
|
const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
|
|
37
35
|
const menuDisabled = useMemo(() => disabled || compatibilityError, [compatibilityError, disabled]);
|
|
38
36
|
return (<TouchableOpacity onPress={onPress} disabled={menuDisabled}>
|
|
@@ -53,11 +51,7 @@ const MenuItemEntry = ({ icon, title, compatibility, onPress = _route => { }, is
|
|
|
53
51
|
<Icon name="exclamation-triangle-fill" color={Colors.errorColor.background} style={styles.dropdownIcon} visible={compatibilityError}/>
|
|
54
52
|
</View>
|
|
55
53
|
</View>
|
|
56
|
-
{compatibilityError && (<WarningCard style={styles.compatibilityError} errorMessage={I18n
|
|
57
|
-
? 'Base_Compatibility_NotFound'
|
|
58
|
-
: 'Base_Compatibility_Error', {
|
|
59
|
-
compatibility: formatCompatibilityToDisplay(compatibility),
|
|
60
|
-
})}/>)}
|
|
54
|
+
{compatibilityError && (<WarningCard style={styles.compatibilityError} errorMessage={getCompatibilityError(compatibility, I18n, false)}/>)}
|
|
61
55
|
</TouchableOpacity>);
|
|
62
56
|
};
|
|
63
57
|
const getIndicatorColor = color => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemEntry.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuItemEntry.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAChE,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"MenuItemEntry.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuItemEntry.js"],"names":[],"mappings":"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"}
|
|
@@ -19,22 +19,17 @@ import React, { useMemo } from 'react';
|
|
|
19
19
|
import { Dimensions, StyleSheet, TouchableOpacity } from 'react-native';
|
|
20
20
|
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useTranslator } from '../../i18n';
|
|
22
|
-
import { getMenuTitle, isMenuIncompatible,
|
|
22
|
+
import { getCompatibilityError, getMenuTitle, isMenuIncompatible, } from '../menu.helper';
|
|
23
23
|
const MenuTitle = ({ module, onPress }) => {
|
|
24
24
|
const Colors = useThemeColor();
|
|
25
25
|
const I18n = useTranslator();
|
|
26
|
-
const moduleNotFound = useMemo(() => isModuleNotFound(module.compatibilityAOS), [module.compatibilityAOS]);
|
|
27
26
|
const compatibilityError = useMemo(() => isMenuIncompatible(module.compatibilityAOS), [module.compatibilityAOS]);
|
|
28
27
|
return (<TouchableOpacity style={styles.menuItemContainer} onPress={onPress} disabled={compatibilityError}>
|
|
29
28
|
<Text style={[styles.text, styles.bold]} textColor={Colors.secondaryColor_dark.background}>
|
|
30
29
|
{getMenuTitle(module, { I18n })}
|
|
31
30
|
</Text>
|
|
32
31
|
{compatibilityError && (<Text style={styles.text} textColor={Colors.errorColor.background}>
|
|
33
|
-
{I18n
|
|
34
|
-
? 'Base_Compatibility_NotFound'
|
|
35
|
-
: 'Base_Compatibility_Error', {
|
|
36
|
-
compatibility: module.compatibilityAOS,
|
|
37
|
-
})}
|
|
32
|
+
{getCompatibilityError(module.compatibilityAOS, I18n, false)}
|
|
38
33
|
</Text>)}
|
|
39
34
|
</TouchableOpacity>);
|
|
40
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuTitle.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuTitle.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACtE,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,kBAAkB,
|
|
1
|
+
{"version":3,"file":"MenuTitle.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuTitle.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACtE,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AAExB,MAAM,SAAS,GAAG,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAE;IACtC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,EACjD,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAC1B,CAAC;IAEF,OAAO,CACL,CAAC,gBAAgB,CACf,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAChC,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAC7B;MAAA,CAAC,IAAI,CACH,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAClC,SAAS,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CACjD;QAAA,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,CAAC,CAC/B;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,kBAAkB,IAAI,CACrB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAChE;UAAA,CAAC,qBAAqB,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,CAC9D;QAAA,EAAE,IAAI,CAAC,CACR,CACH;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,iBAAiB,EAAE;QACjB,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,GAAG,GAAG;QAC3C,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,CAAC;QACjB,aAAa,EAAE,QAAQ;QACvB,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,YAAY;QACxB,UAAU,EAAE,EAAE;KACf;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,CAAC;KACpB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;KACnB;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
|
@@ -5,8 +5,8 @@ export function findIndexAndRouteOfMenu(routes: any, menuName: any): {
|
|
|
5
5
|
export function getMenuTitle(menu: any, { I18n }: {
|
|
6
6
|
I18n: any;
|
|
7
7
|
}): any;
|
|
8
|
-
export function isModuleNotFound(compatibility: any): boolean;
|
|
9
8
|
export function isMenuIncompatible(compatibility: any): boolean;
|
|
9
|
+
export function getCompatibilityError(compatibility: any, I18n: any, showDetails?: boolean): any;
|
|
10
10
|
export function formatMenus(module: any): {
|
|
11
11
|
[k: string]: any;
|
|
12
12
|
};
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import { checkNullString } from '@axelor/aos-mobile-ui';
|
|
19
19
|
import { formatVersionString } from '../utils/string';
|
|
20
|
+
import { formatCompatibilityToDisplay } from './module.helper';
|
|
20
21
|
export function findIndexAndRouteOfMenu(routes, menuName) {
|
|
21
22
|
const index = routes.findIndex(_route => _route.name === menuName);
|
|
22
23
|
if (index === -1) {
|
|
@@ -30,26 +31,48 @@ export function getMenuTitle(menu, { I18n }) {
|
|
|
30
31
|
}
|
|
31
32
|
return menu.screen;
|
|
32
33
|
}
|
|
33
|
-
|
|
34
|
+
function isModuleNotFound(compatibility) {
|
|
34
35
|
return compatibility?.moduleVersion == null;
|
|
35
36
|
}
|
|
37
|
+
function isVersionTooLow(compatibility) {
|
|
38
|
+
const moduleVersion = formatVersionString(compatibility.moduleVersion);
|
|
39
|
+
return (!checkNullString(compatibility.downToVersion) &&
|
|
40
|
+
moduleVersion < formatVersionString(compatibility.downToVersion));
|
|
41
|
+
}
|
|
42
|
+
function isVersionTooHigh(compatibility) {
|
|
43
|
+
const moduleVersion = formatVersionString(compatibility.moduleVersion);
|
|
44
|
+
return (!checkNullString(compatibility.upToVersion) &&
|
|
45
|
+
moduleVersion >= formatVersionString(compatibility.upToVersion));
|
|
46
|
+
}
|
|
36
47
|
export function isMenuIncompatible(compatibility) {
|
|
37
48
|
if (compatibility == null) {
|
|
38
49
|
return false;
|
|
39
50
|
}
|
|
51
|
+
return (isModuleNotFound(compatibility) ||
|
|
52
|
+
isVersionTooLow(compatibility) ||
|
|
53
|
+
isVersionTooHigh(compatibility));
|
|
54
|
+
}
|
|
55
|
+
export function getCompatibilityError(compatibility, I18n, showDetails = true) {
|
|
56
|
+
if (compatibility == null) {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
const compatibilityVersions = formatCompatibilityToDisplay(compatibility);
|
|
40
60
|
if (isModuleNotFound(compatibility)) {
|
|
41
|
-
return
|
|
61
|
+
return I18n.t(showDetails
|
|
62
|
+
? 'Base_Compatibility_NotFoundDetails'
|
|
63
|
+
: 'Base_Compatibility_NotFound', compatibilityVersions);
|
|
42
64
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
65
|
+
if (isVersionTooLow(compatibility)) {
|
|
66
|
+
return I18n.t(showDetails
|
|
67
|
+
? 'Base_Compatibility_ErrorTooLowDetails'
|
|
68
|
+
: 'Base_Compatibility_ErrorTooLow', compatibilityVersions);
|
|
47
69
|
}
|
|
48
|
-
if (
|
|
49
|
-
|
|
50
|
-
|
|
70
|
+
if (isVersionTooHigh(compatibility)) {
|
|
71
|
+
return I18n.t(showDetails
|
|
72
|
+
? 'Base_Compatibility_ErrorTooHighDetails'
|
|
73
|
+
: 'Base_Compatibility_ErrorTooHigh', compatibilityVersions);
|
|
51
74
|
}
|
|
52
|
-
return
|
|
75
|
+
return undefined;
|
|
53
76
|
}
|
|
54
77
|
export function formatMenus(module) {
|
|
55
78
|
return Object.fromEntries(Object.entries(module.menus).map(([key, menu], idx) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/navigator/menu.helper.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/navigator/menu.helper.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "8.1.
|
|
3
|
+
"version": "8.1.19",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"license:add": "npx add-copyright-header --generate --dir 'src'"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@axelor/aos-mobile-error": "8.1.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.1.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.1.19",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.1.19",
|
|
29
29
|
"@react-navigation/drawer": "6.6.15",
|
|
30
30
|
"@react-navigation/native": "6.1.17",
|
|
31
31
|
"@react-navigation/native-stack": "6.9.26",
|