@axelor/aos-mobile-core 8.5.20 → 8.5.22

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

@@ -15,107 +15,127 @@
  * 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 { checkNullString } from '../../utils';
+import { axiosApiProvider, createStandardSearch, } from '../../apiProviders';
+const CACHE_KEY_SEPARATOR = '#';
+const modelMetaCaches = new Map();
+/**
+ * Model metadata only changes when the instance is redeployed, so each request is
+ * sent once per key for the whole session and every caller shares its result.
+ * Storing the promise also deduplicates concurrent callers, and a failed request
+ * is dropped from the cache to stay retryable.
+ */
+const cachedRequest = (cacheName, key, request) => {
+    let cache = modelMetaCaches.get(cacheName);
+    if (cache == null) {
+        cache = new Map();
+        modelMetaCaches.set(cacheName, cache);
+    }
+    const cached = cache.get(key);
+    if (cached != null)
+        return cached;
+    const _cache = cache;
+    const pending = request().catch(error => {
+        _cache.delete(key);
+        console.warn(error);
+        return undefined;
+    });
+    cache.set(key, pending);
+    return pending;
+};
+/**
+ * Drops the cached metadata of the given model, or of every model when none is
+ * given. Called on logout so that a new session never reads the metadata of the
+ * previous one, and available to force a refresh after a studio update.
+ */
+export function clearModelMetaCaches(modelName) {
+    modelMetaCaches.forEach(cache => {
+        if (modelName == null) {
+            cache.clear();
+            return;
+        }
+        cache.forEach((_, key) => {
+            if (key === modelName ||
+                key.startsWith(modelName + CACHE_KEY_SEPARATOR)) {
+                cache.delete(key);
+            }
+        });
+    });
+}
 const createJsonFieldsOfModelCriteria = (modelName, type) => {
     const criteria = [
-        {
-            fieldName: 'model',
-            operator: '=',
-            value: modelName,
-        },
-        {
-            fieldName: 'isVisibleInMobileApp',
-            operator: '=',
-            value: true,
-        },
+        { fieldName: 'model', operator: '=', value: modelName },
+        { fieldName: 'isVisibleInMobileApp', operator: '=', value: true },
     ];
     if (type != null) {
-        criteria.push({
-            fieldName: 'modelField',
-            operator: '=',
-            value: type,
-        });
+        criteria.push({ fieldName: 'modelField', operator: '=', value: type });
     }
     return criteria;
 };
-export async function fetchJsonFieldsOfModel({ modelName, type, }) {
-    if (modelName == null) {
+const EMPTY_ROLES_DOMAIN = 'self.roles IS EMPTY';
+const ROLES_DOMAIN = `${EMPTY_ROLES_DOMAIN} OR EXISTS (SELECT 1 FROM MetaJsonField _field ` +
+    'JOIN _field.roles _role WHERE _field.id = self.id ' +
+    'AND _role.id IN (:userRoleIds))';
+export async function fetchJsonFieldsOfModel({ modelName, type, userRoleIds, }) {
+    if (modelName == null)
         return null;
-    }
-    return axiosApiProvider.post({
-        url: 'ws/rest/com.axelor.meta.db.MetaJsonField/search',
-        data: {
-            data: {
-                operator: 'and',
-                criteria: createJsonFieldsOfModelCriteria(modelName, type),
-            },
-            limit: 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({
+        model: 'com.axelor.meta.db.MetaJsonField',
+        criteria: createJsonFieldsOfModelCriteria(modelName, type),
+        domain: !isFiltered
+            ? undefined
+            : hasRoles
+                ? ROLES_DOMAIN
+                : EMPTY_ROLES_DOMAIN,
+        domainContext: hasRoles ? { userRoleIds } : undefined,
+        fieldKey: 'core_metaJsonField',
+        page: 0,
+        numberElementsByPage: null,
+        provider: 'model',
+    }));
 }
 export async function fetchObject({ modelName, id, }) {
-    if (modelName == null || id == null) {
+    if (modelName == null || id == null)
         return null;
-    }
-    return axiosApiProvider.get({
-        url: `ws/rest/${modelName}/${id}`,
-    });
+    return axiosApiProvider.get({ url: `ws/rest/${modelName}/${id}` });
 }
 export async function fetchObjectModelTypes({ modelName }) {
-    if (modelName == null) {
+    if (modelName == null)
         return null;
-    }
-    return axiosApiProvider.post({
-        url: 'ws/rest/com.axelor.meta.db.MetaField/search',
-        data: {
-            data: {
-                operator: 'and',
-                criteria: [
-                    {
-                        fieldName: 'metaModel.fullName',
-                        operator: '=',
-                        value: modelName,
-                    },
-                    {
-                        fieldName: 'json',
-                        operator: '=',
-                        value: true,
-                    },
-                ],
-            },
-            limit: null,
-        },
-    });
+    return cachedRequest('objectModelTypes', modelName, () => createStandardSearch({
+        model: 'com.axelor.meta.db.MetaField',
+        criteria: [
+            { fieldName: 'metaModel.fullName', operator: '=', value: modelName },
+            { fieldName: 'json', operator: '=', value: true },
+        ],
+        fieldKey: 'core_metaField',
+        page: 0,
+        numberElementsByPage: null,
+        provider: 'model',
+    }));
 }
 export async function updateJsonFieldsObject({ modelName, id, version, values, }) {
-    if (modelName == null || id == null) {
+    if (modelName == null || id == null)
         return null;
-    }
     return axiosApiProvider.post({
         url: `ws/rest/${modelName}`,
-        data: {
-            data: {
-                id: id,
-                version: version,
-                ...values,
-            },
-        },
+        data: { data: { id, version, ...values } },
     });
 }
 export async function fetchData({ modelName, domain, searchValue = null, page = 0, criteria = [], searchFields, }) {
-    if (modelName == null) {
+    if (modelName == null)
         return null;
-    }
     let combinedCriteria = [...criteria];
-    if (searchValue != null) {
-        const searchCriteria = searchFields.map(_field => ({
-            fieldName: _field,
-            operator: 'like',
-            value: searchValue,
-        }));
+    if (searchValue != null && searchFields != null) {
         combinedCriteria.push({
-            criteria: searchCriteria,
             operator: 'or',
+            criteria: searchFields.map(_field => ({
+                fieldName: _field,
+                operator: 'like',
+                value: searchValue,
+            })),
         });
     }
     return axiosApiProvider
@@ -135,35 +155,74 @@ export async function fetchData({ modelName, domain, searchValue = null, page =
         .then(res => res?.data?.data);
 }
 export async function fetchMetaConfig({ modelName, }) {
-    if (modelName == null) {
-        return null;
-    }
-    return axiosApiProvider
-        .get({
-        url: `ws/meta/fields/${modelName}`,
-    })
-        .catch(console.warn);
+    if (modelName == null)
+        return undefined;
+    return cachedRequest('metaConfig', modelName, () => axiosApiProvider.get({ url: `ws/meta/fields/${modelName}` }));
 }
 export async function fetchModelFields({ modelName, }) {
-    if (modelName == null) {
-        return null;
-    }
+    if (modelName == null)
+        return undefined;
     return fetchMetaConfig({ modelName })
         .then(res => res?.data?.data)
         .then(res => res?.fields)
         .then(_fields => {
-        if (!Array.isArray(_fields)) {
+        if (!Array.isArray(_fields))
             return [];
-        }
         return _fields.filter(_item => _item.nameColumn);
     })
         .then(targetFields => targetFields.map(_item => _item.name))
         .then(res => (res.length > 0 ? res : ['name']));
 }
+const buildSelectionMap = (items) => {
+    const mapOfSelection = new Map();
+    if (!Array.isArray(items))
+        return {};
+    items.forEach(_item => {
+        const selectionName = _item?.select?.name;
+        if (selectionName == null)
+            return;
+        let options = mapOfSelection.get(selectionName);
+        if (options == null) {
+            options = new Map();
+            mapOfSelection.set(selectionName, options);
+        }
+        if (_item.hidden === true) {
+            options.delete(_item.value);
+        }
+        else {
+            options.set(_item.value, _item);
+        }
+    });
+    const result = {};
+    mapOfSelection.forEach((_options, _selectionName) => {
+        result[_selectionName] = [..._options.values()]
+            .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
+            .map(_option => ({
+            title: _option?.title,
+            value: _option?.value,
+        }));
+    });
+    return result;
+};
+export async function fetchSelectionMap({ modelName, selections, }) {
+    if (modelName == null || !Array.isArray(selections))
+        return {};
+    const names = selections.filter((_name, _index, _self) => !checkNullString(_name) && _self.indexOf(_name) === _index);
+    if (names.length === 0)
+        return {};
+    return cachedRequest('selectionMap', modelName, () => createStandardSearch({
+        model: 'com.axelor.meta.db.MetaSelectItem',
+        criteria: [{ fieldName: 'select.name', operator: 'in', value: names }],
+        fieldKey: 'core_metaSelectItem',
+        sortKey: 'core_metaSelectItem',
+        page: 0,
+        numberElementsByPage: null,
+        provider: 'model',
+    })).then(res => buildSelectionMap(res?.data?.data));
+}
 export async function fetchSelectionOptions({ modelName, attrsPanelName, fieldName, }) {
-    if (modelName == null) {
-        return null;
-    }
+    if (modelName == null)
+        return [];
     return fetchMetaConfig({ modelName })
         .then(res => res?.data?.data)
         .then(res => res?.jsonFields)
@@ -171,9 +230,8 @@ export async function fetchSelectionOptions({ modelName, attrsPanelName, fieldNa
         .then(_panel => _panel?.[fieldName])
         .then(_field => _field?.selectionList)
         .then(_selection => {
-        if (!Array.isArray(_selection)) {
+        if (!Array.isArray(_selection))
             return [];
-        }
         return _selection
             .sort((a, b) => a.order - b.order)
             .map(_item => ({

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,6 +1,6 @@
 import { ThemeColors } from '@axelor/aos-mobile-ui';
 import { Field, JSONObject, Panel } from '../types';
-export declare const mapStudioFields: (items: any[], Colors: ThemeColors, removeUnauthorizedFields?: (item: any) => any) => {
+export declare const mapStudioFields: (items: any[], Colors: ThemeColors, selectionMap?: JSONObject<any[]>) => {
     panels: JSONObject<Panel>;
     fields: JSONObject<Field>;
     defaults: any;

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

@@ -15,10 +15,11 @@
  * 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 { HorizontalRule, Label } from '@axelor/aos-mobile-ui';
+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, removeUnauthorizedFields = _i => _i) => {
+export const mapStudioFields = (items, Colors, selectionMap = {}) => {
     let formFields = {};
     let formPanels = {};
     let defaults = {};
@@ -29,7 +30,7 @@ export const mapStudioFields = (items, Colors, removeUnauthorizedFields = _i =>
             .filter((item, index, self) => self.indexOf(item) === index)
             .sort();
         for (const modelField of modelFields) {
-            const { _fields, _panels, _defaults } = manageContentOfModel(metaJsonFields, modelField, Colors, removeUnauthorizedFields);
+            const { _fields, _panels, _defaults } = manageContentOfModel(metaJsonFields, modelField, Colors, selectionMap);
             formFields = { ...formFields, ..._fields };
             formPanels = { ...formPanels, ..._panels };
             defaults = { ...defaults, ..._defaults };
@@ -77,7 +78,7 @@ const mapStudioTypeToInputType = (type) => {
     }
 };
 const mapStudioWidgetToWidget = (widget) => {
-    let result = { widget: undefined, inputType: undefined };
+    let result = {};
     switch (widget) {
         case 'Email':
             result.inputType = 'email';
@@ -105,6 +106,15 @@ const mapStudioWidgetToWidget = (widget) => {
 const getWidgetAttrs = (item) => {
     return item?.widgetAttrs == null ? null : JSON.parse(item.widgetAttrs);
 };
+const getColSpan = (widgetAttrs) => {
+    const colSpan = parseInt(widgetAttrs?.colSpan, 10);
+    if (Number.isNaN(colSpan) || colSpan <= 0)
+        return undefined;
+    return Math.min(colSpan, DEFAULT_COLSPAN);
+};
+const isNarrowColSpan = (colSpan) => {
+    return colSpan != null && colSpan < DEFAULT_COLSPAN;
+};
 const BootstrapMapper = {
     error: ['warning'],
     danger: ['danger'],
@@ -113,9 +123,11 @@ const BootstrapMapper = {
     light: ['light', 'secondary'],
     dark: ['dark'],
 };
-const mapStudioCSSToLabelOptions = (item, Colors) => {
-    const css = getWidgetAttrs(item)?.css;
+const mapStudioCSSToLabelOptions = (widgetAttrs, Colors) => {
+    const css = widgetAttrs?.css;
     let result = {};
+    if (checkNullString(css))
+        return result;
     Object.entries(BootstrapMapper).forEach(([key, values]) => {
         if (Array.isArray(values) && values.some(_item => css.includes(_item))) {
             if (key === 'light') {
@@ -131,39 +143,39 @@ const mapStudioCSSToLabelOptions = (item, Colors) => {
     });
     return result;
 };
-const isPanelCollapsible = (item) => {
-    return getWidgetAttrs(item)?.canCollapse;
+const isPanelCollapsible = (widgetAttrs) => {
+    return widgetAttrs?.canCollapse;
 };
-const isPanelTab = (item) => {
-    return getWidgetAttrs(item)?.tab;
+const isPanelTab = (widgetAttrs) => {
+    return widgetAttrs?.tab;
 };
-const isMultiLinesInput = (item) => {
-    return getWidgetAttrs(item)?.multiline;
+const isMultiLinesInput = (widgetAttrs) => {
+    return widgetAttrs?.multiline;
 };
-const hasPanelTitle = (item) => {
-    return (isPanelCollapsible(item) ||
-        isPanelTab(item) ||
-        !getWidgetAttrs(item)?.showTitle);
+const hasPanelTitle = (widgetAttrs) => {
+    return (isPanelCollapsible(widgetAttrs) ||
+        isPanelTab(widgetAttrs) ||
+        !widgetAttrs?.showTitle);
 };
-const manageContentOfModel = (metaJsonFields, modelField, Colors, removeUnauthorizedFields) => {
+const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap) => {
     const formFields = {};
     const formPanels = {};
     const defaults = {};
     let lastPanel;
     metaJsonFields
-        .sort((a, b) => a.sequence - b.sequence)
         .filter(_item => _item.modelField === modelField)
-        .map(removeUnauthorizedFields)
+        .sort((a, b) => a.sequence - b.sequence)
         .forEach(item => {
+        const widgetAttrs = getWidgetAttrs(item);
         switch (item.type) {
             case 'panel':
                 lastPanel = item.name;
                 formPanels[item.name] = {
-                    titleKey: hasPanelTitle(item) ? item.title : null,
+                    titleKey: hasPanelTitle(widgetAttrs) ? item.title : null,
                     order: item.sequence,
-                    colSpan: 12,
-                    direction: 'column',
-                    isCollapsible: isPanelCollapsible(item),
+                    colSpan: getColSpan(widgetAttrs) ?? DEFAULT_COLSPAN,
+                    direction: 'row',
+                    isCollapsible: isPanelCollapsible(widgetAttrs),
                     readonly: item.readonly,
                     readonlyIf: createFormulaFunction(item.readonlyIf),
                     hideIf: item.hidden
@@ -175,8 +187,8 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, removeUnauthor
                 formPanels[item.name] = {
                     titleKey: item.title,
                     order: item.sequence,
-                    colSpan: 12,
-                    direction: 'column',
+                    colSpan: getColSpan(widgetAttrs) ?? DEFAULT_COLSPAN,
+                    direction: 'row',
                 };
                 break;
             case 'label':
@@ -184,13 +196,14 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, removeUnauthor
                     titleKey: item.title,
                     type: 'string',
                     order: item.sequence,
+                    colSpan: getColSpan(widgetAttrs),
                     parentPanel: lastPanel,
                     widget: 'custom',
                     hideIf: () => item.hidden,
                     customComponent: () => Label({
                         message: item.title,
                         type: 'info',
-                        ...mapStudioCSSToLabelOptions(item, Colors),
+                        ...mapStudioCSSToLabelOptions(widgetAttrs, Colors),
                     }),
                 };
                 break;
@@ -216,6 +229,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, removeUnauthor
                     titleKey: item.title,
                     type: 'object',
                     order: item.sequence,
+                    colSpan: getColSpan(widgetAttrs),
                     parentPanel: lastPanel,
                     widget: 'custom',
                     hideIf: () => item.hidden,
@@ -241,6 +255,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, removeUnauthor
                         ? () => true
                         : createFormulaFunction(combinedFormula('||', item.hideIf, reverseFormula(item.showIf))),
                     order: item.sequence,
+                    colSpan: getColSpan(widgetAttrs),
                     parentPanel: lastPanel,
                     widget: widget,
                 };
@@ -253,15 +268,21 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, removeUnauthor
                 if (item.type === 'decimal' && item.scale != null) {
                     config.options = { scale: item.scale };
                 }
-                if (isMultiLinesInput(item)) {
+                if (isMultiLinesInput(widgetAttrs)) {
                     config.options = { multiline: true, adjustHeightWithLines: true };
                 }
-                if (item.isSelectionField) {
+                if (item.isSelectionField || !checkNullString(item.selection)) {
                     config.widget = 'custom';
                     config.customComponent = CustomPicker;
-                    config.options = { item };
+                    config.options = {
+                        item,
+                        selection: selectionMap?.[item.selection],
+                        multiLineLabels: isNarrowColSpan(config.colSpan),
+                        popup: isNarrowColSpan(config.colSpan),
+                    };
                 }
                 if (fieldType === 'array') {
+                    config.colSpan = undefined;
                     config.widget = 'custom';
                     config.customComponent = CustomTagList;
                     config.options = {
@@ -270,9 +291,11 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, removeUnauthor
                 }
                 if (fieldType === 'object') {
                     if (widget === 'signature') {
+                        config.colSpan = undefined;
                         config.options = { popup: true };
                     }
                     else if (widget === 'file') {
+                        config.colSpan = undefined;
                         config.options = { returnBase64String: false };
                     }
                     else {

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":"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"}

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

@@ -1,7 +1,11 @@
 export declare const mapStudioFieldsWithFormula: (fields: any[], object: any) => any[];
-export declare const getAttrsValue: (object: Object, fieldType?: string) => any;
+export declare const getAttrsValue: (object: {
+    [key: string]: string;
+}, fieldType?: 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;
 export declare const reverseFormula: (formula: string | undefined) => string | undefined;
-export declare const manageDependsOnFormula: (formula: string, fields: any[]) => {};
+export declare const manageDependsOnFormula: (formula: string, fields: any[]) => {
+    [key: string]: any;
+};