@axelor/aos-mobile-core 7.2.37 → 7.2.39
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.
|
@@ -22,6 +22,7 @@ import { StyleSheet } from 'react-native';
|
|
|
22
22
|
const ERROR_CODE_REGEX = /\d{3}$/g;
|
|
23
23
|
const LOGIN_ERROR = 401;
|
|
24
24
|
const URL_ERROR = 999;
|
|
25
|
+
const NO_CONNECTION_CODE = 418;
|
|
25
26
|
const ErrorText = ({ error, style }) => {
|
|
26
27
|
const I18n = useTranslator();
|
|
27
28
|
const errorCode = useMemo(() => {
|
|
@@ -38,6 +39,9 @@ const ErrorText = ({ error, style }) => {
|
|
|
38
39
|
if (errorCode === URL_ERROR) {
|
|
39
40
|
return `${I18n.t('Base_Connection_InvalidUrl')}: ${error.url}`;
|
|
40
41
|
}
|
|
42
|
+
if (errorCode === NO_CONNECTION_CODE) {
|
|
43
|
+
return I18n.t('Base_NoConnection');
|
|
44
|
+
}
|
|
41
45
|
return error?.message;
|
|
42
46
|
}, [I18n, error, errorCode]);
|
|
43
47
|
if (error == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorText.js","sourceRoot":"","sources":["../../../../src/sessions/components/error/ErrorText.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,gBAAgB,GAAG,SAAS,CAAC;AACnC,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,SAAS,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"ErrorText.js","sourceRoot":"","sources":["../../../../src/sessions/components/error/ErrorText.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,gBAAgB,GAAG,SAAS,CAAC;AACnC,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,SAAS,GAAG,GAAG,CAAC;AACtB,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAM,SAAS,GAAG,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,EAAE,EAAE;IACnC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC7B,IAAI,KAAK,EAAE,OAAO,IAAI,IAAI,EAAE;YAC1B,OAAO,IAAI,CAAC;SACb;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7D,OAAO,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,SAAS,KAAK,WAAW,EAAE;YAC7B,OAAO,IAAI,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC;SAC1D;QAED,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;SAChE;QAED,IAAI,SAAS,KAAK,kBAAkB,EAAE;YACpC,OAAO,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;SACpC;QAED,OAAO,KAAK,EAAE,OAAO,CAAC;IACxB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAE7B,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,EAAG,CACzE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM;KACd;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
package/lib/utils/api.js
CHANGED
|
@@ -15,9 +15,11 @@
|
|
|
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 { getNetInfo } from '../api/net-info-utils';
|
|
18
19
|
import { formatURL as _formatURL } from './formatters';
|
|
19
20
|
const PREFIX_REGEX = /^https?:\/\//;
|
|
20
21
|
const INVALID_URL_CODE = 999;
|
|
22
|
+
const NO_CONNECTION_CODE = 418;
|
|
21
23
|
export function testUrl(url) {
|
|
22
24
|
return new Promise(async (resolve, reject) => {
|
|
23
25
|
if (!url || typeof url !== 'string') {
|
|
@@ -36,6 +38,10 @@ export function testUrl(url) {
|
|
|
36
38
|
}
|
|
37
39
|
catch (error) { }
|
|
38
40
|
}
|
|
41
|
+
const { isConnected } = await getNetInfo();
|
|
42
|
+
if (!isConnected) {
|
|
43
|
+
reject(new Error(`No available connection while testing URL: "${url}" ${NO_CONNECTION_CODE}`));
|
|
44
|
+
}
|
|
39
45
|
reject(new Error(`Could not fetch URL: "${url}" ${INVALID_URL_CODE}`));
|
|
40
46
|
});
|
|
41
47
|
}
|
package/lib/utils/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,IAAI,UAAU,EAAC,MAAM,cAAc,CAAC;AAErD,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,gBAAgB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAC,SAAS,IAAI,UAAU,EAAC,MAAM,cAAc,CAAC;AAErD,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAM,UAAU,OAAO,CAAC,GAAW;IACjC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACnC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,KAAK,gBAAgB,EAAE,CAAC,CAAC,CAAC;YAC/D,OAAO;SACR;QAED,MAAM,SAAS,GAAG,UAAU,CAC1B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CACrD,CAAC;QAEF,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,CAC5C,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CACzC,CAAC;QAEF,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;YAC9C,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC9C,IAAI,QAAQ,CAAC,EAAE,EAAE;oBACf,OAAO,CAAC,eAAe,CAAC,CAAC;oBACzB,OAAO;iBACR;aACF;YAAC,OAAO,KAAK,EAAE,GAAE;SACnB;QAED,MAAM,EAAC,WAAW,EAAC,GAAG,MAAM,UAAU,EAAE,CAAC;QAEzC,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,CACJ,IAAI,KAAK,CACP,+CAA+C,GAAG,KAAK,kBAAkB,EAAE,CAC5E,CACF,CAAC;SACH;QAED,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,GAAG,KAAK,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.39",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -84,8 +84,8 @@
|
|
|
84
84
|
"vision-camera-code-scanner": "^0.2.0"
|
|
85
85
|
},
|
|
86
86
|
"dependencies": {
|
|
87
|
-
"@axelor/aos-mobile-error": "7.2.
|
|
88
|
-
"@axelor/aos-mobile-ui": "7.2.
|
|
87
|
+
"@axelor/aos-mobile-error": "7.2.39",
|
|
88
|
+
"@axelor/aos-mobile-ui": "7.2.39",
|
|
89
89
|
"@react-navigation/drawer": "6.6.3",
|
|
90
90
|
"@react-navigation/native": "6.1.7",
|
|
91
91
|
"@react-navigation/native-stack": "6.9.13",
|