@axelor/aos-mobile-core 8.3.11 → 8.3.12
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/components/molecules/UploadFileInput/UploadFileInput.d.ts +2 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +17 -8
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/templates/DoubleScannerSearchBar/DoubleScannerSearchBar.js +5 -0
- package/lib/components/templates/DoubleScannerSearchBar/DoubleScannerSearchBar.js.map +1 -1
- package/lib/sessions/components/error/ErrorText.js +4 -0
- package/lib/sessions/components/error/ErrorText.js.map +1 -1
- package/lib/utils/api.js +6 -0
- package/lib/utils/api.js.map +1 -1
- package/package.json +3 -3
|
@@ -13,6 +13,7 @@ interface UploadFileInputProps {
|
|
|
13
13
|
maxSize?: number;
|
|
14
14
|
canTakePicture?: boolean;
|
|
15
15
|
getFileName?: (extension: string, dateTime: string) => string;
|
|
16
|
+
manageFileLocally?: boolean;
|
|
16
17
|
}
|
|
17
|
-
declare const UploadFileInput: ({ style, title, defaultValue, onUpload, returnBase64String, required, readonly, documentTypesAllowed, canDeleteFile, displayPreview, maxSize, canTakePicture, getFileName, }: UploadFileInputProps) => React.JSX.Element;
|
|
18
|
+
declare const UploadFileInput: ({ style, title, defaultValue, onUpload, returnBase64String, required, readonly, documentTypesAllowed, canDeleteFile, displayPreview, maxSize, canTakePicture, getFileName, manageFileLocally, }: UploadFileInputProps) => React.JSX.Element;
|
|
18
19
|
export default UploadFileInput;
|
|
@@ -42,7 +42,7 @@ const formatFileSize = (size) => {
|
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
};
|
|
45
|
-
const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, returnBase64String = false, required = false, readonly = false, documentTypesAllowed = 'allFiles', canDeleteFile = true, displayPreview = false, maxSize = DEFAULT_MAX_FILE_SIZE, canTakePicture = true, getFileName = (extension, dateTime) => `picture_${dateTime}.${extension}`, }) => {
|
|
45
|
+
const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, returnBase64String = false, required = false, readonly = false, documentTypesAllowed = 'allFiles', canDeleteFile = true, displayPreview = false, maxSize = DEFAULT_MAX_FILE_SIZE, canTakePicture = true, getFileName = (extension, dateTime) => `picture_${dateTime}.${extension}`, manageFileLocally = true, }) => {
|
|
46
46
|
const I18n = useTranslator();
|
|
47
47
|
const Colors = useThemeColor();
|
|
48
48
|
const formatMetafileURI = useMetafileUri();
|
|
@@ -95,9 +95,10 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
95
95
|
jsessionId,
|
|
96
96
|
returnBase64String,
|
|
97
97
|
});
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
manageFileLocally &&
|
|
99
|
+
setSelectedFile(returnBase64String
|
|
100
|
+
? { ...file, base64: response }
|
|
101
|
+
: { ...file, ...response });
|
|
101
102
|
onUpload(response);
|
|
102
103
|
}
|
|
103
104
|
catch (error) {
|
|
@@ -115,7 +116,7 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
115
116
|
base64: returnBase64String ? photo.fullBase64 : photo.base64,
|
|
116
117
|
};
|
|
117
118
|
if (returnBase64String) {
|
|
118
|
-
setSelectedFile(_file);
|
|
119
|
+
manageFileLocally && setSelectedFile(_file);
|
|
119
120
|
onUpload(_file.base64);
|
|
120
121
|
return;
|
|
121
122
|
}
|
|
@@ -124,13 +125,21 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
124
125
|
token,
|
|
125
126
|
jsessionId,
|
|
126
127
|
});
|
|
127
|
-
setSelectedFile({ ..._file, ...response });
|
|
128
|
+
manageFileLocally && setSelectedFile({ ..._file, ...response });
|
|
128
129
|
onUpload(response);
|
|
129
130
|
}
|
|
130
131
|
catch (error) {
|
|
131
132
|
console.log('Could not upload the file:', error);
|
|
132
133
|
}
|
|
133
|
-
}, [
|
|
134
|
+
}, [
|
|
135
|
+
baseUrl,
|
|
136
|
+
getFileName,
|
|
137
|
+
jsessionId,
|
|
138
|
+
manageFileLocally,
|
|
139
|
+
onUpload,
|
|
140
|
+
returnBase64String,
|
|
141
|
+
token,
|
|
142
|
+
]);
|
|
134
143
|
const handleFileDelete = async () => {
|
|
135
144
|
if (isMetaFile(selectedFile)) {
|
|
136
145
|
try {
|
|
@@ -140,7 +149,7 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
140
149
|
console.log('Could not delete the file:', error);
|
|
141
150
|
}
|
|
142
151
|
}
|
|
143
|
-
setSelectedFile(null);
|
|
152
|
+
manageFileLocally && setSelectedFile(null);
|
|
144
153
|
onUpload(null);
|
|
145
154
|
};
|
|
146
155
|
const handleFileView = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,cAEN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EAEb,KAAK,EACL,IAAI,GACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,cAAc,EACd,YAAY,EACZ,UAAU,GACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAE,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,UAAU,GAEX,MAAM,+BAA+B,CAAC;AAEvC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AACtC,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE;IACxB,OAAO,CACL,IAAI,IAAI,IAAI;QACZ,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,EAAE,EAAE,IAAI,IAAI;QAChB,IAAI,EAAE,QAAQ,IAAI,IAAI,CACvB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE;IAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE;YAC7B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SACzE;KACF;AACH,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,cAEN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EAEb,KAAK,EACL,IAAI,GACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,cAAc,EACd,YAAY,EACZ,UAAU,GACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAE,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,UAAU,GAEX,MAAM,+BAA+B,CAAC;AAEvC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AACtC,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE;IACxB,OAAO,CACL,IAAI,IAAI,IAAI;QACZ,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,EAAE,EAAE,IAAI,IAAI;QAChB,IAAI,EAAE,QAAQ,IAAI,IAAI,CACvB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE;IAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE;YAC7B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SACzE;KACF;AACH,CAAC,CAAC;AAmBF,MAAM,eAAe,GAAG,CAAC,EACvB,KAAK,EACL,KAAK,EACL,YAAY,EACZ,QAAQ,GAAG,OAAO,CAAC,GAAG,EACtB,kBAAkB,GAAG,KAAK,EAC1B,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK,EAChB,oBAAoB,GAAG,UAAU,EACjC,aAAa,GAAG,IAAI,EACpB,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,qBAAqB,EAC/B,cAAc,GAAG,IAAI,EACrB,WAAW,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,WAAW,QAAQ,IAAI,SAAS,EAAE,EACzE,iBAAiB,GAAG,IAAI,GACH,EAAE,EAAE;IACzB,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,KAAK,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE7E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC/D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CAAC,QAAQ,IAAI,YAAY,IAAI,IAAI,EACtC,CAAC,QAAQ,EAAE,YAAY,CAAC,CACzB,CAAC;IAEF,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,OAAO,qBAAqB,CAAC;SAC9B;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;QAClC,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,oBAAoB,KAAK,KAAK,CAAC;IACxC,CAAC,EAAE,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtE,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,EAClC,CAAC,MAAM,EAAE,SAAS,CAAC,CACpB,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;QACpC,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC;gBAC3C,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,oBAAoB,CAAC;aACjD,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,IAAI,GAAG,YAAY,EAAE;gBAC5B,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,gBAAgB,CAAC,IAAI,CAAC,CAAC;aACxB;iBAAM;gBACL,YAAY,CAAC,IAAI,CAAC,CAAC;aACpB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,IAA4B,EAAE,EAAE;QAC9D,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE;gBACtC,OAAO;gBACP,KAAK;gBACL,UAAU;gBACV,kBAAkB;aACnB,CAAC,CAAC;YAEH,iBAAiB;gBACf,eAAe,CACb,kBAAkB;oBAChB,CAAC,CAAC,EAAC,GAAG,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAC;oBAC7B,CAAC,CAAC,EAAC,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAC,CAC3B,CAAC;YACJ,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACpB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;SAClD;IACH,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,WAAW,CACpC,KAAK,EAAE,KAAkB,EAAE,EAAE;QAC3B,IAAI;YACF,MAAM,KAAK,GAAG;gBACZ,IAAI,EAAE,WAAW;oBACf,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC;oBACrD,CAAC,CAAC,WAAW,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,gBAAgB,EAAE;gBACzD,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;aAC7D,CAAC;YAEF,IAAI,kBAAkB,EAAE;gBACtB,iBAAiB,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;gBAC5C,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACvB,OAAO;aACR;YAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE;gBACzC,OAAO;gBACP,KAAK;gBACL,UAAU;aACX,CAAC,CAAC;YAEH,iBAAiB,IAAI,eAAe,CAAC,EAAC,GAAG,KAAK,EAAE,GAAG,QAAQ,EAAC,CAAC,CAAC;YAC9D,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACpB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;SAClD;IACH,CAAC,EACD;QACE,OAAO;QACP,WAAW;QACX,UAAU;QACV,iBAAiB;QACjB,QAAQ;QACR,kBAAkB;QAClB,KAAK;KACN,CACF,CAAC;IAEF,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE;YAC5B,IAAI;gBACF,MAAM,cAAc,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;aACxC;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;aAClD;SACF;QAED,iBAAiB,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3C,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;QAChC,MAAM,qBAAqB,CACzB;YACE,QAAQ,EAAE,YAAY,EAAE,QAAQ;YAChC,EAAE,EAAE,YAAY,EAAE,EAAE;YACpB,UAAU,EAAE,IAAI;SACjB,EACD,EAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAC,EACxD,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,EAAE;YACjB,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAClC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAElD,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,UAAU,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACrE,OAAO,KAAK,CAAC;SACd;QAED,OAAO,cAAc,IAAI,YAAY,IAAI,IAAI,CAAC;IAChD,CAAC,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;IAEnC,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CACrC;MAAA,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CACrE;MAAA,CAAC,IAAI,CACH,KAAK,CAAC,CAAC;YACL,YAAY,CAAC,MAAM;YACnB,YAAY,CAAC,UAAU;YACvB,YAAY,CAAC,WAAW;YACxB,MAAM,CAAC,OAAO;SACf,CAAC,CACF;QAAA,CAAC,iBAAiB,CAAC,CAAC,CAAC,CACnB,CAAC,KAAK,CACJ,SAAS,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B,UAAU,CAAC,SAAS,CACpB,MAAM,CAAC,CACL,UAAU,CAAC,YAAY,CAAC;gBACtB,CAAC,CAAC,iBAAiB,CAAC,YAAY,EAAE,EAAE,CAAC;gBACrC,CAAC,CAAC,EAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAC,CAChC,CACD,eAAe,CAAC,CAAC,EAAE,CAAC,EACpB,CACH,CAAC,CAAC,CAAC,IAAI,CACR;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAC7C;UAAA,CAAC,YAAY;YACX,CAAC,CAAC,YAAY,CAAC,IAAI,IAAI,YAAY,CAAC,QAAQ;YAC5C,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAC/B;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAC1B;UAAA,CAAC,aAAa,IAAI,YAAY,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,CACrD,CAAC,IAAI,CACH,IAAI,CAAC,MAAM,CACX,IAAI,CAAC,CAAC,WAAW,CAAC,CAClB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAC1B,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,CACH,CACD;UAAA,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAC3B,CAAC,IAAI,CACH,IAAI,CAAC,qBAAqB,CAC1B,IAAI,CAAC,CAAC,WAAW,CAAC,CAClB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,cAAc,CAAC,CACxB,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,CACH,CACD;UAAA,CAAC,YAAY,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,cAAc,IAAI,CACtD,CAAC,IAAI,CACH,IAAI,CAAC,aAAa,CAClB,IAAI,CAAC,CAAC,WAAW,CAAC,CAClB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,YAAY,CAAC,CACtB,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,CACH,CACD;UAAA,CAAC,YAAY,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,CACpC,CAAC,IAAI,CACH,IAAI,CAAC,QAAQ,CACb,IAAI,CAAC,CAAC,WAAW,CAAC,CAClB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAC5B,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,CACH,CACH;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,SAAS,IAAI,CACZ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACjE;UAAA,CAAC,IAAI,CAAC,CAAC,CAAC,0BAA0B,EAAE;gBAClC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC;aACtC,CAAC,CACJ;QAAA,EAAE,IAAI,CAAC,CACR,CACH;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,MAAmB,EAAE,SAAkB,EAAE,EAAE,CAC5D,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,QAAQ;KACpB;IACD,OAAO,EAAE;QACP,KAAK,EAAE,MAAM;QACb,WAAW,EAAE,SAAS;YACpB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU;YAC9B,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU;QACpC,WAAW,EAAE,CAAC;QACd,gBAAgB,EAAE,CAAC;QACnB,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,EAAE;KACd;IACD,KAAK,EAAE;QACL,UAAU,EAAE,EAAE;KACf;IACD,QAAQ,EAAE;QACR,KAAK,EAAE,KAAK;KACb;IACD,OAAO,EAAE;QACP,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,cAAc;QAC9B,UAAU,EAAE,QAAQ;KACrB;IACD,MAAM,EAAE;QACN,gBAAgB,EAAE,CAAC;KACpB;IACD,SAAS,EAAE;QACT,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;KACV;IACD,KAAK,EAAE;QACL,UAAU,EAAE,CAAC;KACd;CACF,CAAC,CAAC;AAEL,eAAe,eAAe,CAAC"}
|
|
@@ -63,6 +63,11 @@ const DoubleScannerSearchBar = ({ style = null, title = '', showTitle = false, v
|
|
|
63
63
|
const handleChangeBarCode = useCallback(_barCode => {
|
|
64
64
|
checkNullString(_barCode) ? setBarCode(null) : setBarCode(_barCode);
|
|
65
65
|
}, []);
|
|
66
|
+
useEffect(() => {
|
|
67
|
+
setSearchValue(value);
|
|
68
|
+
if (!value)
|
|
69
|
+
setBarCode(null);
|
|
70
|
+
}, [value]);
|
|
66
71
|
return (<View style={[styles.container, style]}>
|
|
67
72
|
<View style={styles.searchContainer}>
|
|
68
73
|
<ScannerAutocompleteSearch style={styles.searchBar} title={showTitle && title} objectList={list} isFocus={isFocus} value={_searchValue} required={required} selectLastItem={selectLastItem} readonly={readonly} displayValue={displayValue} onChangeValue={onChangeValue} fetchData={fetchSearchAPI} placeholder={placeholderSearchBar} navigate={navigate} oneFilter={oneFilter} showDetailsPopup={showDetailsPopup} loadingList={loadingList} moreLoading={moreLoading} isListEnd={isListEnd} isScrollViewContainer={isScrollViewContainer} scanKeySearch={scanKeySearch} changeScreenAfter={changeScreenAfter}/>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DoubleScannerSearchBar.js","sourceRoot":"","sources":["../../../../src/components/templates/DoubleScannerSearchBar/DoubleScannerSearchBar.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtE,OAAO,EAAC,IAAI,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,yBAAyB,EAAC,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAkCjD,MAAM,sBAAsB,GAAG,CAAC,EAC9B,KAAK,GAAG,IAAI,EACZ,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,KAAK,EACjB,KAAK,GAAG,IAAI,EACZ,aAAa,GAAG,GAAG,EAAE,GAAE,CAAC,EACxB,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK,EAChB,qBAAqB,GAAG,KAAK,EAC7B,aAAa,EACb,iBAAiB,EACjB,IAAI,EACJ,WAAW,EACX,WAAW,EACX,SAAS,EACT,YAAY,EACZ,gBAAgB,GAAG,IAAI,EACvB,SAAS,EACT,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,EACxB,cAAc,EACd,aAAa,EACb,OAAO,GAAG,IAAI,EACd,iBAAiB,EACjB,QAAQ,EACR,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,GAAG,IAAI,GACE,EAAE,EAAE;IAChC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAE9B,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,EAAE;QACtB,QAAQ,CACN,aAAa,CAAC;YACZ,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC;YAC5B,WAAW,EAAE,WAAW;YACxB,IAAI,EAAE,IAAI;SACX,CAAC,CACH,CAAC;IACJ,CAAC,EACD,CAAC,QAAQ,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAC7C,CAAC;IAEF,MAAM,cAAc,GAAG,WAAW,CAChC,CAAC,EAAC,IAAI,GAAG,CAAC,EAAE,WAAW,EAAC,EAAE,EAAE;QAC1B,iBAAiB,IAAI,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACpD,QAAQ,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,CAAC,CAAC;IAChC,CAAC,EACD,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAC9B,CAAC;IAEF,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,QAAQ,CACN,oBAAoB,CAAC;YACnB,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAC;YACnC,WAAW,EAAE,OAAO;SACrB,CAAC,CACH,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAExE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,OAAO,EAAE;YACpB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SAChC;QAED,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YACjC,eAAe,EAAE,CAAC;QACpB,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,EAAE;YACvC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,cAAc,CAAC,EAAE,CAAC,CAAC;YACnB,UAAU,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAE1C,MAAM,mBAAmB,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE;QACjD,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACtE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CACrC;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAClC;QAAA,CAAC,yBAAyB,CACxB,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACxB,KAAK,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,CAC1B,UAAU,CAAC,CAAC,IAAI,CAAC,CACjB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,KAAK,CAAC,CAAC,YAAY,CAAC,CACpB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,cAAc,CAAC,CAAC,cAAc,CAAC,CAC/B,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,SAAS,CAAC,CAAC,cAAc,CAAC,CAC1B,WAAW,CAAC,CAAC,oBAAoB,CAAC,CAClC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACnC,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,qBAAqB,CAAC,CAAC,qBAAqB,CAAC,CAC7C,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,iBAAiB,CAAC,CAAC,iBAAiB,CAAC,EAEvC;QAAA,CAAC,mBAAmB,IAAI,CACtB,CAAC,gBAAgB,CACf,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACxB,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,IAAI,kBAAkB,CAAC,CAAC,CAC7D,YAAY,CAAC,CAAC,OAAO,CAAC,CACtB,QAAQ,CAAC,CAAC,mBAAmB,CAAC,CAC9B,aAAa,CAAC,CAAC,cAAc,CAAC,EAC9B,CACH,CACH;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,QAAQ;KACpB;IACD,eAAe,EAAE;QACf,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,eAAe;QAC/B,GAAG,EAAE,CAAC;KACP;IACD,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,SAAS,EAAE,YAAY;KACxB;IACD,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,SAAS,EAAE,YAAY;QACvB,SAAS,EAAE,EAAE;KACd;CACF,CAAC,CAAC;AAEH,eAAe,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"DoubleScannerSearchBar.js","sourceRoot":"","sources":["../../../../src/components/templates/DoubleScannerSearchBar/DoubleScannerSearchBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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,EAAE,CAAC,CAAC,CAAC,CAAC;QAE/D,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": "8.3.
|
|
3
|
+
"version": "8.3.12",
|
|
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.3.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.3.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.3.12",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.3.12",
|
|
29
29
|
"@react-navigation/drawer": "6.7.2",
|
|
30
30
|
"@react-navigation/native": "6.1.18",
|
|
31
31
|
"@react-navigation/native-stack": "6.11.0",
|