@axelor/aos-mobile-core 7.0.2 → 7.0.3
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/screens/UserScreen.js +6 -6
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +2 -7
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/navigator/drawer/DrawerContent.js +3 -10
- package/lib/navigator/drawer/DrawerContent.js.map +1 -1
- package/lib/navigator/menu.helper.js +4 -3
- package/lib/navigator/menu.helper.js.map +1 -1
- package/lib/utils/image.d.ts +3 -0
- package/lib/utils/image.js +11 -3
- package/lib/utils/image.js.map +1 -1
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/string.d.ts +1 -0
- package/lib/utils/string.js +20 -0
- package/lib/utils/string.js.map +1 -1
- package/package.json +3 -3
|
@@ -66,7 +66,7 @@ const UserScreen = ({ children }) => {
|
|
|
66
66
|
}, [dispatch, user]);
|
|
67
67
|
return (<Screen style={styles.container}>
|
|
68
68
|
<ScrollView>
|
|
69
|
-
<View style={styles.
|
|
69
|
+
<View style={styles.alignContainer}>
|
|
70
70
|
<ImageBubble style={styles.imageIcon} imageSize={Dimensions.get('window').width * 0.3} defaultIconSize={60} source={{
|
|
71
71
|
uri: `${baseUrl}ws/rest/com.axelor.auth.db.User/${user.id}/image/download?v=${user.version}&parentId=${user.id}&parentModel=com.axelor.auth.db.User&image=true`,
|
|
72
72
|
}} listComponent={[
|
|
@@ -74,11 +74,11 @@ const UserScreen = ({ children }) => {
|
|
|
74
74
|
<Icon style={styles.logOutIcon} name="power-off" color={Colors.primaryColor.background} size={Dimensions.get('window').width * 0.07} touchable={true} onPress={() => dispatch(logout())}/>,
|
|
75
75
|
]}/>
|
|
76
76
|
<Text style={styles.textUser}>{user.name}</Text>
|
|
77
|
+
{baseConfig?.enableMultiCompany && (<Picker title={I18n.t('User_ActiveCompany')} listItems={companyList} labelField="name" valueField="id" onValueChange={updateActiveCompany} isValueItem={true} disabled={!canModifyCompany} disabledValue={user?.activeCompany?.name}/>)}
|
|
78
|
+
{children}
|
|
79
|
+
{languageList?.length > 1 && (<Picker title={I18n.t('User_Language')} defaultValue={user.language} listItems={languageList} labelField="name" valueField="code" onValueChange={updateLanguage} emptyValue={false}/>)}
|
|
80
|
+
{!Theme.isColorBlind && Theme.themes?.length !== 1 && (<Picker title={I18n.t('User_Theme')} defaultValue={Theme.activeTheme?.key} listItems={Theme.themes} labelField="name" valueField="key" onValueChange={handleChangeTheme} emptyValue={false}/>)}
|
|
77
81
|
</View>
|
|
78
|
-
{baseConfig?.enableMultiCompany && (<Picker title={I18n.t('User_ActiveCompany')} listItems={companyList} labelField="name" valueField="id" onValueChange={updateActiveCompany} isValueItem={true} disabled={!canModifyCompany} disabledValue={user?.activeCompany?.name}/>)}
|
|
79
|
-
{children}
|
|
80
|
-
{languageList?.length > 1 && (<Picker title={I18n.t('User_Language')} defaultValue={user.language} listItems={languageList} labelField="name" valueField="code" onValueChange={updateLanguage} emptyValue={false}/>)}
|
|
81
|
-
{!Theme.isColorBlind && Theme.themes?.length !== 1 && (<Picker title={I18n.t('User_Theme')} defaultValue={Theme.activeTheme?.key} listItems={Theme.themes} labelField="name" valueField="key" onValueChange={handleChangeTheme} emptyValue={false}/>)}
|
|
82
82
|
</ScrollView>
|
|
83
83
|
</Screen>);
|
|
84
84
|
};
|
|
@@ -86,7 +86,7 @@ const getStyles = Colors => StyleSheet.create({
|
|
|
86
86
|
container: {
|
|
87
87
|
justifyContent: 'center',
|
|
88
88
|
},
|
|
89
|
-
|
|
89
|
+
alignContainer: {
|
|
90
90
|
alignItems: 'center',
|
|
91
91
|
},
|
|
92
92
|
imageIcon: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UserScreen.js","sourceRoot":"","sources":["../../../src/auth/screens/UserScreen.js"],"names":[],"mappings":"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"}
|
|
@@ -29,11 +29,8 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
|
|
|
29
29
|
const [pickerWidth, setPickerWidth] = useState();
|
|
30
30
|
const [pickerIsOpen, setPickerIsOpen] = useState(false);
|
|
31
31
|
const [selectedDate, setSelectedDate] = useState(defaultDate);
|
|
32
|
-
const [isFocused, setIsFocused] = useState(false);
|
|
33
32
|
useEffect(() => {
|
|
34
|
-
|
|
35
|
-
setSelectedDate(defaultDate);
|
|
36
|
-
}
|
|
33
|
+
setSelectedDate(defaultDate);
|
|
37
34
|
}, [defaultDate]);
|
|
38
35
|
const wrapperRef = useRef(null);
|
|
39
36
|
const clickOutside = useClickOutside({
|
|
@@ -43,13 +40,11 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
|
|
|
43
40
|
useEffect(() => {
|
|
44
41
|
if (clickOutside === OUTSIDE_INDICATOR && pickerIsOpen) {
|
|
45
42
|
setPickerIsOpen(false);
|
|
46
|
-
setIsFocused(false);
|
|
47
43
|
}
|
|
48
44
|
}, [clickOutside, pickerIsOpen]);
|
|
49
45
|
const togglePicker = () => {
|
|
50
46
|
if (!readonly) {
|
|
51
47
|
setPickerIsOpen(current => !current);
|
|
52
|
-
setIsFocused(current => !current);
|
|
53
48
|
}
|
|
54
49
|
};
|
|
55
50
|
const onCheckDate = useCallback(() => {
|
|
@@ -82,7 +77,7 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
|
|
|
82
77
|
commonStyles.filterSize,
|
|
83
78
|
commonStyles.filterAlign,
|
|
84
79
|
styles.rightIconButton,
|
|
85
|
-
|
|
80
|
+
pickerIsOpen && commonStyles.inputFocused,
|
|
86
81
|
]}/>
|
|
87
82
|
<View style={Platform.OS === 'ios' ? styles.dropdownContainer : null}>
|
|
88
83
|
{pickerIsOpen ? (<Card style={styles.selectionContainer}>
|
|
@@ -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,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAYjD,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,MAAM,SAAS,GAAG,CAAC,EACjB,KAAK,EACL,WAAW,EACX,IAAI,GAAG,UAAU,EACjB,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,KAAK,EACL,QAAQ,GAAG,KAAK,GACD,EAAE,EAAE;IACnB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAU,CAAC;IACzD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,7 @@ import AuthMenuIconButton from './AuthMenuIconButton';
|
|
|
30
30
|
import { useSelector } from '../../redux/hooks';
|
|
31
31
|
import { PopupApplicationNotConfigured, PopupMinimalRequiredVersion, } from '../../components';
|
|
32
32
|
import MenuTitle from './MenuTitle';
|
|
33
|
+
import { formatVersionString } from '../../utils/string';
|
|
33
34
|
const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, version, versionCheckConfig, }) => {
|
|
34
35
|
useEffect(() => {
|
|
35
36
|
navigation.dispatch(_state => {
|
|
@@ -58,16 +59,8 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
|
|
|
58
59
|
const secondaryMenusLeft = useRef(new Animated.Value(0)).current;
|
|
59
60
|
const { activeModule } = useContext(ModuleNavigatorContext);
|
|
60
61
|
const { mobileSettings } = useSelector(_state => _state.config);
|
|
61
|
-
const mobileVersion =
|
|
62
|
-
const minimalRequiredVersion = useMemo(() =>
|
|
63
|
-
const formattedRequiredApp = mobileSettings?.minimalRequiredMobileAppVersion?.replace(/\D/g, '');
|
|
64
|
-
if (formattedRequiredApp?.length === 3) {
|
|
65
|
-
return formattedRequiredApp;
|
|
66
|
-
}
|
|
67
|
-
else {
|
|
68
|
-
return null;
|
|
69
|
-
}
|
|
70
|
-
}, [mobileSettings]);
|
|
62
|
+
const mobileVersion = formatVersionString(version);
|
|
63
|
+
const minimalRequiredVersion = useMemo(() => formatVersionString(mobileSettings?.minimalRequiredMobileAppVersion), [mobileSettings]);
|
|
71
64
|
const innerMenuIsVisible = useMemo(() => activeModule.name !== authModule.name, [activeModule]);
|
|
72
65
|
const drawerModules = useMemo(() => modules
|
|
73
66
|
.filter(moduleHasMenus)
|
|
@@ -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;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,aAAa,EAAE,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AACtC,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,6BAA6B,EAC7B,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,SAAS,MAAM,aAAa,CAAC;
|
|
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;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,aAAa,EAAE,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AACtC,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,6BAA6B,EAC7B,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEvD,MAAM,aAAa,GAAG,CAAC,EACrB,KAAK,EACL,OAAO,EACP,UAAU,EACV,aAAa,EACb,SAAS,EACT,OAAO,EACP,kBAAkB,GACnB,EAAE,EAAE;IACH,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC3B,OAAO,aAAa,CAAC,KAAK,CAAC;gBACzB,GAAG,MAAM;gBACT,MAAM,EAAE,OAAO;oBACb,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;oBAClC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;oBAClB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;oBAElC,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;yBAC/B,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;wBACrB,GAAG,IAAI,CAAC,CAAC,CAAC;wBACV,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;wBAC3D,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;qBACb,CAAC,CAAC;yBACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;yBACjC,GAAG,CAAC,IAAI,CAAC,EAAE,CACV,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,CAC7D,CAAC;gBACN,CAAC,CAAC;aACL,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAE1B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,EAAC,aAAa,EAAC,GAAG,SAAS,EAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACjE,MAAM,EAAC,YAAY,EAAC,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC;IAC1D,MAAM,EAAC,cAAc,EAAC,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,sBAAsB,GAAG,OAAO,CACpC,GAAG,EAAE,CAAC,mBAAmB,CAAC,cAAc,EAAE,+BAA+B,CAAC,EAC1E,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,EAC3C,CAAC,YAAY,CAAC,CACf,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CACH,OAAO;SACJ,MAAM,CAAC,cAAc,CAAC;SACtB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EACxD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,qBAAqB,GAAG,OAAO,CACnC,GAAG,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,EACxC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,kBAAkB,EAAE;YACtB,iBAAiB,EAAE,CAAC;SACrB;aAAM;YACL,kBAAkB,EAAE,CAAC;SACtB;IACH,CAAC,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAEhE,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAClC,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,GAAG;YACb,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC,KAAK,EAAE,CAAC;IACb,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC1C,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAClC,OAAO,EAAE,GAAG;YACZ,QAAQ,EAAE,CAAC;YACX,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC,KAAK,EAAE,CAAC;IACb,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,MAAM,iBAAiB,GAAG,OAAO,CAC/B,GAAG,EAAE,CACH,qBAAqB;QACnB,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC;YAC7B,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;YACpB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;SAC5B,CAAC;QACJ,CAAC,CAAC,CAAC,EACP,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,CAC5C,CAAC;IAEF,MAAM,qBAAqB,GAAG,GAAG,EAAE;QACjC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE/B,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAC7B,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC;QAEF,MAAM,OAAO,GACX,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,KAAK;YAC3C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC;YAC5B,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,KAAK,CAAC,GAAG;YACjB,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;YAC3B,UAAU,CAAC,QAAQ,CAAC;gBAClB,GAAG,CAAC,OAAO;oBACT,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE;oBAC7B,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;gBAC5D,MAAM,EAAE,KAAK,CAAC,GAAG;aAClB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IAEF,IAAI,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;QACxC,OAAO,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,EAAG,CAAC;KAChE;IAED,IACE,kBAAkB,EAAE,QAAQ,KAAK,IAAI;QACrC,aAAa,GAAG,sBAAsB,EACtC;QACA,OAAO,CACL,CAAC,2BAA2B,CAC1B,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CACvC,SAAS,CAAC,CAAC,SAAS,CAAC,EACrB,CACH,CAAC;KACH;IAED,OAAO,CACL,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACpC;MAAA,CAAC,qBAAqB,IAAI,CACxB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;UAAA,CAAC,IAAI,CACH;YAAA,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAC5B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CACvD;gBAAA,CAAC,cAAc,CACb,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CACnB,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CACnB,QAAQ,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CACpD,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC3B,KAAK,CAAC,CACJ,OAAO,KAAK,YAAY;oBACtB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,gBAAgB;oBACtC,CAAC,CAAC,IAAI,CACT,CACD,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC3C,aAAa,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAE5C;cAAA,EAAE,IAAI,CAAC,CACR,CAAC,CACJ;UAAA,EAAE,IAAI,CACN;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CACtC;YAAA,CAAC,kBAAkB,CACjB,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,CAChD,mBAAmB,CAAC,CAAC,aAAa,CAAC,CACnC,OAAO,CAAC,CAAC,qBAAqB,CAAC,EAEnC;UAAA,EAAE,IAAI,CACR;QAAA,EAAE,IAAI,CAAC,CACR,CACD;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;QAAA,CAAC,IAAI,CACH;UAAA,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAC5B,CAAC,SAAS,CACR,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAClB,MAAM,CAAC,CAAC,OAAO,CAAC,CAChB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAC3C,CACH,CAAC,CACJ;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,QAAQ,CAAC,IAAI,CACZ,KAAK,CAAC,CAAC;YACL,MAAM,CAAC,uBAAuB;YAC9B;gBACE,IAAI,EAAE,iBAAiB;aACxB;SACF,CAAC,CACF;UAAA,CAAC,IAAI,CACH,YAAY,CAAC,CACX,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACxD,CACD,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,QAAQ,CAAC,CACP,CAAC,qBAAqB,CAAC,CAAC,CAAC,CACvB,CAAC,kBAAkB,CACjB,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,CAChD,mBAAmB,CAAC,CAAC,aAAa,CAAC,CACnC,OAAO,CAAC,CAAC,qBAAqB,CAAC,EAC/B,CACH,CAAC,CAAC,CAAC,IAAI,CACT,CACD,WAAW,CAAC,CACV,qBAAqB;YACnB,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC;YACV,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAChD,EAEL;QAAA,EAAE,QAAQ,CAAC,IAAI,CACjB;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,YAAY,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CACzB,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,MAAM,CAAC,qBAAqB;QAC7C,QAAQ,EAAE,QAAQ;QAClB,MAAM,EAAE,CAAC;KACV;IACD,cAAc,EAAE;QACd,IAAI,EAAE,CAAC;KACR;IACD,cAAc,EAAE;QACd,cAAc,EAAE,eAAe;QAC/B,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,EAAE;QACpB,MAAM,EAAE,CAAC;KACV;IACD,mBAAmB,EAAE;QACnB,cAAc,EAAE,CAAC;KAClB;IACD,iBAAiB,EAAE;QACjB,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,QAAQ;QACxB,MAAM,EAAE,CAAC;KACV;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,UAAU;QACpB,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,IAAI,EAAE,CAAC;QACP,GAAG,EAAE,CAAC;QACN,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,GAAG;QAClB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;QAC7C,YAAY,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;KACpC;CACF,CAAC,CAAC;AAEL,eAAe,aAAa,CAAC"}
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import { checkNullString } from '@axelor/aos-mobile-ui';
|
|
19
19
|
import { userHaveAccessToConfig } from './roles.helper';
|
|
20
|
+
import { formatVersionString } from '../utils/string';
|
|
20
21
|
const userHaveAccessToMenu = ({ menuConfig, user }) => {
|
|
21
22
|
return userHaveAccessToConfig({ config: menuConfig, user: user });
|
|
22
23
|
};
|
|
@@ -58,13 +59,13 @@ export function isMenuIncompatible(compatibility) {
|
|
|
58
59
|
if (isModuleNotFound(compatibility)) {
|
|
59
60
|
return true;
|
|
60
61
|
}
|
|
61
|
-
const moduleVersion =
|
|
62
|
+
const moduleVersion = formatVersionString(compatibility.moduleVersion);
|
|
62
63
|
if (!checkNullString(compatibility.downToVersion) &&
|
|
63
|
-
moduleVersion <
|
|
64
|
+
moduleVersion < formatVersionString(compatibility.downToVersion)) {
|
|
64
65
|
return true;
|
|
65
66
|
}
|
|
66
67
|
if (!checkNullString(compatibility.upToVersion) &&
|
|
67
|
-
moduleVersion >=
|
|
68
|
+
moduleVersion >= formatVersionString(compatibility.upToVersion)) {
|
|
68
69
|
return true;
|
|
69
70
|
}
|
|
70
71
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/navigator/menu.helper.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,sBAAsB,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/navigator/menu.helper.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,sBAAsB,EAAC,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAEpD,MAAM,oBAAoB,GAAG,CAAC,EAAC,UAAU,EAAE,IAAI,EAAC,EAAE,EAAE;IAClD,OAAO,sBAAsB,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;IACxC,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7C,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,EAAC,UAAU,EAAC,EAAE,EAAE;IAC9C,IAAI,UAAU,IAAI,IAAI,EAAE;QACtB,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAC,EAAE,EAAE;IACzD,IAAI,kBAAkB,CAAC,EAAC,QAAQ,EAAC,CAAC,EAAE;QAClC,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,KAAK,OAAO,CAAC,CAAC;QACzE,IAAI,sBAAsB,CAAC,EAAC,UAAU,EAAC,CAAC,EAAE;YACxC,OAAO,oBAAoB,CAAC,EAAC,UAAU,EAAE,IAAI,EAAC,CAAC,CAAC;SACjD;QACD,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,IAAI,EAAE,EAAC,IAAI,EAAC;IACvC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE;QACtB,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC3B;IACD,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,aAAa;IAC5C,OAAO,aAAa,EAAE,aAAa,IAAI,IAAI,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,aAAa;IAC9C,IAAI,aAAa,IAAI,IAAI,EAAE;QACzB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,gBAAgB,CAAC,aAAa,CAAC,EAAE;QACnC,OAAO,IAAI,CAAC;KACb;IAED,MAAM,aAAa,GAAG,mBAAmB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAEvE,IACE,CAAC,eAAe,CAAC,aAAa,CAAC,aAAa,CAAC;QAC7C,aAAa,GAAG,mBAAmB,CAAC,aAAa,CAAC,aAAa,CAAC,EAChE;QACA,OAAO,IAAI,CAAC;KACb;IAED,IACE,CAAC,eAAe,CAAC,aAAa,CAAC,WAAW,CAAC;QAC3C,aAAa,IAAI,mBAAmB,CAAC,aAAa,CAAC,WAAW,CAAC,EAC/D;QACA,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/lib/utils/image.d.ts
CHANGED
|
@@ -4,3 +4,6 @@ export declare const useMetafileUri: () => (metafileId: number) => {
|
|
|
4
4
|
export declare const useBinaryImageUri: () => (id: number, version: number, model: string) => {
|
|
5
5
|
uri: string;
|
|
6
6
|
};
|
|
7
|
+
export declare const useBinaryPictureUri: () => (id: number, version: number, model: string) => {
|
|
8
|
+
uri: string;
|
|
9
|
+
};
|
package/lib/utils/image.js
CHANGED
|
@@ -19,7 +19,7 @@ import { useCallback } from 'react';
|
|
|
19
19
|
import { useSelector } from 'react-redux';
|
|
20
20
|
export const useMetafileUri = () => {
|
|
21
21
|
const { baseUrl } = useSelector((state) => state.auth);
|
|
22
|
-
return useCallback((metafileId) => metafileId
|
|
22
|
+
return useCallback((metafileId) => metafileId != null
|
|
23
23
|
? {
|
|
24
24
|
uri: `${baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${metafileId}/content/download`,
|
|
25
25
|
}
|
|
@@ -27,9 +27,17 @@ export const useMetafileUri = () => {
|
|
|
27
27
|
};
|
|
28
28
|
export const useBinaryImageUri = () => {
|
|
29
29
|
const { baseUrl } = useSelector((state) => state.auth);
|
|
30
|
-
return useCallback((id, version, model) => id && version && model
|
|
30
|
+
return useCallback((id, version, model) => id != null && version != null && model != null
|
|
31
31
|
? {
|
|
32
|
-
uri: `${baseUrl}ws/${model}/${id}/image/download?v=${version}&parentId=${id}&parentModel=${model}&image=true`,
|
|
32
|
+
uri: `${baseUrl}ws/rest/${model}/${id}/image/download?v=${version}&parentId=${id}&parentModel=${model}&image=true`,
|
|
33
|
+
}
|
|
34
|
+
: null, [baseUrl]);
|
|
35
|
+
};
|
|
36
|
+
export const useBinaryPictureUri = () => {
|
|
37
|
+
const { baseUrl } = useSelector((state) => state.auth);
|
|
38
|
+
return useCallback((id, version, model) => id != null && version != null && model != null
|
|
39
|
+
? {
|
|
40
|
+
uri: `${baseUrl}ws/rest/${model}/${id}/picture/download?v=${version}&parentId=${id}&parentModel=${model}&image=true`,
|
|
33
41
|
}
|
|
34
42
|
: null, [baseUrl]);
|
|
35
43
|
};
|
package/lib/utils/image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/utils/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,UAAkB,EAAE,EAAE,CACrB,UAAU;
|
|
1
|
+
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/utils/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,UAAkB,EAAE,EAAE,CACrB,UAAU,IAAI,IAAI;QAChB,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,uCAAuC,UAAU,mBAAmB;SACpF;QACH,CAAC,CAAC,IAAI,EACV,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,EAAU,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CAC7C,EAAE,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI;QAC5C,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,WAAW,KAAK,IAAI,EAAE,qBAAqB,OAAO,aAAa,EAAE,gBAAgB,KAAK,aAAa;SACnH;QACH,CAAC,CAAC,IAAI,EACV,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,EAAU,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CAC7C,EAAE,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI;QAC5C,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,WAAW,KAAK,IAAI,EAAE,uBAAuB,OAAO,aAAa,EAAE,gBAAgB,KAAK,aAAa;SACrH;QACH,CAAC,CAAC,IAAI,EACV,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC"}
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export { updateAgendaItems } from './agenda';
|
|
|
2
2
|
export { isDate, isDateTime, getNextMonth, getPreviousMonth, diffDate, sameDate, incrementDate, } from './date';
|
|
3
3
|
export { displayItemName } from './displayers';
|
|
4
4
|
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, } from './formatters';
|
|
5
|
-
export { useBinaryImageUri, useMetafileUri } from './image';
|
|
5
|
+
export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
|
|
6
6
|
export { filterList, filterListContain } from './list';
|
|
7
7
|
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, } from './time';
|
|
8
8
|
export { areObjectsEquals, isEmpty, fetchJsonField, filterObjectsFields, pickFieldsOfObject, isPlainObject, } from './object';
|
package/lib/utils/index.js
CHANGED
|
@@ -19,7 +19,7 @@ export { updateAgendaItems } from './agenda';
|
|
|
19
19
|
export { isDate, isDateTime, getNextMonth, getPreviousMonth, diffDate, sameDate, incrementDate, } from './date';
|
|
20
20
|
export { displayItemName } from './displayers';
|
|
21
21
|
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, } from './formatters';
|
|
22
|
-
export { useBinaryImageUri, useMetafileUri } from './image';
|
|
22
|
+
export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
|
|
23
23
|
export { filterList, filterListContain } from './list';
|
|
24
24
|
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, } from './time';
|
|
25
25
|
export { areObjectsEquals, isEmpty, fetchJsonField, filterObjectsFields, pickFieldsOfObject, isPlainObject, } from './object';
|
package/lib/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,EACL,MAAM,EACN,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,iBAAiB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,EACL,MAAM,EACN,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAC,MAAM,QAAQ,CAAC;AACrD,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAC,MAAM,UAAU,CAAC;AAC7E,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC"}
|
package/lib/utils/string.d.ts
CHANGED
|
@@ -2,3 +2,4 @@ export declare function splitInTwo(value: String, spacer?: string): Array<String
|
|
|
2
2
|
export declare function isHtml(value: string): boolean;
|
|
3
3
|
export declare function stringNoAccent(message: any): any;
|
|
4
4
|
export declare function checkNullString(message: any): boolean;
|
|
5
|
+
export declare function formatVersionString(version: string): number;
|
package/lib/utils/string.js
CHANGED
|
@@ -51,4 +51,24 @@ export function checkNullString(message) {
|
|
|
51
51
|
return newMessage == null || newMessage === '';
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
+
export function formatVersionString(version) {
|
|
55
|
+
if (typeof version !== 'string') {
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
const vparts = version.split('.');
|
|
59
|
+
let result = '';
|
|
60
|
+
for (const v of vparts) {
|
|
61
|
+
if (isNaN(parseFloat(v))) {
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
64
|
+
result = result.concat(parseFloat(v).toString().padStart(3, '0'));
|
|
65
|
+
}
|
|
66
|
+
const missingVersionNumber = 3 - vparts.length;
|
|
67
|
+
if (missingVersionNumber > 0) {
|
|
68
|
+
for (let index = 0; index < missingVersionNumber; index++) {
|
|
69
|
+
result = result.concat('000');
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return parseFloat(result);
|
|
73
|
+
}
|
|
54
74
|
//# sourceMappingURL=string.js.map
|
package/lib/utils/string.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,UAAU,UAAU,CAAC,KAAa,EAAE,MAAM,GAAG,GAAG;IACpD,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAClC,MAAM,KAAK,GAAG,oBAAoB,CAAC;IACnC,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAO;IACpC,IAAI,OAAO,IAAI,IAAI,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;SAAM;QACL,MAAM,CAAC,GAAG,sDAAsD,CAAC;QACjE,MAAM,CAAC,GAAG,sDAAsD,CAAC;QACjE,IAAI,UAAU,GAAG,OAAO,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;QACD,OAAO,UAAU,CAAC;KACnB;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAO;IACrC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,IAAI,CAAC;KACb;SAAM;QACL,IAAI,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5C,OAAO,UAAU,IAAI,IAAI,IAAI,UAAU,KAAK,EAAE,CAAC;KAChD;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/utils/string.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,UAAU,UAAU,CAAC,KAAa,EAAE,MAAM,GAAG,GAAG;IACpD,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAClC,MAAM,KAAK,GAAG,oBAAoB,CAAC;IACnC,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAO;IACpC,IAAI,OAAO,IAAI,IAAI,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;SAAM;QACL,MAAM,CAAC,GAAG,sDAAsD,CAAC;QACjE,MAAM,CAAC,GAAG,sDAAsD,CAAC;QACjE,IAAI,UAAU,GAAG,OAAO,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;QACD,OAAO,UAAU,CAAC;KACnB;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAO;IACrC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,IAAI,CAAC;KACb;SAAM;QACL,IAAI,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5C,OAAO,UAAU,IAAI,IAAI,IAAI,UAAU,KAAK,EAAE,CAAC;KAChD;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,MAAM,GAAW,EAAE,CAAC;IAExB,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;QACtB,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;YACxB,MAAM;SACP;QAED,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;KACnE;IAED,MAAM,oBAAoB,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IAE/C,IAAI,oBAAoB,GAAG,CAAC,EAAE;QAC5B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,oBAAoB,EAAE,KAAK,EAAE,EAAE;YACzD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/B;KACF;IAED,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -82,8 +82,8 @@
|
|
|
82
82
|
"vision-camera-code-scanner": "^0.2.0"
|
|
83
83
|
},
|
|
84
84
|
"dependencies": {
|
|
85
|
-
"@axelor/aos-mobile-error": "7.0.
|
|
86
|
-
"@axelor/aos-mobile-ui": "7.0.
|
|
85
|
+
"@axelor/aos-mobile-error": "7.0.3",
|
|
86
|
+
"@axelor/aos-mobile-ui": "7.0.3",
|
|
87
87
|
"@react-navigation/drawer": "6.6.3",
|
|
88
88
|
"@react-navigation/native": "6.1.7",
|
|
89
89
|
"@react-navigation/native-stack": "6.9.13",
|