@axelor/aos-mobile-core 8.4.19 → 8.4.21
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/apiProviders/Action/ActionApiProvider.d.ts +1 -1
- package/lib/apiProviders/Action/AosActionApi.d.ts +1 -1
- package/lib/apiProviders/Action/utils.d.ts +1 -1
- package/lib/app/ContextedApplication.js +6 -3
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/components/external/PlanningView/agenda.helpers.js +9 -2
- package/lib/components/external/PlanningView/agenda.helpers.js.map +1 -1
- package/lib/forms/api.helpers.d.ts +3 -3
- package/lib/forms/studio/formula.helpers.d.ts +3 -5
- package/lib/forms/studio/formula.helpers.js +8 -4
- package/lib/forms/studio/formula.helpers.js.map +1 -1
- package/lib/hooks/use-mass-scanner.js +6 -4
- package/lib/hooks/use-mass-scanner.js.map +1 -1
- package/package.json +3 -3
|
@@ -4,6 +4,6 @@ export declare class AosActionApi implements ActionApi {
|
|
|
4
4
|
constructor();
|
|
5
5
|
static isOnlineAvailable: boolean;
|
|
6
6
|
isAvailable(): Promise<boolean>;
|
|
7
|
-
send(request: ActionRequest): Promise<
|
|
7
|
+
send(request: ActionRequest): Promise<any>;
|
|
8
8
|
synchronize(): Promise<void>;
|
|
9
9
|
}
|
|
@@ -26,20 +26,23 @@ import { getActiveUserInfo } from '../api/login-api';
|
|
|
26
26
|
import { ErrorScreen } from '../screens';
|
|
27
27
|
import { Camera, GlobalToolBox, HeaderBandList, Scanner, Toast, } from '../components';
|
|
28
28
|
import { RouterProvider } from '../config';
|
|
29
|
-
import { useDispatch } from '../redux/hooks';
|
|
29
|
+
import { useDispatch, useSelector } from '../redux/hooks';
|
|
30
30
|
import { setAppVersion } from '../features/authSlice';
|
|
31
31
|
import { MaintenanceTrigger } from '../apiProviders';
|
|
32
32
|
import { resetConfigs } from '../features/appConfigSlice';
|
|
33
33
|
const ContextedApplication = ({ modules, mainMenu, version, configuration, customLoginPage, }) => {
|
|
34
34
|
const dispatch = useDispatch();
|
|
35
|
+
const { logged } = useSelector(state => state.auth);
|
|
35
36
|
const [, setRefresh] = useState(false);
|
|
36
37
|
const [tracebackRoute, setTracebackRoute] = useState('');
|
|
37
38
|
const traceBackPutMethod = useCallback(({ additionalURL, data }) => {
|
|
38
39
|
return axios.put(additionalURL, { data: data });
|
|
39
40
|
}, []);
|
|
40
41
|
useEffect(() => {
|
|
41
|
-
|
|
42
|
-
|
|
42
|
+
if (logged) {
|
|
43
|
+
RouterProvider.get('TraceBack').then(setTracebackRoute);
|
|
44
|
+
}
|
|
45
|
+
}, [logged]);
|
|
43
46
|
useEffect(() => {
|
|
44
47
|
dispatch(setAppVersion({ appVersion: version }));
|
|
45
48
|
}, [dispatch, version]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,uBAAuB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,UAAU,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AACvC,OAAO,EACL,MAAM,EACN,aAAa,EACb,cAAc,EACd,OAAO,EACP,KAAK,GACN,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,11 @@ export function mapEntryToItem(agendaItem, itemList) {
|
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
function mapItemToEntry(item) {
|
|
55
|
-
return {
|
|
55
|
+
return {
|
|
56
|
+
name: '' + item?.id,
|
|
57
|
+
height: 80,
|
|
58
|
+
day: new Date(item?.date).toISOString(),
|
|
59
|
+
};
|
|
56
60
|
}
|
|
57
61
|
function mapItemListToEntryList(items) {
|
|
58
62
|
return items.map(mapItemToEntry);
|
|
@@ -114,7 +118,7 @@ export function createAgendaSchedule(items, monthsAroundDate) {
|
|
|
114
118
|
agendaItems.forEach((item) => {
|
|
115
119
|
const itemDate = formatDate(new Date(item.day));
|
|
116
120
|
return (agendaSchedule[itemDate] = [
|
|
117
|
-
...agendaSchedule[itemDate],
|
|
121
|
+
...(agendaSchedule[itemDate] ?? []),
|
|
118
122
|
item,
|
|
119
123
|
]).sort((a, b) => new Date(a.day).getTime() - new Date(b.day).getTime());
|
|
120
124
|
});
|
|
@@ -147,6 +151,9 @@ const createAgendaItem = (event, I18n) => {
|
|
|
147
151
|
const _endDate = isMidnightDate(event.endDate)
|
|
148
152
|
? decreaseDate(new Date(event.endDate), 1)
|
|
149
153
|
: new Date(event.endDate);
|
|
154
|
+
if (_endDate < _startDate) {
|
|
155
|
+
return [];
|
|
156
|
+
}
|
|
150
157
|
if (sameDate(_startDate, _endDate)) {
|
|
151
158
|
return [
|
|
152
159
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agenda.helpers.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/agenda.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,EACL,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,cAAc,EACd,YAAY,GACb,MAAM,gBAAgB,CAAC;AAExB,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,
|
|
1
|
+
{"version":3,"file":"agenda.helpers.js","sourceRoot":"","sources":["../../../../src/components/external/PlanningView/agenda.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export declare function createRecord({ modelName, data, }: {
|
|
2
2
|
modelName: string;
|
|
3
3
|
data: any;
|
|
4
|
-
}): Promise<
|
|
4
|
+
}): Promise<any>;
|
|
5
5
|
export declare function updateRecord({ modelName, data, }: {
|
|
6
6
|
modelName: string;
|
|
7
7
|
data: any;
|
|
8
|
-
}): Promise<
|
|
8
|
+
}): Promise<any>;
|
|
9
9
|
export declare function refreshRecord({ modelName, id, }: {
|
|
10
10
|
modelName: string;
|
|
11
11
|
id: number;
|
|
@@ -13,4 +13,4 @@ export declare function refreshRecord({ modelName, id, }: {
|
|
|
13
13
|
export declare function deleteRecord({ modelName, id, }: {
|
|
14
14
|
modelName: string;
|
|
15
15
|
id: number;
|
|
16
|
-
}): Promise<
|
|
16
|
+
}): Promise<any>;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
export declare const mapStudioFieldsWithFormula: (fields: any[], object: any) => any[];
|
|
2
2
|
export declare const getAttrsValue: (object: Object, fieldType?: string) => any;
|
|
3
|
-
export declare const createFormulaFunction: (formula: string) => ({ objectState }:
|
|
4
|
-
objectState: any;
|
|
5
|
-
}) => any;
|
|
3
|
+
export declare const createFormulaFunction: (formula: string | undefined) => ({ objectState }: any) => any;
|
|
6
4
|
export declare const evaluateFormulaWithObject: (formula: string, object: Object) => string;
|
|
7
|
-
export declare const combinedFormula: (separator: string, ...allFormula: string[]) => string;
|
|
8
|
-
export declare const reverseFormula: (formula: string) => string;
|
|
5
|
+
export declare const combinedFormula: (separator: string, ...allFormula: (string | undefined)[]) => string;
|
|
6
|
+
export declare const reverseFormula: (formula: string | undefined) => string | undefined;
|
|
9
7
|
export declare const manageDependsOnFormula: (formula: string, fields: any[]) => {};
|
|
@@ -55,12 +55,11 @@ export const getAttrsValue = (object, fieldType) => {
|
|
|
55
55
|
return result;
|
|
56
56
|
};
|
|
57
57
|
export const createFormulaFunction = (formula) => {
|
|
58
|
+
if (checkNullString(formula))
|
|
59
|
+
return undefined;
|
|
58
60
|
return ({ objectState }) => {
|
|
59
|
-
if (checkNullString(formula)) {
|
|
60
|
-
return false;
|
|
61
|
-
}
|
|
62
61
|
let expr = `${formula}`;
|
|
63
|
-
sortFieldsByLength(Object.keys(objectState)).forEach(_key => {
|
|
62
|
+
sortFieldsByLength(Object.keys(objectState ?? {})).forEach(_key => {
|
|
64
63
|
if (expr.includes(_key)) {
|
|
65
64
|
expr = manageDottedFields(expr, _key, objectState[_key]);
|
|
66
65
|
}
|
|
@@ -118,6 +117,11 @@ const manageDottedFields = (formula, startKey, object) => {
|
|
|
118
117
|
? startKey
|
|
119
118
|
: startKey + fieldToReplace, manageFieldValue(fetchJsonField(object, getStringWithoutFirstSeparator(fieldToReplace))));
|
|
120
119
|
}
|
|
120
|
+
if (object == null) {
|
|
121
|
+
const escapedKey = startKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
122
|
+
const pathRegex = new RegExp(`${escapedKey}(\\??\\.\\w+)*`, 'g');
|
|
123
|
+
return formula.replace(pathRegex, String(manageFieldValue(object)));
|
|
124
|
+
}
|
|
121
125
|
return formula.replaceAll(startKey, manageFieldValue(object));
|
|
122
126
|
};
|
|
123
127
|
const manageFieldValue = (value) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formula.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/formula.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAE,cAAc,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,GAAG,SAAS,CAAC;AAEzB,MAAM,eAAe,GAAG,aAAa,CAAC;AAEtC,MAAM,qBAAqB,GAAG,CAAC,MAAa,EAAE,MAAW,EAAS,EAAE;IAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,OAAO,EAAE,CAAC;KACX;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC1B,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE;YAC7B,OAAO,IAAI,CAAC;SACb;QAED,OAAO,CACL,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC,CACzE,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,MAAa,EACb,MAAW,EACJ,EAAE;IACT,OAAO,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxD,GAAG,IAAI;QACP,UAAU,EAAE,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;QAC9D,UAAU,EAAE,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;QAC9D,MAAM,EAAE,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;QACtD,MAAM,EAAE,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;QACtD,SAAS,EAAE,yBAAyB,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;KAC7D,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,SAAkB,EAAE,EAAE;IAClE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACvE;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACnB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACtD,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAmB,EAAE,EAAE;QACxC,MAAM,GAAG,EAAC,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEL,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"formula.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/formula.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,16 +55,18 @@ export const useMassScanner = ({ scanKey, backgroundAction, fallbackAction, scan
|
|
|
55
55
|
isZebraDevice,
|
|
56
56
|
scanInterval,
|
|
57
57
|
]);
|
|
58
|
+
const processScanRef = useRef(processScan);
|
|
59
|
+
processScanRef.current = processScan;
|
|
58
60
|
useEffect(() => {
|
|
59
61
|
if (scannedValue) {
|
|
60
|
-
|
|
62
|
+
processScanRef.current(scannedValue, () => dispatch(clearScan()));
|
|
61
63
|
}
|
|
62
|
-
}, [dispatch,
|
|
64
|
+
}, [dispatch, scannedValue]);
|
|
63
65
|
useEffect(() => {
|
|
64
66
|
if (scannedBarcode?.value) {
|
|
65
|
-
|
|
67
|
+
processScanRef.current(scannedBarcode.value, () => dispatch(clearBarcode()));
|
|
66
68
|
}
|
|
67
|
-
}, [dispatch,
|
|
69
|
+
}, [dispatch, scannedBarcode?.value]);
|
|
68
70
|
return useMemo(() => ({ disableScan, enableScan, isEnabled }), [disableScan, enableScan, isEnabled]);
|
|
69
71
|
};
|
|
70
72
|
//# sourceMappingURL=use-mass-scanner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,0BAA0B,EAC1B,YAAY,GACb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAatD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,OAAO,EACP,gBAAgB,EAChB,cAAc,EACd,YAAY,GAAG,IAAI,EACnB,cAAc,GAAG,IAAI,GACA,EAAE,EAAE;IACzB,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,CAAuC,IAAI,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAC,GACtD,kBAAkB,EAAE,CAAC;IACvB,MAAM,EACJ,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,WAAW,EACpB,aAAa,GACd,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CAAC,aAAa,IAAI,aAAa,KAAK,OAAO,EAChD,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC,CACxC,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC7B,KAAK,EAAE,KAAa,EAAE,WAAuB,EAAE,EAAE;QAC/C,IAAI,eAAe,CAAC,OAAO;YAAE,OAAO;QAEpC,IAAI;YACF,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;YAC/B,MAAM,gBAAgB,CAAC,KAAK,EAAE,EAAC,WAAW,EAAC,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,cAAc;gBAAE,WAAW,EAAE,CAAC;YAClC,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;SAC/C;gBAAS;YACR,QAAQ,CAAC,OAAO,GAAG,UAAU,CAC3B,GAAG,EAAE;gBACH,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;gBAChC,WAAW,EAAE,CAAC;YAChB,CAAC,EACD,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CACjC,CAAC;SACH;IACH,CAAC,EACD;QACE,gBAAgB;QAChB,cAAc;QACd,WAAW;QACX,cAAc;QACd,aAAa;QACb,YAAY;KACb,CACF,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,EAAE;YAChB,
|
|
1
|
+
{"version":3,"file":"use-mass-scanner.js","sourceRoot":"","sources":["../../src/hooks/use-mass-scanner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "8.4.
|
|
3
|
+
"version": "8.4.21",
|
|
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.4.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.4.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.4.21",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.4.21",
|
|
29
29
|
"@react-navigation/drawer": "7.3.9",
|
|
30
30
|
"@react-navigation/native": "7.1.6",
|
|
31
31
|
"@react-navigation/native-stack": "7.3.10",
|