@axelor/aos-mobile-core 8.2.18 → 8.2.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/app/modules/ModuleProvider.js +7 -3
- package/lib/app/modules/ModuleProvider.js.map +1 -1
- package/lib/components/external/PlanningView/AgendaItemDisplay.js +6 -2
- package/lib/components/external/PlanningView/AgendaItemDisplay.js.map +1 -1
- package/lib/components/external/PlanningView/PlanningView.d.ts +9 -5
- package/lib/components/external/PlanningView/PlanningView.js +47 -37
- package/lib/components/external/PlanningView/PlanningView.js.map +1 -1
- package/lib/components/external/PlanningView/agenda.helpers.js +8 -3
- package/lib/components/external/PlanningView/agenda.helpers.js.map +1 -1
- package/lib/sessions/components/error/ErrorText.js +4 -0
- package/lib/sessions/components/error/ErrorText.js.map +1 -1
- package/lib/utils/api.js +6 -0
- package/lib/utils/api.js.map +1 -1
- package/package.json +3 -3
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
|
+
import { useSelector } from '../../redux/hooks';
|
|
20
|
+
import { checkModulesMenusAccessibility } from '../../navigator/module.helper';
|
|
19
21
|
class ModuleProvider {
|
|
20
22
|
modules;
|
|
21
23
|
moduleRegisters;
|
|
@@ -65,6 +67,8 @@ class ModuleProvider {
|
|
|
65
67
|
export const modulesProvider = new ModuleProvider();
|
|
66
68
|
export const useModules = () => {
|
|
67
69
|
const [modules, setModules] = useState(modulesProvider.getModules());
|
|
70
|
+
const { mobileSettings } = useSelector(state => state.appConfig);
|
|
71
|
+
const _modules = useMemo(() => checkModulesMenusAccessibility(modules, mobileSettings?.apps), [mobileSettings?.apps, modules]);
|
|
68
72
|
const refreshData = useCallback((data) => setModules([...data]), []);
|
|
69
73
|
useEffect(() => {
|
|
70
74
|
modulesProvider.registerCallback(refreshData);
|
|
@@ -73,8 +77,8 @@ export const useModules = () => {
|
|
|
73
77
|
};
|
|
74
78
|
}, [refreshData]);
|
|
75
79
|
return useMemo(() => ({
|
|
76
|
-
modules,
|
|
77
|
-
checkModule: moduleName =>
|
|
78
|
-
}), [
|
|
80
|
+
modules: _modules,
|
|
81
|
+
checkModule: moduleName => _modules.find(({ name }) => name === moduleName) != null,
|
|
82
|
+
}), [_modules]);
|
|
79
83
|
};
|
|
80
84
|
//# sourceMappingURL=ModuleProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleProvider.js","sourceRoot":"","sources":["../../../src/app/modules/ModuleProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ModuleProvider.js","sourceRoot":"","sources":["../../../src/app/modules/ModuleProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,8 +32,12 @@ const AgendaItemDisplay = ({ isFirst = false, agendaItem, renderComponent, }) =>
|
|
|
32
32
|
<View style={[styles.itemContainer, isNewMonth && styles.newMonthMargin]}>
|
|
33
33
|
<View style={styles.containerTime}>
|
|
34
34
|
{!isFullDayEvent && (<>
|
|
35
|
-
<Text style={styles.centerText}>
|
|
36
|
-
|
|
35
|
+
<Text fontSize={14} style={styles.centerText}>
|
|
36
|
+
{startHour}
|
|
37
|
+
</Text>
|
|
38
|
+
<Text fontSize={14} style={styles.centerText}>
|
|
39
|
+
{endHour}
|
|
40
|
+
</Text>
|
|
37
41
|
</>)}
|
|
38
42
|
</View>
|
|
39
43
|
<View style={styles.renderContainer}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgendaItemDisplay.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/AgendaItemDisplay.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAE,IAAI,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAa,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAE5D,MAAM,iBAAiB,GAAG,CAAC,EACzB,OAAO,GAAG,KAAK,EACf,UAAU,EACV,eAAe,GAKhB,EAAE,EAAE;IACH,MAAM,EAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAC,GAAG,OAAO,CAC5D,GAAG,EAAE,CAAC,UAAU,EAChB,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/D,IAAI,eAAe,IAAI,IAAI,EAAE;QAC3B,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAC1B;QAAA,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAClB;MAAA,EAAE,IAAI,CAAC,CACR,CAAC;KACH;IAED,OAAO,CACL,CAAC,IAAI,CACH;MAAA,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CACxB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAAG,CACjD,CAAC,CAAC,CAAC,IAAI,CACR;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,UAAU,IAAI,MAAM,CAAC,cAAc,CAAC,CAAC,CACvE;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAChC;UAAA,CAAC,CAAC,cAAc,IAAI,CAClB,EACE;cAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"AgendaItemDisplay.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/AgendaItemDisplay.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,17 @@ import { AgendaEvent, AgendaItem } from './agenda.helpers';
|
|
|
3
3
|
interface PlanningProps {
|
|
4
4
|
numberMonthsAroundToday?: number;
|
|
5
5
|
loading?: boolean;
|
|
6
|
-
|
|
6
|
+
itemList?: AgendaEvent[];
|
|
7
|
+
fetchbyMonth: (params: {
|
|
8
|
+
date: Date;
|
|
9
|
+
isAssigned?: boolean;
|
|
10
|
+
}) => void;
|
|
7
11
|
renderItem?: (item: AgendaItem) => React.ReactNode;
|
|
8
12
|
renderFullDayItem?: (item: AgendaItem) => React.ReactNode;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
returnToDayButton: boolean;
|
|
13
|
+
changeWeekButton?: boolean;
|
|
14
|
+
returnToDayButton?: boolean;
|
|
12
15
|
manageAssignment?: boolean;
|
|
16
|
+
computeAssignmentLocally?: boolean;
|
|
13
17
|
}
|
|
14
|
-
declare const PlanningView: ({ numberMonthsAroundToday,
|
|
18
|
+
declare const PlanningView: ({ numberMonthsAroundToday, loading, itemList, fetchbyMonth, renderItem, renderFullDayItem, changeWeekButton, returnToDayButton, manageAssignment, computeAssignmentLocally, }: PlanningProps) => React.JSX.Element;
|
|
15
19
|
export default PlanningView;
|
|
@@ -17,35 +17,35 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
|
-
import { SwitchCard, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
21
|
-
import { useSelector } from 'react-redux';
|
|
22
20
|
import { Agenda, LocaleConfig, } from 'react-native-calendars';
|
|
21
|
+
import { SwitchCard, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { useSelector } from '../../../redux/hooks';
|
|
23
23
|
import { useTranslator } from '../../../i18n';
|
|
24
|
+
import { useIsFocused } from '../../../hooks/use-navigation';
|
|
24
25
|
import { createAgendaItems, createAgendaSchedule, DAYS, filterMarkedDates, mapEntryToItem, MONTHS, shouldRenderDetailsCard, } from './agenda.helpers';
|
|
25
26
|
import MonthDisplay from './MonthDisplay';
|
|
26
27
|
import DayDisplay from './DayDisplay';
|
|
27
28
|
import AgendaItemDisplay from './AgendaItemDisplay';
|
|
28
29
|
import NavigationButton from './NavigationButton';
|
|
29
|
-
const PlanningView = ({ numberMonthsAroundToday = 12,
|
|
30
|
+
const PlanningView = ({ numberMonthsAroundToday = 12, loading = false, itemList = [], fetchbyMonth, renderItem, renderFullDayItem, changeWeekButton = true, returnToDayButton = true, manageAssignment = false, computeAssignmentLocally = true, }) => {
|
|
30
31
|
const Colors = useThemeColor();
|
|
31
32
|
const I18n = useTranslator();
|
|
32
|
-
const
|
|
33
|
-
const
|
|
33
|
+
const isFocused = useIsFocused();
|
|
34
|
+
const { userId } = useSelector(state => state.auth);
|
|
35
|
+
const [fetchDate, setFetchDate] = useState(new Date());
|
|
34
36
|
const [currentDate, setCurrentDate] = useState(new Date().toISOString());
|
|
35
37
|
const [assigned, setAssigned] = useState(true);
|
|
36
38
|
const filterOnUserAssigned = useCallback((list) => {
|
|
37
39
|
if (!Array.isArray(list) || list.length === 0) {
|
|
38
40
|
return [];
|
|
39
41
|
}
|
|
42
|
+
else if (manageAssignment && computeAssignmentLocally) {
|
|
43
|
+
return list.filter(item => !assigned || item?.data?.userId === userId);
|
|
44
|
+
}
|
|
40
45
|
else {
|
|
41
|
-
|
|
42
|
-
return list?.filter(item => item?.data?.userId === userId);
|
|
43
|
-
}
|
|
44
|
-
else {
|
|
45
|
-
return list;
|
|
46
|
-
}
|
|
46
|
+
return list;
|
|
47
47
|
}
|
|
48
|
-
}, [assigned, manageAssignment, userId]);
|
|
48
|
+
}, [assigned, computeAssignmentLocally, manageAssignment, userId]);
|
|
49
49
|
useEffect(() => {
|
|
50
50
|
LocaleConfig.locales = {
|
|
51
51
|
default: {
|
|
@@ -62,17 +62,12 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
62
62
|
const agendaItems = useMemo(() => createAgendaSchedule(_agendaItems, numberMonthsAroundToday), [_agendaItems, numberMonthsAroundToday]);
|
|
63
63
|
const styles = useMemo(() => getStyles(manageAssignment), [manageAssignment]);
|
|
64
64
|
const markedDots = useMemo(() => filterMarkedDates(agendaItems), [agendaItems]);
|
|
65
|
-
const renderDate = (date) => {
|
|
66
|
-
|
|
67
|
-
};
|
|
68
|
-
const renderEmptyDate = () => {
|
|
69
|
-
return <View style={styles.emptyDate}/>;
|
|
70
|
-
};
|
|
65
|
+
const renderDate = useCallback((date) => <DayDisplay date={date}/>, []);
|
|
66
|
+
const renderEmptyDate = useCallback(() => <View style={styles.emptyDate}/>, [styles.emptyDate]);
|
|
71
67
|
const renderDayItem = (item, isFirst) => {
|
|
72
68
|
const agendaItem = mapEntryToItem(item, _agendaItems);
|
|
73
|
-
if (agendaItem == null)
|
|
69
|
+
if (agendaItem == null)
|
|
74
70
|
return null;
|
|
75
|
-
}
|
|
76
71
|
const { id, date, isNewMonth } = agendaItem;
|
|
77
72
|
if (isNewMonth) {
|
|
78
73
|
return <MonthDisplay key={id} date={date} isFirst={isFirst}/>;
|
|
@@ -83,23 +78,38 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
83
78
|
return (<AgendaItemDisplay key={id} isFirst={isFirst} agendaItem={agendaItem} renderComponent={_renderComponent}/>);
|
|
84
79
|
};
|
|
85
80
|
const handleLoadItemsForMonth = useCallback((date) => {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
81
|
+
setFetchDate(new Date(date.dateString));
|
|
82
|
+
}, []);
|
|
83
|
+
const loadItemsWithAPI = useCallback(() => {
|
|
84
|
+
fetchbyMonth({ date: fetchDate, isAssigned: assigned });
|
|
85
|
+
}, [assigned, fetchDate, fetchbyMonth]);
|
|
86
|
+
useEffect(() => {
|
|
87
|
+
if (isFocused)
|
|
88
|
+
loadItemsWithAPI();
|
|
89
|
+
}, [isFocused, loadItemsWithAPI]);
|
|
90
|
+
const handleMonthChange = useCallback((months) => {
|
|
91
|
+
setFetchDate(new Date(months?.[0]?.dateString));
|
|
92
|
+
}, []);
|
|
93
|
+
const todayBtnOnPress = useCallback(() => {
|
|
94
|
+
setFetchDate(new Date());
|
|
91
95
|
setCurrentDate(new Date().toISOString());
|
|
92
|
-
};
|
|
93
|
-
const nextWeekBtnOnPress = () => {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
96
|
+
}, []);
|
|
97
|
+
const nextWeekBtnOnPress = useCallback(() => {
|
|
98
|
+
setCurrentDate(_current => {
|
|
99
|
+
var firstDay = new Date(_current);
|
|
100
|
+
var nextWeek = new Date(firstDay.getTime() + 7 * 24 * 60 * 60 * 1000);
|
|
101
|
+
setFetchDate(nextWeek);
|
|
102
|
+
return nextWeek.toISOString();
|
|
103
|
+
});
|
|
104
|
+
}, []);
|
|
105
|
+
const lastWeekBtnOnPress = useCallback(() => {
|
|
106
|
+
setCurrentDate(_current => {
|
|
107
|
+
var firstDay = new Date(_current);
|
|
108
|
+
var lastWeek = new Date(firstDay.getTime() - 7 * 24 * 60 * 60 * 1000);
|
|
109
|
+
setFetchDate(lastWeek);
|
|
110
|
+
return lastWeek.toISOString();
|
|
111
|
+
});
|
|
112
|
+
}, []);
|
|
103
113
|
return (<View style={[
|
|
104
114
|
styles.agendaContainer,
|
|
105
115
|
{ backgroundColor: Colors.backgroundColor },
|
|
@@ -112,7 +122,7 @@ const PlanningView = ({ numberMonthsAroundToday = 12, renderItem, renderFullDayI
|
|
|
112
122
|
<NavigationButton visible={changeWeekButton} icon="arrow-right" onPress={nextWeekBtnOnPress}/>
|
|
113
123
|
</View>
|
|
114
124
|
</View>
|
|
115
|
-
<Agenda onDayPress={date => setCurrentDate(date.dateString)} selected={currentDate} items={agendaItems} markedDates={markedDots} firstDay={1} loadItemsForMonth={handleLoadItemsForMonth} pastScrollRange={numberMonthsAroundToday} futureScrollRange={numberMonthsAroundToday} renderItem={renderDayItem} renderDay={renderDate} renderEmptyDate={renderEmptyDate} onRefresh={
|
|
125
|
+
<Agenda onDayPress={date => setCurrentDate(date.dateString)} selected={currentDate} onVisibleMonthsChange={handleMonthChange} items={agendaItems} markedDates={markedDots} firstDay={1} loadItemsForMonth={handleLoadItemsForMonth} pastScrollRange={numberMonthsAroundToday} futureScrollRange={numberMonthsAroundToday} renderItem={renderDayItem} renderDay={renderDate} renderEmptyDate={renderEmptyDate} onRefresh={loadItemsWithAPI} refreshing={loading} theme={{
|
|
116
126
|
todayTextColor: Colors.text,
|
|
117
127
|
calendarBackground: Colors.backgroundColor,
|
|
118
128
|
indicatorColor: Colors.primaryColor.background,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlanningView.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/PlanningView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"PlanningView.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/PlanningView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,MAAM,EAGN,YAAY,GACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAGL,iBAAiB,EACjB,oBAAoB,EACpB,IAAI,EACJ,iBAAiB,EACjB,cAAc,EACd,MAAM,EACN,uBAAuB,GACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAelD,MAAM,YAAY,GAAG,CAAC,EACpB,uBAAuB,GAAG,EAAE,EAC5B,OAAO,GAAG,KAAK,EACf,QAAQ,GAAG,EAAE,EACb,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,gBAAgB,GAAG,IAAI,EACvB,iBAAiB,GAAG,IAAI,EACxB,gBAAgB,GAAG,KAAK,EACxB,wBAAwB,GAAG,IAAI,GACjB,EAAE,EAAE;IAClB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IAEjC,MAAM,EAAC,MAAM,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACzE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,oBAAoB,GAAG,WAAW,CACtC,CAAC,IAAW,EAAE,EAAE;QACd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7C,OAAO,EAAE,CAAC;SACX;aAAM,IAAI,gBAAgB,IAAI,wBAAwB,EAAE;YACvD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;SACxE;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAC/D,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,YAAY,CAAC,OAAO,GAAG;YACrB,OAAO,EAAE;gBACP,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACxC,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC7C,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACpC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACzC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;aACrC;SACF,CAAC;QAEF,YAAY,CAAC,aAAa,GAAG,SAAS,CAAC;IACzC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,EAC7D,CAAC,oBAAoB,EAAE,QAAQ,EAAE,IAAI,CAAC,CACvC,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,oBAAoB,CAAC,YAAY,EAAE,uBAAuB,CAAC,EACjE,CAAC,YAAY,EAAE,uBAAuB,CAAC,CACxC,CAAC;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAE9E,MAAM,UAAU,GAAG,OAAO,CACxB,GAAG,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,EACpC,CAAC,WAAW,CAAC,CACd,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC5B,CAAC,IAAU,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAG,EAC1C,EAAE,CACH,CAAC;IAEF,MAAM,eAAe,GAAG,WAAW,CACjC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAG,EACvC,CAAC,MAAM,CAAC,SAAS,CAAC,CACnB,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,IAAiB,EAAE,OAAgB,EAAE,EAAE;QAC5D,MAAM,UAAU,GAAe,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAElE,IAAI,UAAU,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAEpC,MAAM,EAAC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAC,GAAG,UAAU,CAAC;QAE1C,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAG,CAAC;SAChE;QAED,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,UAAU,CAAC;YAC1D,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,iBAAiB,CAAC;QAEtB,OAAO,CACL,CAAC,iBAAiB,CAChB,GAAG,CAAC,CAAC,EAAE,CAAC,CACR,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,eAAe,CAAC,CAAC,gBAAgB,CAAC,EAClC,CACH,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,uBAAuB,GAAG,WAAW,CAAC,CAAC,IAAc,EAAE,EAAE;QAC7D,YAAY,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,YAAY,CAAC,EAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAC,CAAC,CAAC;IACxD,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS;YAAE,gBAAgB,EAAE,CAAC;IACpC,CAAC,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,WAAW,CAAC,CAAC,MAAkB,EAAE,EAAE;QAC3D,YAAY,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;IAClD,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACzB,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAC3C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC1C,cAAc,CAAC,QAAQ,CAAC,EAAE;YACxB,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YACtE,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC1C,cAAc,CAAC,QAAQ,CAAC,EAAE;YACxB,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YACtE,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,CAAC,IAAI,CACH,KAAK,CAAC,CAAC;YACL,MAAM,CAAC,eAAe;YACtB,EAAC,eAAe,EAAE,MAAM,CAAC,eAAe,EAAC;SAC1C,CAAC,CACF;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;QAAA,CAAC,gBAAgB,IAAI,CACnB,CAAC,UAAU,CACT,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CACnC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CACzB,YAAY,CAAC,CAAC,QAAQ,CAAC,CACvB,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,EACvC,CACH,CACD;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAC/B;UAAA,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAC1B,IAAI,CAAC,YAAY,CACjB,OAAO,CAAC,CAAC,kBAAkB,CAAC,EAE9B;UAAA,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,iBAAiB,CAAC,CAC3B,IAAI,CAAC,gBAAgB,CACrB,OAAO,CAAC,CAAC,eAAe,CAAC,EAE3B;UAAA,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAC1B,IAAI,CAAC,aAAa,CAClB,OAAO,CAAC,CAAC,kBAAkB,CAAC,EAEhC;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,MAAM,CACL,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CACpD,QAAQ,CAAC,CAAC,WAAW,CAAC,CACtB,qBAAqB,CAAC,CAAC,iBAAiB,CAAC,CACzC,KAAK,CAAC,CAAC,WAAW,CAAC,CACnB,WAAW,CAAC,CAAC,UAAU,CAAC,CACxB,QAAQ,CAAC,CAAC,CAAC,CAAC,CACZ,iBAAiB,CAAC,CAAC,uBAAuB,CAAC,CAC3C,eAAe,CAAC,CAAC,uBAAuB,CAAC,CACzC,iBAAiB,CAAC,CAAC,uBAAuB,CAAC,CAC3C,UAAU,CAAC,CAAC,aAAa,CAAC,CAC1B,SAAS,CAAC,CAAC,UAAU,CAAC,CACtB,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAC5B,UAAU,CAAC,CAAC,OAAO,CAAC,CACpB,KAAK,CAAC,CAAC;YACL,cAAc,EAAE,MAAM,CAAC,IAAI;YAC3B,kBAAkB,EAAE,MAAM,CAAC,eAAe;YAC1C,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;YAC9C,qBAAqB,EAAE,MAAM,CAAC,oBAAoB;YAClD,YAAY,EAAE,MAAM,CAAC,IAAI;YACzB,oBAAoB,EAAE,MAAM,CAAC,IAAI;YACjC,cAAc,EAAE,MAAM,CAAC,IAAI;YAC3B,0BAA0B,EAAE,MAAM,CAAC,YAAY,CAAC,gBAAgB;YAChE,eAAe,EAAE,MAAM,CAAC,qBAAqB;YAC7C,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;YACxC,gBAAgB,EAAE,MAAM,CAAC,IAAI;YAC7B,kBAAkB,EAAE,MAAM,CAAC,IAAI;YAC/B,iBAAiB,EAAE,MAAM,CAAC,IAAI;YAC9B,gBAAgB,EAAE,MAAM,CAAC,YAAY,CAAC,gBAAgB;YACtD,eAAe,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;YACjD,oBAAoB,EAAE,MAAM,CAAC,cAAc,CAAC,gBAAgB;SAC7D,CAAC,CACF,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,GAAG,CAAC,CAAC,WAAW,CAAC,EAErB;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,gBAAyB,EAAE,EAAE,CAC9C,UAAU,CAAC,MAAM,CAAC;IAChB,eAAe,EAAE;QACf,MAAM,EAAE,MAAM;KACf;IACD,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;KACR;IACD,cAAc,EAAE;QACd,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU;QAC/D,UAAU,EAAE,QAAQ;KACrB;IACD,YAAY,EAAE;QACZ,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;KACrB;IACD,UAAU,EAAE;QACV,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,CAAC;KACd;CACF,CAAC,CAAC;AAEL,eAAe,YAAY,CAAC"}
|
|
@@ -62,9 +62,11 @@ function formatDate(date) {
|
|
|
62
62
|
.toString()
|
|
63
63
|
.padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
|
|
64
64
|
}
|
|
65
|
-
function addDays(originDate, days) {
|
|
65
|
+
function addDays(originDate, days, resetTime = false) {
|
|
66
66
|
var date = new Date(originDate);
|
|
67
67
|
date.setDate(date.getDate() + days);
|
|
68
|
+
if (resetTime)
|
|
69
|
+
date.setHours(23, 59, 59, 999);
|
|
68
70
|
return date;
|
|
69
71
|
}
|
|
70
72
|
function addMonths(originDate, months) {
|
|
@@ -93,7 +95,7 @@ function generateAgendaItems(monthsAroundDate) {
|
|
|
93
95
|
const agendaItems = {};
|
|
94
96
|
dateArray.forEach((date) => {
|
|
95
97
|
if (isStartOfMonth(date)) {
|
|
96
|
-
const _d = addDays(date, -1);
|
|
98
|
+
const _d = addDays(date, -1, true);
|
|
97
99
|
agendaItems[formatDate(_d)] = [
|
|
98
100
|
{
|
|
99
101
|
day: _d,
|
|
@@ -111,7 +113,10 @@ export function createAgendaSchedule(items, monthsAroundDate) {
|
|
|
111
113
|
const agendaItems = mapItemListToEntryList(items);
|
|
112
114
|
agendaItems.forEach((item) => {
|
|
113
115
|
const itemDate = formatDate(new Date(item.day));
|
|
114
|
-
return (agendaSchedule[itemDate] = [
|
|
116
|
+
return (agendaSchedule[itemDate] = [
|
|
117
|
+
...agendaSchedule[itemDate],
|
|
118
|
+
item,
|
|
119
|
+
]).sort((a, b) => new Date(a.day).getTime() - new Date(b.day).getTime());
|
|
115
120
|
});
|
|
116
121
|
return agendaSchedule;
|
|
117
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agenda.helpers.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/agenda.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE7E,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAC9B,MAAM,mBAAmB,GAAG,cAAc,CAAC;AAE3C,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,wBAAwB;IACxB,yBAAyB;IACzB,sBAAsB;IACtB,sBAAsB;IACtB,oBAAoB;IACpB,qBAAqB;IACrB,qBAAqB;IACrB,uBAAuB;IACvB,0BAA0B;IAC1B,wBAAwB;IACxB,yBAAyB;IACzB,yBAAyB;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;CACf,CAAC;AAmBF,MAAM,UAAU,cAAc,CAC5B,UAAuB,EACvB,QAAsB;IAEtB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CACzB,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,UAAU,CAAC,IAAI,CAClD,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,UAAU,CAAC,IAAI;QACnB,IAAI,EAAE,UAAU,CAAC,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAChB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC;KAC1D,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAgB;IACtC,OAAO,EAAC,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAC,CAAC;AACzE,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAmB;IACjD,OAAO,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAClD,QAAQ,EAAE;SACV,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;AACtE,CAAC;AAED,SAAS,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"agenda.helpers.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/agenda.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE7E,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAC9B,MAAM,mBAAmB,GAAG,cAAc,CAAC;AAE3C,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,wBAAwB;IACxB,yBAAyB;IACzB,sBAAsB;IACtB,sBAAsB;IACtB,oBAAoB;IACpB,qBAAqB;IACrB,qBAAqB;IACrB,uBAAuB;IACvB,0BAA0B;IAC1B,wBAAwB;IACxB,yBAAyB;IACzB,yBAAyB;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;CACf,CAAC;AAmBF,MAAM,UAAU,cAAc,CAC5B,UAAuB,EACvB,QAAsB;IAEtB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CACzB,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,UAAU,CAAC,IAAI,CAClD,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,UAAU,CAAC,IAAI;QACnB,IAAI,EAAE,UAAU,CAAC,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAChB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC;KAC1D,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAgB;IACtC,OAAO,EAAC,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAC,CAAC;AACzE,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAmB;IACjD,OAAO,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAClD,QAAQ,EAAE;SACV,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;AACtE,CAAC;AAED,SAAS,OAAO,CAAC,UAAyB,EAAE,IAAY,EAAE,SAAS,GAAG,KAAK;IACzE,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAEpC,IAAI,SAAS;QAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAE9C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,SAAS,CAAC,UAAU,EAAE,MAAM;IACnC,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,SAAS,EAAE,QAAQ;IACtC,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,WAAW,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,OAAO,WAAW,IAAI,OAAO,EAAE;QAC7B,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QACtC,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;KACvC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mBAAmB,CAAC,gBAAwB,EAAE,IAAU;IAC/D,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACnD,OAAO,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,mBAAmB,CAAC,gBAAgB;IAC3C,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,SAAS,CAAC,OAAO,CAAC,CAAC,IAAU,EAAE,EAAE;QAC/B,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;YACxB,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAEnC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,GAAG;gBAC5B;oBACE,GAAG,EAAE,EAAE;oBACP,IAAI,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,IACvB,EAAE,CAAC,QAAQ,EAAE,GAAG,CAClB,IAAI,mBAAmB,EAAE;oBACzB,MAAM,EAAE,SAAS;iBAClB;aACF,CAAC;SACH;QAED,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAmB,EACnB,gBAAwB;IAExB,MAAM,cAAc,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAElD,WAAW,CAAC,OAAO,CAAC,CAAC,IAAiB,EAAE,EAAE;QACxC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAChD,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG;YACjC,GAAG,cAAc,CAAC,QAAQ,CAAC;YAC3B,IAAI;SACL,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAU;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAmB;IAC9C,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5B,OAAO,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAmB;IAChD,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAmB,EACnB,IAAqB,EACd,EAAE;IACT,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAChB,MAAM,KAAK,GAAG,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACzC,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,KAAkB,EAClB,IAAqB,EACP,EAAE;IAChB,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEzC,IAAI,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL;gBACE,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE;gBACvB,IAAI,EAAE,KAAK,CAAC,OAAO;gBACnB,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;gBACjE,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;gBAC7D,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB;SACF,CAAC;KACH;IAED,OAAO,yBAAyB,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,KAAkB,EAClB,SAAe,EACf,OAAa,EACb,IAAqB,EACP,EAAE;IAChB,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,WAAW,CAAC,IAAI,CAAC;QACf,EAAE,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE;QACtB,IAAI,EAAE,KAAK,CAAC,SAAS;QACrB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;QACjE,OAAO,EAAE,UAAU;KACpB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACrC,WAAW,CAAC,IAAI,CAAC;YACf,EAAE,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE;YAC/C,cAAc,EAAE,IAAI;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CAAC;KACJ;IAED,WAAW,CAAC,IAAI,CAAC;QACf,EAAE,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,QAAQ,GAAG,CAAC,EAAE;QACjC,IAAI,EAAE,KAAK,CAAC,OAAO;QACnB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,SAAS,EAAE,UAAU;QACrB,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;KAC9D,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAiB,EAAE,EAAE;IAC3D,MAAM,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAC,GAAG,KAAK,CAAC;IAEzD,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,kBAAkB,GAAG,SAAS,KAAK,UAAU,IAAI,OAAO,KAAK,UAAU,CAAC;IAC9E,MAAM,iBAAiB,GAAG,SAAS,KAAK,UAAU,IAAI,OAAO,KAAK,UAAU,CAAC;IAC7E,MAAM,UAAU,GACd,CAAC,cAAc,IAAI,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,CAAC;IAE/D,OAAO,CACL,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,kBAAkB,IAAI,SAAS,IAAI,KAAK,CAAC;QAC1C,CAAC,iBAAiB,IAAI,SAAS,IAAI,KAAK,CAAC;QACzC,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,WAA2B,EAAE,EAAE;IAC/D,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;QACxE,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAE5E,OAAO,CAAC,EAAE,EAAE,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;AAC/C,CAAC,CAAC"}
|
|
@@ -22,6 +22,7 @@ import { StyleSheet } from 'react-native';
|
|
|
22
22
|
const ERROR_CODE_REGEX = /\d{3}$/g;
|
|
23
23
|
const LOGIN_ERROR = 401;
|
|
24
24
|
const URL_ERROR = 999;
|
|
25
|
+
const NO_CONNECTION_CODE = 418;
|
|
25
26
|
const ErrorText = ({ error, style }) => {
|
|
26
27
|
const I18n = useTranslator();
|
|
27
28
|
const errorCode = useMemo(() => {
|
|
@@ -38,6 +39,9 @@ const ErrorText = ({ error, style }) => {
|
|
|
38
39
|
if (errorCode === URL_ERROR) {
|
|
39
40
|
return `${I18n.t('Base_Connection_InvalidUrl')}: ${error.url}`;
|
|
40
41
|
}
|
|
42
|
+
if (errorCode === NO_CONNECTION_CODE) {
|
|
43
|
+
return I18n.t('Base_NoConnection');
|
|
44
|
+
}
|
|
41
45
|
return error?.message;
|
|
42
46
|
}, [I18n, error, errorCode]);
|
|
43
47
|
if (error == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorText.js","sourceRoot":"","sources":["../../../../src/sessions/components/error/ErrorText.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,gBAAgB,GAAG,SAAS,CAAC;AACnC,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,SAAS,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"ErrorText.js","sourceRoot":"","sources":["../../../../src/sessions/components/error/ErrorText.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,gBAAgB,GAAG,SAAS,CAAC;AACnC,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,SAAS,GAAG,GAAG,CAAC;AACtB,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAM,SAAS,GAAG,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,EAAE,EAAE;IACnC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC7B,IAAI,KAAK,EAAE,OAAO,IAAI,IAAI,EAAE;YAC1B,OAAO,IAAI,CAAC;SACb;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE/D,OAAO,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,SAAS,KAAK,WAAW,EAAE;YAC7B,OAAO,IAAI,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC;SAC1D;QAED,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;SAChE;QAED,IAAI,SAAS,KAAK,kBAAkB,EAAE;YACpC,OAAO,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;SACpC;QAED,OAAO,KAAK,EAAE,OAAO,CAAC;IACxB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAE7B,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,EAAG,CACzE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM;KACd;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
package/lib/utils/api.js
CHANGED
|
@@ -15,9 +15,11 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
+
import { getNetInfo } from '../api/net-info-utils';
|
|
18
19
|
import { formatURL as _formatURL } from './formatters';
|
|
19
20
|
const PREFIX_REGEX = /^https?:\/\//;
|
|
20
21
|
const INVALID_URL_CODE = 999;
|
|
22
|
+
const NO_CONNECTION_CODE = 418;
|
|
21
23
|
export function testUrl(url) {
|
|
22
24
|
return new Promise(async (resolve, reject) => {
|
|
23
25
|
if (!url || typeof url !== 'string') {
|
|
@@ -36,6 +38,10 @@ export function testUrl(url) {
|
|
|
36
38
|
}
|
|
37
39
|
catch (error) { }
|
|
38
40
|
}
|
|
41
|
+
const { isConnected } = await getNetInfo();
|
|
42
|
+
if (!isConnected) {
|
|
43
|
+
reject(new Error(`No available connection while testing URL: "${url}" ${NO_CONNECTION_CODE}`));
|
|
44
|
+
}
|
|
39
45
|
reject(new Error(`Could not fetch URL: "${url}" ${INVALID_URL_CODE}`));
|
|
40
46
|
});
|
|
41
47
|
}
|
package/lib/utils/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,IAAI,UAAU,EAAC,MAAM,cAAc,CAAC;AAErD,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,gBAAgB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAC,SAAS,IAAI,UAAU,EAAC,MAAM,cAAc,CAAC;AAErD,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAM,UAAU,OAAO,CAAC,GAAW;IACjC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACnC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,KAAK,gBAAgB,EAAE,CAAC,CAAC,CAAC;YAC/D,OAAO;SACR;QAED,MAAM,SAAS,GAAG,UAAU,CAC1B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CACrD,CAAC;QAEF,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,CAC5C,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CACzC,CAAC;QAEF,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;YAC9C,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC9C,IAAI,QAAQ,CAAC,EAAE,EAAE;oBACf,OAAO,CAAC,eAAe,CAAC,CAAC;oBACzB,OAAO;iBACR;aACF;YAAC,OAAO,KAAK,EAAE,GAAE;SACnB;QAED,MAAM,EAAC,WAAW,EAAC,GAAG,MAAM,UAAU,EAAE,CAAC;QAEzC,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,CACJ,IAAI,KAAK,CACP,+CAA+C,GAAG,KAAK,kBAAkB,EAAE,CAC5E,CACF,CAAC;SACH;QAED,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,GAAG,KAAK,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "8.2.
|
|
3
|
+
"version": "8.2.20",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"license:add": "npx add-copyright-header --generate --dir 'src'"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@axelor/aos-mobile-error": "8.2.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.2.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.2.20",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.2.20",
|
|
29
29
|
"@react-navigation/drawer": "6.7.2",
|
|
30
30
|
"@react-navigation/native": "6.1.18",
|
|
31
31
|
"@react-navigation/native-stack": "6.11.0",
|