@axelor/aos-mobile-core 8.4.18 → 8.4.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/aop-filter-api.d.ts +3 -0
- package/lib/api/aop-filter-api.js +7 -4
- package/lib/api/aop-filter-api.js.map +1 -1
- package/lib/api/index.d.ts +1 -1
- package/lib/api/index.js +1 -1
- package/lib/api/index.js.map +1 -1
- package/lib/apiProviders/Action/ActionApiProvider.d.ts +1 -1
- package/lib/apiProviders/Action/AosActionApi.d.ts +1 -1
- package/lib/apiProviders/Action/utils.d.ts +1 -1
- package/lib/apiProviders/Standard/requests.helper.js +1 -1
- package/lib/apiProviders/Standard/requests.helper.js.map +1 -1
- package/lib/components/organisms/PopupFilters/PopupFilters.js +7 -10
- package/lib/components/organisms/PopupFilters/PopupFilters.js.map +1 -1
- package/lib/components/organisms/PopupPrintTemplate/PopupPrintTemplate.js +4 -7
- package/lib/components/organisms/PopupPrintTemplate/PopupPrintTemplate.js.map +1 -1
- package/lib/forms/api.helpers.d.ts +3 -3
- package/lib/forms/studio/formula.helpers.d.ts +3 -5
- package/lib/forms/studio/formula.helpers.js +8 -4
- package/lib/forms/studio/formula.helpers.js.map +1 -1
- package/lib/header/FilterProvider.d.ts +1 -0
- package/lib/header/FilterProvider.js.map +1 -1
- package/lib/header/hooks.js +23 -10
- package/lib/header/hooks.js.map +1 -1
- package/lib/header/types.d.ts +4 -0
- package/lib/hooks/use-mass-scanner.js +6 -4
- package/lib/hooks/use-mass-scanner.js.map +1 -1
- package/lib/navigator/components/header/HeaderOptionMenu.js +22 -2
- package/lib/navigator/components/header/HeaderOptionMenu.js.map +1 -1
- package/package.json +3 -3
|
@@ -44,10 +44,7 @@ export async function fetchDefaultFilters({ modelName, options, }) {
|
|
|
44
44
|
return axiosApiProvider.post({
|
|
45
45
|
url: `/ws/meta/view`,
|
|
46
46
|
data: {
|
|
47
|
-
data: {
|
|
48
|
-
type: 'search-filters',
|
|
49
|
-
...(options != null && options),
|
|
50
|
-
},
|
|
47
|
+
data: { type: 'search-filters', name: options?.name },
|
|
51
48
|
model: modelName,
|
|
52
49
|
},
|
|
53
50
|
});
|
|
@@ -60,4 +57,10 @@ export async function fetchMetaFilters({ page = 0, filterName, userId }) {
|
|
|
60
57
|
page,
|
|
61
58
|
});
|
|
62
59
|
}
|
|
60
|
+
export async function fetchViewContext({ actionViewName, }) {
|
|
61
|
+
return axiosApiProvider.post({
|
|
62
|
+
url: `/ws/action/${actionViewName}`,
|
|
63
|
+
data: { model: 'com.axelor.meta.db.MetaAction' },
|
|
64
|
+
});
|
|
65
|
+
}
|
|
63
66
|
//# sourceMappingURL=aop-filter-api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aop-filter-api.js","sourceRoot":"","sources":["../../src/api/aop-filter-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,oBAAoB,GAErB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,yBAAyB,GAAG,CAAC,EAAC,UAAU,EAAE,MAAM,EAAC,EAAc,EAAE;IACrE,OAAO;QACL;YACE,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,UAAU;SAClB;QACD;YACE,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE;gBACR;oBACE,SAAS,EAAE,QAAQ;oBACnB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,IAAI;iBACZ;gBACD;oBACE,SAAS,EAAE,SAAS;oBACpB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,MAAM;iBACd;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACxC,SAAS,EACT,OAAO,GAIR;IACC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,eAAe;QACpB,IAAI,EAAE;YACJ,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"aop-filter-api.js","sourceRoot":"","sources":["../../src/api/aop-filter-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,oBAAoB,GAErB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,yBAAyB,GAAG,CAAC,EAAC,UAAU,EAAE,MAAM,EAAC,EAAc,EAAE;IACrE,OAAO;QACL;YACE,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,UAAU;SAClB;QACD;YACE,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE;gBACR;oBACE,SAAS,EAAE,QAAQ;oBACnB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,IAAI;iBACZ;gBACD;oBACE,SAAS,EAAE,SAAS;oBACpB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,MAAM;iBACd;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACxC,SAAS,EACT,OAAO,GAIR;IACC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,eAAe;QACpB,IAAI,EAAE;YACJ,IAAI,EAAE,EAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC;YACnD,KAAK,EAAE,SAAS;SACjB;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAC,IAAI,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,EAAC;IACnE,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,yBAAyB,CAAC,EAAC,UAAU,EAAE,MAAM,EAAC,CAAC;QACzD,QAAQ,EAAE,iBAAiB;QAC3B,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,cAAc,GAGf;IACC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,cAAc,cAAc,EAAE;QACnC,IAAI,EAAE,EAAC,KAAK,EAAE,+BAA+B,EAAC;KAC/C,CAAC,CAAC;AACL,CAAC"}
|
package/lib/api/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { fetchAnomalies } from './anomaly-api';
|
|
2
|
-
export { fetchDefaultFilters, fetchMetaFilters } from './aop-filter-api';
|
|
2
|
+
export { fetchDefaultFilters, fetchMetaFilters, fetchViewContext, } from './aop-filter-api';
|
|
3
3
|
export { getAppConfig } from './app-config-api';
|
|
4
4
|
export { getAllCurrencies } from './currency-api';
|
|
5
5
|
export { ejectAxios, getActiveUserInfo, initAxiosWithHeaders, loginApi, logoutApi, } from './login-api';
|
package/lib/api/index.js
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
export { fetchAnomalies } from './anomaly-api';
|
|
19
|
-
export { fetchDefaultFilters, fetchMetaFilters } from './aop-filter-api';
|
|
19
|
+
export { fetchDefaultFilters, fetchMetaFilters, fetchViewContext, } from './aop-filter-api';
|
|
20
20
|
export { getAppConfig } from './app-config-api';
|
|
21
21
|
export { getAllCurrencies } from './currency-api';
|
|
22
22
|
export { ejectAxios, getActiveUserInfo, initAxiosWithHeaders, loginApi, logoutApi, } from './login-api';
|
package/lib/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,oBAAoB,EACpB,QAAQ,EACR,SAAS,GACV,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,UAAU,GACX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AACvC,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,sBAAsB,IAAI,yBAAyB,GACpD,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,UAAU,IAAI,aAAa,EAAC,MAAM,YAAY,CAAC"}
|
|
@@ -4,6 +4,6 @@ export declare class AosActionApi implements ActionApi {
|
|
|
4
4
|
constructor();
|
|
5
5
|
static isOnlineAvailable: boolean;
|
|
6
6
|
isAvailable(): Promise<boolean>;
|
|
7
|
-
send(request: ActionRequest): Promise<
|
|
7
|
+
send(request: ActionRequest): Promise<any>;
|
|
8
8
|
synchronize(): Promise<void>;
|
|
9
9
|
}
|
|
@@ -229,7 +229,7 @@ export function getFilterDomains(model, filter) {
|
|
|
229
229
|
title: filter.title,
|
|
230
230
|
},
|
|
231
231
|
],
|
|
232
|
-
domainContext: { _model: model },
|
|
232
|
+
domainContext: { _model: model, ...(filter.context ?? {}) },
|
|
233
233
|
};
|
|
234
234
|
}
|
|
235
235
|
export const getCompanyDomain = (companyId, companySetFieldName = 'companySet') => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.helper.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/requests.helper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"requests.helper.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/requests.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useState } from 'react';
|
|
19
19
|
import { StyleSheet } from 'react-native';
|
|
20
|
-
import { Alert,
|
|
20
|
+
import { Alert, RadioSelect, ScrollView } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useTranslator } from '../../../i18n';
|
|
22
22
|
import { filterProvider, useActiveFilter } from '../../../header/FilterProvider';
|
|
23
23
|
const PopupFilters = ({ visible = false, onClose, savedFilters = [], userFilters = [], model, }) => {
|
|
@@ -48,15 +48,12 @@ const PopupFilters = ({ visible = false, onClose, savedFilters = [], userFilters
|
|
|
48
48
|
return null;
|
|
49
49
|
return (<RadioSelect style={styles.container} question={I18n.t(titleKey)} items={filters} onChange={handleFilterSelection} defaultValue={selectedFilter?.id} direction="column" radioButtonStyle={styles.radioButtonStyle}/>);
|
|
50
50
|
};
|
|
51
|
-
return (
|
|
52
|
-
<
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
</ScrollView>
|
|
58
|
-
</Alert>
|
|
59
|
-
</>);
|
|
51
|
+
return (<Alert visible={visible} title={I18n.t('Base_SelectFilter')} cancelButtonConfig={{ onPress: onClose }} confirmButtonConfig={{ onPress: handleConfirm }} translator={I18n.t}>
|
|
52
|
+
<ScrollView style={styles.scrollview}>
|
|
53
|
+
{renderRadioSelect(savedFilters, 'Base_Filters')}
|
|
54
|
+
{renderRadioSelect(userFilters, 'Base_MyFilters')}
|
|
55
|
+
</ScrollView>
|
|
56
|
+
</Alert>);
|
|
60
57
|
};
|
|
61
58
|
const styles = StyleSheet.create({
|
|
62
59
|
scrollview: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupFilters.js","sourceRoot":"","sources":["../../../../src/components/organisms/PopupFilters/PopupFilters.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"PopupFilters.js","sourceRoot":"","sources":["../../../../src/components/organisms/PopupFilters/PopupFilters.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useState } from 'react';
|
|
19
|
-
import { Alert
|
|
19
|
+
import { Alert } from '@axelor/aos-mobile-ui';
|
|
20
20
|
import { useTranslator } from '../../../i18n';
|
|
21
21
|
import { useSelector } from '../../../redux/hooks';
|
|
22
22
|
import { fetchFileToPrint } from '../../../api/print-template-api';
|
|
@@ -67,12 +67,9 @@ const PopupPrintTemplate = ({ visible = false, onClose, model, modelId, template
|
|
|
67
67
|
})
|
|
68
68
|
.catch(handleCancel);
|
|
69
69
|
}, [selectedTemplate, modelId, model, handleCancel, handleShowFile]);
|
|
70
|
-
return (
|
|
71
|
-
<
|
|
72
|
-
|
|
73
|
-
<PrintTemplateSearchBar idList={templateSet} defaultValue={selectedTemplate} onChange={setSelectedTemplate}/>
|
|
74
|
-
</Alert>
|
|
75
|
-
</>);
|
|
70
|
+
return (<Alert visible={showPopup} cancelButtonConfig={{ onPress: onClose }} confirmButtonConfig={{ onPress: openFile }} translator={I18n.t}>
|
|
71
|
+
<PrintTemplateSearchBar idList={templateSet} defaultValue={selectedTemplate} onChange={setSelectedTemplate}/>
|
|
72
|
+
</Alert>);
|
|
76
73
|
};
|
|
77
74
|
export default PopupPrintTemplate;
|
|
78
75
|
//# sourceMappingURL=PopupPrintTemplate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupPrintTemplate.js","sourceRoot":"","sources":["../../../../src/components/organisms/PopupPrintTemplate/PopupPrintTemplate.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"PopupPrintTemplate.js","sourceRoot":"","sources":["../../../../src/components/organisms/PopupPrintTemplate/PopupPrintTemplate.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export declare function createRecord({ modelName, data, }: {
|
|
2
2
|
modelName: string;
|
|
3
3
|
data: any;
|
|
4
|
-
}): Promise<
|
|
4
|
+
}): Promise<any>;
|
|
5
5
|
export declare function updateRecord({ modelName, data, }: {
|
|
6
6
|
modelName: string;
|
|
7
7
|
data: any;
|
|
8
|
-
}): Promise<
|
|
8
|
+
}): Promise<any>;
|
|
9
9
|
export declare function refreshRecord({ modelName, id, }: {
|
|
10
10
|
modelName: string;
|
|
11
11
|
id: number;
|
|
@@ -13,4 +13,4 @@ export declare function refreshRecord({ modelName, id, }: {
|
|
|
13
13
|
export declare function deleteRecord({ modelName, id, }: {
|
|
14
14
|
modelName: string;
|
|
15
15
|
id: number;
|
|
16
|
-
}): Promise<
|
|
16
|
+
}): Promise<any>;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
export declare const mapStudioFieldsWithFormula: (fields: any[], object: any) => any[];
|
|
2
2
|
export declare const getAttrsValue: (object: Object, fieldType?: string) => any;
|
|
3
|
-
export declare const createFormulaFunction: (formula: string) => ({ objectState }:
|
|
4
|
-
objectState: any;
|
|
5
|
-
}) => any;
|
|
3
|
+
export declare const createFormulaFunction: (formula: string | undefined) => ({ objectState }: any) => any;
|
|
6
4
|
export declare const evaluateFormulaWithObject: (formula: string, object: Object) => string;
|
|
7
|
-
export declare const combinedFormula: (separator: string, ...allFormula: string[]) => string;
|
|
8
|
-
export declare const reverseFormula: (formula: string) => string;
|
|
5
|
+
export declare const combinedFormula: (separator: string, ...allFormula: (string | undefined)[]) => string;
|
|
6
|
+
export declare const reverseFormula: (formula: string | undefined) => string | undefined;
|
|
9
7
|
export declare const manageDependsOnFormula: (formula: string, fields: any[]) => {};
|
|
@@ -55,12 +55,11 @@ export const getAttrsValue = (object, fieldType) => {
|
|
|
55
55
|
return result;
|
|
56
56
|
};
|
|
57
57
|
export const createFormulaFunction = (formula) => {
|
|
58
|
+
if (checkNullString(formula))
|
|
59
|
+
return undefined;
|
|
58
60
|
return ({ objectState }) => {
|
|
59
|
-
if (checkNullString(formula)) {
|
|
60
|
-
return false;
|
|
61
|
-
}
|
|
62
61
|
let expr = `${formula}`;
|
|
63
|
-
sortFieldsByLength(Object.keys(objectState)).forEach(_key => {
|
|
62
|
+
sortFieldsByLength(Object.keys(objectState ?? {})).forEach(_key => {
|
|
64
63
|
if (expr.includes(_key)) {
|
|
65
64
|
expr = manageDottedFields(expr, _key, objectState[_key]);
|
|
66
65
|
}
|
|
@@ -118,6 +117,11 @@ const manageDottedFields = (formula, startKey, object) => {
|
|
|
118
117
|
? startKey
|
|
119
118
|
: startKey + fieldToReplace, manageFieldValue(fetchJsonField(object, getStringWithoutFirstSeparator(fieldToReplace))));
|
|
120
119
|
}
|
|
120
|
+
if (object == null) {
|
|
121
|
+
const escapedKey = startKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
122
|
+
const pathRegex = new RegExp(`${escapedKey}(\\??\\.\\w+)*`, 'g');
|
|
123
|
+
return formula.replace(pathRegex, String(manageFieldValue(object)));
|
|
124
|
+
}
|
|
121
125
|
return formula.replaceAll(startKey, manageFieldValue(object));
|
|
122
126
|
};
|
|
123
127
|
const manageFieldValue = (value) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formula.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/formula.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAE,cAAc,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,GAAG,SAAS,CAAC;AAEzB,MAAM,eAAe,GAAG,aAAa,CAAC;AAEtC,MAAM,qBAAqB,GAAG,CAAC,MAAa,EAAE,MAAW,EAAS,EAAE;IAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,OAAO,EAAE,CAAC;KACX;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC1B,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE;YAC7B,OAAO,IAAI,CAAC;SACb;QAED,OAAO,CACL,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC,CACzE,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,MAAa,EACb,MAAW,EACJ,EAAE;IACT,OAAO,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxD,GAAG,IAAI;QACP,UAAU,EAAE,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;QAC9D,UAAU,EAAE,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;QAC9D,MAAM,EAAE,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;QACtD,MAAM,EAAE,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;QACtD,SAAS,EAAE,yBAAyB,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;KAC7D,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,SAAkB,EAAE,EAAE;IAClE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACvE;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACnB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACtD,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAmB,EAAE,EAAE;QACxC,MAAM,GAAG,EAAC,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEL,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"formula.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/formula.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterProvider.js","sourceRoot":"","sources":["../../src/header/FilterProvider.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"FilterProvider.js","sourceRoot":"","sources":["../../src/header/FilterProvider.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAYtC,MAAM,cAAc;IACV,YAAY,GAAW,IAAI,CAAC;IAC5B,SAAS,GAAe,EAAE,CAAC;IAEnC,QAAQ,CAAC,QAAkB;QACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,UAAU,CAAC,QAAkB;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;IAChE,CAAC;IAEO,MAAM;QACZ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,eAAe,CAAC,MAAe;QAC7B,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;AAEnD,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,CAAC,YAAY,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,CAAC,MAAqB,EAAE,EAAE;YACzC,IAAI,SAAS;gBAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC,CAAC;QAEF,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,YAAY,EAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC"}
|
package/lib/header/hooks.js
CHANGED
|
@@ -21,7 +21,7 @@ import { useTranslator } from '../i18n';
|
|
|
21
21
|
import { useOnline } from '../features/onlineSlice';
|
|
22
22
|
import { useNavigation } from '../hooks/use-navigation';
|
|
23
23
|
import { fetchJsonFieldsOfModel } from '../forms';
|
|
24
|
-
import { fetchModel, getNetInfo, fetchActionPrint, fetchDefaultFilters, fetchMetaFilters, } from '../api';
|
|
24
|
+
import { fetchModel, getNetInfo, fetchActionPrint, fetchDefaultFilters, fetchMetaFilters, fetchViewContext, } from '../api';
|
|
25
25
|
import { PopupFilters, PopupPrintTemplate } from '../components';
|
|
26
26
|
import { headerActionsProvider } from './HeaderActionsProvider';
|
|
27
27
|
export const useBasicActions = () => {
|
|
@@ -43,7 +43,6 @@ export const useBasicActions = () => {
|
|
|
43
43
|
const useFilterGenericAction = () => {
|
|
44
44
|
const I18n = useTranslator();
|
|
45
45
|
const { userId } = useSelector(state => state.auth);
|
|
46
|
-
const [alertVisible, setAlertVisible] = useState(false);
|
|
47
46
|
useEffect(() => {
|
|
48
47
|
headerActionsProvider.registerGenericAction('core_modelFilters', async ({ model, modelId, options }) => {
|
|
49
48
|
const _defaultAction = {
|
|
@@ -69,22 +68,37 @@ const useFilterGenericAction = () => {
|
|
|
69
68
|
}));
|
|
70
69
|
const filterName = options?.name ?? res?.view?.name;
|
|
71
70
|
let _userFilters = [];
|
|
71
|
+
let _viewContext;
|
|
72
|
+
if (options?.actionViewName) {
|
|
73
|
+
_viewContext = await fetchViewContext({
|
|
74
|
+
actionViewName: options?.actionViewName,
|
|
75
|
+
})
|
|
76
|
+
.then(_cRes => _cRes?.data?.data?.[0] ?? {})
|
|
77
|
+
.then(_cRes => _cRes?.view?.context)
|
|
78
|
+
.catch(() => undefined);
|
|
79
|
+
}
|
|
72
80
|
if (filterName) {
|
|
73
81
|
_userFilters = await fetchMetaFilters({ filterName, userId })
|
|
74
82
|
.then(metaRes => metaRes?.data?.data ?? [])
|
|
75
83
|
.catch(() => []);
|
|
76
84
|
}
|
|
77
|
-
return {
|
|
85
|
+
return {
|
|
86
|
+
savedFilters: _filters.map((_f) => ({
|
|
87
|
+
..._f,
|
|
88
|
+
context: _viewContext,
|
|
89
|
+
})),
|
|
90
|
+
userFilters: _userFilters,
|
|
91
|
+
};
|
|
78
92
|
})
|
|
79
93
|
.catch(() => ({ savedFilters: [], userFilters: [] }));
|
|
80
94
|
return {
|
|
81
95
|
..._defaultAction,
|
|
82
96
|
hideIf: savedFilters?.length === 0 && userFilters?.length === 0,
|
|
83
|
-
onPress: () =>
|
|
84
|
-
|
|
97
|
+
onPress: () => { },
|
|
98
|
+
popupComponent: props => (<PopupFilters {...props} savedFilters={savedFilters} userFilters={userFilters} model={model}/>),
|
|
85
99
|
};
|
|
86
100
|
});
|
|
87
|
-
}, [I18n,
|
|
101
|
+
}, [I18n, userId]);
|
|
88
102
|
};
|
|
89
103
|
const useJsonFieldsGenericAction = (isConnected) => {
|
|
90
104
|
const I18n = useTranslator();
|
|
@@ -152,7 +166,6 @@ const useBarcodeGenericAction = () => {
|
|
|
152
166
|
const usePrintingGenericAction = (isConnected) => {
|
|
153
167
|
const I18n = useTranslator();
|
|
154
168
|
const online = useOnline();
|
|
155
|
-
const [alertVisible, setAlertVisible] = useState(false);
|
|
156
169
|
useEffect(() => {
|
|
157
170
|
headerActionsProvider.registerGenericAction('core_modelPrinting', async ({ model, modelId, options }) => {
|
|
158
171
|
const _defaultAction = {
|
|
@@ -176,10 +189,10 @@ const usePrintingGenericAction = (isConnected) => {
|
|
|
176
189
|
(templateSet == null && fileName == null) ||
|
|
177
190
|
!online.isEnabled ||
|
|
178
191
|
!isConnected,
|
|
179
|
-
onPress: () =>
|
|
180
|
-
|
|
192
|
+
onPress: () => { },
|
|
193
|
+
popupComponent: props => (<PopupPrintTemplate {...props} model={model} modelId={modelId} templateSet={templateSet} fileName={fileName}/>),
|
|
181
194
|
};
|
|
182
195
|
});
|
|
183
|
-
}, [I18n,
|
|
196
|
+
}, [I18n, isConnected, online.isEnabled]);
|
|
184
197
|
};
|
|
185
198
|
//# sourceMappingURL=hooks.js.map
|
package/lib/header/hooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/header/hooks.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtE,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AACtC,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAC,sBAAsB,EAAC,MAAM,UAAU,CAAC;AAChD,OAAO,EACL,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,kBAAkB,GAAG,MAAM,EAAU,CAAC;IAE5C,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAErD,MAAM,uBAAuB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACrD,MAAM,EAAC,WAAW,EAAE,YAAY,EAAC,GAAG,MAAM,UAAU,EAAE,CAAC;QACvD,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,kBAAkB,CAAC,OAAO,GAAG,WAAW,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;QAExE,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAE9B,sBAAsB,EAAE,CAAC;IACzB,uBAAuB,EAAE,CAAC;IAC1B,0BAA0B,CAAC,WAAW,CAAC,CAAC;IACxC,wBAAwB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,GAAG,EAAE;IAClC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElD,
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/header/hooks.tsx"],"names":[],"mappings":"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"}
|
package/lib/header/types.d.ts
CHANGED
|
@@ -31,6 +31,10 @@ export interface ActionType {
|
|
|
31
31
|
onPress: () => void;
|
|
32
32
|
showInHeader?: boolean;
|
|
33
33
|
customComponent?: ReactElement<any>;
|
|
34
|
+
popupComponent?: (props: {
|
|
35
|
+
visible: boolean;
|
|
36
|
+
onClose: () => void;
|
|
37
|
+
}) => ReactElement;
|
|
34
38
|
}
|
|
35
39
|
export interface HeaderBandItem {
|
|
36
40
|
key: string;
|
|
@@ -55,16 +55,18 @@ export const useMassScanner = ({ scanKey, backgroundAction, fallbackAction, scan
|
|
|
55
55
|
isZebraDevice,
|
|
56
56
|
scanInterval,
|
|
57
57
|
]);
|
|
58
|
+
const processScanRef = useRef(processScan);
|
|
59
|
+
processScanRef.current = processScan;
|
|
58
60
|
useEffect(() => {
|
|
59
61
|
if (scannedValue) {
|
|
60
|
-
|
|
62
|
+
processScanRef.current(scannedValue, () => dispatch(clearScan()));
|
|
61
63
|
}
|
|
62
|
-
}, [dispatch,
|
|
64
|
+
}, [dispatch, scannedValue]);
|
|
63
65
|
useEffect(() => {
|
|
64
66
|
if (scannedBarcode?.value) {
|
|
65
|
-
|
|
67
|
+
processScanRef.current(scannedBarcode.value, () => dispatch(clearBarcode()));
|
|
66
68
|
}
|
|
67
|
-
}, [dispatch,
|
|
69
|
+
}, [dispatch, scannedBarcode?.value]);
|
|
68
70
|
return useMemo(() => ({ disableScan, enableScan, isEnabled }), [disableScan, enableScan, isEnabled]);
|
|
69
71
|
};
|
|
70
72
|
//# sourceMappingURL=use-mass-scanner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,0BAA0B,EAC1B,YAAY,GACb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAatD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,OAAO,EACP,gBAAgB,EAChB,cAAc,EACd,YAAY,GAAG,IAAI,EACnB,cAAc,GAAG,IAAI,GACA,EAAE,EAAE;IACzB,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,CAAuC,IAAI,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAC,GACtD,kBAAkB,EAAE,CAAC;IACvB,MAAM,EACJ,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,WAAW,EACpB,aAAa,GACd,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CAAC,aAAa,IAAI,aAAa,KAAK,OAAO,EAChD,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC,CACxC,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC7B,KAAK,EAAE,KAAa,EAAE,WAAuB,EAAE,EAAE;QAC/C,IAAI,eAAe,CAAC,OAAO;YAAE,OAAO;QAEpC,IAAI;YACF,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;YAC/B,MAAM,gBAAgB,CAAC,KAAK,EAAE,EAAC,WAAW,EAAC,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,cAAc;gBAAE,WAAW,EAAE,CAAC;YAClC,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;SAC/C;gBAAS;YACR,QAAQ,CAAC,OAAO,GAAG,UAAU,CAC3B,GAAG,EAAE;gBACH,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;gBAChC,WAAW,EAAE,CAAC;YAChB,CAAC,EACD,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CACjC,CAAC;SACH;IACH,CAAC,EACD;QACE,gBAAgB;QAChB,cAAc;QACd,WAAW;QACX,cAAc;QACd,aAAa;QACb,YAAY;KACb,CACF,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,EAAE;YAChB,
|
|
1
|
+
{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useEffect, useMemo, useState } from 'react';
|
|
18
|
+
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { Dimensions, StyleSheet, View } from 'react-native';
|
|
20
20
|
import { DropdownMenu, DropdownMenuItem } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useSelector } from '../../../redux/hooks';
|
|
@@ -26,6 +26,7 @@ const HeaderOptionMenu = ({ model, modelId, actions = [], genericActions = {}, o
|
|
|
26
26
|
const collapseMenuItems = useMemo(() => Dimensions.get('window').width <= SMALLEST_WINDOW_WIDTH, []);
|
|
27
27
|
const MenuItem = useMemo(() => (collapseMenuItems ? DropdownMenuItem : HeaderOptionMenuItem), [collapseMenuItems]);
|
|
28
28
|
const [visibleGenericActions, setVisibleGenericActions] = useState([]);
|
|
29
|
+
const [activePopupKey, setActivePopupKey] = useState(null);
|
|
29
30
|
useEffect(() => {
|
|
30
31
|
const getVisibleGenericActions = async () => {
|
|
31
32
|
const _genericActions = await Promise.all(Object.entries(genericActions).map(async ([key, func]) => await func({
|
|
@@ -40,22 +41,41 @@ const HeaderOptionMenu = ({ model, modelId, actions = [], genericActions = {}, o
|
|
|
40
41
|
}, [genericActions, mobileSettings?.apps, model, modelId, options]);
|
|
41
42
|
const allActions = useMemo(() => [...actions, ...visibleGenericActions]
|
|
42
43
|
.filter(_action => !_action.hideIf)
|
|
43
|
-
.sort((a, b) => a.order - b.order)
|
|
44
|
+
.sort((a, b) => a.order - b.order)
|
|
45
|
+
.map(_a => _a.popupComponent
|
|
46
|
+
? {
|
|
47
|
+
..._a,
|
|
48
|
+
onPress: () => {
|
|
49
|
+
_a.onPress?.();
|
|
50
|
+
setActivePopupKey(_a.key);
|
|
51
|
+
},
|
|
52
|
+
}
|
|
53
|
+
: _a), [actions, visibleGenericActions]);
|
|
44
54
|
const headerActions = useMemo(() => allActions.filter(_action => _action.showInHeader).slice(0, 2), [allActions]);
|
|
45
55
|
const menuActions = useMemo(() => allActions.filter(_action => !headerActions.some(_header => _header.key === _action.key)), [allActions, headerActions]);
|
|
46
56
|
const HeaderItemList = useMemo(() => headerActions.map((_action, index) => (<MenuItem key={_action.key + index} icon={_action.iconName} color={_action.iconColor} indicator={_action.indicator} placeholder={_action.title} hideIf={_action.hideIf} disableIf={_action.disableIf} onPress={_action.onPress} customComponent={_action.customComponent}/>)), [MenuItem, headerActions]);
|
|
47
57
|
const MenuItemList = useMemo(() => menuActions.map((_action, index) => (<DropdownMenuItem key={_action.key + index} icon={_action.iconName} indicator={_action.indicator} placeholder={_action.title} hideIf={_action.hideIf} disableIf={_action.disableIf} onPress={_action.onPress} customComponent={_action.customComponent}/>)), [menuActions]);
|
|
58
|
+
const renderPopups = useCallback(() => {
|
|
59
|
+
return allActions.map(({ key, popupComponent }) => popupComponent ? (<React.Fragment key={key}>
|
|
60
|
+
{popupComponent({
|
|
61
|
+
visible: key === activePopupKey,
|
|
62
|
+
onClose: () => setActivePopupKey(null),
|
|
63
|
+
})}
|
|
64
|
+
</React.Fragment>) : null);
|
|
65
|
+
}, [activePopupKey, allActions]);
|
|
48
66
|
if (allActions.length === 0) {
|
|
49
67
|
return null;
|
|
50
68
|
}
|
|
51
69
|
if (collapseMenuItems) {
|
|
52
70
|
return (<View style={styles.container}>
|
|
53
71
|
<DropdownMenu>{[...HeaderItemList, ...MenuItemList]}</DropdownMenu>
|
|
72
|
+
{renderPopups()}
|
|
54
73
|
</View>);
|
|
55
74
|
}
|
|
56
75
|
return (<View style={styles.container}>
|
|
57
76
|
{HeaderItemList}
|
|
58
77
|
{menuActions.length !== 0 && <DropdownMenu>{MenuItemList}</DropdownMenu>}
|
|
78
|
+
{renderPopups()}
|
|
59
79
|
</View>);
|
|
60
80
|
};
|
|
61
81
|
const styles = StyleSheet.create({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaderOptionMenu.js","sourceRoot":"","sources":["../../../../src/navigator/components/header/HeaderOptionMenu.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"HeaderOptionMenu.js","sourceRoot":"","sources":["../../../../src/navigator/components/header/HeaderOptionMenu.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAUlC,MAAM,gBAAgB,GAAG,CAAC,EACxB,KAAK,EACL,OAAO,EACP,OAAO,GAAG,EAAE,EACZ,cAAc,GAAG,EAAE,EACnB,OAAO,GACe,EAAE,EAAE;IAC1B,MAAM,EAAC,cAAc,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE/D,MAAM,iBAAiB,GAAG,OAAO,CAC/B,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,IAAI,qBAAqB,EAC7D,EAAE,CACH,CAAC;IAEF,MAAM,QAAQ,GAAG,OAAO,CACtB,GAAG,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,oBAAoB,CAAC,EACnE,CAAC,iBAAiB,CAAC,CACpB,CAAC;IAEF,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAS,IAAI,CAAC,CAAC;IAEnE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;YAC1C,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAChC,KAAK,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CACpB,MAAM,IAAI,CAAC;gBACT,KAAK;gBACL,OAAO;gBACP,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC;gBACvB,MAAM,EAAE,cAAc,EAAE,IAAI;aAC7B,CAAC,CACL,CACF,CAAC;YACF,wBAAwB,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF,wBAAwB,EAAE,CAAC;IAC7B,CAAC,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAiB,OAAO,CACtC,GAAG,EAAE,CACH,CAAC,GAAG,OAAO,EAAE,GAAG,qBAAqB,CAAC;SACnC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;SAClC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;SACjC,GAAG,CAAC,EAAE,CAAC,EAAE,CACR,EAAE,CAAC,cAAc;QACf,CAAC,CAAC;YACE,GAAG,EAAE;YACL,OAAO,EAAE,GAAG,EAAE;gBACZ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;gBACf,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;SACF;QACH,CAAC,CAAC,EAAE,CACP,EACL,CAAC,OAAO,EAAE,qBAAqB,CAAC,CACjC,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EACpE,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CACH,UAAU,CAAC,MAAM,CACf,OAAO,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CACvE,EACH,CAAC,UAAU,EAAE,aAAa,CAAC,CAC5B,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAC5B,GAAG,EAAE,CACH,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CACpC,CAAC,QAAQ,CACP,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,CACzB,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CACvB,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CACzB,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAC7B,WAAW,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAC3B,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CACvB,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAC7B,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CACzB,eAAe,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,EACzC,CACH,CAAC,EACJ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAC1B,CAAC;IAEF,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CACH,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAClC,CAAC,gBAAgB,CACf,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,CACzB,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CACvB,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAC7B,WAAW,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAC3B,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CACvB,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAC7B,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CACzB,eAAe,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,EACzC,CACH,CAAC,EACJ,CAAC,WAAW,CAAC,CACd,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;QACpC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,GAAG,EAAE,cAAc,EAAC,EAAE,EAAE,CAC9C,cAAc,CAAC,CAAC,CAAC,CACf,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CACvB;UAAA,CAAC,cAAc,CAAC;gBACd,OAAO,EAAE,GAAG,KAAK,cAAc;gBAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;aACvC,CAAC,CACJ;QAAA,EAAE,KAAK,CAAC,QAAQ,CAAC,CAClB,CAAC,CAAC,CAAC,IAAI,CACT,CAAC;IACJ,CAAC,EAAE,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAEjC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IAED,IAAI,iBAAiB,EAAE;QACrB,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;QAAA,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,YAAY,CAAC,CAAC,EAAE,YAAY,CAClE;QAAA,CAAC,YAAY,EAAE,CACjB;MAAA,EAAE,IAAI,CAAC,CACR,CAAC;KACH;IAED,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,cAAc,CACf;MAAA,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,CACxE;MAAA,CAAC,YAAY,EAAE,CACjB;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,EAAE;KACrB;CACF,CAAC,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "8.4.
|
|
3
|
+
"version": "8.4.20",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"license:add": "npx add-copyright-header --generate --dir 'src'"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@axelor/aos-mobile-error": "8.4.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.4.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.4.20",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.4.20",
|
|
29
29
|
"@react-navigation/drawer": "7.3.9",
|
|
30
30
|
"@react-navigation/native": "7.1.6",
|
|
31
31
|
"@react-navigation/native-stack": "7.3.10",
|