@axelor/aos-mobile-core 7.2.7 → 7.2.8
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/auth/models/objectFields.js +3 -1
- package/lib/auth/models/objectFields.js.map +1 -1
- package/lib/components/molecules/HeaderBand/HeaderBand.d.ts +1 -1
- package/lib/components/molecules/HeaderBand/HeaderBand.js +3 -3
- package/lib/components/molecules/HeaderBand/HeaderBand.js.map +1 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +2 -2
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +2 -2
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/lib/header/header-band-context.helper.d.ts +1 -0
- package/lib/header/header-band-context.helper.js +1 -0
- package/lib/header/header-band-context.helper.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.js +10 -9
- package/lib/navigator/drawer/DrawerContent.js.map +1 -1
- package/lib/navigator/drawer/Header.js +18 -3
- package/lib/navigator/drawer/Header.js.map +1 -1
- package/lib/navigator/drawer/Menu.js +3 -3
- package/lib/navigator/drawer/Menu.js.map +1 -1
- package/lib/navigator/drawer/MenuTitle.js +3 -1
- package/lib/navigator/drawer/MenuTitle.js.map +1 -1
- package/lib/navigator/menu.helper.d.ts +1 -1
- package/lib/navigator/roles.helper.d.ts +1 -1
- package/lib/navigator/roles.helper.js +5 -6
- package/lib/navigator/roles.helper.js.map +1 -1
- package/package.json +3 -3
|
@@ -30,7 +30,9 @@ export const auth_modelAPI = {
|
|
|
30
30
|
activeTeam: schemaContructor.subObject(),
|
|
31
31
|
workshopStockLocation: schemaContructor.subObject(),
|
|
32
32
|
roles: schemaContructor.array(),
|
|
33
|
-
group: schemaContructor.subObject()
|
|
33
|
+
group: schemaContructor.subObject().concat(schemaContructor.object({
|
|
34
|
+
roles: schemaContructor.array(),
|
|
35
|
+
})),
|
|
34
36
|
employee: schemaContructor.subObject(),
|
|
35
37
|
language: schemaContructor.string(),
|
|
36
38
|
todayDateT: schemaContructor.string(),
|
|
@@ -1 +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;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,CAAC,MAAM,CAChD,gBAAgB,CAAC,MAAM,CAAC;YACtB,QAAQ,EAAE,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC;SAC/C,CAAC,CACH;QACD,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;
|
|
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;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,CAAC,MAAM,CAChD,gBAAgB,CAAC,MAAM,CAAC;YACtB,QAAQ,EAAE,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC;SAC/C,CAAC,CACH;QACD,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,CAAC,MAAM,CACxC,gBAAgB,CAAC,MAAM,CAAC;YACtB,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE;SAChC,CAAC,CACH;QACD,QAAQ,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACtC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE;KACtC,CAAC;CACH,CAAC"}
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useMemo } from 'react';
|
|
19
19
|
import { Dimensions, StyleSheet, View } from 'react-native';
|
|
20
|
-
import { useThemeColor } from '@axelor/aos-mobile-ui
|
|
21
|
-
import {
|
|
20
|
+
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { HeaderBandHelper } from '../../../header';
|
|
22
22
|
const HeaderBand = ({ color, text, showIf }) => {
|
|
23
23
|
const Colors = useThemeColor();
|
|
24
24
|
const styles = useMemo(() => getStyles(color || Colors.secondaryColor), [Colors, color]);
|
|
@@ -37,7 +37,7 @@ const getStyles = (color) => StyleSheet.create({
|
|
|
37
37
|
backgroundColor: color.background_light,
|
|
38
38
|
justifyContent: 'center',
|
|
39
39
|
alignItems: 'center',
|
|
40
|
-
height:
|
|
40
|
+
height: HeaderBandHelper.bandHeight,
|
|
41
41
|
},
|
|
42
42
|
text: {
|
|
43
43
|
maxWidth: '80%',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaderBand.js","sourceRoot":"","sources":["../../../../src/components/molecules/HeaderBand/HeaderBand.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAQ,aAAa,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"HeaderBand.js","sourceRoot":"","sources":["../../../../src/components/molecules/HeaderBand/HeaderBand.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAQ,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAQjD,MAAM,UAAU,GAAG,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAkB,EAAE,EAAE;IAC5D,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,MAAM,CAAC,cAAc,CAAC,EAC/C,CAAC,MAAM,EAAE,KAAK,CAAC,CAChB,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACzC;QAAA,CAAC,IAAI,CACP;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,EAAE,CACjC,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK;QACrC,eAAe,EAAE,KAAK,CAAC,gBAAgB;QACvC,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,gBAAgB,CAAC,UAAU;KACpC;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,KAAK;QACf,SAAS,EAAE,QAAQ;QACnB,QAAQ,EAAE,EAAE;QACZ,eAAe,EAAE,CAAC;QAClB,KAAK,EAAE,KAAK,CAAC,UAAU;KACxB;CACF,CAAC,CAAC;AAEL,eAAe,UAAU,CAAC"}
|
|
@@ -23,7 +23,7 @@ import { Text, getCommonStyles, useThemeColor, Image, Icon, } from '@axelor/aos-
|
|
|
23
23
|
import { deleteMetaFile, uploadBase64, uploadFile, } from '../../../api/metafile-api';
|
|
24
24
|
import { useTranslator } from '../../../i18n';
|
|
25
25
|
import { openFileInExternalApp } from '../../../tools';
|
|
26
|
-
import { useMetafileUri } from '../../../utils';
|
|
26
|
+
import { checkNullString, useMetafileUri } from '../../../utils';
|
|
27
27
|
import { useCameraValueByKey, enableCamera, clearPhoto, } from '../../../features/cameraSlice';
|
|
28
28
|
const DEFAULT_MAX_FILE_SIZE = 5000000;
|
|
29
29
|
const BUTTON_SIZE = 28;
|
|
@@ -166,7 +166,7 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
166
166
|
return displayPreview && selectedFile != null;
|
|
167
167
|
}, [displayPreview, selectedFile]);
|
|
168
168
|
return (<View style={[styles.container, style]}>
|
|
169
|
-
<Text style={styles.title}>{title}</Text>
|
|
169
|
+
{!checkNullString(title) && <Text style={styles.title}>{title}</Text>}
|
|
170
170
|
<View style={[
|
|
171
171
|
commonStyles.filter,
|
|
172
172
|
commonStyles.filterSize,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.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,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,cAEN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EAEb,KAAK,EACL,IAAI,GACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,cAAc,EACd,YAAY,EACZ,UAAU,GACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
19
19
|
import { Platform, StyleSheet, View } from 'react-native';
|
|
20
20
|
import useTranslator from '../../../i18n/hooks/use-translator';
|
|
21
|
-
import { Card, getCommonStyles, Icon, RightIconButton, Text, useClickOutside, useThemeColor, OUTSIDE_INDICATOR, } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { Card, getCommonStyles, Icon, RightIconButton, Text, useClickOutside, useThemeColor, OUTSIDE_INDICATOR, checkNullString, } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { DatePicker } from '../../molecules';
|
|
23
23
|
import DateInputUtils from './date-input.helper';
|
|
24
24
|
const ACTION_ICON_SIZE = 30;
|
|
@@ -69,7 +69,7 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
|
|
|
69
69
|
Platform.OS === 'ios' ? styles.containerZIndex : null,
|
|
70
70
|
style,
|
|
71
71
|
]}>
|
|
72
|
-
{title && <Text style={styles.title}>{title}</Text>}
|
|
72
|
+
{!checkNullString(title) && <Text style={styles.title}>{title}</Text>}
|
|
73
73
|
<RightIconButton onPress={togglePicker} icon={!readonly && (<Icon name={DateInputUtils.getIconName(mode)} color={Colors.secondaryColor_dark.background}/>)} title={selectedDate
|
|
74
74
|
? DateInputUtils.formatDate(mode, selectedDate, I18n)
|
|
75
75
|
: DateInputUtils.getDateInputPlaceholder(mode)} styleText={styles.styleTextButton} style={[
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AACxD,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EACL,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,aAAa,EACb,iBAAiB,
|
|
1
|
+
{"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ const ScannerAutocompleteSearch = ({ title, objectList, value, required = false,
|
|
|
48
48
|
}, [value]);
|
|
49
49
|
const handleChangeValue = useCallback(_value => {
|
|
50
50
|
setSearchValue(_value);
|
|
51
|
-
onChangeValue(_value);
|
|
51
|
+
onChangeValue?.(_value);
|
|
52
52
|
}, [onChangeValue]);
|
|
53
53
|
return (<AutoCompleteSearch title={title} selectLastItem={selectLastItem} objectList={objectList} value={searchValue} required={required} readonly={readonly} onChangeValue={handleChangeValue} fetchData={fetchData} displayValue={displayValue} placeholder={placeholder} changeScreenAfter={changeScreenAfter} navigate={navigate} oneFilter={oneFilter} onSelection={enableScanner} onScanPress={onScanPress} scanIconColor={isEnabled && scanKey === scanKeySearch
|
|
54
54
|
? Colors.primaryColor.background
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScannerAutocompleteSearch.js","sourceRoot":"","sources":["../../../../src/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,kBAAkB,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACxE,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAC,0BAA0B,EAAC,MAAM,sCAAsC,CAAC;AAChF,OAAO,EACL,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAgC5C,MAAM,yBAAyB,GAAG,CAAC,EACjC,KAAK,EACL,UAAU,EACV,KAAK,EACL,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK,EAChB,aAAa,EACb,SAAS,EACT,YAAY,EACZ,WAAW,EACX,aAAa,EACb,OAAO,GAAG,KAAK,EACf,iBAAiB,GAAG,KAAK,EACzB,QAAQ,GAAG,KAAK,EAChB,SAAS,GAAG,KAAK,EACjB,cAAc,GAAG,IAAI,EACrB,KAAK,EACL,gBAAgB,GAAG,KAAK,EACxB,WAAW,EACX,WAAW,EACX,SAAS,EACT,qBAAqB,GAAG,KAAK,GACL,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,kBAAkB,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAC3D,MAAM,EAAC,MAAM,EAAE,WAAW,EAAC,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,EAAC,MAAM,EAAE,aAAa,EAAC,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IAEzE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,EAAE;YAChB,cAAc,CAAC,YAAY,CAAC,CAAC;SAC9B;aAAM,IAAI,QAAQ,EAAE,KAAK,IAAI,IAAI,EAAE;YAClC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAChC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,EAAE;YACX,aAAa,EAAE,CAAC;SACjB;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAE7B,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,MAAM,iBAAiB,GAAG,WAAW,CACnC,MAAM,CAAC,EAAE;QACP,cAAc,CAAC,MAAM,CAAC,CAAC;QACvB,aAAa,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ScannerAutocompleteSearch.js","sourceRoot":"","sources":["../../../../src/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { HeaderBandItem } from './types';
|
|
2
2
|
export declare class HeaderBandHelper {
|
|
3
|
+
static bandHeight: number;
|
|
3
4
|
static filterBands: (allBands: HeaderBandItem[]) => HeaderBandItem[];
|
|
4
5
|
static registerHeaderBand(allBands: HeaderBandItem[], band: HeaderBandItem): HeaderBandItem[];
|
|
5
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header-band-context.helper.js","sourceRoot":"","sources":["../../src/header/header-band-context.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,WAAW,GAAG,CAAC,QAA0B,EAAoB,EAAE;QACpE,OAAO,QAAQ;aACZ,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;aAC3B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,MAAM,CAAC,kBAAkB,CACvB,QAA0B,EAC1B,IAAoB;QAEpB,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE;YACpC,OAAO,QAAQ,CAAC;SACjB;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAC,GAAG,IAAI,EAAE,GAAG,IAAI,EAAC,CAAC,CAAC,CAAC,IAAI,CACxC,CAAC;SACH;aAAM;YACL,OAAO;gBACL,GAAG,QAAQ;gBACX;oBACE,KAAK,EAAE,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE;oBACjC,MAAM,EAAE,KAAK;oBACb,GAAG,IAAI;iBACR;aACF,CAAC;SACH;IACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"header-band-context.helper.js","sourceRoot":"","sources":["../../src/header/header-band-context.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,MAAM,CAAC,WAAW,GAAG,CAAC,QAA0B,EAAoB,EAAE;QACpE,OAAO,QAAQ;aACZ,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;aAC3B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,MAAM,CAAC,kBAAkB,CACvB,QAA0B,EAC1B,IAAoB;QAEpB,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE;YACpC,OAAO,QAAQ,CAAC;SACjB;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAC,GAAG,IAAI,EAAE,GAAG,IAAI,EAAC,CAAC,CAAC,CAAC,IAAI,CACxC,CAAC;SACH;aAAM;YACL,OAAO;gBACL,GAAG,QAAQ;gBACX;oBACE,KAAK,EAAE,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE;oBACjC,MAAM,EAAE,KAAK;oBACb,GAAG,IAAI;iBACR;aACF,CAAC;SACH;IACH,CAAC"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useRef, useContext, useMemo, useEffect, useCallback, } from 'react';
|
|
19
|
-
import { StyleSheet, View, Animated } from 'react-native';
|
|
19
|
+
import { StyleSheet, View, Animated, ScrollView } from 'react-native';
|
|
20
20
|
import { SafeAreaView } from 'react-native-safe-area-context';
|
|
21
21
|
import { CommonActions, DrawerActions } from '@react-navigation/native';
|
|
22
22
|
import { useThemeColor, useConfig } from '@axelor/aos-mobile-ui';
|
|
@@ -140,21 +140,19 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
140
140
|
}
|
|
141
141
|
return (<SafeAreaView style={styles.container}>
|
|
142
142
|
{externalMenuIsVisible && (<View style={styles.iconsContainer}>
|
|
143
|
-
<
|
|
144
|
-
{drawerModules.map(_module => (<View
|
|
145
|
-
<MenuIconButton
|
|
143
|
+
<ScrollView showsVerticalScrollIndicator={false}>
|
|
144
|
+
{drawerModules.map(_module => (<View style={styles.globalContainer} key={_module.name}>
|
|
145
|
+
<MenuIconButton style={styles.menuItemContainer} icon={_module.icon} subtitle={showSubtitles && I18n.t(_module.subtitle)} disabled={_module.disabled} color={_module === activeModule
|
|
146
146
|
? Colors.primaryColor.background_light
|
|
147
147
|
: null} onPress={() => handleModuleClick(_module)} compatibility={_module.compatibilityAOS}/>
|
|
148
|
+
{!innerMenuIsVisible && (<MenuTitle module={_module} onPress={() => handleModuleClick(_module)}/>)}
|
|
148
149
|
</View>))}
|
|
149
|
-
</
|
|
150
|
+
</ScrollView>
|
|
150
151
|
<View style={styles.otherIconsContainer}>
|
|
151
152
|
<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={() => handleModuleClick(authModule)}/>
|
|
152
153
|
</View>
|
|
153
154
|
</View>)}
|
|
154
155
|
<View style={styles.menusContainer}>
|
|
155
|
-
<View>
|
|
156
|
-
{drawerModules.map(_module => (<MenuTitle key={_module.name} module={_module} onPress={() => handleModuleClick(_module)}/>))}
|
|
157
|
-
</View>
|
|
158
156
|
<Animated.View style={[
|
|
159
157
|
styles.secondaryMenusContainer,
|
|
160
158
|
{
|
|
@@ -176,13 +174,16 @@ const getStyles = Colors => StyleSheet.create({
|
|
|
176
174
|
overflow: 'hidden',
|
|
177
175
|
zIndex: 2,
|
|
178
176
|
},
|
|
177
|
+
globalContainer: {
|
|
178
|
+
flexDirection: 'row',
|
|
179
|
+
},
|
|
179
180
|
menusContainer: {
|
|
180
181
|
flex: 1,
|
|
181
182
|
},
|
|
182
183
|
iconsContainer: {
|
|
183
184
|
justifyContent: 'space-between',
|
|
184
|
-
alignItems: 'center',
|
|
185
185
|
marginHorizontal: 12,
|
|
186
|
+
width: '100%',
|
|
186
187
|
zIndex: 3,
|
|
187
188
|
},
|
|
188
189
|
otherIconsContainer: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerContent.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,MAAM,EACN,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,GACZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"DrawerContent.js","sourceRoot":"","sources":["../../../src/navigator/drawer/DrawerContent.js"],"names":[],"mappings":"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"}
|
|
@@ -17,19 +17,31 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
19
19
|
import { Dimensions, Platform, StyleSheet, View } from 'react-native';
|
|
20
|
-
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
20
|
+
import { Text, useConfig, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import DrawerToggleButton from './DrawerToggleButton';
|
|
22
22
|
import BackIcon from './BackIcon';
|
|
23
23
|
import { useTranslator } from '../../i18n';
|
|
24
24
|
import { HeaderOptionsMenu } from '../../components';
|
|
25
|
-
import { headerActionsProvider, useHeaderActions } from '../../header';
|
|
25
|
+
import { HeaderBandHelper, headerActionsProvider, useHeaderActions, useHeaderBand, } from '../../header';
|
|
26
26
|
const TIME_BEFORE_RETRY = 500;
|
|
27
27
|
const Header = ({ mainScreen, title, actionID = null, shadedHeader = true }) => {
|
|
28
28
|
const Colors = useThemeColor();
|
|
29
29
|
const I18n = useTranslator();
|
|
30
|
+
const { setHeaderHeight } = useConfig();
|
|
31
|
+
const { allBands } = useHeaderBand();
|
|
30
32
|
let timeOutRequestCall = useRef();
|
|
31
33
|
const { headers } = useHeaderActions(actionID);
|
|
32
34
|
const [options, setOptions] = useState();
|
|
35
|
+
const [containerHeight, setContainerHeight] = useState();
|
|
36
|
+
const visibleBands = useMemo(() => {
|
|
37
|
+
return HeaderBandHelper.filterBands(allBands)?.length ?? 0;
|
|
38
|
+
}, [allBands]);
|
|
39
|
+
useEffect(() => {
|
|
40
|
+
const height = containerHeight + visibleBands * HeaderBandHelper.bandHeight;
|
|
41
|
+
if (!isNaN(height)) {
|
|
42
|
+
setHeaderHeight(height);
|
|
43
|
+
}
|
|
44
|
+
}, [visibleBands, containerHeight, setHeaderHeight]);
|
|
33
45
|
useEffect(() => {
|
|
34
46
|
setOptions(headers);
|
|
35
47
|
}, [headers]);
|
|
@@ -44,7 +56,10 @@ const Header = ({ mainScreen, title, actionID = null, shadedHeader = true }) =>
|
|
|
44
56
|
};
|
|
45
57
|
}, [handleTimeOut]);
|
|
46
58
|
const styles = useMemo(() => getHeaderStyles(Colors), [Colors]);
|
|
47
|
-
return (<View
|
|
59
|
+
return (<View onLayout={event => {
|
|
60
|
+
const { height } = event.nativeEvent.layout;
|
|
61
|
+
setContainerHeight(height);
|
|
62
|
+
}} style={[styles.header, shadedHeader ? styles.shadedHeader : null]}>
|
|
48
63
|
<View style={styles.options}>
|
|
49
64
|
{mainScreen ? (<DrawerToggleButton tintColor={Colors.primaryColor.background}/>) : (<BackIcon tintColor={Colors.primaryColor.background}/>)}
|
|
50
65
|
<View>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Header.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AACpE,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Header.js"],"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, { useMemo } from 'react';
|
|
19
|
-
import { View, StyleSheet } from 'react-native';
|
|
19
|
+
import { View, StyleSheet, ScrollView } from 'react-native';
|
|
20
20
|
import { CommonActions, DrawerActions } from '@react-navigation/native';
|
|
21
21
|
import { Text, WarningCard } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import MenuItem from './MenuItem';
|
|
@@ -75,7 +75,7 @@ const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatib
|
|
|
75
75
|
const moduleNotFound = useMemo(() => isModuleNotFound(compatibility), [compatibility]);
|
|
76
76
|
const compatibilityError = useMemo(() => isMenuIncompatible(compatibility), [compatibility]);
|
|
77
77
|
return (<View style={styles.menuContainer}>
|
|
78
|
-
<
|
|
78
|
+
<ScrollView contentContainerStyle={styles.moduleMenuContainer} showsVerticalScrollIndicator={false}>
|
|
79
79
|
<View style={styles.menuTitleContainer}>
|
|
80
80
|
<Text style={styles.menuTitle}>{title}</Text>
|
|
81
81
|
</View>
|
|
@@ -85,7 +85,7 @@ const Menu = ({ state, navigation, authMenu, activeModule, onItemClick, compatib
|
|
|
85
85
|
compatibility: formatCompatibilityToDisplay(compatibility),
|
|
86
86
|
})}/>)}
|
|
87
87
|
<MenuItemList state={state} navigation={navigation} activeModule={activeModule} onItemClick={onItemClick} disabled={compatibilityError}/>
|
|
88
|
-
</
|
|
88
|
+
</ScrollView>
|
|
89
89
|
<View style={styles.authMenuIcon}>{authMenu}</View>
|
|
90
90
|
</View>);
|
|
91
91
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Menu.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,IAAI,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/navigator/drawer/Menu.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,IAAI,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EACL,uBAAuB,EACvB,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAC,4BAA4B,EAAC,MAAM,kBAAkB,CAAC;AAE9D,MAAM,YAAY,GAAG,CAAC,EACpB,KAAK,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,EAAE;QACnC,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE;YACzB,MAAM,EAAC,QAAQ,EAAC,GAAG,QAAQ,CAAC;YAC5B,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC;SACnE;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,OAAO,KAAK,CAAC,MAAM;aAChB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;aACzD,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAC,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,EAAC,CAAC,CAAC;aACpE,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACnB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE;gBACtB,OAAO,IAAI,CAAC;aACb;YAED,OAAO,EAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE,EAAC,CAAC;QACtC,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAEjC,OAAO,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,EAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAC,GAAG,uBAAuB,CAC/C,KAAK,CAAC,MAAM,EACZ,QAAQ,CAAC,GAAG,CACb,CAAC;QAEF,MAAM,OAAO,GACX,CAAC,KAAK,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5E,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE;YACvB,IAAI,MAAM,IAAI,IAAI,EAAE;gBAClB,OAAO,IAAI,CAAC;aACb;YAED,WAAW,EAAE,CAAC;YAEd,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC;gBAC5B,IAAI,EAAE,iBAAiB;gBACvB,MAAM,EAAE,MAAM,CAAC,GAAG;gBAClB,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;gBAC3B,UAAU,CAAC,QAAQ,CAAC;oBAClB,GAAG,CAAC,OAAO;wBACT,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE;wBAC7B,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC7D,MAAM,EAAE,KAAK,CAAC,GAAG;iBAClB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAE9C,OAAO,CACL,CAAC,QAAQ,CACP,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CACf,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,OAAO,CAAC,CAClB,QAAQ,CAAC,CAAC,QAAQ,CAAC,EACnB,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,CAAC,EACZ,KAAK,EACL,UAAU,EACV,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,GACd,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,KAAK,GAAG,OAAO,CACnB,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,EAAC,IAAI,EAAC,CAAC,EACxC,CAAC,IAAI,EAAE,YAAY,CAAC,CACrB,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAC5B,GAAG,EAAE,CAAC,gBAAgB,CAAC,aAAa,CAAC,EACrC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,EACvC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAChC;MAAA,CAAC,UAAU,CACT,qBAAqB,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAClD,4BAA4B,CAAC,CAAC,KAAK,CAAC,CACpC;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CACrC;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,CAC9C;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,kBAAkB,IAAI,CACrB,CAAC,WAAW,CACV,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAClB,cAAc;gBACZ,CAAC,CAAC,kCAAkC;gBACpC,CAAC,CAAC,+BAA+B,EACnC;gBACE,aAAa,EAAE,4BAA4B,CAAC,aAAa,CAAC;aAC3D,CACF,CAAC,EACF,CACH,CACD;QAAA,CAAC,YAAY,CACX,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,QAAQ,CAAC,CAAC,kBAAkB,CAAC,EAEjC;MAAA,EAAE,UAAU,CACZ;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CACpD;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,aAAa,EAAE;QACb,aAAa,EAAE,QAAQ;QACvB,cAAc,EAAE,eAAe;QAC/B,MAAM,EAAE,MAAM;KACf;IACD,mBAAmB,EAAE;QACnB,aAAa,EAAE,QAAQ;QACvB,eAAe,EAAE,CAAC;KACnB;IACD,kBAAkB,EAAE;QAClB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,CAAC;KAChB;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;KACnB;IACD,YAAY,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE;KACf;CACF,CAAC,CAAC;AAEH,eAAe,IAAI,CAAC"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useMemo } from 'react';
|
|
19
|
-
import { StyleSheet, TouchableOpacity } from 'react-native';
|
|
19
|
+
import { Dimensions, StyleSheet, TouchableOpacity } from 'react-native';
|
|
20
20
|
import { Text, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
21
|
import { useTranslator } from '../../i18n';
|
|
22
22
|
import { getMenuTitle, isMenuIncompatible, isModuleNotFound, } from '../menu.helper';
|
|
@@ -40,11 +40,13 @@ const MenuTitle = ({ module, onPress }) => {
|
|
|
40
40
|
};
|
|
41
41
|
const styles = StyleSheet.create({
|
|
42
42
|
menuItemContainer: {
|
|
43
|
+
width: Dimensions.get('window').width * 0.6,
|
|
43
44
|
height: 60,
|
|
44
45
|
marginVertical: 8,
|
|
45
46
|
flexDirection: 'column',
|
|
46
47
|
justifyContent: 'center',
|
|
47
48
|
alignItems: 'flex-start',
|
|
49
|
+
marginLeft: 15,
|
|
48
50
|
},
|
|
49
51
|
text: {
|
|
50
52
|
marginHorizontal: 6,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuTitle.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuTitle.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"MenuTitle.js","sourceRoot":"","sources":["../../../src/navigator/drawer/MenuTitle.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACtE,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAExB,MAAM,SAAS,GAAG,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAE;IACtC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,cAAc,GAAG,OAAO,CAC5B,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAC/C,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAC1B,CAAC;IAEF,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,EACjD,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAC1B,CAAC;IAEF,OAAO,CACL,CAAC,gBAAgB,CACf,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAChC,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAC7B;MAAA,CAAC,IAAI,CACH,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAClC,SAAS,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CACjD;QAAA,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAC,CAAC,CAC/B;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,kBAAkB,IAAI,CACrB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAChE;UAAA,CAAC,IAAI,CAAC,CAAC,CACL,cAAc;gBACZ,CAAC,CAAC,2BAA2B;gBAC7B,CAAC,CAAC,wBAAwB,EAC5B;gBACE,aAAa,EAAE,MAAM,CAAC,gBAAgB;aACvC,CACF,CACH;QAAA,EAAE,IAAI,CAAC,CACR,CACH;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,iBAAiB,EAAE;QACjB,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,GAAG,GAAG;QAC3C,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,CAAC;QACjB,aAAa,EAAE,QAAQ;QACvB,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,YAAY;QACxB,UAAU,EAAE,EAAE;KACf;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,CAAC;KACpB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;KACnB;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
|
@@ -18,16 +18,15 @@
|
|
|
18
18
|
export function userHaveAccessToConfig({ config, user }) {
|
|
19
19
|
const { authorizedRoles } = config;
|
|
20
20
|
const { roles } = user;
|
|
21
|
+
const { roles: groupRoles } = user.group;
|
|
21
22
|
if (authorizedRoles == null ||
|
|
22
23
|
authorizedRoles.length === 0 ||
|
|
23
|
-
roles == null ||
|
|
24
|
-
|
|
24
|
+
((roles == null || roles.length === 0) &&
|
|
25
|
+
(groupRoles == null || groupRoles.length === 0))) {
|
|
25
26
|
return false;
|
|
26
27
|
}
|
|
27
28
|
const authorizedRoleIds = authorizedRoles.map(_role => _role.id);
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
return false;
|
|
29
|
+
return (roles.some(_role => authorizedRoleIds.includes(_role.id)) ||
|
|
30
|
+
groupRoles.some(_role => authorizedRoleIds.includes(_role.id)));
|
|
32
31
|
}
|
|
33
32
|
//# sourceMappingURL=roles.helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.helper.js","sourceRoot":"","sources":["../../src/navigator/roles.helper.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,UAAU,sBAAsB,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC;IACnD,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,CAAC;IACjC,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"roles.helper.js","sourceRoot":"","sources":["../../src/navigator/roles.helper.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,UAAU,sBAAsB,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC;IACnD,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,CAAC;IACjC,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC;IACrB,MAAM,EAAC,KAAK,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;IAEvC,IACE,eAAe,IAAI,IAAI;QACvB,eAAe,CAAC,MAAM,KAAK,CAAC;QAC5B,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;YACpC,CAAC,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,EAClD;QACA,OAAO,KAAK,CAAC;KACd;IAED,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEjE,OAAO,CACL,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAC/D,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.8",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -84,8 +84,8 @@
|
|
|
84
84
|
"vision-camera-code-scanner": "^0.2.0"
|
|
85
85
|
},
|
|
86
86
|
"dependencies": {
|
|
87
|
-
"@axelor/aos-mobile-error": "7.2.
|
|
88
|
-
"@axelor/aos-mobile-ui": "7.2.
|
|
87
|
+
"@axelor/aos-mobile-error": "7.2.8",
|
|
88
|
+
"@axelor/aos-mobile-ui": "7.2.8",
|
|
89
89
|
"@react-navigation/drawer": "6.6.3",
|
|
90
90
|
"@react-navigation/native": "6.1.7",
|
|
91
91
|
"@react-navigation/native-stack": "6.9.13",
|