@axelor/aos-mobile-core 6.5.3 → 6.5.5

package/lib/api/metafile-api.d.ts

@@ -3,8 +3,10 @@ export declare function fetchFileDetails({ listFiles, isMetaFile }: {
     listFiles: any;
     isMetaFile: any;
 }): Promise<any>;
-export declare function uploadFile(file: DocumentPickerResponse, { baseUrl, jsessionId, token }: {
+export declare function uploadFile(file: DocumentPickerResponse, { baseUrl, jsessionId, token, returnBase64String }: {
     baseUrl: any;
     jsessionId: any;
     token: any;
+    returnBase64String: any;
 }): Promise<any>;
+export declare function deleteMetaFile(fileId: number): Promise<any>;

package/lib/api/metafile-api.js

@@ -15,7 +15,7 @@
  * 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 { createStandardSearch } from '../apiProviders';
+import { axiosApiProvider, createStandardSearch, } from '../apiProviders';
 import RNFS from 'react-native-fs';
 import RNFetchBlob from 'rn-fetch-blob';
 const createCriteria = (listFiles) => {
@@ -48,13 +48,16 @@ export async function fetchFileDetails({ listFiles, isMetaFile }) {
         page: 0,
     });
 }
-export async function uploadFile(file, { baseUrl, jsessionId, token }) {
+export async function uploadFile(file, { baseUrl, jsessionId, token, returnBase64String }) {
     if (file == null) {
         return;
     }
     return new Promise(async (resolve, reject) => {
         try {
             const base64Data = await RNFS.readFile(file.uri, 'base64');
+            if (returnBase64String) {
+                resolve(`data:${file.type};base64,${base64Data}`);
+            }
             const headers = {
                 'Content-Type': 'application/octet-stream',
                 'Content-Length': String(file.size),
@@ -79,4 +82,9 @@ export async function uploadFile(file, { baseUrl, jsessionId, token }) {
         }
     });
 }
+export async function deleteMetaFile(fileId) {
+    return axiosApiProvider.delete({
+        url: `ws/rest/com.axelor.meta.db.MetaFile/${fileId}`,
+    });
+}
 //# sourceMappingURL=metafile-api.js.map

package/lib/api/metafile-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,oBAAoB,EAAW,MAAM,iBAAiB,CAAC;AAE/D,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,MAAM,cAAc,GAAG,CAAC,SAAS,EAAc,EAAE;IAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,OAAO;YACL;gBACE,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC7B,MAAM,QAAQ,GAAa;wBACzB,SAAS,EAAE,IAAI;wBACf,QAAQ,EAAE,GAAG;wBACb,KAAK,EAAE,IAAI,CAAC,EAAE;qBACf,CAAC;oBAEF,OAAO,QAAQ,CAAC;gBAClB,CAAC,CAAC;aACH;SACF,CAAC;KACH;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC;IAC5D,MAAM,KAAK,GAAG,UAAU;QACtB,CAAC,CAAC,6BAA6B;QAC/B,CAAC,CAAC,2BAA2B,CAAC;IAEhC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC;QACnC,QAAQ,EAAE,eAAe;QACzB,oBAAoB,EAAE,IAAI;QAC1B,IAAI,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAA4B,EAC5B,EAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAC;IAE5B,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO;KACR;IAED,OAAO,IAAI,OAAO,CAAM,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAE3D,MAAM,OAAO,GAAG;gBACd,cAAc,EAAE,0BAA0B;gBAC1C,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBACnC,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBAChC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC1B,cAAc,EAAE,KAAK;gBACrB,MAAM,EAAE,cAAc,KAAK,KAAK,UAAU,EAAE;aAC7C,CAAC;YAEF,MAAM,QAAQ,GAAQ,MAAM,WAAW,CAAC,KAAK,CAC3C,MAAM,EACN,GAAG,OAAO,iBAAiB,EAC3B,OAAO,EACP,UAAU,CACX,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE3C,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACxC,OAAO,CAAC,QAAQ,CAAC,CAAC;aACnB;iBAAM;gBACL,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAC;aACpC;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"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"}

package/lib/apiProviders/utils.d.ts

@@ -4,7 +4,7 @@ export declare const getApiResponseData: (response: any, { isArrayResponse }: {
 export declare const getFirstData: (data: any) => any;
 export declare const handlerError: (message: any, { getState }: {
     getState?: () => void;
-}, { showErrorToast, errorTracing }: errorOptionsProps) => (error: any) => void;
+}, options: any) => (error: any) => any;
 interface ApiHandlerProps {
     fetchFunction: (data: any) => Promise<any>;
     data: any;
@@ -14,12 +14,12 @@ interface ApiHandlerProps {
         showToast?: boolean;
         isArrayResponse?: boolean;
         returnTotal?: boolean;
+        returnResponseMessage?: boolean;
+    };
+    errorOptions?: {
+        showErrorToast?: boolean;
+        errorTracing?: boolean;
     };
-    errorOptions?: errorOptionsProps;
-}
-interface errorOptionsProps {
-    showErrorToast?: boolean;
-    errorTracing?: boolean;
 }
-export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions: { showToast, isArrayResponse, returnTotal, }, errorOptions, }: ApiHandlerProps) => Promise<any>;
+export declare const handlerApiCall: ({ fetchFunction, data, action, getState, responseOptions, errorOptions, }: ApiHandlerProps) => Promise<any>;
 export {};

package/lib/apiProviders/utils.js

@@ -27,6 +27,7 @@ export const getApiResponseData = (response, { isArrayResponse = true }) => {
         : getFirstData(response?.data?.data);
 };
 const getApiResponseMessage = response => response?.data?.messageStatus || response?.statusTxt;
+const getApiResponseCode = response => response?.data?.codeStatus || response?.status;
 const getApiResponseTotal = response => response?.data?.total || 0;
 export const getFirstData = data => {
     if (data instanceof Array) {
@@ -57,17 +58,16 @@ const manageError = (error, action, userId, { showErrorToast = true, errorTracin
                 text2: `${i18nProvider.i18n.t('Base_Failed_To')} ${i18nProvider.i18n.t(action)}: ${message}.`,
             });
         }
+        return error.response;
     }
 };
-export const handlerError = (message, { getState = () => { } }, { showErrorToast, errorTracing }) => {
-    return error => manageError(error, message, getUser({ getState }), {
-        showErrorToast,
-        errorTracing,
-    });
+export const handlerError = (message, { getState = () => { } }, options) => {
+    return error => manageError(error, message, getUser({ getState }), options);
 };
-const manageSucess = (response, action, { showToast = false, isArrayResponse, returnTotal = false }) => {
+const manageSucess = (response, action, { showToast = false, isArrayResponse, returnTotal = false, returnResponseMessage = false, }) => {
     const data = getApiResponseData(response, { isArrayResponse });
     const message = getApiResponseMessage(response);
+    const code = getApiResponseCode(response);
     const total = getApiResponseTotal(response);
     if (showToast) {
         Toast.show({
@@ -78,14 +78,25 @@ const manageSucess = (response, action, { showToast = false, isArrayResponse, re
             text2: `${message ? message : i18nProvider.i18n.t(action)}.`,
         });
     }
-    return returnTotal ? total : data;
+    if (returnResponseMessage) {
+        return { total, data, message, code };
+    }
+    if (returnTotal) {
+        return total;
+    }
+    return data;
 };
-const handlerSuccess = (action, { showToast, isArrayResponse, returnTotal }) => {
-    return response => manageSucess(response, action, { showToast, isArrayResponse, returnTotal });
+const handlerSuccess = (action, options) => {
+    return response => manageSucess(response, action, options);
 };
-export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions: { showToast = false, isArrayResponse = false, returnTotal = false, }, errorOptions = { showErrorToast: true, errorTracing: true }, }) => {
+export const handlerApiCall = ({ fetchFunction, data, action, getState, responseOptions = {
+    showToast: false,
+    isArrayResponse: false,
+    returnTotal: false,
+    returnResponseMessage: false,
+}, errorOptions = { showErrorToast: true, errorTracing: true }, }) => {
     return fetchFunction(data)
         .catch(handlerError(action, { getState }, errorOptions))
-        .then(handlerSuccess(action, { showToast, isArrayResponse, returnTotal }));
+        .then(handlerSuccess(action, responseOptions));
 };
 //# sourceMappingURL=utils.js.map

package/lib/apiProviders/utils.js.map

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

package/lib/app/Module.d.ts

@@ -1,14 +1,27 @@
 /// <reference types="react" />
 import { Reducer } from '@reduxjs/toolkit';
 import { Schema } from 'yup';
-export interface Menu {
+interface MenuBase {
     title: string;
     icon: string;
-    screen: string;
     disabled?: boolean;
     parent?: string;
     order?: number;
 }
+interface MenuWithSubMenus extends MenuBase {
+    subMenus: {
+        [subMenuKey: string]: SubMenu;
+    };
+}
+interface MenuWithScreen extends MenuBase {
+    screen: string;
+}
+interface RootMenuWithScreen extends MenuWithScreen {
+    isDefault?: boolean;
+}
+export type Menu = MenuWithSubMenus | RootMenuWithScreen;
+export interface SubMenu extends MenuWithScreen {
+}
 interface ScreenOptions {
     shadedHeader: boolean;
 }

package/lib/auth/api/user-api.js

@@ -15,10 +15,12 @@
  * 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 { axiosApiProvider } from '../../apiProviders';
+import { axiosApiProvider, createStandardFetch } from '../../apiProviders';
 export async function getLoggedUser(userId) {
-    return axiosApiProvider.get({
-        url: `/ws/rest/com.axelor.auth.db.User/${userId}`,
+    return createStandardFetch({
+        model: 'com.axelor.auth.db.User',
+        id: userId,
+        fieldKey: 'auth_user',
     });
 }
 export async function postUser(user) {

package/lib/auth/api/user-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-api.js","sourceRoot":"","sources":["../../../src/auth/api/user-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAM;IACxC,OAAO,gBAAgB,CAAC,GAAG,CAAC;QAC1B,GAAG,EAAE,oCAAoC,MAAM,EAAE;KAClD,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAI;IACjC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,kCAAkC;QACvC,IAAI,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC;KACnB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"user-api.js","sourceRoot":"","sources":["../../../src/auth/api/user-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEzE,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAM;IACxC,OAAO,mBAAmB,CAAC;QACzB,KAAK,EAAE,yBAAyB;QAChC,EAAE,EAAE,MAAM;QACV,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAI;IACjC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,kCAAkC;QACvC,IAAI,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC;KACnB,CAAC,CAAC;AACL,CAAC"}

package/lib/auth/features/userSlice.js

@@ -34,7 +34,13 @@ export const updateActiveUser = createAsyncThunk('user/updateActiveUser', async
         action: 'Auth_SliceAction_UpdateActiveUser',
         getState,
         responseOptions: { isArrayResponse: false },
-    });
+    }).then(() => handlerApiCall({
+        fetchFunction: getLoggedUser,
+        data: user.id,
+        action: 'Auth_SliceAction_FetchActiveUser',
+        getState,
+        responseOptions: { isArrayResponse: false },
+    }));
 });
 const initialState = {
     loadingUser: true,

package/lib/auth/features/userSlice.js.map

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

package/lib/auth/index.js

@@ -31,6 +31,7 @@ export const authModule = {
             title: 'User_UserProfile',
             icon: 'user',
             screen: 'UserScreen',
+            isDefault: true,
         },
     },
     screens: {

package/lib/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,YAAY;SACrB;KACF;IACD,OAAO,EAAE;QACP,UAAU,EAAE;YACV,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,cAAc,EAAE;YACd,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,cAAc;SAC1B;KACF;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,YAAY;KAChB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,aAAa,EAAC;QAChC,eAAe,EAAE,cAAc;KAChC;CACF,CAAC;AAEF,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC;AACtB,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;SAChB;KACF;IACD,OAAO,EAAE;QACP,UAAU,EAAE;YACV,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,cAAc,EAAE;YACd,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,cAAc;SAC1B;KACF;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,YAAY;KAChB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,aAAa,EAAC;QAChC,eAAe,EAAE,cAAc;KAChC;CACF,CAAC;AAEF,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC;AACtB,cAAc,gCAAgC,CAAC"}

package/lib/auth/models/objectFields.js

@@ -21,5 +21,19 @@ export const auth_modelAPI = {
         code: schemaContructor.string(),
         name: schemaContructor.string(),
     }),
+    auth_user: schemaContructor.object({
+        fullName: schemaContructor.string(),
+        name: schemaContructor.string(),
+        activeCompany: schemaContructor.subObject(),
+        'activeCompany.currency': schemaContructor.subObject(),
+        'activeCompany.currency.symbol': schemaContructor.string(),
+        activeTeam: schemaContructor.subObject(),
+        workshopStockLocation: schemaContructor.subObject(),
+        roles: schemaContructor.array(),
+        group: schemaContructor.subObject(),
+        employee: schemaContructor.subObject(),
+        language: schemaContructor.string(),
+        todayDateT: schemaContructor.string(),
+    }),
 };
 //# sourceMappingURL=objectFields.js.map

package/lib/auth/models/objectFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../../src/auth/models/objectFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAe,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;KAChC,CAAC;CACH,CAAC"}
+{"version":3,"file":"objectFields.js","sourceRoot":"","sources":["../../../src/auth/models/objectFields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAe,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;KAChC,CAAC;IACF,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC/B,aAAa,EAAE,gBAAgB,CAAC,SAAS,EAAE;QAC3C,wBAAwB,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtD,+BAA+B,EAAE,gBAAgB,CAAC,MAAM,EAAE;QAC1D,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACxC,qBAAqB,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnD,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE;QAC/B,KAAK,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnC,QAAQ,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE;KACtC,CAAC;CACH,CAAC"}

package/lib/components/molecules/UploadFileInput/UploadFileInput.d.ts

@@ -1,6 +1,15 @@
 interface UploadFileInputProps {
     style?: any;
-    onUpload?: (file: any) => void;
+    title?: string;
+    defaultValue?: string | any;
+    onUpload?: (file?: any) => void;
+    returnBase64String?: boolean;
+    required?: boolean;
+    readonly?: boolean;
+    documentTypesAllowed?: 'images' | 'pdf' | 'allFiles';
+    canDeleteFile?: boolean;
+    displayPreview?: boolean;
+    maxSize?: number;
 }
-declare const UploadFileInput: ({ style, onUpload, }: UploadFileInputProps) => JSX.Element;
+declare const UploadFileInput: ({ style, title, defaultValue, onUpload, returnBase64String, required, readonly, documentTypesAllowed, canDeleteFile, displayPreview, maxSize, }: UploadFileInputProps) => JSX.Element;
 export default UploadFileInput;

package/lib/components/molecules/UploadFileInput/UploadFileInput.js

@@ -15,24 +15,57 @@
  * 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, { useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useSelector } from 'react-redux';
 import DocumentPicker from 'react-native-document-picker';
-import { CircleButton, Text } from '@axelor/aos-mobile-ui';
-import { uploadFile } from '../../../api/metafile-api';
+import { CircleButton, Text, getCommonStyles, useThemeColor, Image, } from '@axelor/aos-mobile-ui';
+import { deleteMetaFile, uploadFile } from '../../../api/metafile-api';
 import { useTranslator } from '../../../i18n';
-const UploadFileInput = ({ style, onUpload = console.log, }) => {
+import { openFileInExternalApp } from '../../../tools';
+const DEFAULT_MAX_FILE_SIZE = 5000000;
+const isMetaFile = file => {
+    return (typeof file === 'object' &&
+        file?.id != null &&
+        file?.version != null &&
+        file?.fileName != null);
+};
+const formatFileSize = (size) => {
+    const _size = Math.abs(size);
+    const labels = ['octets', 'ko', 'Mo', 'Go', 'To'];
+    for (let i = 0; i < labels.length; i++) {
+        if (_size < Math.pow(1000, i)) {
+            return (_size / Math.pow(1000, i - 1)).toFixed(2) + ' ' + labels[i - 1];
+        }
+    }
+};
+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, }) => {
     const I18n = useTranslator();
+    const Colors = useThemeColor();
     const { baseUrl, token, jsessionId } = useSelector((state) => state.auth);
-    const [selectedFile, setSelectedFile] = useState(null);
+    const [selectedFile, setSelectedFile] = useState(defaultValue);
+    const [sizeError, setSizeError] = useState(false);
+    const _required = useMemo(() => required && selectedFile == null, [required, selectedFile]);
+    const _maxFileSize = useMemo(() => {
+        if (maxSize == null) {
+            return DEFAULT_MAX_FILE_SIZE;
+        }
+        return maxSize;
+    }, [maxSize]);
+    const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
+    const styles = useMemo(() => getStyles(Colors, _required), [Colors, _required]);
     const handleDocumentPick = async () => {
         try {
             const file = await DocumentPicker.pickSingle({
-                type: [DocumentPicker.types.allFiles, DocumentPicker.types.images],
+                type: DocumentPicker.types[documentTypesAllowed],
             });
-            setSelectedFile(file);
-            handleFileUpload(file);
+            if (file.size < _maxFileSize) {
+                setSizeError(false);
+                handleFileUpload(file);
+            }
+            else {
+                setSizeError(true);
+            }
         }
         catch (error) {
             console.log('Document picking error:', error);
@@ -40,31 +73,107 @@ const UploadFileInput = ({ style, onUpload = console.log, }) => {
     };
     const handleFileUpload = async (file) => {
         try {
-            const response = await uploadFile(file, { baseUrl, token, jsessionId });
+            const response = await uploadFile(file, {
+                baseUrl,
+                token,
+                jsessionId,
+                returnBase64String,
+            });
+            setSelectedFile(returnBase64String
+                ? { ...file, base64: response }
+                : { ...file, ...response });
             onUpload(response);
         }
         catch (error) {
             console.log('Could not upload the file:', error);
         }
     };
+    const handleFileDelete = async () => {
+        if (isMetaFile(selectedFile)) {
+            try {
+                await deleteMetaFile(selectedFile?.id);
+                onUpload();
+            }
+            catch (error) {
+                console.log('Could not delete the file:', error);
+            }
+        }
+        setSelectedFile(null);
+    };
+    const handleFileView = async () => {
+        await openFileInExternalApp({
+            fileName: selectedFile?.fileName,
+            id: selectedFile?.id,
+            isMetaFile: true,
+        }, { baseUrl: baseUrl, token: token, jsessionId: jsessionId }, I18n);
+    };
+    useEffect(() => {
+        setSelectedFile(defaultValue);
+    }, [defaultValue]);
     return (<View style={[styles.container, style]}>
-      <Text style={styles.fileName}>
-        {selectedFile ? selectedFile.name : I18n.t('Base_ChooseFile')}
-      </Text>
-      <CircleButton iconName="plus" size={30} onPress={handleDocumentPick}/>
+      <Text style={styles.title}>{title}</Text>
+      <View style={[
+            commonStyles.filter,
+            commonStyles.filterSize,
+            commonStyles.filterAlign,
+            styles.content,
+        ]}>
+        {displayPreview && selectedFile != null ? (<Image imageSize={styles.imageSize} resizeMode="contain" source={isMetaFile(selectedFile)
+                ? {
+                    uri: `${baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${selectedFile?.id}/content/download`,
+                }
+                : { uri: selectedFile?.base64 }} defaultIconSize={60}/>) : null}
+        <Text style={styles.fileName} numberOfLines={1}>
+          {selectedFile ? selectedFile.name : I18n.t('Base_ChooseFile')}
+        </Text>
+        <View style={styles.buttons}>
+          {canDeleteFile && selectedFile != null && !readonly && (<CircleButton iconName="times" size={30} onPress={handleFileDelete} style={styles.action}/>)}
+          {isMetaFile(selectedFile) && (<CircleButton iconName="expand-alt" size={30} onPress={handleFileView} style={styles.action}/>)}
+          {selectedFile == null && !readonly && (<CircleButton iconName="plus" size={30} onPress={handleDocumentPick} style={styles.action}/>)}
+        </View>
+      </View>
+      {sizeError && (<Text textColor={Colors.errorColor.background} style={styles.error}>
+          {I18n.t('Base_FileSizeUploadError', {
+                maxSize: formatFileSize(_maxFileSize),
+            })}
+        </Text>)}
     </View>);
 };
-const styles = StyleSheet.create({
+const getStyles = (Colors, _required) => StyleSheet.create({
     container: {
+        width: '90%',
+        alignSelf: 'center',
+    },
+    content: {
         width: '100%',
+        borderColor: _required
+            ? Colors.errorColor.background
+            : Colors.secondaryColor.background,
+        borderWidth: 1,
+        marginHorizontal: 0,
+        height: null,
+        minHeight: 40,
+    },
+    title: {
+        marginLeft: 10,
+    },
+    fileName: {
+        width: '60%',
+    },
+    buttons: {
         flexDirection: 'row',
-        justifyContent: 'space-between',
+        justifyContent: 'space-around',
         alignItems: 'center',
-        marginVertical: 5,
-        paddingHorizontal: 18,
     },
-    fileName: {
-        width: '90%',
+    action: {
+        marginHorizontal: 2,
+    },
+    imageSize: {
+        height: 60,
+        width: 60,
+    },
+    error: {
+        marginLeft: 5,
     },
 });
 export default UploadFileInput;

package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,cAEN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAC,YAAY,EAAE,IAAI,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAO5C,MAAM,eAAe,GAAG,CAAC,EACvB,KAAK,EACL,QAAQ,GAAG,OAAO,CAAC,GAAG,GACD,EAAE,EAAE;IACzB,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,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,IAAI,CAAC,CAAC;IAEvD,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;QACpC,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC;gBAC3C,IAAI,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;aACnE,CAAC,CAAC;YAEH,eAAe,CAAC,IAAI,CAAC,CAAC;YAEtB,gBAAgB,CAAC,IAAI,CAAC,CAAC;SACxB;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,EAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAC,CAAC,CAAC;YACtE,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,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,QAAQ,CAAC,CAC3B;QAAA,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAC/D;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,kBAAkB,CAAC,EACtE;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,KAAK,EAAE,MAAM;QACb,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,eAAe;QAC/B,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,CAAC;QACjB,iBAAiB,EAAE,EAAE;KACtB;IACD,QAAQ,EAAE;QACR,KAAK,EAAE,KAAK;KACb;CACF,CAAC,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"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"}

package/lib/components/organisms/DateInput/DateInput.d.ts

@@ -6,6 +6,7 @@ interface DateInputProps {
     onDateChange: (date: Date) => void;
     style?: any;
     readonly?: boolean;
+    required?: boolean;
 }
-declare const DateInput: ({ title, defaultDate, mode, nullable, onDateChange, style, readonly, }: DateInputProps) => JSX.Element;
+declare const DateInput: ({ title, defaultDate, mode, nullable, onDateChange, style, readonly, required, }: DateInputProps) => JSX.Element;
 export default DateInput;

package/lib/components/organisms/DateInput/DateInput.js

@@ -22,18 +22,16 @@ import { Card, getCommonStyles, Icon, RightIconButton, Text, useClickOutside, us
 import { DatePicker } from '../../molecules';
 import DateInputUtils from './date-input.helper';
 const ACTION_ICON_SIZE = 30;
-const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, onDateChange, style, readonly = false, }) => {
+const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, onDateChange, style, readonly = false, required = false, }) => {
     const Colors = useThemeColor();
     const I18n = useTranslator();
     const currentDate = useMemo(() => new Date(), []);
     const [pickerWidth, setPickerWidth] = useState();
     const [pickerIsOpen, setPickerIsOpen] = useState(false);
     const [selectedDate, setSelectedDate] = useState(defaultDate);
-    const [isFocused, setIsFocused] = useState(false);
+    const _required = useMemo(() => required && selectedDate == null, [required, selectedDate]);
     useEffect(() => {
-        if (defaultDate) {
-            setSelectedDate(defaultDate);
-        }
+        setSelectedDate(defaultDate);
     }, [defaultDate]);
     const wrapperRef = useRef(null);
     const clickOutside = useClickOutside({
@@ -43,13 +41,11 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
     useEffect(() => {
         if (clickOutside === OUTSIDE_INDICATOR && pickerIsOpen) {
             setPickerIsOpen(false);
-            setIsFocused(false);
         }
     }, [clickOutside, pickerIsOpen]);
     const togglePicker = () => {
         if (!readonly) {
             setPickerIsOpen(current => !current);
-            setIsFocused(current => !current);
         }
     };
     const onCheckDate = useCallback(() => {
@@ -67,8 +63,8 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
         setSelectedDate(null);
         setPickerIsOpen(false);
     }, []);
-    const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
-    const styles = useMemo(() => getStyles(Colors), [Colors]);
+    const commonStyles = useMemo(() => getCommonStyles(Colors, _required), [Colors, _required]);
+    const styles = useMemo(() => getStyles(Colors, pickerIsOpen, _required), [Colors, pickerIsOpen, _required]);
     return (<View ref={wrapperRef} style={[styles.container, style]}>
       <Text style={styles.title}>{title}</Text>
       <RightIconButton onPress={togglePicker} icon={!readonly && (<Icon name={DateInputUtils.getIconName(mode)} color={Colors.secondaryColor_dark.background}/>)} title={selectedDate
@@ -78,7 +74,7 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
             commonStyles.filterSize,
             commonStyles.filterAlign,
             styles.rightIconButton,
-            isFocused && commonStyles.inputFocused,
+            pickerIsOpen && commonStyles.inputFocused,
         ]}/>
       <View>
         {pickerIsOpen ? (<Card style={styles.selectionContainer}>
@@ -96,7 +92,7 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
       </View>
     </View>);
 };
-const getStyles = Colors => StyleSheet.create({
+const getStyles = (Colors, pickerIsOpen, required) => StyleSheet.create({
     actionButton: {
         marginLeft: 10,
     },
@@ -112,7 +108,9 @@ const getStyles = Colors => StyleSheet.create({
         flex: 1,
     },
     rightIconButton: {
-        borderColor: Colors.secondaryColor.background,
+        borderColor: required
+            ? Colors.errorColor.background
+            : Colors.secondaryColor.background,
         borderWidth: 1,
         marginLeft: 0,
         width: '100%',