@axelor/aos-mobile-core 6.5.0 → 6.5.1
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/login-api.d.ts +1 -0
- package/lib/api/login-api.js +2 -2
- package/lib/api/login-api.js.map +1 -1
- package/lib/apiProviders/utils.js +8 -9
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/Module.d.ts +2 -0
- package/lib/app/RootNavigator.js +8 -1
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/auth/api/config-api.d.ts +1 -5
- package/lib/auth/api/config-api.js +1 -10
- package/lib/auth/api/config-api.js.map +1 -1
- package/lib/auth/features/companySlice.js +1 -1
- package/lib/auth/features/companySlice.js.map +1 -1
- package/lib/auth/features/configSlice.js +2 -2
- package/lib/auth/features/configSlice.js.map +1 -1
- package/lib/auth/features/languageSlice.js +1 -1
- package/lib/auth/features/languageSlice.js.map +1 -1
- package/lib/auth/features/userSlice.js +2 -2
- package/lib/auth/features/userSlice.js.map +1 -1
- package/lib/auth/hooks/use-auth-headers.d.ts +1 -0
- package/lib/auth/hooks/use-auth-headers.js +48 -0
- package/lib/auth/hooks/use-auth-headers.js.map +1 -0
- package/lib/auth/i18n/en.json +7 -1
- package/lib/auth/i18n/fr.json +7 -1
- package/lib/auth/index.js +3 -0
- package/lib/auth/index.js.map +1 -1
- package/lib/auth/screens/SettingsScreen.js +13 -2
- package/lib/auth/screens/SettingsScreen.js.map +1 -1
- package/lib/auth/screens/UserScreen.js +0 -6
- package/lib/auth/screens/UserScreen.js.map +1 -1
- package/lib/components/external/Scanner/Scanner.js +10 -6
- package/lib/components/external/Scanner/Scanner.js.map +1 -1
- package/lib/components/molecules/ErrorText/ErrorText.d.ts +2 -2
- package/lib/components/molecules/ErrorText/ErrorText.js +28 -11
- package/lib/components/molecules/ErrorText/ErrorText.js.map +1 -1
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.d.ts +2 -1
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js +9 -9
- package/lib/components/molecules/HeaderOptionsMenuItem/HeaderOptionMenuItem.js.map +1 -1
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.d.ts +3 -1
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js +18 -33
- package/lib/components/molecules/InputBarCodeCard/InputBarCodeCard.js.map +1 -1
- package/lib/components/molecules/LoginButton/LoginButton.d.ts +2 -1
- package/lib/components/molecules/LoginButton/LoginButton.js +4 -3
- package/lib/components/molecules/LoginButton/LoginButton.js.map +1 -1
- package/lib/components/molecules/MailMessageReadIcon/MailMessageReadIcon.d.ts +4 -0
- package/lib/components/molecules/MailMessageReadIcon/MailMessageReadIcon.js +10 -6
- package/lib/components/molecules/MailMessageReadIcon/MailMessageReadIcon.js.map +1 -1
- package/lib/components/molecules/index.d.ts +0 -1
- package/lib/components/molecules/index.js +0 -1
- package/lib/components/molecules/index.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +4 -0
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.d.ts +2 -3
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js +31 -36
- package/lib/components/organisms/HeaderOptionsMenu/HeaderOptionsMenu.js.map +1 -1
- package/lib/components/organisms/MailMessageCard/MailMessageCard.d.ts +1 -2
- package/lib/components/organisms/MailMessageCard/MailMessageCard.js +2 -2
- package/lib/components/organisms/MailMessageCard/MailMessageCard.js.map +1 -1
- package/lib/components/organisms/MailMessageCommentCard/MailMessageCommentCard.d.ts +1 -1
- package/lib/components/organisms/MailMessageCommentCard/MailMessageCommentCard.js +3 -1
- package/lib/components/organisms/MailMessageCommentCard/MailMessageCommentCard.js.map +1 -1
- package/lib/components/organisms/PasswordInput/PasswordInput.js +1 -1
- package/lib/components/organisms/PasswordInput/PasswordInput.js.map +1 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.d.ts +2 -1
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js +8 -13
- package/lib/components/organisms/ScannerAutocompleteSearch/ScannerAutocompleteSearch.js.map +1 -1
- package/lib/components/organisms/UrlInput/UrlInput.js +1 -1
- package/lib/components/organisms/UrlInput/UrlInput.js.map +1 -1
- package/lib/components/organisms/UsernameInput/UsernameInput.js +1 -1
- package/lib/components/organisms/UsernameInput/UsernameInput.js.map +1 -1
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.d.ts +1 -2
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js +4 -2
- package/lib/components/templates/AttachedFilesView/AttachedFilesView.js.map +1 -1
- package/lib/components/templates/MailMessageView/MailMessageView.d.ts +1 -2
- package/lib/components/templates/MailMessageView/MailMessageView.js +38 -24
- package/lib/components/templates/MailMessageView/MailMessageView.js.map +1 -1
- package/lib/features/attachedFilesSlice.js +3 -3
- package/lib/features/attachedFilesSlice.js.map +1 -1
- package/lib/features/authSlice.d.ts +27 -24
- package/lib/features/authSlice.js +27 -10
- package/lib/features/authSlice.js.map +1 -1
- package/lib/features/mailMessageSlice.js +10 -10
- package/lib/features/mailMessageSlice.js.map +1 -1
- package/lib/features/menuConfigSlice.js +1 -1
- package/lib/features/menuConfigSlice.js.map +1 -1
- package/lib/features/metafileSlice.js +1 -1
- package/lib/features/metafileSlice.js.map +1 -1
- package/lib/features/mobileConfigSlice.js +1 -1
- package/lib/features/mobileConfigSlice.js.map +1 -1
- package/lib/header/HeaderActionsProvider.d.ts +15 -0
- package/lib/header/HeaderActionsProvider.js +60 -0
- package/lib/header/HeaderActionsProvider.js.map +1 -0
- package/lib/header/hooks.d.ts +37 -0
- package/lib/header/hooks.js +105 -0
- package/lib/header/hooks.js.map +1 -0
- package/lib/header/index.d.ts +3 -0
- package/lib/header/index.js +20 -0
- package/lib/header/index.js.map +1 -0
- package/lib/header/types.d.ts +22 -0
- package/lib/header/types.js +19 -0
- package/lib/header/types.js.map +1 -0
- package/lib/header/utils.d.ts +3 -0
- package/lib/header/utils.js +51 -0
- package/lib/header/utils.js.map +1 -0
- package/lib/hooks/use-header-registers.d.ts +1 -0
- package/lib/{components/molecules/IconSettings/IconSettings.js → hooks/use-header-registers.js} +3 -13
- package/lib/hooks/use-header-registers.js.map +1 -0
- package/lib/hooks/use-navigation.d.ts +1 -0
- package/lib/hooks/use-navigation.js +22 -0
- package/lib/hooks/use-navigation.js.map +1 -0
- package/lib/hooks/use-scan-activator.d.ts +9 -0
- package/lib/hooks/use-scan-activator.js +60 -0
- package/lib/hooks/use-scan-activator.js.map +1 -0
- package/lib/i18n/component/Translator.d.ts +3 -1
- package/lib/i18n/translations/en.json +24 -1
- package/lib/i18n/translations/fr.json +24 -1
- package/lib/index.d.ts +2 -0
- package/lib/index.js +2 -0
- package/lib/index.js.map +1 -1
- package/lib/navigator/Navigator.js +12 -35
- package/lib/navigator/Navigator.js.map +1 -1
- package/lib/navigator/drawer/Header.d.ts +7 -0
- package/lib/navigator/drawer/Header.js +71 -0
- package/lib/navigator/drawer/Header.js.map +1 -0
- package/lib/screens/AttachedFilesScreen.d.ts +1 -2
- package/lib/screens/AttachedFilesScreen.js +2 -2
- package/lib/screens/AttachedFilesScreen.js.map +1 -1
- package/lib/screens/LoginScreen.js +21 -10
- package/lib/screens/LoginScreen.js.map +1 -1
- package/lib/screens/MailMessageScreen.d.ts +1 -2
- package/lib/screens/MailMessageScreen.js +2 -2
- package/lib/screens/MailMessageScreen.js.map +1 -1
- package/lib/utils/api.d.ts +2 -0
- package/lib/utils/api.js +47 -0
- package/lib/utils/api.js.map +1 -0
- package/lib/utils/formatters.js +16 -0
- package/lib/utils/formatters.js.map +1 -1
- package/lib/utils/storage-keys.d.ts +1 -0
- package/lib/utils/storage-keys.js +19 -0
- package/lib/utils/storage-keys.js.map +1 -0
- package/lib/utils/string.d.ts +1 -1
- package/lib/utils/string.js +1 -1
- package/lib/utils/string.js.map +1 -1
- package/package.json +3 -3
- package/lib/components/molecules/IconSettings/IconSettings.d.ts +0 -4
- package/lib/components/molecules/IconSettings/IconSettings.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailMessageCommentCard.js","sourceRoot":"","sources":["../../../../src/components/organisms/MailMessageCommentCard/MailMessageCommentCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAChE,OAAO,EACL,IAAI,EACJ,eAAe,EACf,SAAS,EACT,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"MailMessageCommentCard.js","sourceRoot":"","sources":["../../../../src/components/organisms/MailMessageCommentCard/MailMessageCommentCard.tsx"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ import useTranslator from '../../../i18n/hooks/use-translator';
|
|
|
22
22
|
const PasswordInput = ({ style, value, onChange, readOnly }) => {
|
|
23
23
|
const [visible, setVisible] = useState(false);
|
|
24
24
|
const I18n = useTranslator();
|
|
25
|
-
return (<IconInput style={style} value={value} onChange={onChange} readOnly={readOnly} secureTextEntry={!visible} placeholder={I18n.t('Auth_Password')} leftIconsList={[<Icon name="key" size={17} style={styles.icon}/>]} rightIconsList={[
|
|
25
|
+
return (<IconInput style={style} value={value} onChange={onChange} readOnly={readOnly} required={true} secureTextEntry={!visible} placeholder={I18n.t('Auth_Password')} leftIconsList={[<Icon name="key" size={17} style={styles.icon}/>]} rightIconsList={[
|
|
26
26
|
<Icon name={visible ? 'eye' : 'eye-slash'} size={17} touchable={true} onPress={() => setVisible(!visible)} style={styles.icon}/>,
|
|
27
27
|
]}/>);
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PasswordInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/PasswordInput/PasswordInput.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,IAAI,EAAE,SAAS,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAC,EAAE,EAAE;IAC3D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,OAAO,CACL,CAAC,SAAS,CACR,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAC1B,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CACrC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC,CACnE,cAAc,CAAC,CAAC;YACd,CAAC,IAAI,CACH,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CACpC,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CACpC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EACnB;SACH,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"PasswordInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/PasswordInput/PasswordInput.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,IAAI,EAAE,SAAS,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAC,EAAE,EAAE;IAC3D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,OAAO,CACL,CAAC,SAAS,CACR,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,IAAI,CAAC,CACf,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAC1B,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CACrC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC,CACnE,cAAc,CAAC,CAAC;YACd,CAAC,IAAI,CACH,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CACpC,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CACpC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EACnB;SACH,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}
|
|
@@ -11,6 +11,7 @@ interface AutocompleteSearchProps {
|
|
|
11
11
|
navigate?: boolean;
|
|
12
12
|
oneFilter?: boolean;
|
|
13
13
|
selectLastItem?: boolean;
|
|
14
|
+
style?: any;
|
|
14
15
|
}
|
|
15
|
-
declare const ScannerAutocompleteSearch: ({ objectList, value, onChangeValue, fetchData, displayValue, placeholder, scanKeySearch, isFocus, changeScreenAfter, navigate, oneFilter, selectLastItem, }: AutocompleteSearchProps) => JSX.Element;
|
|
16
|
+
declare const ScannerAutocompleteSearch: ({ objectList, value, onChangeValue, fetchData, displayValue, placeholder, scanKeySearch, isFocus, changeScreenAfter, navigate, oneFilter, selectLastItem, style, }: AutocompleteSearchProps) => JSX.Element;
|
|
16
17
|
export default ScannerAutocompleteSearch;
|
|
@@ -16,16 +16,17 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useState, useEffect } from 'react';
|
|
19
|
-
import { useDispatch } from 'react-redux';
|
|
20
19
|
import { AutoCompleteSearch, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
|
-
import {
|
|
22
|
-
import {
|
|
23
|
-
|
|
20
|
+
import { useScannedValueByKey, useScannerSelector, } from '../../../features/scannerSlice';
|
|
21
|
+
import { useCameraScannerValueByKey } from '../../../features/cameraScannerSlice';
|
|
22
|
+
import { useScanActivator, useScannerDeviceActivator, } from '../../../hooks/use-scan-activator';
|
|
23
|
+
const ScannerAutocompleteSearch = ({ objectList, value, onChangeValue, fetchData, displayValue, placeholder, scanKeySearch, isFocus = false, changeScreenAfter = false, navigate = false, oneFilter = false, selectLastItem = true, style, }) => {
|
|
24
24
|
const [searchText, setSearchText] = useState(value);
|
|
25
25
|
const { isEnabled, scanKey } = useScannerSelector();
|
|
26
26
|
const scannedValue = useScannedValueByKey(scanKeySearch);
|
|
27
27
|
const scanData = useCameraScannerValueByKey(scanKeySearch);
|
|
28
|
-
const
|
|
28
|
+
const { enable: onScanPress } = useScanActivator(scanKeySearch);
|
|
29
|
+
const { enable: enableScanner } = useScannerDeviceActivator(scanKeySearch);
|
|
29
30
|
useEffect(() => {
|
|
30
31
|
if (scannedValue) {
|
|
31
32
|
setSearchText(scannedValue);
|
|
@@ -38,15 +39,9 @@ const ScannerAutocompleteSearch = ({ objectList, value, onChangeValue, fetchData
|
|
|
38
39
|
return (<AutoCompleteSearch selectLastItem={selectLastItem} objectList={objectList} value={searchText} onChangeValue={result => {
|
|
39
40
|
setSearchText(result);
|
|
40
41
|
onChangeValue(result);
|
|
41
|
-
}} fetchData={fetchData} displayValue={displayValue} placeholder={placeholder} isFocus={isFocus} changeScreenAfter={changeScreenAfter} navigate={navigate} oneFilter={oneFilter} onSelection={
|
|
42
|
-
scanKeySearch ? dispatch(enableScan(scanKeySearch)) : undefined;
|
|
43
|
-
}} onScanPress={() => {
|
|
44
|
-
scanKeySearch
|
|
45
|
-
? dispatch(enableCameraScanner(scanKeySearch))
|
|
46
|
-
: undefined;
|
|
47
|
-
}} scanIconColor={isEnabled && scanKey === scanKeySearch
|
|
42
|
+
}} fetchData={fetchData} displayValue={displayValue} placeholder={placeholder} isFocus={isFocus} changeScreenAfter={changeScreenAfter} navigate={navigate} oneFilter={oneFilter} onSelection={enableScanner} onScanPress={onScanPress} scanIconColor={isEnabled && scanKey === scanKeySearch
|
|
48
43
|
? Colors.primaryColor.background
|
|
49
|
-
: Colors.secondaryColor_dark.background}/>);
|
|
44
|
+
: Colors.secondaryColor_dark.background} style={style}/>);
|
|
50
45
|
};
|
|
51
46
|
export default ScannerAutocompleteSearch;
|
|
52
47
|
//# sourceMappingURL=ScannerAutocompleteSearch.js.map
|
|
@@ -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,EAAC,MAAM,OAAO,CAAC;AACjD,OAAO,EAAC,
|
|
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,EAAC,MAAM,OAAO,CAAC;AACjD,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;AAkB3C,MAAM,yBAAyB,GAAG,CAAC,EACjC,UAAU,EACV,KAAK,EACL,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,GACmB,EAAE,EAAE;IAC5B,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,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,aAAa,CAAC,YAAY,CAAC,CAAC;SAC7B;aAAM,IAAI,QAAQ,EAAE,KAAK,IAAI,IAAI,EAAE;YAClC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC/B;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,OAAO,CACL,CAAC,kBAAkB,CACjB,cAAc,CAAC,CAAC,cAAc,CAAC,CAC/B,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,KAAK,CAAC,CAAC,UAAU,CAAC,CAClB,aAAa,CAAC,CAAC,MAAM,CAAC,EAAE;YACtB,aAAa,CAAC,MAAM,CAAC,CAAC;YACtB,aAAa,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC,CAAC,CACF,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,iBAAiB,CAAC,CAAC,iBAAiB,CAAC,CACrC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,WAAW,CAAC,CAAC,aAAa,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,aAAa,CAAC,CACZ,SAAS,IAAI,OAAO,KAAK,aAAa;YACpC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU;YAChC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAC1C,CACD,KAAK,CAAC,CAAC,KAAK,CAAC,EACb,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,yBAAyB,CAAC"}
|
|
@@ -22,7 +22,7 @@ import useTranslator from '../../../i18n/hooks/use-translator';
|
|
|
22
22
|
const UrlInput = ({ style, value, onChange, readOnly, onScanPress, onSelection = () => { }, scanIconColor, }) => {
|
|
23
23
|
const Colors = useThemeColor();
|
|
24
24
|
const I18n = useTranslator();
|
|
25
|
-
return (<IconInput style={style} value={value} onChange={onChange} readOnly={readOnly} onSelection={onSelection} placeholder={I18n.t('Auth_URL')} leftIconsList={[<Icon name="link" size={17} style={styles.icon}/>]} rightIconsList={[
|
|
25
|
+
return (<IconInput style={style} value={value} onChange={onChange} readOnly={readOnly} required={true} onSelection={onSelection} placeholder={I18n.t('Auth_URL')} leftIconsList={[<Icon name="link" size={17} style={styles.icon}/>]} rightIconsList={[
|
|
26
26
|
<Icon name="qrcode" size={20} color={scanIconColor == null
|
|
27
27
|
? Colors.secondaryColor_dark.background
|
|
28
28
|
: scanIconColor} touchable={true} style={styles.icon} onPress={onScanPress} FontAwesome5={false}/>,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UrlInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/UrlInput/UrlInput.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACrE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAE/D,MAAM,QAAQ,GAAG,CAAC,EAChB,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,EACtB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,OAAO,CACL,CAAC,SAAS,CACR,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAChC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC,CACpE,cAAc,CAAC,CAAC;YACd,CAAC,IAAI,CACH,IAAI,CAAC,QAAQ,CACb,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,KAAK,CAAC,CACJ,aAAa,IAAI,IAAI;oBACnB,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU;oBACvC,CAAC,CAAC,aAAa,CAClB,CACD,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,YAAY,CAAC,CAAC,KAAK,CAAC,EACpB;SACH,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"UrlInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/UrlInput/UrlInput.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACrE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAE/D,MAAM,QAAQ,GAAG,CAAC,EAChB,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,EACtB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,OAAO,CACL,CAAC,SAAS,CACR,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,IAAI,CAAC,CACf,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAChC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC,CACpE,cAAc,CAAC,CAAC;YACd,CAAC,IAAI,CACH,IAAI,CAAC,QAAQ,CACb,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,KAAK,CAAC,CACJ,aAAa,IAAI,IAAI;oBACnB,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU;oBACvC,CAAC,CAAC,aAAa,CAClB,CACD,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,YAAY,CAAC,CAAC,KAAK,CAAC,EACpB;SACH,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
|
|
@@ -22,7 +22,7 @@ import useTranslator from '../../../i18n/hooks/use-translator';
|
|
|
22
22
|
const UsernameInput = ({ value, onChange, readOnly, showScanIcon = true, onScanPress, onSelection = () => { }, scanIconColor, }) => {
|
|
23
23
|
const Colors = useThemeColor();
|
|
24
24
|
const I18n = useTranslator();
|
|
25
|
-
return (<IconInput value={value} onChange={onChange} readOnly={readOnly} onSelection={showScanIcon ? onSelection : () => { }} placeholder={I18n.t('Auth_Username')} leftIconsList={[<Icon name="user" size={17} style={styles.icon}/>]} rightIconsList={showScanIcon
|
|
25
|
+
return (<IconInput value={value} onChange={onChange} readOnly={readOnly} required={true} onSelection={showScanIcon ? onSelection : () => { }} placeholder={I18n.t('Auth_Username')} leftIconsList={[<Icon name="user" size={17} style={styles.icon}/>]} rightIconsList={showScanIcon
|
|
26
26
|
? [
|
|
27
27
|
<Icon name="qrcode" size={20} color={scanIconColor == null
|
|
28
28
|
? Colors.secondaryColor_dark.background
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsernameInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/UsernameInput/UsernameInput.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACrE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAC,EACrB,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,YAAY,GAAG,IAAI,EACnB,WAAW,EACX,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,EACtB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,OAAO,CACL,CAAC,SAAS,CACR,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CACnD,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CACrC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC,CACpE,cAAc,CAAC,CACb,YAAY;YACV,CAAC,CAAC;gBACE,CAAC,IAAI,CACH,IAAI,CAAC,QAAQ,CACb,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,KAAK,CAAC,CACJ,aAAa,IAAI,IAAI;wBACnB,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU;wBACvC,CAAC,CAAC,aAAa,CAClB,CACD,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,YAAY,CAAC,CAAC,KAAK,CAAC,EACpB;aACH;YACH,CAAC,CAAC,EAAE,CACP,EACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"UsernameInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/UsernameInput/UsernameInput.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACrE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAC,EACrB,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,YAAY,GAAG,IAAI,EACnB,WAAW,EACX,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,EACtB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,OAAO,CACL,CAAC,SAAS,CACR,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,QAAQ,CAAC,CAAC,IAAI,CAAC,CACf,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CACnD,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CACrC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC,CACpE,cAAc,CAAC,CACb,YAAY;YACV,CAAC,CAAC;gBACE,CAAC,IAAI,CACH,IAAI,CAAC,QAAQ,CACb,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,KAAK,CAAC,CACJ,aAAa,IAAI,IAAI;wBACnB,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU;wBACvC,CAAC,CAAC,aAAa,CAClB,CACD,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,YAAY,CAAC,CAAC,KAAK,CAAC,EACpB;aACH;YACH,CAAC,CAAC,EAAE,CACP,EACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
export default AttachedFilesView;
|
|
2
|
-
declare function AttachedFilesView({ files, model, modelId, isStaticList, isMetaFile, screenTitle,
|
|
2
|
+
declare function AttachedFilesView({ files, model, modelId, isStaticList, isMetaFile, screenTitle, }: {
|
|
3
3
|
files: any;
|
|
4
4
|
model: any;
|
|
5
5
|
modelId: any;
|
|
6
6
|
isStaticList?: boolean;
|
|
7
7
|
isMetaFile?: boolean;
|
|
8
8
|
screenTitle: any;
|
|
9
|
-
navigation: any;
|
|
10
9
|
}): JSX.Element;
|
|
@@ -22,14 +22,16 @@ import { AttachmentCard, ChipSelect, File, HeaderContainer, Screen, ScrollList,
|
|
|
22
22
|
import useTranslator from '../../../i18n/hooks/use-translator';
|
|
23
23
|
import { getAttachedFiles, getAttachedFilesDetails, } from '../../../features/attachedFilesSlice';
|
|
24
24
|
import { openFileInExternalApp } from '../../../tools/FileViewer';
|
|
25
|
-
|
|
25
|
+
import { useNavigation } from '../../../hooks/use-navigation';
|
|
26
|
+
function AttachedFilesView({ files, model, modelId, isStaticList = false, isMetaFile = false, screenTitle, }) {
|
|
26
27
|
const Colors = useThemeColor();
|
|
27
28
|
const I18n = useTranslator();
|
|
29
|
+
const navigation = useNavigation();
|
|
30
|
+
const dispatch = useDispatch();
|
|
28
31
|
const { baseUrl, token, jsessionId } = useSelector(state => state.auth);
|
|
29
32
|
const { loading, attachedFilesList } = useSelector(state => state.attachedFiles);
|
|
30
33
|
const [selectedStatus, setSelectedStatus] = useState([]);
|
|
31
34
|
const [extensionList, setExtensionList] = useState([]);
|
|
32
|
-
const dispatch = useDispatch();
|
|
33
35
|
const handleShowFile = async (item) => {
|
|
34
36
|
await openFileInExternalApp({ fileName: item.fileName, id: item.id, isMetaFile: isMetaFile }, { baseUrl: baseUrl, token: token, jsessionId: jsessionId }, I18n);
|
|
35
37
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttachedFilesView.js","sourceRoot":"","sources":["../../../../src/components/templates/AttachedFilesView/AttachedFilesView.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,cAAc,EACd,UAAU,EACV,IAAI,EACJ,eAAe,EACf,MAAM,EACN,UAAU,EACV,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EACL,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"AttachedFilesView.js","sourceRoot":"","sources":["../../../../src/components/templates/AttachedFilesView/AttachedFilesView.js"],"names":[],"mappings":"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"}
|
|
@@ -18,15 +18,18 @@
|
|
|
18
18
|
import React, { useCallback, useEffect, useState } from 'react';
|
|
19
19
|
import { Dimensions, Keyboard, KeyboardAvoidingView, Platform, StyleSheet, View, } from 'react-native';
|
|
20
20
|
import { useDispatch, useSelector } from 'react-redux';
|
|
21
|
-
import { ScrollList, Screen, MessageBox,
|
|
22
|
-
import { MailMessageCard
|
|
21
|
+
import { ScrollList, Screen, MessageBox, PopUpTwoButton, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { MailMessageCard } from '../../../components';
|
|
23
23
|
import { getMailMessages, getModelSubscribers, modelSubscribeRequest, modelUnsubscribeRequest, sendMailMessageComment, } from '../../../features/mailMessageSlice';
|
|
24
24
|
import useTranslator from '../../../i18n/hooks/use-translator';
|
|
25
|
+
import { headerActionsProvider } from '../../../header';
|
|
26
|
+
import { useMarkAllMailMessages } from '../../molecules/MailMessageReadIcon/MailMessageReadIcon';
|
|
25
27
|
const DEFAULT_BOTTOM_MARGIN = 10;
|
|
26
|
-
const MailMessageView = ({ model, modelId
|
|
28
|
+
const MailMessageView = ({ model, modelId }) => {
|
|
27
29
|
const dispatch = useDispatch();
|
|
28
30
|
const I18n = useTranslator();
|
|
29
31
|
const Colors = useThemeColor();
|
|
32
|
+
const handleMarkAll = useMarkAllMailMessages({ model, modelId });
|
|
30
33
|
const [comment, setComment] = useState();
|
|
31
34
|
const [subscribe, setSubscribe] = useState(false);
|
|
32
35
|
const [popUp, setPopUp] = useState(false);
|
|
@@ -67,26 +70,37 @@ const MailMessageView = ({ model, modelId, navigation }) => {
|
|
|
67
70
|
Keyboard.dismiss();
|
|
68
71
|
setComment('');
|
|
69
72
|
}, [dispatch, model, modelId, comment]);
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
:
|
|
77
|
-
|
|
73
|
+
useEffect(() => {
|
|
74
|
+
headerActionsProvider.registerModel('core_mailMessage_details', {
|
|
75
|
+
actions: [
|
|
76
|
+
{
|
|
77
|
+
key: 'readMessages',
|
|
78
|
+
order: 10,
|
|
79
|
+
showInHeader: true,
|
|
80
|
+
iconName: 'check-double',
|
|
81
|
+
iconColor: unreadMessages === 0
|
|
82
|
+
? Colors.primaryColor.background
|
|
83
|
+
: Colors.secondaryColor.background,
|
|
84
|
+
title: I18n.t('Base_MailMessages_MarkAllAsRead'),
|
|
85
|
+
onPress: handleMarkAll,
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
key: 'subscribe',
|
|
89
|
+
order: 20,
|
|
90
|
+
showInHeader: true,
|
|
91
|
+
iconName: subscribe ? 'star' : 'star-o',
|
|
92
|
+
iconColor: subscribe
|
|
93
|
+
? Colors.primaryColor.background
|
|
94
|
+
: Colors.secondaryColor_dark.background,
|
|
95
|
+
FontAwesome5: false,
|
|
96
|
+
title: I18n.t(subscribe
|
|
97
|
+
? 'Base_MailMessages_Unsubscribe'
|
|
98
|
+
: 'Base_MailMessages_Subscribe'),
|
|
99
|
+
onPress: subscribe ? () => setPopUp(true) : handleSubscribe,
|
|
100
|
+
},
|
|
101
|
+
],
|
|
78
102
|
});
|
|
79
|
-
}, [
|
|
80
|
-
navigation,
|
|
81
|
-
Colors,
|
|
82
|
-
subscribe,
|
|
83
|
-
unreadMessages,
|
|
84
|
-
handleSubscribe,
|
|
85
|
-
handleUnsubscribe,
|
|
86
|
-
mailMessagesList,
|
|
87
|
-
model,
|
|
88
|
-
modelId,
|
|
89
|
-
]);
|
|
103
|
+
}, [Colors, subscribe, unreadMessages, handleSubscribe, I18n, handleMarkAll]);
|
|
90
104
|
useEffect(() => {
|
|
91
105
|
fetchModelFollowersAPI();
|
|
92
106
|
}, [fetchModelFollowersAPI]);
|
|
@@ -105,7 +119,7 @@ const MailMessageView = ({ model, modelId, navigation }) => {
|
|
|
105
119
|
<Screen removeSpaceOnTop={true}>
|
|
106
120
|
<PopUpTwoButton visible={popUp} title={I18n.t('Base_Question')} data={I18n.t('Base_Unfollow_Confirmation')} PrimaryBtnTitle={I18n.t('Base_OK')} SecondaryBtnTitle={I18n.t('Base_Cancel')} onPressPrimary={handleUnfollowConfirmation} onPressSecondary={() => setPopUp(false)}/>
|
|
107
121
|
<View style={styles.scrollListContainer}>
|
|
108
|
-
<ScrollList loadingList={loading} data={mailMessagesList} renderItem={({ item }) => (<MailMessageCard key={item.id} author={item.$author?.fullName} avatar={item.$avatar} body={item.body} eventText={item.$eventText} eventTime={item.$eventTime} files={item.$files} subject={item.subject} title={item.subject} type={item.type} flags={item.$flags}
|
|
122
|
+
<ScrollList loadingList={loading} data={mailMessagesList} renderItem={({ item }) => (<MailMessageCard key={item.id} author={item.$author?.fullName} avatar={item.$avatar} body={item.body} eventText={item.$eventText} eventTime={item.$eventTime} files={item.$files} subject={item.subject} title={item.subject} type={item.type} flags={item.$flags} relatedId={modelId} relatedModel={model}/>)} fetchData={fetchMailMessageAPI} filter={false} moreLoading={moreLoading} isListEnd={isListEnd} translator={I18n.t}/>
|
|
109
123
|
</View>
|
|
110
124
|
<View style={styles.commentContainer}>
|
|
111
125
|
<MessageBox placeholder={I18n.t('Base_MailMessages_CommentInput_Placeholder')} disabled={!comment} value={comment} onChange={setComment} onSend={handleSendMailMessageComment}/>
|
|
@@ -126,11 +140,11 @@ const styles = StyleSheet.create({
|
|
|
126
140
|
},
|
|
127
141
|
headerOptionsContainer: {
|
|
128
142
|
flexDirection: 'row',
|
|
129
|
-
width: '50%',
|
|
130
143
|
margin: 15,
|
|
131
144
|
},
|
|
132
145
|
action: {
|
|
133
146
|
flex: 1,
|
|
147
|
+
marginHorizontal: 5,
|
|
134
148
|
},
|
|
135
149
|
scrollListContainer: {
|
|
136
150
|
flex: 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailMessageView.js","sourceRoot":"","sources":["../../../../src/components/templates/MailMessageView/MailMessageView.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EACL,UAAU,EACV,QAAQ,EACR,oBAAoB,EACpB,QAAQ,EACR,UAAU,EACV,IAAI,GACL,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,UAAU,EACV,MAAM,EACN,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"MailMessageView.js","sourceRoot":"","sources":["../../../../src/components/templates/MailMessageView/MailMessageView.js"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export const getAttachedFiles = createAsyncThunk('attachedFiles/getAttachedFiles
|
|
|
23
23
|
return handlerApiCall({
|
|
24
24
|
fetchFunction: fetchAttachedFiles,
|
|
25
25
|
data: data,
|
|
26
|
-
action: '
|
|
26
|
+
action: 'Base_SliceAction_FetchAttachedFiles',
|
|
27
27
|
getState: getState,
|
|
28
28
|
responseOptions: { isArrayResponse: true },
|
|
29
29
|
});
|
|
@@ -32,7 +32,7 @@ export const getAttachedFilesDetails = createAsyncThunk('attachedFiles/getAttach
|
|
|
32
32
|
return handlerApiCall({
|
|
33
33
|
fetchFunction: fetchFileDetails,
|
|
34
34
|
data: data,
|
|
35
|
-
action: '
|
|
35
|
+
action: 'Base_SliceAction_FetchFilesDetails',
|
|
36
36
|
getState: getState,
|
|
37
37
|
responseOptions: { isArrayResponse: true },
|
|
38
38
|
});
|
|
@@ -41,7 +41,7 @@ export const countAttachmentFiles = createAsyncThunk('attachedFiles/countAttachm
|
|
|
41
41
|
return handlerApiCall({
|
|
42
42
|
fetchFunction: countAttachments,
|
|
43
43
|
data: data,
|
|
44
|
-
action: '
|
|
44
|
+
action: 'Base_SliceAction_CountAttachedFiles',
|
|
45
45
|
getState: getState,
|
|
46
46
|
responseOptions: { isArrayResponse: true, returnTotal: true },
|
|
47
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachedFilesSlice.js","sourceRoot":"","sources":["../../src/features/attachedFilesSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAErD,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,gCAAgC,EAChC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,kBAAkB;QACjC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"attachedFilesSlice.js","sourceRoot":"","sources":["../../src/features/attachedFilesSlice.js"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export const login: import("@reduxjs/toolkit").AsyncThunk<{
|
|
2
|
-
url:
|
|
2
|
+
url: string;
|
|
3
3
|
token: string;
|
|
4
4
|
jsessionId: string;
|
|
5
5
|
userId: any;
|
|
6
|
+
interceptorId: number;
|
|
6
7
|
}, void, {
|
|
7
8
|
state?: unknown;
|
|
8
9
|
dispatch?: import("redux").Dispatch<import("redux").AnyAction>;
|
|
@@ -13,40 +14,42 @@ export const login: import("@reduxjs/toolkit").AsyncThunk<{
|
|
|
13
14
|
fulfilledMeta?: unknown;
|
|
14
15
|
rejectedMeta?: unknown;
|
|
15
16
|
}>;
|
|
16
|
-
export const
|
|
17
|
+
export const logout: import("@reduxjs/toolkit").AsyncThunk<void, void, {
|
|
18
|
+
state?: unknown;
|
|
19
|
+
dispatch?: import("redux").Dispatch<import("redux").AnyAction>;
|
|
20
|
+
extra?: unknown;
|
|
21
|
+
rejectValue?: unknown;
|
|
22
|
+
serializedErrorType?: unknown;
|
|
23
|
+
pendingMeta?: unknown;
|
|
24
|
+
fulfilledMeta?: unknown;
|
|
25
|
+
rejectedMeta?: unknown;
|
|
26
|
+
}>;
|
|
27
|
+
export const authSlice: import("@reduxjs/toolkit").Slice<{
|
|
28
|
+
loading: boolean;
|
|
29
|
+
logged: boolean;
|
|
30
|
+
userId: any;
|
|
31
|
+
baseUrl: any;
|
|
32
|
+
token: any;
|
|
33
|
+
jsessionId: any;
|
|
34
|
+
interceptorId: any;
|
|
35
|
+
error: any;
|
|
36
|
+
}, import("@reduxjs/toolkit").SliceCaseReducers<{
|
|
17
37
|
loading: boolean;
|
|
18
38
|
logged: boolean;
|
|
19
39
|
userId: any;
|
|
20
40
|
baseUrl: any;
|
|
21
41
|
token: any;
|
|
22
42
|
jsessionId: any;
|
|
43
|
+
interceptorId: any;
|
|
23
44
|
error: any;
|
|
24
|
-
}>,
|
|
25
|
-
|
|
26
|
-
loading: boolean;
|
|
27
|
-
logged: boolean;
|
|
28
|
-
userId: any;
|
|
29
|
-
baseUrl: any;
|
|
30
|
-
token: any;
|
|
31
|
-
jsessionId: any;
|
|
32
|
-
error: any;
|
|
33
|
-
}>) => {
|
|
34
|
-
baseUrl: any;
|
|
35
|
-
loading: boolean;
|
|
36
|
-
logged: boolean;
|
|
37
|
-
userId: any;
|
|
38
|
-
token: any;
|
|
39
|
-
jsessionId: any;
|
|
40
|
-
error: any;
|
|
41
|
-
};
|
|
42
|
-
}, "auth">;
|
|
43
|
-
export const logout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"auth/logout">;
|
|
44
|
-
export const authReducer: import("redux").Reducer<import("immer/dist/internal").WritableDraft<{
|
|
45
|
+
}>, "auth">;
|
|
46
|
+
export const authReducer: import("redux").Reducer<{
|
|
45
47
|
loading: boolean;
|
|
46
48
|
logged: boolean;
|
|
47
49
|
userId: any;
|
|
48
50
|
baseUrl: any;
|
|
49
51
|
token: any;
|
|
50
52
|
jsessionId: any;
|
|
53
|
+
interceptorId: any;
|
|
51
54
|
error: any;
|
|
52
|
-
}
|
|
55
|
+
}, import("redux").AnyAction>;
|
|
@@ -16,12 +16,22 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
|
19
|
+
import axios from 'axios';
|
|
19
20
|
import { getActiveUserId, loginApi } from '../api/login-api';
|
|
20
|
-
import {
|
|
21
|
+
import { storage } from '../storage/Storage';
|
|
22
|
+
import { testUrl } from '../utils/api';
|
|
23
|
+
import { URL_STORAGE_KEY } from '../utils/storage-keys';
|
|
21
24
|
export const login = createAsyncThunk('auth/login', async ({ url, username, password }) => {
|
|
22
|
-
const
|
|
25
|
+
const urlWithProtocol = await testUrl(url);
|
|
26
|
+
const { token, jsessionId, interceptorId } = await loginApi(urlWithProtocol, username, password);
|
|
23
27
|
const userId = await getActiveUserId();
|
|
24
|
-
|
|
28
|
+
storage.setItem(URL_STORAGE_KEY, urlWithProtocol);
|
|
29
|
+
return { url: urlWithProtocol, token, jsessionId, userId, interceptorId };
|
|
30
|
+
});
|
|
31
|
+
export const logout = createAsyncThunk('auth/logout', async function (data, { getState }) {
|
|
32
|
+
const interceptorId = getState()?.auth?.interceptorId;
|
|
33
|
+
axios.interceptors.request.eject(interceptorId);
|
|
34
|
+
return;
|
|
25
35
|
});
|
|
26
36
|
const initialState = {
|
|
27
37
|
loading: false,
|
|
@@ -30,14 +40,12 @@ const initialState = {
|
|
|
30
40
|
baseUrl: null,
|
|
31
41
|
token: null,
|
|
32
42
|
jsessionId: null,
|
|
43
|
+
interceptorId: null,
|
|
33
44
|
error: null,
|
|
34
45
|
};
|
|
35
46
|
export const authSlice = createSlice({
|
|
36
47
|
name: 'auth',
|
|
37
48
|
initialState,
|
|
38
|
-
reducers: {
|
|
39
|
-
logout: state => ({ ...initialState, baseUrl: state.baseUrl }),
|
|
40
|
-
},
|
|
41
49
|
extraReducers: builder => {
|
|
42
50
|
builder.addCase(login.pending, state => {
|
|
43
51
|
state.logged = false;
|
|
@@ -47,21 +55,30 @@ export const authSlice = createSlice({
|
|
|
47
55
|
state.error = null;
|
|
48
56
|
});
|
|
49
57
|
builder.addCase(login.fulfilled, (state, action) => {
|
|
50
|
-
const { url, token, jsessionId, userId } = action.payload;
|
|
58
|
+
const { url, token, jsessionId, userId, interceptorId } = action.payload;
|
|
51
59
|
state.logged = token != null;
|
|
52
60
|
state.loading = false;
|
|
53
61
|
state.userId = userId;
|
|
54
|
-
state.baseUrl =
|
|
62
|
+
state.baseUrl = url;
|
|
55
63
|
state.token = token;
|
|
56
64
|
state.jsessionId = jsessionId;
|
|
57
65
|
state.error = null;
|
|
66
|
+
state.interceptorId = interceptorId;
|
|
58
67
|
});
|
|
59
68
|
builder.addCase(login.rejected, (state, action) => {
|
|
60
69
|
state.loading = false;
|
|
61
|
-
state.error = action.error;
|
|
70
|
+
state.error = { ...action.error, url: action.meta?.arg?.url };
|
|
71
|
+
});
|
|
72
|
+
builder.addCase(logout.fulfilled, state => {
|
|
73
|
+
state.logged = false;
|
|
74
|
+
state.loading = false;
|
|
75
|
+
state.userId = null;
|
|
76
|
+
state.token = null;
|
|
77
|
+
state.jsessionId = null;
|
|
78
|
+
state.error = null;
|
|
79
|
+
state.interceptorId = null;
|
|
62
80
|
});
|
|
63
81
|
},
|
|
64
82
|
});
|
|
65
|
-
export const { logout } = authSlice.actions;
|
|
66
83
|
export const authReducer = authSlice.reducer;
|
|
67
84
|
//# sourceMappingURL=authSlice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,eAAe,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"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"}
|