@axelor/aos-mobile-manufacturing 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.
@@ -121,7 +121,11 @@ export async function fetchOperationOrder({ operationOrderId }) {
121
121
  id: operationOrderId,
122
122
  fieldKey: 'manufacturing_operationOrder',
123
123
  relatedFields: {
124
- operationOrderDurationList: ['startingDateTime', 'stoppingDateTime'],
124
+ operationOrderDurationList: [
125
+ 'startingDateTime',
126
+ 'stoppingDateTime',
127
+ 'startedBy',
128
+ ],
125
129
  prodProcessLine: ['objectDescriptionList'],
126
130
  },
127
131
  });
@@ -1 +1 @@
1
- {"version":3,"file":"operation-order-api.js","sourceRoot":"","sources":["../../src/api/operation-order-api.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"operation-order-api.js","sourceRoot":"","sources":["../../src/api/operation-order-api.js"],"names":[],"mappings":"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"}
@@ -15,20 +15,24 @@
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 React, { useCallback, useMemo } from 'react';
18
+ import React, { useCallback, useEffect, useMemo, useState } from 'react';
19
+ import { Label } from '@axelor/aos-mobile-ui';
19
20
  import { useTranslator, Stopwatch, isEmpty, StopwatchType, useDispatch, useSelector, } from '@axelor/aos-mobile-core';
20
21
  import { OperationOrder } from '../../../types';
21
22
  import { updateOperationOrder } from '../../../features/operationOrderSlice';
23
+ import { StyleSheet, View } from 'react-native';
22
24
  const OperationOrderStopwatch = ({}) => {
23
25
  const I18n = useTranslator();
24
26
  const dispatch = useDispatch();
25
- const { operationOrder } = useSelector(state => state.operationOrder);
27
+ const { operationOrder, updateMessage } = useSelector(state => state.operationOrder);
28
+ const { user } = useSelector(state => state.user);
29
+ const [labelVisible, setLabelVisible] = useState(false);
26
30
  const { status: timerStatus, time } = useMemo(() => {
27
31
  if (!isEmpty(operationOrder)) {
28
- return OperationOrder.getTimerState(operationOrder);
32
+ return OperationOrder.getTimerState(operationOrder, user?.id);
29
33
  }
30
34
  return { status: StopwatchType.status.Ready, time: 0 };
31
- }, [operationOrder]);
35
+ }, [operationOrder, user]);
32
36
  const updateStatus = useCallback(status => {
33
37
  dispatch(updateOperationOrder({
34
38
  operationOrderId: operationOrder?.id,
@@ -36,7 +40,26 @@ const OperationOrderStopwatch = ({}) => {
36
40
  status,
37
41
  }));
38
42
  }, [dispatch, operationOrder]);
39
- return (<Stopwatch startTime={time} status={timerStatus} timerFormat={I18n.t('Stopwatch_TimerFormat')} onPlay={() => updateStatus(OperationOrder.status.InProgress)} onPause={() => updateStatus(OperationOrder.status.StandBy)} onStop={() => updateStatus(OperationOrder.status.Finished)} disableStop={operationOrder?.statusSelect === OperationOrder.status.StandBy} disableCancel={operationOrder?.statusSelect === OperationOrder.status.Finished} hideCancel={true}/>);
43
+ useEffect(() => {
44
+ setLabelVisible(updateMessage?.message != null);
45
+ }, [updateMessage]);
46
+ return (<View style={styles.container}>
47
+ <Label style={styles.label} message={updateMessage?.message} type={updateMessage?.code !== 200 ? 'error' : 'info'} showClose={true} visible={labelVisible} onClose={() => setLabelVisible(false)}/>
48
+ <Stopwatch style={styles.timer} startTime={time} status={timerStatus} timerFormat={I18n.t('Stopwatch_TimerFormat')} onPlay={() => updateStatus(OperationOrder.status.InProgress)} onPause={() => updateStatus(OperationOrder.status.StandBy)} onStop={() => updateStatus(OperationOrder.status.Finished)} disableStop={timerStatus !== StopwatchType.status.InProgress &&
49
+ timerStatus !== StopwatchType.status.Paused} hideCancel={true} useObjectStatus={true}/>
50
+ </View>);
40
51
  };
52
+ const styles = StyleSheet.create({
53
+ container: {
54
+ marginVertical: '30%',
55
+ },
56
+ label: {
57
+ width: '90%',
58
+ marginLeft: 20,
59
+ },
60
+ timer: {
61
+ marginVertical: 5,
62
+ },
63
+ });
41
64
  export default OperationOrderStopwatch;
42
65
  //# sourceMappingURL=OperationOrderStopwatch.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"OperationOrderStopwatch.js","sourceRoot":"","sources":["../../../../src/components/organisms/OperationOrderStopwatch/OperationOrderStopwatch.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAClD,OAAO,EACL,aAAa,EACb,SAAS,EACT,OAAO,EACP,aAAa,EACb,WAAW,EACX,WAAW,GACZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAC,oBAAoB,EAAC,MAAM,uCAAuC,CAAC;AAE3E,MAAM,uBAAuB,GAAG,CAAC,EAAE,EAAE,EAAE;IACrC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,cAAc,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAEpE,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAC,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/C,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YAC5B,OAAO,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;SACrD;QACD,OAAO,EAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC;IACvD,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,MAAM,YAAY,GAAG,WAAW,CAC9B,MAAM,CAAC,EAAE;QACP,QAAQ,CACN,oBAAoB,CAAC;YACnB,gBAAgB,EAAE,cAAc,EAAE,EAAE;YACpC,OAAO,EAAE,cAAc,EAAE,OAAO;YAChC,MAAM;SACP,CAAC,CACH,CAAC;IACJ,CAAC,EACD,CAAC,QAAQ,EAAE,cAAc,CAAC,CAC3B,CAAC;IAEF,OAAO,CACL,CAAC,SAAS,CACR,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,MAAM,CAAC,CAAC,WAAW,CAAC,CACpB,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAC7C,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAC7D,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAC3D,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAC3D,WAAW,CAAC,CACV,cAAc,EAAE,YAAY,KAAK,cAAc,CAAC,MAAM,CAAC,OAAO,CAC/D,CACD,aAAa,CAAC,CACZ,cAAc,EAAE,YAAY,KAAK,cAAc,CAAC,MAAM,CAAC,QAAQ,CAChE,CACD,UAAU,CAAC,CAAC,IAAI,CAAC,EACjB,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"OperationOrderStopwatch.js","sourceRoot":"","sources":["../../../../src/components/organisms/OperationOrderStopwatch/OperationOrderStopwatch.js"],"names":[],"mappings":"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"}
@@ -45,5 +45,6 @@ export const operationOrderReducer: import("redux").Reducer<{
45
45
  operationOrderList: any[];
46
46
  loadingOrder: boolean;
47
47
  operationOrder: {};
48
+ updateMessage: any;
48
49
  plannedOperationOrderList: any[];
49
50
  }, import("redux").AnyAction>;
@@ -47,18 +47,30 @@ export const fetchOperationOrderById = createAsyncThunk('OperationOrder/fetchOpe
47
47
  });
48
48
  export const updateOperationOrder = createAsyncThunk('OperationOrder/updateOperationOrderStatus', async function (data, { getState }) {
49
49
  return handlerApiCall({
50
- fetchFunction: updateOperationOrderStatus,
51
- data: data,
52
- action: 'Manufacturing_SliceAction_UpdateOperationOrderStatus',
53
- getState: getState,
54
- responseOptions: { showToast: false },
55
- }).then(object => handlerApiCall({
56
50
  fetchFunction: fetchOperationOrder,
57
- data: { operationOrderId: object.id },
51
+ data,
58
52
  action: 'Manufacturing_SliceAction_FetchOperationOrderById',
59
- getState: getState,
53
+ getState,
60
54
  responseOptions: { isArrayResponse: false },
61
- }));
55
+ })
56
+ .then(res => handlerApiCall({
57
+ fetchFunction: updateOperationOrderStatus,
58
+ data: { ...data, version: res?.version },
59
+ action: 'Manufacturing_SliceAction_UpdateOperationOrderStatus',
60
+ getState: getState,
61
+ responseOptions: { showToast: false, returnResponseMessage: true },
62
+ errorOptions: { showErrorToast: false },
63
+ }))
64
+ .then(async (res) => {
65
+ const _data = await handlerApiCall({
66
+ fetchFunction: fetchOperationOrder,
67
+ data: { operationOrderId: data.operationOrderId },
68
+ action: 'Manufacturing_SliceAction_FetchOperationOrderById',
69
+ getState: getState,
70
+ responseOptions: { isArrayResponse: false },
71
+ });
72
+ return { ...res, data: _data };
73
+ });
62
74
  });
63
75
  const initialState = {
64
76
  loading: false,
@@ -67,6 +79,7 @@ const initialState = {
67
79
  operationOrderList: [],
68
80
  loadingOrder: false,
69
81
  operationOrder: {},
82
+ updateMessage: null,
70
83
  plannedOperationOrderList: [],
71
84
  };
72
85
  const operationOrderSlice = createSlice({
@@ -88,13 +101,18 @@ const operationOrderSlice = createSlice({
88
101
  });
89
102
  builder.addCase(fetchOperationOrderById.pending, state => {
90
103
  state.loadingOrder = true;
104
+ state.updateMessage = null;
91
105
  });
92
106
  builder.addCase(fetchOperationOrderById.fulfilled, (state, action) => {
93
107
  state.loadingOrder = false;
94
108
  state.operationOrder = action.payload;
95
109
  });
96
110
  builder.addCase(updateOperationOrder.fulfilled, (state, action) => {
97
- state.operationOrder = action.payload;
111
+ state.operationOrder = action.payload?.data;
112
+ state.updateMessage = {
113
+ message: action.payload?.message,
114
+ code: action.payload?.code,
115
+ };
98
116
  });
99
117
  },
100
118
  });
@@ -1 +1 @@
1
- {"version":3,"file":"operationOrderSlice.js","sourceRoot":"","sources":["../../src/features/operationOrderSlice.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"operationOrderSlice.js","sourceRoot":"","sources":["../../src/features/operationOrderSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,EACd,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAClD,qCAAqC,EACrC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,0BAA0B;QACzC,IAAI;QACJ,MAAM,EAAE,gDAAgD;QACxD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,gBAAgB,CACxD,2CAA2C,EAC3C,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,wBAAwB;QACvC,IAAI;QACJ,MAAM,EAAE,uDAAuD;QAC/D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,gBAAgB,CACrD,oCAAoC,EACpC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,mDAAmD;QAC3D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAClD,2CAA2C,EAC3C,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,mDAAmD;QAC3D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC;SACC,IAAI,CAAC,GAAG,CAAC,EAAE,CACV,cAAc,CAAC;QACb,aAAa,EAAE,0BAA0B;QACzC,IAAI,EAAE,EAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAC;QACtC,MAAM,EAAE,sDAAsD;QAC9D,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,EAAC,SAAS,EAAE,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAC;QAChE,YAAY,EAAE,EAAC,cAAc,EAAE,KAAK,EAAC;KACtC,CAAC,CACH;SACA,IAAI,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;QAChB,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC;YACjC,aAAa,EAAE,mBAAmB;YAClC,IAAI,EAAE,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAC;YAC/C,MAAM,EAAE,mDAAmD;YAC3D,QAAQ,EAAE,QAAQ;YAClB,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;SAC1C,CAAC,CAAC;QAEH,OAAO,EAAC,GAAG,GAAG,EAAE,IAAI,EAAE,KAAK,EAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,kBAAkB,EAAE,EAAE;IACtB,YAAY,EAAE,KAAK;IACnB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,IAAI;IACnB,yBAAyB,EAAE,EAAE;CAC9B,CAAC;AAEF,MAAM,mBAAmB,GAAG,WAAW,CAAC;IACtC,IAAI,EAAE,gBAAgB;IACtB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,4BAA4B,CAAC,OAAO,EAAE,oBAAoB,EAAE;YAC1D,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,oBAAoB;SAC3B,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC1D,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACtE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,yBAAyB,GAAG,iBAAiB,CACjD,KAAK,CAAC,yBAAyB,EAC/B,MAAM,CAAC,OAAO,CACf,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YACvD,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;YAC1B,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACnE,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC;YAC3B,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAChE,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC;YAC5C,KAAK,CAAC,aAAa,GAAG;gBACpB,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO;gBAChC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI;aAC3B,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,OAAO,CAAC"}
@@ -16,11 +16,12 @@ declare class OperationOrder {
16
16
  title?: string;
17
17
  value?: string;
18
18
  }[];
19
- static getTimerState: (operationOrder: any) => {
19
+ static getTimerState: (operationOrder: any, userId?: number) => {
20
20
  status?: number;
21
21
  time?: number;
22
22
  };
23
23
  static getTotalDuration: (operationOrderDurationList: any) => number;
24
+ private static getTimerStatus;
24
25
  static getCalendarListItems: (list: any[], Colors: ThemeColors) => any[];
25
26
  }
26
27
  export default OperationOrder;
@@ -118,7 +118,13 @@ class OperationOrder {
118
118
  return [];
119
119
  }
120
120
  };
121
- static getTimerState = (operationOrder) => {
121
+ static getTimerState = (operationOrder, userId) => {
122
+ const _durationList = operationOrder?.operationOrderDurationList?.filter(_duration => {
123
+ if (userId != null) {
124
+ return _duration.startedBy?.id === userId;
125
+ }
126
+ return true;
127
+ });
122
128
  switch (operationOrder.statusSelect) {
123
129
  case OperationOrder.status.Draft:
124
130
  case OperationOrder.status.Planned:
@@ -128,13 +134,13 @@ class OperationOrder {
128
134
  };
129
135
  case OperationOrder.status.InProgress:
130
136
  return {
131
- status: StopwatchType.status.InProgress,
132
- time: this.getTotalDuration(operationOrder?.operationOrderDurationList),
137
+ status: this.getTimerStatus(_durationList),
138
+ time: this.getTotalDuration(_durationList),
133
139
  };
134
140
  case OperationOrder.status.StandBy:
135
141
  return {
136
- status: StopwatchType.status.Paused,
137
- time: this.getTotalDuration(operationOrder?.operationOrderDurationList),
142
+ status: this.getTimerStatus(_durationList),
143
+ time: this.getTotalDuration(_durationList),
138
144
  };
139
145
  case OperationOrder.status.Finished:
140
146
  return {
@@ -148,16 +154,27 @@ class OperationOrder {
148
154
  };
149
155
  static getTotalDuration = (operationOrderDurationList) => {
150
156
  if (operationOrderDurationList == null) {
151
- console.warn('Operation order duration list cannot be null');
152
157
  return 0;
153
158
  }
154
159
  let totalDuration = 0;
155
- operationOrderDurationList.forEach(duration => {
156
- let diff = calculateDiff(duration.startingDateTime, duration.stoppingDateTime);
160
+ operationOrderDurationList.forEach(_duration => {
161
+ let diff = calculateDiff(_duration.startingDateTime, _duration.stoppingDateTime);
157
162
  totalDuration += diff;
158
163
  });
159
164
  return totalDuration;
160
165
  };
166
+ static getTimerStatus = (_durationList) => {
167
+ if (!Array.isArray(_durationList) || _durationList.length === 0) {
168
+ return StopwatchType.status.Ready;
169
+ }
170
+ else if (_durationList.find(_duration => _duration.stoppingDateTime == null) !=
171
+ null) {
172
+ return StopwatchType.status.InProgress;
173
+ }
174
+ else {
175
+ return StopwatchType.status.Paused;
176
+ }
177
+ };
161
178
  static getCalendarListItems = (list, Colors) => {
162
179
  if (list == null || list.length === 0) {
163
180
  return [];
@@ -1 +1 @@
1
- {"version":3,"file":"operation-order.js","sourceRoot":"","sources":["../../src/types/operation-order.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"operation-order.js","sourceRoot":"","sources":["../../src/types/operation-order.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@axelor/aos-mobile-manufacturing",
3
- "version": "7.0.3",
3
+ "version": "7.0.4",
4
4
  "author": "Axelor",
5
5
  "license": "AGPL-3.0-only",
6
6
  "publishConfig": {
@@ -28,9 +28,9 @@
28
28
  "react-i18next": "^11.18.6"
29
29
  },
30
30
  "dependencies": {
31
- "@axelor/aos-mobile-core": "7.0.3",
32
- "@axelor/aos-mobile-stock": "7.0.3",
33
- "@axelor/aos-mobile-ui": "7.0.3",
31
+ "@axelor/aos-mobile-core": "7.0.4",
32
+ "@axelor/aos-mobile-stock": "7.0.4",
33
+ "@axelor/aos-mobile-ui": "7.0.4",
34
34
  "@reduxjs/toolkit": "^1.8.5"
35
35
  },
36
36
  "devDependencies": {