npm - @axelor/aos-mobile-core - Versions diffs - 7.0.3 → 7.0.4 - Mend

@axelor/aos-mobile-core 7.0.3 → 7.0.4

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.

Files changed (189) hide show

package/lib/components/molecules/index.js CHANGED Viewed

@@ -16,13 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 export { default as DatePicker } from './DatePicker/DatePicker';
-export { default as ErrorText } from './ErrorText/ErrorText';
 export { default as HeaderBand } from './HeaderBand/HeaderBand';
 export { default as HeaderOptionMenuItem } from './HeaderOptionsMenuItem/HeaderOptionMenuItem';
 export { default as InputBarCodeCard } from './InputBarCodeCard/InputBarCodeCard';
-export { default as LoginButton } from './LoginButton/LoginButton';
 export { default as MailMessageReadIcon } from './MailMessageReadIcon/MailMessageReadIcon';
-export { default as SessionNumberIndicator } from './SessionNumberIndicator/SessionNumberIndicator';
 export { default as TrackItem } from './TrackItem/TrackItem';
 export { default as UploadFileInput } from './UploadFileInput/UploadFileInput';
 //# sourceMappingURL=index.js.map

package/lib/components/molecules/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/molecules/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,OAAO,IAAI,~~SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,~~UAAU,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,OAAO,IAAI,oBAAoB,EAAC,MAAM,8CAA8C,CAAC;AAC7F,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,OAAO,IAAI,~~WAAW,EAAC,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,~~mBAAmB,EAAC,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAC,OAAO,IAAI,~~sBAAsB,EAAC,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAC,OAAO,IAAI,~~SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/molecules/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,OAAO,IAAI,oBAAoB,EAAC,MAAM,8CAA8C,CAAC;AAC7F,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,OAAO,IAAI,mBAAmB,EAAC,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC"}

package/lib/components/organisms/DateInput/DateInput.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ interface DateInputProps {
     onDateChange: (date: Date) => void;
     style?: any;
     readonly?: boolean;
+    required?: boolean;
 }
-declare const DateInput: ({ title, defaultDate, mode, nullable, onDateChange, style, readonly, }: DateInputProps) => JSX.Element;
+declare const DateInput: ({ title, defaultDate, mode, nullable, onDateChange, style, readonly, required, }: DateInputProps) => JSX.Element;
 export default DateInput;

package/lib/components/organisms/DateInput/DateInput.js CHANGED Viewed

@@ -22,13 +22,14 @@ import { Card, getCommonStyles, Icon, RightIconButton, Text, useClickOutside, us
 import { DatePicker } from '../../molecules';
 import DateInputUtils from './date-input.helper';
 const ACTION_ICON_SIZE = 30;
-const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, onDateChange, style, readonly = false, }) => {
+const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, onDateChange, style, readonly = false, required = false, }) => {
     const Colors = useThemeColor();
     const I18n = useTranslator();
     const currentDate = useMemo(() => new Date(), []);
     const [pickerWidth, setPickerWidth] = useState();
     const [pickerIsOpen, setPickerIsOpen] = useState(false);
     const [selectedDate, setSelectedDate] = useState(defaultDate);
+    const _required = useMemo(() => required && selectedDate == null, [required, selectedDate]);
     useEffect(() => {
         setSelectedDate(defaultDate);
     }, [defaultDate]);
@@ -62,8 +63,8 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
         setSelectedDate(null);
         setPickerIsOpen(false);
     }, []);
-    const commonStyles = useMemo(() => getCommonStyles(Colors), [Colors]);
-    const styles = useMemo(() => getStyles(Colors, pickerIsOpen), [Colors, pickerIsOpen]);
+    const commonStyles = useMemo(() => getCommonStyles(Colors, _required), [Colors, _required]);
+    const styles = useMemo(() => getStyles(Colors, pickerIsOpen, _required), [Colors, pickerIsOpen, _required]);
     return (<View ref={wrapperRef} style={[
             styles.container,
             Platform.OS === 'ios' ? styles.containerZIndex : null,
@@ -95,7 +96,7 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, on
       </View>
     </View>);
 };
-const getStyles = (Colors, pickerIsOpen) => StyleSheet.create({
+const getStyles = (Colors, pickerIsOpen, required) => StyleSheet.create({
     actionButton: {
         marginLeft: 10,
     },
@@ -114,7 +115,9 @@ const getStyles = (Colors, pickerIsOpen) => StyleSheet.create({
         flex: 1,
     },
     rightIconButton: {
-        borderColor: Colors.secondaryColor.background,
+        borderColor: required
+            ? Colors.errorColor.background
+            : Colors.secondaryColor.background,
         borderWidth: 1,
         marginLeft: 0,
         width: '100%',

package/lib/components/organisms/DateInput/DateInput.js.map CHANGED Viewed

	@@ -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;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,YAAY,GAAG,eAAe,CAAC;QACnC,UAAU;QACV,OAAO,EAAE,YAAY;KACtB,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,iBAAiB,IAAI,YAAY,EAAE;YACtD,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IAEjC,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,CAAC,QAAQ,EAAE;YACb,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SACtC;IACH,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,IAAI,CAAC,YAAY,EAAE;YACjB,eAAe,CAAC,WAAW,CAAC,CAAC;YAC7B,YAAY,CAAC,WAAW,CAAC,CAAC;YAC1B,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;aAAM;YACL,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3B,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAE9C,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,eAAe,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,YAAY,GAAG,OAAO,~~CAAC~~,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,~~EAAE~~,CAAC,MAAM,~~CAAC~~,CAAC,CAAC;~~IACtE~~,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,~~EACrC~~,CAAC,MAAM,EAAE,YAAY,CAAC,~~CACvB~~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~~CAAC~~,MAAmB,~~EAAE~~,YAAqB,~~EAAE~~,EAAE,~~CAC/D~~,UAAU,CAAC,MAAM,CAAC;IAChB,YAAY,EAAE;QACZ,UAAU,EAAE,EAAE;KACf;IACD,eAAe,EAAE;QACf,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,UAAU;QAC1B,UAAU,EAAE,UAAU;KACvB;IACD,SAAS,EAAE;QACT,KAAK,EAAE,MAAM;KACd;IACD,eAAe,EAAE;QACf,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC9B;IACD,mBAAmB,EAAE;QACnB,IAAI,EAAE,CAAC;KACR;IACD,eAAe,EAAE;QACf,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;~~QAC7C~~,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,CAAC;QACb,KAAK,EAAE,MAAM;KACd;IACD,iBAAiB,EAAE;QACjB,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC9B;IACD,kBAAkB,EAAE;QAClB,iBAAiB,EAAE,CAAC;QACpB,eAAe,EAAE,EAAE;QACnB,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,UAAU;QACpB,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,EAAE;KACX;IACD,eAAe,EAAE;QACf,IAAI,EAAE,MAAM;KACb;IACD,KAAK,EAAE;QACL,UAAU,EAAE,EAAE;KACf;CACF,CAAC,CAAC;AAEL,eAAe,SAAS,CAAC"}
1	+ {"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"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"}

package/lib/components/organisms/index.d.ts CHANGED Viewed

@@ -3,13 +3,8 @@ export { default as AOSImageBubble } from "./AOSImageBubble/AOSImageBubble";
 export { default as DateInput } from "./DateInput/DateInput";
 export { default as HeaderBandList } from "./HeaderBandList/HeaderBandList";
 export { default as HeaderOptionsMenu } from "./HeaderOptionsMenu/HeaderOptionsMenu";
-export { default as LogoImage } from "./LogoImage/LogoImage";
+export { default as LogoImage } from "../../sessions/components/display/LogoImage";
 export { default as MailMessageCard } from "./MailMessageCard/MailMessageCard";
 export { default as MailMessageCommentCard } from "./MailMessageCommentCard/MailMessageCommentCard";
 export { default as MailMessageNotificationCard } from "./MailMessageNotificationCard/MailMessageNotificationCard";
-export { default as PasswordInput } from "./PasswordInput/PasswordInput";
 export { default as ScannerAutocompleteSearch } from "./ScannerAutocompleteSearch/ScannerAutocompleteSearch";
-export { default as SessionNameInput } from "./SessionNameInput/SessionNameInput";
-export { default as UrlInput } from "./UrlInput/UrlInput";
-export { default as UsernameInput } from "./UsernameInput/UsernameInput";
-export { ChooseSessionButton, ConnectSessionButton, CreateSessionButton, NoActiveSessionButton } from "./SessionButtons/SessionButtons";

package/lib/components/organisms/index.js CHANGED Viewed

@@ -20,14 +20,9 @@ export { default as AOSImageBubble } from './AOSImageBubble/AOSImageBubble';
 export { default as DateInput } from './DateInput/DateInput';
 export { default as HeaderBandList } from './HeaderBandList/HeaderBandList';
 export { default as HeaderOptionsMenu } from './HeaderOptionsMenu/HeaderOptionsMenu';
-export { default as LogoImage } from './LogoImage/LogoImage';
+export { default as LogoImage } from '../../sessions/components/display/LogoImage';
 export { default as MailMessageCard } from './MailMessageCard/MailMessageCard';
 export { default as MailMessageCommentCard } from './MailMessageCommentCard/MailMessageCommentCard';
 export { default as MailMessageNotificationCard } from './MailMessageNotificationCard/MailMessageNotificationCard';
-export { default as PasswordInput } from './PasswordInput/PasswordInput';
 export { default as ScannerAutocompleteSearch } from './ScannerAutocompleteSearch/ScannerAutocompleteSearch';
-export { ChooseSessionButton, ConnectSessionButton, CreateSessionButton, NoActiveSessionButton, } from './SessionButtons/SessionButtons';
-export { default as SessionNameInput } from './SessionNameInput/SessionNameInput';
-export { default as UrlInput } from './UrlInput/UrlInput';
-export { default as UsernameInput } from './UsernameInput/UsernameInput';
 //# sourceMappingURL=index.js.map

package/lib/components/organisms/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/organisms/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,~~uBAAuB~~,CAAC;~~AAC3D~~,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,sBAAsB,EAAC,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAC,OAAO,IAAI,2BAA2B,EAAC,MAAM,2DAA2D,CAAC;AACjH,OAAO,EAAC,OAAO,IAAI,~~aAAa,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,~~yBAAyB,EAAC,MAAM,uDAAuD,CAAC;AAC3G,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/organisms/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,sBAAsB,EAAC,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAC,OAAO,IAAI,2BAA2B,EAAC,MAAM,2DAA2D,CAAC;AACjH,OAAO,EAAC,OAAO,IAAI,yBAAyB,EAAC,MAAM,uDAAuD,CAAC"}

package/lib/components/templates/index.d.ts CHANGED Viewed

@@ -1,7 +1,4 @@
 export { default as AttachedFilesView } from "./AttachedFilesView/AttachedFilesView";
 export { default as MailMessageView } from "./MailMessageView/MailMessageView";
 export { default as PopupApplicationNotConfigured } from "./PopupApplicationNotConfigured/PopupApplicationNotConfigured";
-export { default as PopupCreateSession } from "./PopupCreateSession/PopupCreateSession";
 export { default as PopupMinimalRequiredVersion } from "./PopupMinimalRequiredVersion/PopupMinimalRequiredVersion";
-export { default as PopupSession } from "./PopupSession/PopupSession";
-export { default as PopupSessionList } from "./PopupSessionList/PopupSessionList";

package/lib/components/templates/index.js CHANGED Viewed

@@ -18,8 +18,5 @@
 export { default as AttachedFilesView } from './AttachedFilesView/AttachedFilesView';
 export { default as MailMessageView } from './MailMessageView/MailMessageView';
 export { default as PopupApplicationNotConfigured } from './PopupApplicationNotConfigured/PopupApplicationNotConfigured';
-export { default as PopupCreateSession } from './PopupCreateSession/PopupCreateSession';
 export { default as PopupMinimalRequiredVersion } from './PopupMinimalRequiredVersion/PopupMinimalRequiredVersion';
-export { default as PopupSession } from './PopupSession/PopupSession';
-export { default as PopupSessionList } from './PopupSessionList/PopupSessionList';
 //# sourceMappingURL=index.js.map

package/lib/components/templates/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/templates/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,6BAA6B,EAAC,MAAM,+DAA+D,CAAC;AACvH,OAAO,EAAC,OAAO,IAAI,~~kBAAkB,EAAC,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAC,OAAO,IAAI,~~2BAA2B,EAAC,MAAM,2DAA2D,CAAC~~;AACjH,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/templates/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,6BAA6B,EAAC,MAAM,+DAA+D,CAAC;AACvH,OAAO,EAAC,OAAO,IAAI,2BAA2B,EAAC,MAAM,2DAA2D,CAAC"}

package/lib/header/HeaderActionsProvider.d.ts CHANGED Viewed

@@ -1,15 +1,14 @@
-import { HeaderOptions } from './types';
+import { HeaderActions, HeaderOptions } from './types';
 declare class HeaderActionsProvider {
     private headerActions;
     private refreshCallBack;
     constructor();
     register(callBack: any): void;
-    private updateState;
     registerModel(key: string, options: HeaderOptions): void;
     getHeaderOptions(key: string): HeaderOptions;
 }
 export declare const headerActionsProvider: HeaderActionsProvider;
-export declare const useHeaderOptions: (modelKey: string) => {
-    options: HeaderOptions;
+export declare const useHeaderActions: () => {
+    headers: HeaderActions;
 };
 export {};

package/lib/header/HeaderActionsProvider.js CHANGED Viewed

@@ -27,9 +27,6 @@ class HeaderActionsProvider {
     register(callBack) {
         this.refreshCallBack = callBack;
     }
-    updateState() {
-        this.refreshCallBack(this.headerActions);
-    }
     registerModel(key, options) {
         if (!Object.keys(this.headerActions).includes(key)) {
             this.headerActions[key] = options;
@@ -42,19 +39,28 @@ class HeaderActionsProvider {
                 actions: mergeActions(oldOptions.actions, options.actions),
             };
         }
-        this.updateState();
+        this.refreshCallBack(key, this.headerActions[key]);
     }
     getHeaderOptions(key) {
         return fetchOptionsOfHeaderKey(this.headerActions, key);
     }
 }
 export const headerActionsProvider = new HeaderActionsProvider();
-export const useHeaderOptions = (modelKey) => {
-    const [header, setHeader] = useState();
-    useEffect(() => {
-        headerActionsProvider.register(setHeader);
+export const useHeaderActions = () => {
+    const [headers, setHeaders] = useState();
+    const refreshData = useCallback((key, options) => {
+        setHeaders(_current => {
+            if (_current?.[key] === options) {
+                return _current;
+            }
+            const updatedHeaders = _current != null ? { ..._current } : {};
+            updatedHeaders[key] = options;
+            return updatedHeaders;
+        });
     }, []);
-    const getHeaderOptionsOfModel = useCallback(key => fetchOptionsOfHeaderKey(header, key), [header]);
-    return useMemo(() => ({ options: getHeaderOptionsOfModel(modelKey) }), [getHeaderOptionsOfModel, modelKey]);
+    useEffect(() => {
+        headerActionsProvider.register(refreshData);
+    }, [refreshData]);
+    return useMemo(() => ({ headers }), [headers]);
 };
 //# sourceMappingURL=HeaderActionsProvider.js.map

package/lib/header/HeaderActionsProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HeaderActionsProvider.js","sourceRoot":"","sources":["../../src/header/HeaderActionsProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAEhE,OAAO,EAAC,uBAAuB,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AAE9D,MAAM,qBAAqB;IACjB,aAAa,CAAgB;IAC7B,eAAe,CAAW;IAElC;QACE,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,QAAQ;QACf,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;IAClC,CAAC;~~IAEO,WAAW;QACjB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;~~IAED,aAAa,CAAC,GAAW,EAAE,OAAsB;QAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAClD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;SACnC;aAAM;YACL,MAAM,UAAU,GAAG,EAAC,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAC,CAAC;YAChD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG;gBACxB,GAAG,UAAU;gBACb,GAAG,OAAO;gBACV,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;aAC3D,CAAC;SACH;~~QACD~~,IAAI,CAAC,~~WAAW~~,EAAE,CAAC;~~IACrB~~,CAAC;IAED,gBAAgB,CAAC,GAAW;QAC1B,OAAO,uBAAuB,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAEjE,MAAM,CAAC,MAAM,gBAAgB,GAAG,~~CAAC~~,~~QAAgB,~~EAAE~~,EAAE~~;~~IACnD~~,MAAM,CAAC,~~MAAM~~,EAAE,~~SAAS~~,CAAC,GAAG,QAAQ,~~EAAE~~,CAAC;~~IAEvC~~,~~SAAS~~,~~CAAC~~,GAAG,EAAE;~~QACb~~,~~qBAAqB~~,CAAC,QAAQ,CAAC,~~SAAS~~,~~CAAC~~,CAAC~~;IAC5C~~,CAAC,~~EAAE~~,EAAE,~~CAAC~~,CAAC;~~IAEP~~,MAAM,~~uBAAuB~~,GAAG,~~WAAW~~,~~CACzC~~,GAAG,CAAC,EAAE,CAAC,~~uBAAuB~~,CAAC,~~MAAM~~,~~EAAE~~,GAAG,CAAC,~~EAC3C~~,CAAC,~~MAAM~~,CAAC,~~CACT~~,CAAC;~~IAEF~~,~~OAAO~~,~~OAAO~~,~~CACZ,~~GAAG,EAAE,CAAC,CAAC,~~EAAC~~,~~OAAO~~,EAAE,~~uBAAuB~~,CAAC,~~QAAQ~~,CAAC,~~EAAC~~,CAAC,~~EACpD~~,CAAC,~~uBAAuB~~,EAAE,~~QAAQ~~,CAAC,~~CACpC~~,CAAC;~~AACJ~~,CAAC,CAAC"}
1	+ {"version":3,"file":"HeaderActionsProvider.js","sourceRoot":"","sources":["../../src/header/HeaderActionsProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAEhE,OAAO,EAAC,uBAAuB,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AAE9D,MAAM,qBAAqB;IACjB,aAAa,CAAgB;IAC7B,eAAe,CAAW;IAElC;QACE,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,QAAQ;QACf,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;IAClC,CAAC;IAED,aAAa,CAAC,GAAW,EAAE,OAAsB;QAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAClD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;SACnC;aAAM;YACL,MAAM,UAAU,GAAG,EAAC,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAC,CAAC;YAChD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG;gBACxB,GAAG,UAAU;gBACb,GAAG,OAAO;gBACV,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;aAC3D,CAAC;SACH;QAED,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,gBAAgB,CAAC,GAAW;QAC1B,OAAO,uBAAuB,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAEjE,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAA6B,EAAE;IAC7D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAiB,CAAC;IAExD,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,GAAW,EAAE,OAAsB,EAAE,EAAE;QACtE,UAAU,CAAC,QAAQ,CAAC,EAAE;YACpB,IAAI,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE;gBAC/B,OAAO,QAAQ,CAAC;aACjB;YAED,MAAM,cAAc,GAAG,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,EAAC,GAAG,QAAQ,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAE7D,cAAc,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;YAE9B,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC"}

package/lib/header/index.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
-export { headerActionsProvider, useHeaderOptions } from './HeaderActionsProvider';
+export { headerActionsProvider, useHeaderActions } from './HeaderActionsProvider';
 export { useBasicActions } from './hooks';
 export { HeaderActions, HeaderOptions, ActionType, HeaderBandItem, } from './types';
 export { HeaderBandProvider, useHeaderBand } from './HeaderBandContext';
 export { HeaderBandHelper } from './header-band-context.helper';
+export { fetchOptionsOfHeaderKey } from './utils';

package/lib/header/index.js CHANGED Viewed

@@ -15,8 +15,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-export { headerActionsProvider, useHeaderOptions } from './HeaderActionsProvider';
+export { headerActionsProvider, useHeaderActions } from './HeaderActionsProvider';
 export { useBasicActions } from './hooks';
 export { HeaderBandProvider, useHeaderBand } from './HeaderBandContext';
 export { HeaderBandHelper } from './header-band-context.helper';
+export { fetchOptionsOfHeaderKey } from './utils';
 //# sourceMappingURL=index.js.map

package/lib/header/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/header/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAOxC,OAAO,EAAC,kBAAkB,EAAE,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/header/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAOxC,OAAO,EAAC,kBAAkB,EAAE,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,uBAAuB,EAAC,MAAM,SAAS,CAAC"}

package/lib/i18n/hooks/use-translator.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 export interface TranslatorProps {
-    t: (key: string) => string;
+    t: (key: string, values?: any) => string;
 }
 declare function useTranslator(): TranslatorProps;
 export default useTranslator;

package/lib/i18n/translations/en.json CHANGED Viewed

@@ -34,6 +34,7 @@
     "Base_Content": "Content",
     "Base_ViewAll": "View all",
     "Base_ChooseFile": "Choose a file",
+    "Base_FileSizeUploadError": "File is too big, max size is {{maxSize}}.",
     "Base_NoAppConfigured": "No module configured on your application, please contact an administrator.",
     "Base_MinimalRequiredVersion": "The current version is below the minimum required version, please update your application.",
     "Base_Contact_Admin": "Please contact an administrator.",
@@ -65,11 +66,21 @@
     "Base_Failed_To": "Failed to",
     "Base_Offline_Mode": "The internet connection is disabled",
     "Base_Compatibily_Error": "This app isn't compatible with web application (v{{compatibility.moduleVersion}}).",
-    "Base_Compatibily_ErrorDetails": "This menu item is not compatible with the current web ERP configuration. This menu entry requires the {{compatibility.moduleName}} application to be installed on the web instance with a version between {{compatibility.downToVersion}} and {{compatibility.upToVersion}}. The currently installed web version of the application is {{compatibility.moduleVersion}}.",
+    "Base_Compatibily_ErrorDetails": "This menu item is not compatible with the current web ERP configuration. This menu entry requires the {{compatibility.moduleName}} application to be installed on the web instance with a version higher than {{compatibility.downToVersion}} and strictly less than {{compatibility.upToVersion}}. The currently installed web version of the application is {{compatibility.moduleVersion}}.",
     "Base_Compatibily_NotFound": "The {{compatibility.moduleName}} web application cannot be found.",
-    "Base_Compatibily_NotFoundDetails": "This menu item is not compatible with the current web ERP configuration. This menu entry requires the {{compatibility.moduleName}} application to be installed on the web instance with a version between {{compatibility.downToVersion}} and {{compatibility.upToVersion}}. The application is not installed on the web instance.",
-    "Auth_WrongPasswordOrUserName": "Wrong username or password",
-    "Auth_InvalidUrl": "Invalid url",
+    "Base_Compatibily_NotFoundDetails": "This menu item is not compatible with the current web ERP configuration. This menu entry requires the {{compatibility.moduleName}} application to be installed on the web instance with a version higher than {{compatibility.downToVersion}} and strictly less than {{compatibility.upToVersion}}. The application is not installed on the web instance.",
+    "Base_Connection_Login": "Login",
+    "Base_Connection_SessionName": "Session name",
+    "Base_Connection_Url": "Url",
+    "Base_Connection_Username": "Username",
+    "Base_Connection_Password": "Password",
+    "Base_Connection_Update": "Update",
+    "Base_Connection_SessionNameAlreadyExist": "Session name already exists",
+    "Base_Connection_WrongPasswordOrUserName": "Wrong username or password",
+    "Base_Connection_InvalidUrl": "Invalid url",
+    "Base_Connection_CreateSession": "Create a session",
+    "Base_Connection_EditSession": "Edit session",
+    "Base_Connection_DefaultSession": "Default session ?",
     "User_BlockConnection": "Stop internet connection",
     "Stopwatch_Status_Ready": "Ready",
     "Stopwatch_Status_InProgress": "InProgress",
@@ -77,6 +88,25 @@
     "Stopwatch_Status_Finished": "Finished",
     "Stopwatch_Status_Canceled": "Canceled",
     "Stopwatch_TimerFormat": "mm:ss",
+    "Base_Day_Sun": "Sun",
+    "Base_Day_Mon": "Mon",
+    "Base_Day_Tue": "Tue",
+    "Base_Day_Wed": "Wed",
+    "Base_Day_Thu": "Thu",
+    "Base_Day_Fri": "Fri",
+    "Base_Day_Sat": "Sat",
+    "Base_Month_Jan": "Jan",
+    "Base_Month_Feb": "Feb",
+    "Base_Month_Mar": "Mar",
+    "Base_Month_Apr": "Apr",
+    "Base_Month_May": "May",
+    "Base_Month_Jun": "Jun",
+    "Base_Month_Jul": "Jul",
+    "Base_Month_Aug": "Aug",
+    "Base_Month_Sep": "Sept",
+    "Base_Month_Oct": "Oct",
+    "Base_Month_Nov": "Nov",
+    "Base_Month_Dec": "Dec",
     "Base_SliceAction_FetchAttachedFiles": "fetch attached files",
     "Base_SliceAction_FetchFilesDetails": "fetch file details",
     "Base_SliceAction_FetchMetaModule": "fetch meta modules",

package/lib/i18n/translations/fr.json CHANGED Viewed

@@ -34,6 +34,7 @@
     "Base_Content": "Contenu",
     "Base_ViewAll": "Tout voir",
     "Base_ChooseFile": "Choisir un fichier",
+    "Base_FileSizeUploadError": "Le fichier est trop lourd, la taille maximale est {{maxSize}}.",
     "Base_NoAppConfigured": "Votre application n'est pas configurée, merci de contacter un administrateur.",
     "Base_MinimalRequiredVersion": "La version actuelle est en dessous de la version minimale requise, merci de mettre à jour votre application.",
     "Base_Contact_Admin": "Merci de contacter un administrateur.",
@@ -65,11 +66,21 @@
     "Base_Failed_To": "N'a pas réussi à effectuer l'action :",
     "Base_Offline_Mode": "La connexion internet est désactivée",
     "Base_Compatibily_Error": "Cette app n'est pas compatible avec l'application web (v{{compatibility.moduleVersion}}).",
-    "Base_Compatibily_ErrorDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version comprise entre {{compatibility.downToVersion}} et {{compatibility.upToVersion}}. La version web installée de l'application est actuellement la {{compatibility.moduleVersion}}.",
+    "Base_Compatibily_ErrorDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version supérieure à {{compatibility.downToVersion}} et strictement inférieure à {{compatibility.upToVersion}}. La version web installée de l'application est actuellement la {{compatibility.moduleVersion}}.",
     "Base_Compatibily_NotFound": "L'application web {{compatibility.moduleName}} est introuvable.",
-    "Base_Compatibily_NotFoundDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version comprise entre {{compatibility.downToVersion}} et {{compatibility.upToVersion}}. L'application n'est pas installée sur l'instance web.",
-    "Auth_WrongPasswordOrUserName": "Mauvais nom d'utilisateur ou mot de passe",
-    "Auth_InvalidUrl": "Url non valide",
+    "Base_Compatibily_NotFoundDetails": "Cette entrée de menu n'est pas compatible avec la configuration de l'ERP web actuelle. Cette entrée de menu nécessite que l'application {{compatibility.moduleName}} soit installée sur l'instance web avec une version supérieure à {{compatibility.downToVersion}} et strictement inférieure à {{compatibility.upToVersion}}. L'application n'est pas installée sur l'instance web.",
+    "Base_Connection_Login": "Se connecter",
+    "Base_Connection_SessionName": "Nom de la session",
+    "Base_Connection_Url": "Url",
+    "Base_Connection_Username": "Nom utilisateur",
+    "Base_Connection_Password": "Mot de passe",
+    "Base_Connection_Update": "Mettre à jour",
+    "Base_Connection_SessionNameAlreadyExist": "Ce nom de session existe déjà",
+    "Base_Connection_WrongPasswordOrUserName": "Mauvais nom d'utilisateur ou mot de passe",
+    "Base_Connection_InvalidUrl": "Url non valide",
+    "Base_Connection_CreateSession": "Créer une session",
+    "Base_Connection_EditSession": "Editer la session",
+    "Base_Connection_DefaultSession": "Session par défaut ?",
     "User_BlockConnection": "Bloquer la connexion internet",
     "Stopwatch_Status_Ready": "Prêt",
     "Stopwatch_Status_InProgress": "En cours",
@@ -77,6 +88,25 @@
     "Stopwatch_Status_Finished": "Terminé",
     "Stopwatch_Status_Canceled": "Annulé",
     "Stopwatch_TimerFormat": "mm:ss",
+    "Base_Day_Sun": "Dim.",
+    "Base_Day_Mon": "Lun.",
+    "Base_Day_Tue": "Mar.",
+    "Base_Day_Wed": "Mer.",
+    "Base_Day_Thu": "Jeu.",
+    "Base_Day_Fri": "Ven.",
+    "Base_Day_Sat": "Sam.",
+    "Base_Month_Jan": "Janv.",
+    "Base_Month_Feb": "Fev.",
+    "Base_Month_Mar": "Mars",
+    "Base_Month_Apr": "Avr.",
+    "Base_Month_May": "Mai",
+    "Base_Month_Jun": "Juin",
+    "Base_Month_Jul": "Juill.",
+    "Base_Month_Aug": "Août",
+    "Base_Month_Sep": "Sept.",
+    "Base_Month_Oct": "Oct.",
+    "Base_Month_Nov": "Nov.",
+    "Base_Month_Dec": "Déc.",
     "Base_SliceAction_FetchAttachedFiles": "récupération des fichiers joints",
     "Base_SliceAction_FetchFilesDetails": "récupération des détails du fichier",
     "Base_SliceAction_FetchMetaModule": "récupération des modules",

package/lib/navigator/Navigator.js CHANGED Viewed

@@ -22,7 +22,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import { useThemeColor } from '@axelor/aos-mobile-ui';
 import DrawerContent from './drawer/DrawerContent';
 import { filterAuthorizedModules, getDefaultModule, manageOverridingMenus, manageWebCompatibility, moduleHasMenus, updateAccessibleMenus, } from './module.helper';
-import { getMenuTitle } from './menu.helper';
+import { manageSubMenusOverriding, getMenuTitle, hasSubMenus, } from './menu.helper';
 import useTranslator from '../i18n/hooks/use-translator';
 import { useDispatch, useSelector } from 'react-redux';
 import { fetchMenuConfig } from '../features/menuConfigSlice';
@@ -46,7 +46,7 @@ const Navigator = ({ modules, mainMenu, onRefresh, version, versionCheckConfig,
     const I18n = useTranslator();
     const Colors = useThemeColor();
     const dispatch = useDispatch();
-    const enabledModule = useMemo(() => manageWebCompatibility(manageOverridingMenus(filterAuthorizedModules(modules, mobileConfigs, user)), metaModules), [metaModules, mobileConfigs, modules, user]);
+    const enabledModule = useMemo(() => manageWebCompatibility(manageOverridingMenus(manageSubMenusOverriding(filterAuthorizedModules(modules, mobileConfigs, user))), metaModules), [metaModules, mobileConfigs, modules, user]);
     const [activeModule, setActiveModule] = useState(getDefaultModule(enabledModule, mainMenu));
     useEffect(() => {
         dispatch(fetchMobileConfig());
@@ -110,11 +110,23 @@ const Navigator = ({ modules, mainMenu, onRefresh, version, versionCheckConfig,
                 width: isLargeScreen ? windowWidth * 0.5 : windowWidth * 0.8,
             },
         }} drawerContent={props => (<DrawerContent {...props} modules={enabledModule} onModuleClick={changeActiveModule} onRefresh={onRefresh} version={version} versionCheckConfig={versionCheckConfig}/>)}>
-        {Object.entries(modulesMenus).map(([key, menu]) => (<Drawer.Screen key={key} name={key} options={{
-                title: getMenuTitle(menu, { I18n }),
-            }}>
-            {props => (<ModulesScreensStackNavigator {...props} initialRouteName={menu.screen}/>)}
-          </Drawer.Screen>))}
+        {Object.entries(modulesMenus).map(([key, menu], index) => {
+            return (<React.Fragment key={index}>
+              <Drawer.Screen key={key} name={key} options={{
+                    title: getMenuTitle(menu, { I18n }),
+                }}>
+                {props => menu.screen && (<ModulesScreensStackNavigator {...props} initialRouteName={menu.screen}/>)}
+              </Drawer.Screen>
+              {hasSubMenus(menu) &&
+                    Object.entries(menu.subMenus).map(([subMenukey, subMenu]) => {
+                        return (<Drawer.Screen key={subMenukey} name={subMenukey} options={{
+                                title: getMenuTitle(subMenu, { I18n }),
+                            }}>
+                      {props => (<ModulesScreensStackNavigator {...props} initialRouteName={subMenu.screen}/>)}
+                    </Drawer.Screen>);
+                    })}
+            </React.Fragment>);
+        })}
       </Drawer.Navigator>
     </ModuleNavigatorContext.Provider>);
 };

package/lib/navigator/Navigator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,~~EAAC~~,YAAY,~~EAAC~~,MAAM,eAAe,CAAC;~~AAC3C~~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~~CACjD~~,CAAC,MAAM,CAAC,MAAM,CACZ,GAAG,CAAC,CAAC,GAAG,CAAC,CACT,IAAI,CAAC,CAAC,GAAG,CAAC,CACV,OAAO,CAAC,CAAC;~~gBACP~~,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,EAAC,IAAI,EAAC,CAAC;~~aAClC~~,CAAC,CACF;~~YAAA~~,CAAC,KAAK,CAAC,EAAE,CAAC,~~CACR~~,CAAC,4BAA4B,CAC3B,IAAI,KAAK,CAAC,CACV,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAC9B,CACH,CACH;~~UAAA~~,EAAE,MAAM,CAAC,MAAM,CAAC,CACjB,CAAC,CACJ;MAAA,EAAE,MAAM,CAAC,SAAS,CACpB;IAAA,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CACnC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
1	+ {"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"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"}

package/lib/navigator/drawer/DrawerContent.js CHANGED Viewed

@@ -31,24 +31,30 @@ import { useSelector } from '../../redux/hooks';
 import { PopupApplicationNotConfigured, PopupMinimalRequiredVersion, } from '../../components';
 import MenuTitle from './MenuTitle';
 import { formatVersionString } from '../../utils/string';
+import { getDefaultMenuKey, hasSubMenus } from '../menu.helper';
 const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, version, versionCheckConfig, }) => {
     useEffect(() => {
+        const generateRoutes = _state => {
+            return [...modules]
+                ?.filter(_module => _module.menus)
+                ?.flatMap(_module => {
+                const result = [];
+                for (const [key, menu] of Object.entries(_module.menus)) {
+                    result.push(key);
+                    if (hasSubMenus(menu)) {
+                        Object.keys(menu.subMenus).forEach(_key => {
+                            result.push(_key);
+                        });
+                    }
+                }
+                return result;
+            })
+                .map(_key => _state.routes.find(_item => _item.name === _key));
+        };
         navigation.dispatch(_state => {
             return CommonActions.reset({
                 ..._state,
-                routes: modules
-                    ?.filter(_module => _module.menus)
-                    ?.flatMap(_module => {
-                    const moduleMenus = _module.menus;
-                    return Object.entries(moduleMenus)
-                        .map((item, index) => ({
-                        ...item[1],
-                        order: item[1]?.order != null ? item[1]?.order : index * 10,
-                        key: item[0],
-                    }))
-                        .sort((a, b) => a.order - b.order)
-                        .map(item => _state.routes.find(stateItem => stateItem.name === item.key));
-                }),
+                routes: generateRoutes(_state),
             });
         });
     }, [modules, navigation]);
@@ -94,9 +100,21 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
             outputRange: ['0%', '100%'],
         })
         : 0, [externalMenuIsVisible, secondaryMenusLeft]);
-    const handleAuthModuleClick = () => {
-        onModuleClick(authModule.name);
-        const route = state.routes.find(_route => (_route.name = Object.keys(authModule.menus)[0]));
+    const handleModuleClick = _module => {
+        onModuleClick(_module.name);
+        navigateToDefaultMenu(_module);
+    };
+    const navigateToDefaultMenu = selectedModule => {
+        const defaultMenuKey = getDefaultMenuKey(selectedModule);
+        if (defaultMenuKey) {
+            navigateToMenu(defaultMenuKey);
+        }
+    };
+    const navigateToMenu = menuKey => {
+        const route = state.routes.find(_route => _route.name === menuKey);
+        if (route == null) {
+            return;
+        }
         const focused = state.routes.indexOf(route) === state.index &&
             Object.keys(activeModule.menus).includes(route.name);
         const event = navigation.emit({
@@ -126,16 +144,16 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
             {drawerModules.map(_module => (<View key={_module.name} style={styles.menuItemContainer}>
                 <MenuIconButton key={_module.title} icon={_module.icon} subtitle={showSubtitles && I18n.t(_module.subtitle)} disabled={_module.disabled} color={_module === activeModule
                     ? Colors.primaryColor.background_light
-                    : null} onPress={() => onModuleClick(_module.name)} compatibility={_module.compatibilityAOS}/>
+                    : null} onPress={() => handleModuleClick(_module)} compatibility={_module.compatibilityAOS}/>
               </View>))}
           </View>
           <View style={styles.otherIconsContainer}>
-            <AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={handleAuthModuleClick}/>
+            <AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={() => handleModuleClick(authModule)}/>
           </View>
         </View>)}
       <View style={styles.menusContainer}>
         <View>
-          {drawerModules.map(_module => (<MenuTitle key={_module.name} module={_module} onPress={() => onModuleClick(_module.name)}/>))}
+          {drawerModules.map(_module => (<MenuTitle key={_module.name} module={_module} onPress={() => handleModuleClick(_module)}/>))}
         </View>
         <Animated.View style={[
             styles.secondaryMenusContainer,
@@ -143,9 +161,9 @@ const DrawerContent = ({ state, modules, navigation, onModuleClick, onRefresh, v
                 left: innerMenuPosition,
             },
         ]}>
-          <Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={!externalMenuIsVisible ? (<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={handleAuthModuleClick}/>) : null} onItemClick={externalMenuIsVisible
+          <Menu activeModule={externalMenuIsVisible ? activeModule : drawerModules[0]} state={state} navigation={navigation} authMenu={!externalMenuIsVisible ? (<AuthMenuIconButton isActive={authModule.name === activeModule.name} showModulesSubtitle={showSubtitles} onPress={() => handleModuleClick(authModule)}/>) : null} onItemClick={externalMenuIsVisible
             ? () => { }
-            : () => onModuleClick(drawerModules[0]?.name)}/>
+            : () => onModuleClick(drawerModules[0]?.name)} compatibility={externalMenuIsVisible ? null : drawerModules[0].compatibilityAOS}/>
         </Animated.View>
       </View>
     </SafeAreaView>);