@axelor/aos-mobile-core 9.0.19 → 9.0.21

package/lib/apiProviders/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./Action";
-export * from "./Model";
-export * from "./Standard";
-export * from "./middlewares";
-export { apiProviderConfig, ApiProviderConfig } from "./config";
-export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState } from "./utils";
+export * from './Action';
+export * from './Model';
+export * from './Standard';
+export * from './middlewares';
+export { apiProviderConfig, ApiProviderConfig } from './config';
+export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState, } from './utils';

package/lib/apiProviders/index.js.map

@@ -1 +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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.ts"],"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/app/ContextedApplication.js

@@ -30,6 +30,7 @@ import { useDispatch, useSelector } from '../redux/hooks';
 import { setAppVersion } from '../features/authSlice';
 import { MaintenanceTrigger } from '../apiProviders';
 import { resetConfigs } from '../features/appConfigSlice';
+import WebViewPreloader from '../webViews/WebViewPreloader';
 const ContextedApplication = ({ modules, mainMenu, version, configuration, customLoginPage, }) => {
     const dispatch = useDispatch();
     const { logged } = useSelector(state => state.auth);
@@ -62,6 +63,7 @@ const ContextedApplication = ({ modules, mainMenu, version, configuration, custo
           <LoadingIndicator />
           <BlockInteractionMessage />
           <GlobalToolBox />
+          <WebViewPreloader />
           <RootNavigator modules={modules} mainMenu={mainMenu} onRefresh={handleAppRefresh} configuration={configuration} customLoginPage={customLoginPage}/>
         </NavigationContainer>
       </ErrorBoundary>

package/lib/app/ContextedApplication.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}

package/lib/components/external/WebView/WebView.d.ts

@@ -4,6 +4,10 @@ interface WebViewProps {
     baseUrl?: string;
     path?: string;
     queryParams?: Object;
+    injectedJavaScript?: string;
+    onMessage?: (event: any) => void;
+    onLoadEnd?: () => void;
+    onError?: () => void;
 }
-declare const WebView: ({ style, baseUrl, path, queryParams }: WebViewProps) => React.JSX.Element;
+declare const WebView: ({ style, baseUrl, path, queryParams, injectedJavaScript, onMessage, onLoadEnd, onError, }: WebViewProps) => React.JSX.Element;
 export default WebView;

package/lib/components/external/WebView/WebView.js

@@ -19,18 +19,19 @@ import React, { useMemo } from 'react';
 import { ActivityIndicator, StyleSheet } from 'react-native';
 import { WebView as RNWebView } from 'react-native-webview';
 import { useThemeColor } from '@axelor/aos-mobile-ui';
+import { useOnline } from '../../../features/onlineSlice';
 import { useSelector } from '../../../redux/hooks';
 import { checkNullString } from '../../../utils';
-const WebView = ({ style, baseUrl, path, queryParams }) => {
+const WebView = ({ style, baseUrl, path, queryParams, injectedJavaScript, onMessage, onLoadEnd, onError, }) => {
     const Colors = useThemeColor();
-    const { baseUrl: AOSBaseUrl } = useSelector((state) => state.auth);
+    const { isEnabled: isConnected } = useOnline();
+    const { baseUrl: AOSBaseUrl, token, jsessionId, } = useSelector(state => state.auth);
     const formattedQueryParams = useMemo(() => {
         let _formattedQueryParams = '';
         if (queryParams != null) {
             Object.entries(queryParams).map(([key, value]) => {
-                if (value == null) {
+                if (value == null)
                     return;
-                }
                 const separator = checkNullString(_formattedQueryParams) ? '?' : '&';
                 const queryParam = key + '=' + value;
                 _formattedQueryParams += separator + queryParam;
@@ -39,7 +40,14 @@ const WebView = ({ style, baseUrl, path, queryParams }) => {
         return _formattedQueryParams;
     }, [queryParams]);
     const uri = useMemo(() => (baseUrl ?? AOSBaseUrl) + path + formattedQueryParams, [AOSBaseUrl, baseUrl, formattedQueryParams, path]);
-    return (<RNWebView geolocationEnabled={true} containerStyle={style} source={{ uri }} startInLoadingState renderLoading={() => (<ActivityIndicator style={styles.activityIndicator} size="large" color={Colors.inverseColor.background}/>)}/>);
+    const targetsAOSInstance = useMemo(() => !checkNullString(AOSBaseUrl) &&
+        (checkNullString(baseUrl) || baseUrl.startsWith(AOSBaseUrl)), [AOSBaseUrl, baseUrl]);
+    const headers = useMemo(() => {
+        if (!targetsAOSInstance)
+            return undefined;
+        return { Cookie: `CSRF-TOKEN=${token}; ${jsessionId}` };
+    }, [jsessionId, targetsAOSInstance, token]);
+    return (<RNWebView containerStyle={style} source={{ uri, headers }} cacheEnabled cacheMode={isConnected ? 'LOAD_DEFAULT' : 'LOAD_CACHE_ELSE_NETWORK'} domStorageEnabled sharedCookiesEnabled thirdPartyCookiesEnabled geolocationEnabled injectedJavaScript={injectedJavaScript} onMessage={onMessage} onLoadEnd={onLoadEnd} onError={onError} startInLoadingState renderLoading={() => (<ActivityIndicator style={styles.activityIndicator} size="large" color={Colors.inverseColor.background}/>)}/>);
 };
 const styles = StyleSheet.create({
     activityIndicator: {

package/lib/components/external/WebView/WebView.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebView.js","sourceRoot":"","sources":["../../../../src/components/external/WebView/WebView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAS/C,MAAM,OAAO,GAAG,CAAC,EAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAe,EAAE,EAAE;IACpE,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,EAAC,OAAO,EAAE,UAAU,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEtE,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,EAAE;QACxC,IAAI,qBAAqB,GAAG,EAAE,CAAC;QAE/B,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC/C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;oBAClB,OAAO;gBACT,CAAC;gBAED,MAAM,SAAS,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;gBACrE,MAAM,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,KAAK,CAAC;gBACrC,qBAAqB,IAAI,SAAS,GAAG,UAAU,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,qBAAqB,CAAC;IAC/B,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC,GAAG,IAAI,GAAG,oBAAoB,EAC3D,CAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAClD,CAAC;IAEF,OAAO,CACL,CAAC,SAAS,CACR,kBAAkB,CAAC,CAAC,IAAI,CAAC,CACzB,cAAc,CAAC,CAAC,KAAK,CAAC,CACtB,MAAM,CAAC,CAAC,EAAC,GAAG,EAAC,CAAC,CACd,mBAAmB,CACnB,aAAa,CAAC,CAAC,GAAG,EAAE,CAAC,CACnB,CAAC,iBAAiB,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAChC,IAAI,CAAC,OAAO,CACZ,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EACtC,CACH,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,iBAAiB,EAAE;QACjB,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC,CAAC;AAEH,eAAe,OAAO,CAAC"}
+{"version":3,"file":"WebView.js","sourceRoot":"","sources":["../../../../src/components/external/WebView/WebView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAa/C,MAAM,OAAO,GAAG,CAAC,EACf,KAAK,EACL,OAAO,EACP,IAAI,EACJ,WAAW,EACX,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,OAAO,GACM,EAAE,EAAE;IACjB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAE7C,MAAM,EACJ,OAAO,EAAE,UAAU,EACnB,KAAK,EACL,UAAU,GACX,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAErC,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,EAAE;QACxC,IAAI,qBAAqB,GAAG,EAAE,CAAC;QAE/B,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC/C,IAAI,KAAK,IAAI,IAAI;oBAAE,OAAO;gBAE1B,MAAM,SAAS,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;gBACrE,MAAM,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,KAAK,CAAC;gBACrC,qBAAqB,IAAI,SAAS,GAAG,UAAU,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,qBAAqB,CAAC;IAC/B,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC,GAAG,IAAI,GAAG,oBAAoB,EAC3D,CAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAClD,CAAC;IAEF,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CACH,CAAC,eAAe,CAAC,UAAU,CAAC;QAC5B,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,OAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAC/D,CAAC,UAAU,EAAE,OAAO,CAAC,CACtB,CAAC;IAEF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE;QAC3B,IAAI,CAAC,kBAAkB;YAAE,OAAO,SAAS,CAAC;QAE1C,OAAO,EAAC,MAAM,EAAE,cAAc,KAAK,KAAK,UAAU,EAAE,EAAC,CAAC;IACxD,CAAC,EAAE,CAAC,UAAU,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;IAE5C,OAAO,CACL,CAAC,SAAS,CACR,cAAc,CAAC,CAAC,KAAK,CAAC,CACtB,MAAM,CAAC,CAAC,EAAC,GAAG,EAAE,OAAO,EAAC,CAAC,CACvB,YAAY,CACZ,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,yBAAyB,CAAC,CACpE,iBAAiB,CACjB,oBAAoB,CACpB,wBAAwB,CACxB,kBAAkB,CAClB,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CACvC,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,mBAAmB,CACnB,aAAa,CAAC,CAAC,GAAG,EAAE,CAAC,CACnB,CAAC,iBAAiB,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAChC,IAAI,CAAC,OAAO,CACZ,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EACtC,CACH,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,iBAAiB,EAAE;QACjB,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC,CAAC;AAEH,eAAe,OAAO,CAAC"}

package/lib/components/pages/CustomFieldForm/CustomFieldForm.d.ts

@@ -9,12 +9,12 @@ interface CustomFieldFormProps {
     style?: any;
     model: string;
     modelId: number;
-    fieldType?: string;
+    fieldType?: string | string[];
     additionalActions?: JsonAction[];
     readonly?: boolean;
     readonlyButton?: boolean;
     hideButtonBackground?: boolean;
     hideFormBackground?: boolean;
 }
-declare const CustomFieldForm: ({ style, model: modelName, modelId, fieldType, additionalActions, readonly, readonlyButton, hideButtonBackground, hideFormBackground, }: CustomFieldFormProps) => React.JSX.Element;
+declare const CustomFieldForm: ({ style, model: modelName, modelId, fieldType: _fieldType, additionalActions, readonly, readonlyButton, hideButtonBackground, hideFormBackground, }: CustomFieldFormProps) => React.JSX.Element;
 export default CustomFieldForm;

package/lib/components/pages/CustomFieldForm/CustomFieldForm.js

@@ -23,12 +23,22 @@ import { useSelector } from '../../../redux/hooks';
 import { fetchJsonFieldsOfModel, fetchObject, fetchSelectionMap, formConfigsProvider, getAttrsValue, mapFormToStudioFields, mapStudioFields, mapStudioFieldsWithFormula, updateJsonFieldsObject, useFieldPermitter, useRoleFilter, } from '../../../forms';
 import { FormView } from '../../pages';
 const FORM_KEY = 'customField-form';
-const CustomFieldForm = ({ style, model: modelName, modelId, fieldType, additionalActions = [], readonly = false, readonlyButton = false, hideButtonBackground, hideFormBackground, }) => {
+const FIELD_TYPE_SEPARATOR = ',';
+const CustomFieldForm = ({ style, model: modelName, modelId, fieldType: _fieldType, additionalActions = [], readonly = false, readonlyButton = false, hideButtonBackground, hideFormBackground, }) => {
     const Colors = useThemeColor();
     const { userId } = useSelector(state => state.auth);
     const [_fields, setFields] = useState();
     const [object, setObject] = useState();
     const [selectionMap, setSelectionMap] = useState();
+    const fieldTypeKey = Array.isArray(_fieldType)
+        ? _fieldType.join(FIELD_TYPE_SEPARATOR)
+        : _fieldType;
+    const fieldType = useMemo(() => {
+        const fieldTypes = fieldTypeKey?.split(FIELD_TYPE_SEPARATOR);
+        return fieldTypes != null && fieldTypes.length > 1
+            ? fieldTypes
+            : fieldTypeKey;
+    }, [fieldTypeKey]);
     const userRoleIds = useRoleFilter();
     const removeUnauthorizedFields = useFieldPermitter({ modelName });
     useEffect(() => {
@@ -55,9 +65,16 @@ const CustomFieldForm = ({ style, model: modelName, modelId, fieldType, addition
         const authorizedFields = Array.isArray(_fields)
             ? _fields.map(removeUnauthorizedFields)
             : _fields;
-        return mapStudioFields(mapStudioFieldsWithFormula(authorizedFields, object), Colors, selectionMap);
-    }, [Colors, _fields, object, removeUnauthorizedFields, selectionMap]);
-    const formKey = useMemo(() => `${FORM_KEY}_${fieldType}_${readonly}`, [fieldType, readonly]);
+        return mapStudioFields(mapStudioFieldsWithFormula(authorizedFields, object), Colors, selectionMap, Array.isArray(fieldType) ? fieldType : undefined);
+    }, [
+        Colors,
+        _fields,
+        fieldType,
+        object,
+        removeUnauthorizedFields,
+        selectionMap,
+    ]);
+    const formKey = useMemo(() => `${FORM_KEY}_${fieldTypeKey}_${readonly}`, [fieldTypeKey, readonly]);
     useEffect(() => {
         formConfigsProvider.registerForm(formKey, { readonlyIf: () => readonly, fields, panels, modelName }, { replaceOld: true });
     }, [fields, formKey, modelName, panels, readonly]);
@@ -73,7 +90,7 @@ const CustomFieldForm = ({ style, model: modelName, modelId, fieldType, addition
                             modelName,
                             id: object?.id,
                             version: object?.version,
-                            values: mapFormToStudioFields(_fields, objectState),
+                            values: mapFormToStudioFields(_fields, objectState, object),
                         },
                         action: 'Base_SliceAction_UpdateJsonFieldsObject',
                         getState: () => ({ auth: { userId } }),
@@ -90,14 +107,7 @@ const CustomFieldForm = ({ style, model: modelName, modelId, fieldType, addition
         }
         else
             return _action;
-    }), [
-        _fields,
-        additionalActions,
-        modelName,
-        object?.id,
-        object?.version,
-        userId,
-    ]);
+    }), [_fields, additionalActions, modelName, object, userId]);
     return (<FormView style={[styles.formView, style]} styleScreen={hideFormBackground && styles.screen} hideButtonBackground={hideButtonBackground} actions={_additionalActions} formKey={formKey} isCustom={true} defaultValue={attrsValues == null ? { ...defaults } : attrsValues} floatingTools={readonlyButton}/>);
 };
 const styles = StyleSheet.create({

package/lib/components/pages/CustomFieldForm/CustomFieldForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomFieldForm.js","sourceRoot":"","sources":["../../../../src/components/pages/CustomFieldForm/CustomFieldForm.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CustomFieldForm.js","sourceRoot":"","sources":["../../../../src/components/pages/CustomFieldForm/CustomFieldForm.tsx"],"names":[],"mappings":"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"}

package/lib/forms/studio/api.helpers.d.ts

@@ -7,7 +7,7 @@ import { JSONObject } from '../types';
 export declare function clearModelMetaCaches(modelName?: string): void;
 export declare function fetchJsonFieldsOfModel({ modelName, type, userRoleIds, }: {
     modelName: string;
-    type?: string;
+    type?: string | string[];
     userRoleIds?: number[] | null;
 }): Promise<any>;
 export declare function fetchObject({ modelName, id, }: {

package/lib/forms/studio/api.helpers.js

@@ -67,7 +67,10 @@ const createJsonFieldsOfModelCriteria = (modelName, type) => {
         { fieldName: 'model', operator: '=', value: modelName },
         { fieldName: 'isVisibleInMobileApp', operator: '=', value: true },
     ];
-    if (type != null) {
+    if (Array.isArray(type)) {
+        criteria.push({ fieldName: 'modelField', operator: 'in', value: type });
+    }
+    else if (type != null) {
         criteria.push({ fieldName: 'modelField', operator: '=', value: type });
     }
     return criteria;
@@ -81,7 +84,11 @@ export async function fetchJsonFieldsOfModel({ modelName, type, userRoleIds, })
         return null;
     const isFiltered = Array.isArray(userRoleIds);
     const hasRoles = isFiltered && userRoleIds.length > 0;
-    return cachedRequest('jsonFieldsOfModel', [modelName, type ?? '', isFiltered ? userRoleIds.join('-') : 'all'].join(CACHE_KEY_SEPARATOR), () => createStandardSearch({
+    return cachedRequest('jsonFieldsOfModel', [
+        modelName,
+        [type ?? ''].flat().join('-'),
+        isFiltered ? userRoleIds.join('-') : 'all',
+    ].join(CACHE_KEY_SEPARATOR), () => createStandardSearch({
         model: 'com.axelor.meta.db.MetaJsonField',
         criteria: createJsonFieldsOfModelCriteria(modelName, type),
         domain: !isFiltered

package/lib/forms/studio/api.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/api.helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/api.helpers.ts"],"names":[],"mappings":"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"}

package/lib/forms/studio/display.helpers.d.ts

@@ -1,8 +1,8 @@
 import { ThemeColors } from '@axelor/aos-mobile-ui';
 import { Field, JSONObject, Panel } from '../types';
-export declare const mapStudioFields: (items: any[], Colors: ThemeColors, selectionMap?: JSONObject<any[]>) => {
+export declare const mapStudioFields: (items: any[], Colors: ThemeColors, selectionMap?: JSONObject<any[]>, modelFieldsOrder?: string[]) => {
     panels: JSONObject<Panel>;
     fields: JSONObject<Field>;
     defaults: any;
 };
-export declare const mapFormToStudioFields: (fields: any[], formValues: any) => JSONObject<string>;
+export declare const mapFormToStudioFields: (fields: any[], formValues: any, object?: any) => JSONObject<string>;

package/lib/forms/studio/display.helpers.js

@@ -19,26 +19,48 @@ import { checkNullString, HorizontalRule, Label, } from '@axelor/aos-mobile-ui';
 import { DEFAULT_COLSPAN, } from '../types';
 import { CustomButton, CustomPicker, CustomSearchBar, CustomTagList, } from '../../components';
 import { combinedFormula, createFormulaFunction, manageDependsOnFormula, reverseFormula, } from './formula.helpers';
-export const mapStudioFields = (items, Colors, selectionMap = {}) => {
+const getSortedModelFields = (metaJsonFields, modelFieldsOrder = []) => {
+    const getRank = (modelField) => {
+        const rank = modelFieldsOrder.indexOf(modelField);
+        return rank === -1 ? modelFieldsOrder.length : rank;
+    };
+    return metaJsonFields
+        .map(_item => _item.modelField)
+        .filter((item, index, self) => self.indexOf(item) === index)
+        .sort((a, b) => getRank(a) - getRank(b) || a.localeCompare(b));
+};
+const getMaxSequence = (metaJsonFields, modelField) => Math.max(0, ...metaJsonFields
+    .filter(_item => _item.modelField === modelField)
+    .map(_item => _item.sequence ?? 0));
+export const mapStudioFields = (items, Colors, selectionMap = {}, modelFieldsOrder) => {
     let formFields = {};
     let formPanels = {};
     let defaults = {};
     if (Array.isArray(items)) {
         const metaJsonFields = [...items];
-        const modelFields = metaJsonFields
-            .map(_item => _item.modelField)
-            .filter((item, index, self) => self.indexOf(item) === index)
-            .sort();
+        const modelFields = getSortedModelFields(metaJsonFields, modelFieldsOrder);
+        let orderOffset = 0;
         for (const modelField of modelFields) {
-            const { _fields, _panels, _defaults } = manageContentOfModel(metaJsonFields, modelField, Colors, selectionMap);
+            const { _fields, _panels, _defaults } = manageContentOfModel(metaJsonFields, modelField, Colors, selectionMap, orderOffset);
             formFields = { ...formFields, ..._fields };
             formPanels = { ...formPanels, ..._panels };
             defaults = { ...defaults, ..._defaults };
+            orderOffset += getMaxSequence(metaJsonFields, modelField) + 1;
         }
     }
     return { fields: formFields, panels: formPanels, defaults };
 };
-export const mapFormToStudioFields = (fields, formValues) => {
+const parseStudioValues = (value) => {
+    if (value == null || typeof value !== 'string')
+        return value ?? {};
+    try {
+        return JSON.parse(value) ?? {};
+    }
+    catch {
+        return {};
+    }
+};
+export const mapFormToStudioFields = (fields, formValues, object) => {
     let items = {};
     if (Array.isArray(fields)) {
         const metaJsonFields = [...fields];
@@ -57,7 +79,13 @@ export const mapFormToStudioFields = (fields, formValues) => {
                     panelValues[fieldKey] = formValues[fieldKey];
                 }
             });
-            items = { ...items, [modelField]: JSON.stringify(panelValues) };
+            items = {
+                ...items,
+                [modelField]: JSON.stringify({
+                    ...parseStudioValues(object?.[modelField]),
+                    ...panelValues,
+                }),
+            };
         }
     }
     return items;
@@ -157,7 +185,7 @@ const hasPanelTitle = (widgetAttrs) => {
         isPanelTab(widgetAttrs) ||
         !widgetAttrs?.showTitle);
 };
-const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap) => {
+const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap, orderOffset = 0) => {
     const formFields = {};
     const formPanels = {};
     const defaults = {};
@@ -167,12 +195,13 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
         .sort((a, b) => a.sequence - b.sequence)
         .forEach(item => {
         const widgetAttrs = getWidgetAttrs(item);
+        const order = orderOffset + (item.sequence ?? 0);
         switch (item.type) {
             case 'panel':
                 lastPanel = item.name;
                 formPanels[item.name] = {
                     titleKey: hasPanelTitle(widgetAttrs) ? item.title : null,
-                    order: item.sequence,
+                    order,
                     colSpan: getColSpan(widgetAttrs) ?? DEFAULT_COLSPAN,
                     direction: 'row',
                     isCollapsible: isPanelCollapsible(widgetAttrs),
@@ -186,7 +215,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
             case 'spacer':
                 formPanels[item.name] = {
                     titleKey: item.title,
-                    order: item.sequence,
+                    order,
                     colSpan: getColSpan(widgetAttrs) ?? DEFAULT_COLSPAN,
                     direction: 'row',
                 };
@@ -195,7 +224,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
                 formFields[item.name] = {
                     titleKey: item.title,
                     type: 'string',
-                    order: item.sequence,
+                    order,
                     colSpan: getColSpan(widgetAttrs),
                     parentPanel: lastPanel,
                     widget: 'custom',
@@ -211,7 +240,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
                 formFields[item.name] = {
                     titleKey: item.title,
                     type: 'string',
-                    order: item.sequence,
+                    order,
                     parentPanel: lastPanel,
                     widget: 'custom',
                     hideIf: () => item.hidden,
@@ -228,7 +257,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
                 formFields[item.name] = {
                     titleKey: item.title,
                     type: 'object',
-                    order: item.sequence,
+                    order,
                     colSpan: getColSpan(widgetAttrs),
                     parentPanel: lastPanel,
                     widget: 'custom',
@@ -254,7 +283,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
                     hideIf: item.hidden
                         ? () => true
                         : createFormulaFunction(combinedFormula('||', item.hideIf, reverseFormula(item.showIf))),
-                    order: item.sequence,
+                    order,
                     colSpan: getColSpan(widgetAttrs),
                     parentPanel: lastPanel,
                     widget: widget,

package/lib/forms/studio/display.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"display.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/display.helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"display.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/display.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,eAAe,EACf,cAAc,EACd,KAAK,GAEN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,eAAe,GAMhB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,aAAa,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,GACf,MAAM,mBAAmB,CAAC;AAE3B,MAAM,oBAAoB,GAAG,CAC3B,cAAqB,EACrB,mBAA6B,EAAE,EACrB,EAAE;IACZ,MAAM,OAAO,GAAG,CAAC,UAAkB,EAAE,EAAE;QACrC,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAElD,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,CAAC,CAAC;IAEF,OAAO,cAAc;SAClB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;SAC9B,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC;SAC3D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,cAAqB,EAAE,UAAkB,EAAU,EAAE,CAC3E,IAAI,CAAC,GAAG,CACN,CAAC,EACD,GAAG,cAAc;KACd,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC;KAChD,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,CACrC,CAAC;AAEJ,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,KAAY,EACZ,MAAmB,EACnB,eAAkC,EAAE,EACpC,gBAA2B,EAC4C,EAAE;IACzE,IAAI,UAAU,GAAsB,EAAE,CAAC;IACvC,IAAI,UAAU,GAAsB,EAAE,CAAC;IACvC,IAAI,QAAQ,GAAQ,EAAE,CAAC;IAEvB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,cAAc,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;QAClC,MAAM,WAAW,GAAG,oBAAoB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QAC3E,IAAI,WAAW,GAAG,CAAC,CAAC;QAEpB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAC,GAAG,oBAAoB,CACxD,cAAc,EACd,UAAU,EACV,MAAM,EACN,YAAY,EACZ,WAAW,CACZ,CAAC;YAEF,UAAU,GAAG,EAAC,GAAG,UAAU,EAAE,GAAG,OAAO,EAAC,CAAC;YACzC,UAAU,GAAG,EAAC,GAAG,UAAU,EAAE,GAAG,OAAO,EAAC,CAAC;YACzC,QAAQ,GAAG,EAAC,GAAG,QAAQ,EAAE,GAAG,SAAS,EAAC,CAAC;YACvC,WAAW,IAAI,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAAO,EAAE;IAC5C,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,IAAI,EAAE,CAAC;IAEnE,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,MAAa,EACb,UAAe,EACf,MAAY,EACQ,EAAE;IACtB,IAAI,KAAK,GAAuB,EAAE,CAAC;IAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,MAAM,cAAc,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,cAAc;aAC/B,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;aAC9B,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC;aAC3D,IAAI,EAAE,CAAC;QAEV,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,WAAW,GAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAErC,cAAc;iBACX,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC;iBAChD,OAAO,CAAC,KAAK,CAAC,EAAE;gBACf,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE5B,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5B,WAAW,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAC/C,CAAC;YACH,CAAC,CAAC,CAAC;YAEL,KAAK,GAAG;gBACN,GAAG,KAAK;gBACR,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;oBAC3B,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC;oBAC1C,GAAG,WAAW;iBACf,CAAC;aACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAa,EAAE;IAC3D,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;QAClB,KAAK,cAAc,CAAC;QACpB,KAAK,aAAa;YAChB,OAAO,OAAO,CAAC;QACjB,KAAK,aAAa,CAAC;QACnB,KAAK,WAAW;YACd,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,IAAiB,CAAC;IAC7B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC9B,MAAW,EAC+B,EAAE;IAC5C,IAAI,MAAM,GAA6C,EAAE,CAAC;IAE1D,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,OAAO;YACV,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;YAC3B,MAAM;QACR,KAAK,KAAK;YACR,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;YACzB,MAAM;QACR,KAAK,MAAM;YACT,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM;QACR,KAAK,UAAU;YACb,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC;YAC3B,MAAM;QACR,KAAK,SAAS;YACZ,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC;YAC5B,MAAM;QACR,KAAK,OAAO;YACV,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM;QACR;YACE,MAAM;IACV,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAS,EAAO,EAAE;IACxC,OAAO,IAAI,EAAE,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,WAAgB,EAAsB,EAAE;IAC1D,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAEnD,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAE5D,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAW,EAAE;IACpD,OAAO,OAAO,IAAI,IAAI,IAAI,OAAO,GAAG,eAAe,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,CAAC,SAAS,CAAC;IAClB,MAAM,EAAE,CAAC,QAAQ,CAAC;IAClB,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,KAAK,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;IAC7B,IAAI,EAAE,CAAC,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,0BAA0B,GAAG,CACjC,WAAgB,EAChB,MAAmB,EACd,EAAE;IACP,MAAM,GAAG,GAAW,WAAW,EAAE,GAAa,CAAC;IAE/C,IAAI,MAAM,GAAQ,EAAE,CAAC;IAErB,IAAI,eAAe,CAAC,GAAG,CAAC;QAAE,OAAO,MAAM,CAAC;IAExC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE;QACxD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACvE,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;gBACpB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC;YACvC,CAAC;iBAAM,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBAC1B,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,WAAgB,EAAW,EAAE;IACvD,OAAO,WAAW,EAAE,WAAW,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,WAAgB,EAAW,EAAE;IAC/C,OAAO,WAAW,EAAE,GAAG,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,WAAgB,EAAW,EAAE;IACtD,OAAO,WAAW,EAAE,SAAS,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,WAAgB,EAAW,EAAE;IAClD,OAAO,CACL,kBAAkB,CAAC,WAAW,CAAC;QAC/B,UAAU,CAAC,WAAW,CAAC;QACvB,CAAC,WAAW,EAAE,SAAS,CACxB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,cAAqB,EACrB,UAAkB,EAClB,MAAmB,EACnB,YAA+B,EAC/B,cAAsB,CAAC,EACmD,EAAE;IAC5E,MAAM,UAAU,GAAsB,EAAE,CAAC;IACzC,MAAM,UAAU,GAAsB,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAQ,EAAE,CAAC;IACzB,IAAI,SAA6B,CAAC;IAElC,cAAc;SACX,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC;SAChD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;SACvC,OAAO,CAAC,IAAI,CAAC,EAAE;QACd,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,WAAW,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;QAEjD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,OAAO;gBACV,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;gBAEtB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACtB,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;oBACxD,KAAK;oBACL,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,IAAI,eAAe;oBACnD,SAAS,EAAE,KAAK;oBAChB,aAAa,EAAE,kBAAkB,CAAC,WAAW,CAAC;oBAC9C,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC;oBAClD,MAAM,EAAE,IAAI,CAAC,MAAM;wBACjB,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI;wBACZ,CAAC,CAAC,qBAAqB,CACnB,eAAe,CACb,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAC5B,CACF;iBACN,CAAC;gBACF,MAAM;YACR,KAAK,QAAQ;gBACX,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACtB,QAAQ,EAAE,IAAI,CAAC,KAAK;oBACpB,KAAK;oBACL,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,IAAI,eAAe;oBACnD,SAAS,EAAE,KAAK;iBACjB,CAAC;gBACF,MAAM;YACR,KAAK,OAAO;gBACV,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACtB,QAAQ,EAAE,IAAI,CAAC,KAAK;oBACpB,IAAI,EAAE,QAAQ;oBACd,KAAK;oBACL,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC;oBAChC,WAAW,EAAE,SAAS;oBACtB,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM;oBACzB,eAAe,EAAE,GAAG,EAAE,CACpB,KAAK,CAAC;wBACJ,OAAO,EAAE,IAAI,CAAC,KAAK;wBACnB,IAAI,EAAE,MAAM;wBACZ,GAAG,0BAA0B,CAAC,WAAW,EAAE,MAAM,CAAC;qBACnD,CAAC;iBACL,CAAC;gBACF,MAAM;YACR,KAAK,WAAW;gBACd,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACtB,QAAQ,EAAE,IAAI,CAAC,KAAK;oBACpB,IAAI,EAAE,QAAQ;oBACd,KAAK;oBACL,WAAW,EAAE,SAAS;oBACtB,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM;oBACzB,eAAe,EAAE,GAAG,EAAE,CACpB,cAAc,CAAC;wBACb,KAAK,EAAE;4BACL,cAAc,EAAE,CAAC;4BACjB,KAAK,EAAE,KAAK;4BACZ,SAAS,EAAE,QAAQ;yBACpB;qBACF,CAAC;iBACL,CAAC;gBACF,MAAM;YACR,KAAK,QAAQ;gBACX,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACtB,QAAQ,EAAE,IAAI,CAAC,KAAK;oBACpB,IAAI,EAAE,QAAQ;oBACd,KAAK;oBACL,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC;oBAChC,WAAW,EAAE,SAAS;oBACtB,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM;oBACzB,eAAe,EAAE,YAAY;oBAC7B,OAAO,EAAE,EAAC,IAAI,EAAC;iBAChB,CAAC;gBACF,MAAM;YACR;gBACE,MAAM,SAAS,GAAc,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjE,MAAM,EAAC,MAAM,EAAE,SAAS,EAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAEjE,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;oBAC9B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;gBAC1C,CAAC;gBAED,MAAM,MAAM,GAAU;oBACpB,QAAQ,EAAE,IAAI,CAAC,KAAK;oBACpB,SAAS,EAAE,IAAI,CAAC,IAAI;oBACpB,IAAI,EAAE,SAAS,IAAI,SAAS;oBAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC;oBAClD,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC;oBAClD,MAAM,EAAE,IAAI,CAAC,MAAM;wBACjB,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI;wBACZ,CAAC,CAAC,qBAAqB,CACnB,eAAe,CACb,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAC5B,CACF;oBACL,KAAK;oBACL,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC;oBAChC,WAAW,EAAE,SAAS;oBACtB,MAAM,EAAE,MAAM;iBACf,CAAC;gBAEF,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC5B,MAAM,CAAC,iBAAiB,GAAG;wBACzB,OAAO,EAAE,EAAE;qBACZ,CAAC;oBACF,MAAM,CAAC,OAAO,GAAG,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC;gBAC9B,CAAC;gBAED,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;oBAClD,MAAM,CAAC,OAAO,GAAG,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAC,CAAC;gBACvC,CAAC;gBAED,IAAI,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;oBACnC,MAAM,CAAC,OAAO,GAAG,EAAC,SAAS,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAC,CAAC;gBAClE,CAAC;gBAED,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9D,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC;oBACzB,MAAM,CAAC,eAAe,GAAG,YAAY,CAAC;oBACtC,MAAM,CAAC,OAAO,GAAG;wBACf,IAAI;wBACJ,SAAS,EAAE,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;wBACzC,eAAe,EAAE,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC;wBAChD,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC;qBACvC,CAAC;gBACJ,CAAC;gBAED,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;oBAC1B,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;oBAC3B,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC;oBACzB,MAAM,CAAC,eAAe,GAAG,aAAa,CAAC;oBACvC,MAAM,CAAC,OAAO,GAAG;wBACf,WAAW,EAAE,IAAI,CAAC,WAAW;qBAC9B,CAAC;gBACJ,CAAC;gBAED,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;oBAC3B,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;wBAC3B,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;wBAC3B,MAAM,CAAC,OAAO,GAAG,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC;oBACjC,CAAC;yBAAM,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;wBAC7B,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;wBAC3B,MAAM,CAAC,OAAO,GAAG,EAAC,kBAAkB,EAAE,KAAK,EAAC,CAAC;oBAC/C,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC;wBACzB,MAAM,CAAC,eAAe,GAAG,eAAe,CAAC;wBACzC,MAAM,CAAC,OAAO,GAAG,EAAC,IAAI,EAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBAED,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;oBAC3B,MAAM,CAAC,SAAS,GAAG,sBAAsB,CACvC,IAAI,CAAC,SAAS,EACd,cAAc,CACf,CAAC;gBACJ,CAAC;gBAED,IACE,IAAI,CAAC,IAAI,KAAK,MAAM;oBACpB,IAAI,CAAC,IAAI,KAAK,UAAU;oBACxB,IAAI,CAAC,IAAI,KAAK,MAAM,EACpB,CAAC;oBACD,MAAM,CAAC,OAAO,GAAG,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC;gBACjC,CAAC;gBAED,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;gBAE/B,MAAM;QACV,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,OAAO,EAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAC,CAAC;AACzE,CAAC,CAAC"}

package/lib/forms/studio/formula.helpers.d.ts

@@ -1,7 +1,7 @@
 export declare const mapStudioFieldsWithFormula: (fields: any[], object: any) => any[];
 export declare const getAttrsValue: (object: {
     [key: string]: string;
-}, fieldType?: string) => any;
+}, fieldType?: string | string[]) => any;
 export declare const createFormulaFunction: (formula: string | undefined) => ({ objectState }: any) => any;
 export declare const evaluateFormulaWithObject: (formula: string, object: Object) => string;
 export declare const combinedFormula: (separator: string, ...allFormula: (string | undefined)[]) => string;

package/lib/forms/studio/formula.helpers.js

@@ -96,13 +96,14 @@ export const mapStudioFieldsWithFormula = (fields, object) => {
 export const getAttrsValue = (object, fieldType) => {
     if (isEmpty(object))
         return {};
-    if (fieldType != null)
+    if (typeof fieldType === 'string') {
         return JSON.parse(object[fieldType] ?? '{}');
+    }
+    const priorityKeys = Array.isArray(fieldType) ? fieldType : [];
+    const attrsKeys = Object.keys(object).filter(key => key.toLowerCase().includes('attrs') && !priorityKeys.includes(key));
     let result = {};
-    Object.entries(object)
-        .filter(([key]) => key.toLowerCase().includes('attrs'))
-        .forEach(([_, value]) => {
-        result = { ...result, ...JSON.parse(value) };
+    [...attrsKeys, ...priorityKeys].forEach(key => {
+        result = { ...result, ...JSON.parse(object[key] ?? '{}') };
     });
     return result;
 };

package/lib/forms/studio/formula.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"formula.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/formula.helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"formula.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/formula.helpers.ts"],"names":[],"mappings":"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"}

package/lib/tools/FileViewer.js

@@ -16,32 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import FileViewer from 'react-native-file-viewer';
+import RNFetchBlob from 'react-native-blob-util';
 import RNFS from 'react-native-fs';
-import { showToastMessage } from '../utils/show-toast-message';
+import { sanitizeLocalFileName, showToastMessage } from '../utils';
 export const openFileInExternalApp = async (file, authentification, I18n) => {
     if (file == null) {
         return;
     }
-    const localFile = `${RNFS.DocumentDirectoryPath}/${file.fileName}`;
+    const localFile = `${RNFS.DocumentDirectoryPath}/${sanitizeLocalFileName(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: {
+    try {
+        const res = await RNFetchBlob.config({ path: localFile }).fetch('GET', fromUrl, {
             Cookie: `CSRF-TOKEN=${authentification.token}; ${authentification.jsessionId}`,
-        },
-    };
-    RNFS.downloadFile(options)
-        .promise.then(() => FileViewer.open(localFile, { showOpenWithDialog: true }))
-        .then(() => {
-        // success
-    })
-        .catch(error => {
-        // error
+        });
+        const { status } = res.info();
+        if (status < 200 || status >= 300) {
+            await RNFS.unlink(localFile).catch(() => { });
+            throw new Error(`Download failed with status ${status}`);
+        }
+        await FileViewer.open(localFile, { showOpenWithDialog: true });
+    }
+    catch (error) {
         showToastMessage({
             type: 'error',
             position: 'bottom',
@@ -49,6 +48,6 @@ export const openFileInExternalApp = async (file, authentification, I18n) => {
             text2: I18n.t('Auth_CannotOpenFile'),
         });
         console.log(error);
-    });
+    }
 };
 //# 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,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,IAAI,MAAM,iBAAiB,CAAC;AAEnC,OAAO,EAAC,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAmBjE,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,qBAAqB,CACtE,IAAI,CAAC,QAAQ,CACd,EAAE,CAAC;IAEJ,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,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC,CAAC,KAAK,CAC3D,KAAK,EACL,OAAO,EACP;YACE,MAAM,EAAE,cAAc,gBAAgB,CAAC,KAAK,KAAK,gBAAgB,CAAC,UAAU,EAAE;SAC/E,CACF,CAAC;QACF,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAE5B,IAAI,MAAM,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,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;AACH,CAAC,CAAC"}

package/lib/utils/file.d.ts

@@ -1 +1,2 @@
 export declare const sanitizeFileName: (name: string) => string;
+export declare const sanitizeLocalFileName: (name: string) => string;

package/lib/utils/file.js

@@ -19,4 +19,5 @@ export const sanitizeFileName = (name) => name
     ?.normalize('NFD')
     .replace(/[\u0300-\u036f]/g, '')
     .replace(/[ :*?"<>|\\]/g, '_');
+export const sanitizeLocalFileName = (name) => sanitizeFileName(name)?.replace(/[^a-zA-Z0-9._\-()]/g, '_');
 //# sourceMappingURL=file.js.map

package/lib/utils/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/utils/file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAC/C,IAAI;IACF,EAAE,SAAS,CAAC,KAAK,CAAC;KACjB,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;KAC/B,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/utils/file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAC/C,IAAI;IACF,EAAE,SAAS,CAAC,KAAK,CAAC;KACjB,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;KAC/B,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAE,EAAE,CACpD,gBAAgB,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC"}

package/lib/utils/index.d.ts

@@ -2,7 +2,7 @@ export { updateAgendaItems } from './agenda';
 export * from './api';
 export { decreaseDate, diffDate, getDay, getEndOfDay, getFromNowDate, getFullDateItems, getMonth, getNextMonth, getPreviousMonth, getStartOfDay, incrementDate, isDate, isDateTime, ISODateTimeToDate, isMidnightDate, isToday, sameDate, } from './date';
 export { displayItemName, displayItemFullname, displayItemTitle, } from './displayers';
-export { sanitizeFileName } from './file';
+export { sanitizeFileName, sanitizeLocalFileName } from './file';
 export { formatDate, formatDateTime, formatTime, formatScan, formatURL, getNowDateZonesISOString, getDateZonesISOString, formatRequestBody, } from './formatters';
 export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
 export { filterList, filterListContain, getLastItem, getNextItem } from './list';

package/lib/utils/index.js

@@ -19,7 +19,7 @@ export { updateAgendaItems } from './agenda';
 export * from './api';
 export { decreaseDate, diffDate, getDay, getEndOfDay, getFromNowDate, getFullDateItems, getMonth, getNextMonth, getPreviousMonth, getStartOfDay, incrementDate, isDate, isDateTime, ISODateTimeToDate, isMidnightDate, isToday, sameDate, } from './date';
 export { displayItemName, displayItemFullname, displayItemTitle, } from './displayers';
-export { sanitizeFileName } from './file';
+export { sanitizeFileName, sanitizeLocalFileName } from './file';
 export { formatDate, formatDateTime, formatTime, formatScan, formatURL, getNowDateZonesISOString, getDateZonesISOString, formatRequestBody, } from './formatters';
 export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
 export { filterList, filterListContain, getLastItem, getNextItem } from './list';

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,cAAc,OAAO,CAAC;AACtB,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,QAAQ,GACT,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,gBAAgB,EAAC,MAAM,QAAQ,CAAC;AACxC,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,QAAQ,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,QAAQ,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,MAAM,EACN,UAAU,EACV,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,UAAU,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,cAAc,OAAO,CAAC;AACtB,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,QAAQ,GACT,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,gBAAgB,EAAE,qBAAqB,EAAC,MAAM,QAAQ,CAAC;AAC/D,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,QAAQ,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,QAAQ,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,MAAM,EACN,UAAU,EACV,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,UAAU,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC"}

package/lib/webViews/WebViewPreloader.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const WebViewPreloader: () => React.JSX.Element;
+export default WebViewPreloader;

package/lib/webViews/WebViewPreloader.js

@@ -0,0 +1,111 @@
+/*
+ * Axelor Business Solutions
+ *
+ * Copyright (C) 2026 Axelor (<http://axelor.com>).
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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 React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { StyleSheet, View } from 'react-native';
+import { WebView } from '../components';
+import { useOnline } from '../features/onlineSlice';
+import { useSelector } from '../redux/hooks';
+import { createWebViewPath } from './display.helpers';
+import { useWebViewConfigs } from './webView.provider';
+const PRELOAD_MESSAGE_TYPE = 'aos-webview-preload';
+const SERVICE_WORKER_TIMEOUT = 20000;
+const NATIVE_FALLBACK_TIMEOUT = SERVICE_WORKER_TIMEOUT + 5000;
+const PRELOAD_SCRIPT = `
+(function () {
+  var reported = false;
+  var report = function (hasServiceWorker) {
+    if (reported) { return; }
+    reported = true;
+    window.ReactNativeWebView.postMessage(JSON.stringify({
+      type: '${PRELOAD_MESSAGE_TYPE}',
+      hasServiceWorker: hasServiceWorker,
+    }));
+  };
+
+  if (!('serviceWorker' in navigator)) {
+    report(false);
+  } else {
+    navigator.serviceWorker.ready.then(function () { report(true); });
+    setTimeout(function () { report(false); }, ${SERVICE_WORKER_TIMEOUT});
+  }
+})();
+true;
+`;
+const WebViewPreloader = () => {
+    const configs = useWebViewConfigs();
+    const { isEnabled: isConnected } = useOnline();
+    const { logged } = useSelector(state => state.auth);
+    const [queue, setQueue] = useState([]);
+    const preloadedIds = useRef([]);
+    const fallbackTimeout = useRef(null);
+    useEffect(() => {
+        if (!logged) {
+            preloadedIds.current = [];
+            setQueue([]);
+            return;
+        }
+        if (!isConnected)
+            return;
+        setQueue(configs.filter(({ id }) => !preloadedIds.current.includes(id)));
+    }, [configs, isConnected, logged]);
+    const current = useMemo(() => (logged && isConnected ? queue[0] : null), [isConnected, logged, queue]);
+    const completeCurrent = useCallback((isPreloaded) => {
+        clearTimeout(fallbackTimeout.current);
+        if (isPreloaded && current != null) {
+            preloadedIds.current = [...preloadedIds.current, current.id];
+        }
+        setQueue(_queue => _queue.slice(1));
+    }, [current]);
+    useEffect(() => {
+        if (current == null)
+            return;
+        fallbackTimeout.current = setTimeout(() => completeCurrent(false), NATIVE_FALLBACK_TIMEOUT);
+        return () => clearTimeout(fallbackTimeout.current);
+    }, [completeCurrent, current]);
+    const handleMessage = useCallback((event) => {
+        try {
+            const payload = JSON.parse(event?.nativeEvent?.data);
+            if (payload?.type === PRELOAD_MESSAGE_TYPE) {
+                completeCurrent(payload.hasServiceWorker === true);
+            }
+        }
+        catch { }
+    }, [completeCurrent]);
+    const handleError = useCallback(() => completeCurrent(false), [completeCurrent]);
+    if (current == null)
+        return null;
+    return (<View style={styles.container} pointerEvents="none">
+      <WebView key={current.id} style={styles.webView} baseUrl={current.url} path={createWebViewPath(current)} injectedJavaScript={PRELOAD_SCRIPT} onMessage={handleMessage} onError={handleError}/>
+    </View>);
+};
+const styles = StyleSheet.create({
+    container: {
+        position: 'absolute',
+        top: -1000,
+        left: -1000,
+        width: 1,
+        height: 1,
+        opacity: 0,
+    },
+    webView: {
+        width: 1,
+        height: 1,
+    },
+});
+export default WebViewPreloader;
+//# sourceMappingURL=WebViewPreloader.js.map

package/lib/webViews/WebViewPreloader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebViewPreloader.js","sourceRoot":"","sources":["../../src/webViews/WebViewPreloader.tsx"],"names":[],"mappings":"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"}

package/lib/webViews/display.helpers.d.ts

@@ -1 +1,6 @@
 export declare const createWebViewActionID: (id: number) => string;
+export declare const createWebViewPath: (config: {
+    metaAction?: {
+        name: string;
+    };
+}) => string;

package/lib/webViews/display.helpers.js

@@ -18,4 +18,9 @@
 export const createWebViewActionID = (id) => {
     return `core_webView${id}_details`;
 };
+export const createWebViewPath = (config) => {
+    return config?.metaAction?.name != null
+        ? `#/ds/${config.metaAction.name}`
+        : '';
+};
 //# sourceMappingURL=display.helpers.js.map

package/lib/webViews/display.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"display.helpers.js","sourceRoot":"","sources":["../../src/webViews/display.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EAAU,EAAE,EAAE;IAClD,OAAO,eAAe,EAAE,UAAU,CAAC;AACrC,CAAC,CAAC"}
+{"version":3,"file":"display.helpers.js","sourceRoot":"","sources":["../../src/webViews/display.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EAAU,EAAE,EAAE;IAClD,OAAO,eAAe,EAAE,UAAU,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAEjC,EAAU,EAAE;IACX,OAAO,MAAM,EAAE,UAAU,EAAE,IAAI,IAAI,IAAI;QACrC,CAAC,CAAC,QAAQ,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE;QAClC,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC"}

package/lib/webViews/menu.helper.d.ts

@@ -1,4 +1,5 @@
 import { Menu, Screen } from '../app';
+import { WebViewConfig } from './webView.provider';
 type WebViewMenuConfig = {
     [menuKey: string]: {
         menu: Menu;
@@ -11,15 +12,7 @@ type Menus = {
 type Screens = {
     [screenKey: string]: Screen;
 };
-export declare const createWebViewScreens: (webViewConfigs: {
-    id: number;
-    appName: string;
-    isAosWebView: boolean;
-    menuTitle?: string;
-    iconName?: string;
-    menuOrder?: number;
-    authorizedRoleSet: any[];
-}[]) => {
+export declare const createWebViewScreens: (webViewConfigs: WebViewConfig[]) => {
     menus: WebViewMenuConfig;
     screens: Screens;
 };

package/lib/webViews/menu.helper.js

@@ -19,15 +19,21 @@ import { modulesProvider } from '../app';
 import { fetchWebViewConfigs } from './api.helpers';
 import { createWebViewActionID } from './display.helpers';
 import { WebViewScreen } from './view';
+import { webViewProvider } from './webView.provider';
 import { getRoles } from '../utils';
-const createScreenComponent = id => {
-    return props => WebViewScreen({ ...props, webViewId: id });
+const createScreenComponent = (webViewConfig) => {
+    return props => WebViewScreen({
+        ...props,
+        webViewId: webViewConfig.id,
+        defaultConfig: webViewConfig,
+    });
 };
 export const createWebViewScreens = (webViewConfigs) => {
     const screens = {};
     const menus = {};
     if (Array.isArray(webViewConfigs) && webViewConfigs.length > 0) {
-        webViewConfigs.forEach(({ id, appName, menuTitle, iconName, menuOrder, authorizedRoleSet = [], }) => {
+        webViewConfigs.forEach(webViewConfig => {
+            const { id, appName, menuTitle, iconName, menuOrder, authorizedRoleSet = [], } = webViewConfig;
             const config = {
                 title: menuTitle ?? 'Base_WebView',
                 icon: iconName ?? 'layers',
@@ -36,7 +42,7 @@ export const createWebViewScreens = (webViewConfigs) => {
             const screenKey = `WebView_${appName}_${id}`;
             screens[screenKey] = {
                 title: config.title,
-                component: createScreenComponent(id),
+                component: createScreenComponent(webViewConfig),
                 actionID: createWebViewActionID(id),
             };
             const _menu = {
@@ -81,6 +87,7 @@ export const registerWebViewModule = async (user) => {
     const webViewConfigs = await fetchWebViewConfigs()
         .then(res => res?.data?.data)
         .catch(() => []);
+    webViewProvider.registerConfigs(webViewConfigs);
     const { screens, menus } = createWebViewScreens(webViewConfigs);
     const userRoles = getRoles(user);
     modulesProvider.registerModule({

package/lib/webViews/menu.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/webViews/menu.helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/webViews/menu.helper.ts"],"names":[],"mappings":"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"}

package/lib/webViews/view/WebViewScreen.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
+import { WebViewConfig } from '../webView.provider';
 interface WebViewScreenProps {
     webViewId: number;
+    defaultConfig?: WebViewConfig;
     hideCardBackground?: boolean;
     chartWidth?: number;
 }
-export declare const WebViewScreen: ({ webViewId }: WebViewScreenProps) => React.JSX.Element;
+export declare const WebViewScreen: ({ webViewId, defaultConfig, }: WebViewScreenProps) => React.JSX.Element;
 export {};

package/lib/webViews/view/WebViewScreen.js

@@ -15,24 +15,29 @@
  * 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 React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { ActivityIndicator } from 'react-native';
 import { WebView } from '../../components';
 import { headerActionsProvider } from '../../header';
 import { useTranslator } from '../../i18n';
 import { fetchWebViewById } from '../api.helpers';
-import { createWebViewActionID } from '../display.helpers';
-export const WebViewScreen = ({ webViewId }) => {
+import { createWebViewActionID, createWebViewPath } from '../display.helpers';
+import { webViewProvider } from '../webView.provider';
+export const WebViewScreen = ({ webViewId, defaultConfig, }) => {
     const I18n = useTranslator();
-    const [webViewData, setWebViewData] = useState({});
+    const [webViewData, setWebViewData] = useState(defaultConfig ?? webViewProvider.getConfig(webViewId) ?? {});
     const [loading, setLoading] = useState(false);
     const refresh = useCallback(() => {
         setLoading(true);
         fetchWebViewById({ mobileWebViewId: webViewId })
             .then(response => {
-            setWebViewData(response?.data?.data[0]);
+            const config = response?.data?.data?.[0];
+            if (config != null) {
+                setWebViewData(config);
+                webViewProvider.updateConfig(config);
+            }
         })
-            .catch(() => setWebViewData({}))
+            .catch(() => { })
             .finally(() => setLoading(false));
     }, [webViewId]);
     useEffect(() => {
@@ -44,6 +49,7 @@ export const WebViewScreen = ({ webViewId }) => {
             isMounted = false;
         };
     }, [refresh]);
+    const hasConfig = useMemo(() => Object.keys(webViewData ?? {}).length > 0, [webViewData]);
     useEffect(() => {
         headerActionsProvider.registerModel(createWebViewActionID(webViewId), {
             actions: [
@@ -58,11 +64,9 @@ export const WebViewScreen = ({ webViewId }) => {
             ],
         });
     }, [I18n, webViewId, refresh]);
-    if (loading) {
+    if (loading && !hasConfig) {
         return <ActivityIndicator size="large"/>;
     }
-    return (<WebView baseUrl={webViewData?.url} path={webViewData?.metaAction != null
-            ? `#/ds/${webViewData?.metaAction?.name}`
-            : ''}/>);
+    return (<WebView baseUrl={webViewData?.url} path={createWebViewPath(webViewData)}/>);
 };
 //# sourceMappingURL=WebViewScreen.js.map

package/lib/webViews/view/WebViewScreen.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewScreen.js","sourceRoot":"","sources":["../../../src/webViews/view/WebViewScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAC,qBAAqB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AAQzD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAC,SAAS,EAAqB,EAAE,EAAE;IAC/D,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAM,EAAE,CAAC,CAAC;IACxD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEvD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE;QAC/B,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,gBAAgB,CAAC,EAAC,eAAe,EAAE,SAAS,EAAC,CAAC;aAC3C,IAAI,CAAC,QAAQ,CAAC,EAAE;YACf,cAAc,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;aAC/B,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,GAAG,IAAI,CAAC;QAErB,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,SAAS,CAAC,GAAG,EAAE;QACb,qBAAqB,CAAC,aAAa,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE;YACpE,OAAO,EAAE;gBACP;oBACE,GAAG,EAAE,eAAe;oBACpB,KAAK,EAAE,EAAE;oBACT,YAAY,EAAE,KAAK;oBACnB,QAAQ,EAAE,cAAc;oBACxB,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC;oBAC3C,OAAO,EAAE,OAAO;iBACjB;aACF;SACF,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAE/B,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAG,CAAC;IAC5C,CAAC;IAED,OAAO,CACL,CAAC,OAAO,CACN,OAAO,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAC1B,IAAI,CAAC,CACH,WAAW,EAAE,UAAU,IAAI,IAAI;YAC7B,CAAC,CAAC,QAAQ,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;YACzC,CAAC,CAAC,EACN,CAAC,EACD,CACH,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"WebViewScreen.js","sourceRoot":"","sources":["../../../src/webViews/view/WebViewScreen.tsx"],"names":[],"mappings":"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"}

package/lib/webViews/webView.provider.d.ts

@@ -0,0 +1,28 @@
+export interface WebViewConfig {
+    id: number;
+    appName: string;
+    isAosWebView?: boolean;
+    url?: string;
+    metaAction?: {
+        name: string;
+    };
+    menuTitle?: string;
+    iconName?: string;
+    menuOrder?: number;
+    authorizedRoleSet?: any[];
+}
+declare class WebViewProvider {
+    private configs;
+    private refreshCallBack;
+    constructor();
+    registerCallback(callBack: Function): void;
+    unregisterCallback(callBack: Function): void;
+    registerConfigs(configs: WebViewConfig[]): void;
+    updateConfig(config: WebViewConfig): void;
+    getConfigs(): WebViewConfig[];
+    getConfig(id: number): WebViewConfig;
+    private updateState;
+}
+export declare const webViewProvider: WebViewProvider;
+export declare const useWebViewConfigs: () => WebViewConfig[];
+export {};

package/lib/webViews/webView.provider.js

@@ -0,0 +1,65 @@
+/*
+ * Axelor Business Solutions
+ *
+ * Copyright (C) 2026 Axelor (<http://axelor.com>).
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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, useEffect, useState } from 'react';
+class WebViewProvider {
+    configs;
+    refreshCallBack;
+    constructor() {
+        this.configs = [];
+        this.refreshCallBack = [];
+    }
+    registerCallback(callBack) {
+        this.refreshCallBack.push(callBack);
+    }
+    unregisterCallback(callBack) {
+        this.refreshCallBack = this.refreshCallBack.filter(_f => _f !== callBack);
+    }
+    registerConfigs(configs) {
+        this.configs = Array.isArray(configs) ? configs : [];
+        this.updateState();
+    }
+    updateConfig(config) {
+        if (config?.id == null) {
+            return;
+        }
+        this.configs = this.configs.map(_config => _config.id === config.id ? { ..._config, ...config } : _config);
+        this.updateState();
+    }
+    getConfigs() {
+        return this.configs;
+    }
+    getConfig(id) {
+        return this.configs.find(_config => _config.id === id);
+    }
+    updateState() {
+        this.refreshCallBack.forEach(_f => _f(this.configs));
+    }
+}
+export const webViewProvider = new WebViewProvider();
+export const useWebViewConfigs = () => {
+    const [configs, setConfigs] = useState(webViewProvider.getConfigs());
+    const refreshData = useCallback((data) => setConfigs([...data]), []);
+    useEffect(() => {
+        webViewProvider.registerCallback(refreshData);
+        return () => {
+            webViewProvider.unregisterCallback(refreshData);
+        };
+    }, [refreshData]);
+    return configs;
+};
+//# sourceMappingURL=webView.provider.js.map

package/lib/webViews/webView.provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webView.provider.js","sourceRoot":"","sources":["../../src/webViews/webView.provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAcvD,MAAM,eAAe;IACX,OAAO,CAAkB;IACzB,eAAe,CAAa;IAEpC;QACE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED,gBAAgB,CAAC,QAAkB;QACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,kBAAkB,CAAC,QAAkB;QACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;IAC5E,CAAC;IAED,eAAe,CAAC,OAAwB;QACtC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,YAAY,CAAC,MAAqB;QAChC,IAAI,MAAM,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CACxC,OAAO,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAC,GAAG,OAAO,EAAE,GAAG,MAAM,EAAC,CAAC,CAAC,CAAC,OAAO,CAC7D,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,SAAS,CAAC,EAAU;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAkB,CAAC;IAC1E,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACvD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;AAErD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAoB,EAAE;IACrD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CACpC,eAAe,CAAC,UAAU,EAAE,CAC7B,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,IAAqB,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAChD,EAAE,CACH,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE9C,OAAO,GAAG,EAAE;YACV,eAAe,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAClD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}

package/package.json

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