@axelor/aos-mobile-core 9.0.12 → 9.1.0

package/lib/tools/FileViewer.js

@@ -15,40 +15,24 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import FileViewer from 'react-native-file-viewer';
 import RNFS from 'react-native-fs';
 import { showToastMessage } from '../utils/show-toast-message';
-export const openFileInExternalApp = async (file, authentification, I18n) => {
-    if (file == null) {
+import { buildCookie, downloadUrlToPath, openLocalFile, } from '../apiProviders';
+export const openFileInExternalApp = async (file, credentials, I18n) => {
+    if (file == null || credentials?.baseUrl == null) {
         return;
     }
-    const localFile = `${RNFS.DocumentDirectoryPath}/${file.fileName}`;
-    const fromUrl = file.path != null
-        ? `${authentification.baseUrl}${file.path}`
-        : file.isMetaFile
-            ? `${authentification.baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${file.id}/content/download`
-            : `${authentification.baseUrl}ws/dms/inline/${file.id}`;
-    const options = {
-        fromUrl: fromUrl,
-        toFile: localFile,
-        headers: {
-            Cookie: `CSRF-TOKEN=${authentification.token}; ${authentification.jsessionId}`,
-        },
-    };
-    RNFS.downloadFile(options)
-        .promise.then(() => FileViewer.open(localFile, { showOpenWithDialog: true }))
-        .then(() => {
-        // success
-    })
-        .catch(error => {
-        // error
+    const toFile = `${RNFS.DocumentDirectoryPath}/${file.fileName}`;
+    const saved = await downloadUrlToPath(`${credentials.baseUrl}${file.path}`, toFile, buildCookie(credentials));
+    if (saved == null) {
         showToastMessage({
             type: 'error',
             position: 'bottom',
             text1: I18n.t('Auth_Error'),
             text2: I18n.t('Auth_CannotOpenFile'),
         });
-        console.log(error);
-    });
+        return;
+    }
+    await openLocalFile(saved, I18n.t);
 };
 //# sourceMappingURL=FileViewer.js.map

package/lib/tools/FileViewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileViewer.js","sourceRoot":"","sources":["../../src/tools/FileViewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,IAAI,MAAM,iBAAiB,CAAC;AAEnC,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAmB7D,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAyB,EACzB,gBAA+B,EAC/B,IAAqB,EACrB,EAAE;IACF,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAEnE,MAAM,OAAO,GACV,IAAiB,CAAC,IAAI,IAAI,IAAI;QAC7B,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO,GAAI,IAAiB,CAAC,IAAI,EAAE;QACzD,CAAC,CAAE,IAAiB,CAAC,UAAU;YAC7B,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO,uCACxB,IAAiB,CAAC,EACrB,mBAAmB;YACrB,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO,iBAAkB,IAAiB,CAAC,EAAE,EAAE,CAAC;IAE5E,MAAM,OAAO,GAAG;QACd,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE;YACP,MAAM,EAAE,cAAc,gBAAgB,CAAC,KAAK,KAAK,gBAAgB,CAAC,UAAU,EAAE;SAC/E;KACF,CAAC;IAEF,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;SACvB,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC;SAC1E,IAAI,CAAC,GAAG,EAAE;QACT,UAAU;IACZ,CAAC,CAAC;SACD,KAAK,CAAC,KAAK,CAAC,EAAE;QACb,QAAQ;QACR,gBAAgB,CAAC;YACf,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;YAC3B,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;SACrC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
+{"version":3,"file":"FileViewer.js","sourceRoot":"","sources":["../../src/tools/FileViewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,IAAI,MAAM,iBAAiB,CAAC;AAEnC,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,aAAa,GACd,MAAM,iBAAiB,CAAC;AAOzB,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAc,EACd,WAA+B,EAC/B,IAAqB,EACrB,EAAE;IACF,IAAI,IAAI,IAAI,IAAI,IAAI,WAAW,EAAE,OAAO,IAAI,IAAI,EAAE,CAAC;QACjD,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,iBAAiB,CACnC,GAAG,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,EACpC,MAAM,EACN,WAAW,CAAC,WAAW,CAAC,CACzB,CAAC;IAEF,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,gBAAgB,CAAC;YACf,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;YAC3B,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;SACrC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC,CAAC"}

package/lib/utils/image.js

@@ -15,32 +15,54 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { useCallback } from 'react';
-import { useSelector } from 'react-redux';
+import { useCallback, useRef, useState } from 'react';
+import { getFileApi } from '../apiProviders';
 export const useMetafileUri = () => {
-    const { baseUrl } = useSelector((state) => state.auth);
-    return useCallback((metafileId) => metafileId != null
-        ? {
-            uri: `${baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${metafileId}/content/download`,
+    const [cache, setCache] = useState({});
+    const pending = useRef(new Set());
+    const resolve = useCallback((id) => {
+        if (pending.current.has(id))
+            return;
+        pending.current.add(id);
+        getFileApi()
+            .getDisplayUri({ id, fileName: '', isMetaFile: true })
+            .then(uri => setCache(prev => ({ ...prev, [id]: uri })))
+            .finally(() => pending.current.delete(id));
+    }, []);
+    return useCallback((metafileId) => {
+        if (metafileId == null)
+            return undefined;
+        if (metafileId in cache) {
+            return cache[metafileId] != null ? { uri: cache[metafileId] } : undefined;
         }
-        : null, [baseUrl]);
+        resolve(metafileId);
+        return undefined;
+    }, [cache, resolve]);
 };
-export const useBinaryImageUri = () => {
-    const { baseUrl } = useSelector((state) => state.auth);
-    return useCallback((id, version, model) => id == null || model == null
-        ? null
-        : {
-            uri: `${baseUrl}ws/rest/${model}/${id}/image/download?${version != null
-                ? `v=${version}&parentId=${id}&parentModel=${model}&`
-                : ''}image=true`,
-        }, [baseUrl]);
-};
-export const useBinaryPictureUri = () => {
-    const { baseUrl } = useSelector((state) => state.auth);
-    return useCallback((id, version, model) => id != null && version != null && model != null
-        ? {
-            uri: `${baseUrl}ws/rest/${model}/${id}/picture/download?v=${version}&parentId=${id}&parentModel=${model}&image=true`,
+const useBinaryFieldUri = (field, requireVersion) => {
+    const [cache, setCache] = useState({});
+    const pending = useRef(new Set());
+    const resolve = useCallback((key, ref) => {
+        if (pending.current.has(key))
+            return;
+        pending.current.add(key);
+        getFileApi()
+            .getBinaryImageUri({ ...ref, field })
+            .then(uri => setCache(prev => ({ ...prev, [key]: uri })))
+            .finally(() => pending.current.delete(key));
+    }, [field]);
+    return useCallback((id, version, model) => {
+        if (id == null || model == null || (requireVersion && version == null)) {
+            return undefined;
+        }
+        const key = `${model}:${id}:${version}:${field}`;
+        if (key in cache) {
+            return cache[key] != null ? { uri: cache[key] } : undefined;
         }
-        : null, [baseUrl]);
+        resolve(key, { model, id, version });
+        return undefined;
+    }, [cache, resolve, field, requireVersion]);
 };
+export const useBinaryImageUri = () => useBinaryFieldUri('image', false);
+export const useBinaryPictureUri = () => useBinaryFieldUri('picture', true);
 //# sourceMappingURL=image.js.map

package/lib/utils/image.js.map

@@ -1 +1 @@
-{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/utils/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,UAAkB,EAAE,EAAE,CACrB,UAAU,IAAI,IAAI;QAChB,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,uCAAuC,UAAU,mBAAmB;SACpF;QACH,CAAC,CAAC,IAAI,EACV,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,EAAU,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CAC7C,EAAE,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI;QACzB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,WAAW,KAAK,IAAI,EAAE,mBACnC,OAAO,IAAI,IAAI;gBACb,CAAC,CAAC,KAAK,OAAO,aAAa,EAAE,gBAAgB,KAAK,GAAG;gBACrD,CAAC,CAAC,EACN,YAAY;SACb,EACP,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,EAAU,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CAC7C,EAAE,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI;QAC5C,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,WAAW,KAAK,IAAI,EAAE,uBAAuB,OAAO,aAAa,EAAE,gBAAgB,KAAK,aAAa;SACrH;QACH,CAAC,CAAC,IAAI,EACV,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/utils/image.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axelor/aos-mobile-core",
-  "version": "9.0.12",
+  "version": "9.1.0",
   "author": "Axelor",
   "license": "AGPL-3.0-only",
   "publishConfig": {
@@ -24,8 +24,8 @@
     "license:add": "npx add-copyright-header --generate --dir 'src'"
   },
   "dependencies": {
-    "@axelor/aos-mobile-error": "9.0.12",
-    "@axelor/aos-mobile-ui": "9.0.12",
+    "@axelor/aos-mobile-error": "9.1.0",
+    "@axelor/aos-mobile-ui": "9.1.0",
     "@react-navigation/drawer": "7.7.13",
     "@react-navigation/native": "7.1.28",
     "@react-navigation/native-stack": "7.10.1",