oa-componentbook 0.17.45 → 0.17.47

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 (3) hide show
  1. package/build/components/oa-component-modal/CustomModal.js +1 -3
  2. package/build/widgets/oa-widget-add-spare-part/AddSparePartWidget.js +67 -83
  3. package/package.json +1 -1
package/build/components/oa-component-modal/CustomModal.js CHANGED
@@ -61,9 +61,7 @@ function CustomModal(_ref) {
61
61
  ((0, _utils.isString)(children) || (0, _utils.isNumber)(children)) && /*#__PURE__*/_react.default.createElement(_Typography.default, {
62
62
  color: "secondarygrey-text",
63
63
  typography: typographies.children
64
- }, children) ||
65
- // The label is a node
66
- (0, _utils.isObject)(children) && children));
64
+ }, children) || /*#__PURE__*/_react.default.isValidElement(children) && children));
67
65
  }
68
66
  CustomModal.propTypes = {
69
67
  // Array of button configurations
package/build/widgets/oa-widget-add-spare-part/AddSparePartWidget.js CHANGED
@@ -15,7 +15,7 @@ var _antd = require("antd");
15
15
  var _CustomDrawer = _interopRequireDefault(require("../../components/oa-component-drawer/CustomDrawer"));
16
16
  var _Typography = _interopRequireDefault(require("../../components/oa-component-typography/Typography"));
17
17
  var _styles = require("./styles");
18
- const _excluded = ["data-test", "onClose", "onSave", "addedSpareList", "allSpareList", "open"];
18
+ const _excluded = ["onClose", "onSave", "addedSpareList", "allSpareList", "open"];
19
19
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
20
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
21
21
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -24,7 +24,6 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
24
24
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
25
25
  function AddSparePartWidget(_ref) {
26
26
  let {
27
- 'data-test': dataTest,
28
27
  onClose,
29
28
  onSave,
30
29
  addedSpareList,
@@ -45,15 +44,13 @@ function AddSparePartWidget(_ref) {
45
44
  form.validateFields({
46
45
  validateOnly: true
47
46
  }).then(values => {
48
- // console.log(values);
49
-
50
47
  // This flag tells us if a submittable field is present in the form or not.
51
48
  let submittableFieldPresent = false;
52
49
 
53
50
  // Iterating over the parts that have been selected
54
51
  selectedParts.forEach(selectedPart => {
55
52
  // This means that the selectedPart is already added and not submittable.
56
- if (addedSpareList.some(addedSpare => addedSpare.id === selectedPart)) {
53
+ if (addedSpareList.some(addedSpare => addedSpare.scopeId === selectedPart)) {
57
54
  return;
58
55
  }
59
56
  submittableFieldPresent = true;
@@ -69,23 +66,23 @@ function AddSparePartWidget(_ref) {
69
66
  (0, _react.useEffect)(() => {
70
67
  const newValueForDisabledParts = {};
71
68
  allSpareList.forEach(spare => {
72
- newValueForDisabledParts[spare.id] = false;
69
+ newValueForDisabledParts[spare.scopeId] = false;
73
70
  });
74
71
  form.resetFields();
75
72
  const selectedArray = [];
76
73
  addedSpareList.forEach(spare => {
77
- selectedArray.push(spare.id);
74
+ selectedArray.push(spare.scopeId);
78
75
  });
79
76
  setSelectedParts(selectedArray);
80
77
  }, [addedSpareList, allSpareList]);
81
78
  const handleSave = () => {
82
79
  const formValues = form.getFieldsValue();
83
- const formArray = selectedParts.filter(selectedPart => !addedSpareList.some(addedSpare => addedSpare.id === selectedPart)).map(selectedPart => ({
84
- id: selectedPart,
85
- partName: allSpareList.find(spare => spare.id === selectedPart).partName,
86
- partPrice: formValues["partPrice-".concat(selectedPart)],
87
- partDiscount: formValues["partDiscount-".concat(selectedPart)],
88
- partHsnCode: formValues["partHsnCode-".concat(selectedPart)]
80
+ const formArray = selectedParts.filter(selectedPart => !addedSpareList.some(addedSpare => addedSpare.scopeId === selectedPart)).map(selectedPart => ({
81
+ scopeId: selectedPart,
82
+ scopeName: allSpareList.find(spare => spare.scopeId === selectedPart).scopeName,
83
+ cost: formValues["cost-".concat(selectedPart)],
84
+ discount: formValues["discount-".concat(selectedPart)],
85
+ hsnId: formValues["hsnId-".concat(selectedPart)]
89
86
  }));
90
87
 
91
88
  // Call to `onSave` callback received from props.
@@ -94,106 +91,98 @@ function AddSparePartWidget(_ref) {
94
91
  };
95
92
  const dataSource = allSpareList.map(spare => {
96
93
  // If the spare is already added, all its fields are disabled.
97
- if (addedSpareList.some(addedSpare => addedSpare.id === spare.id)) {
98
- const partObject = addedSpareList.find(correctSpare => correctSpare.id === spare.id);
94
+ if (addedSpareList.some(addedSpare => addedSpare.scopeId === spare.scopeId)) {
95
+ const partObject = addedSpareList.find(correctSpare => correctSpare.scopeId === spare.scopeId);
99
96
  return {
100
- key: spare.id,
101
- partName: spare.partName,
102
- partPrice: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
103
- name: "partPrice-".concat(spare.id),
97
+ key: spare.scopeId,
98
+ scopeName: spare.scopeName,
99
+ cost: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
100
+ name: "cost-".concat(spare.scopeId),
104
101
  rules: [{
105
- required: selectedParts.includes(spare.id),
102
+ required: selectedParts.includes(spare.scopeId),
106
103
  message: ''
107
104
  // message: 'Enter the discount value.',
108
105
  }],
109
106
 
110
- initialValue: partObject === null || partObject === void 0 ? void 0 : partObject.partPrice
107
+ initialValue: partObject === null || partObject === void 0 ? void 0 : partObject.cost
111
108
  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
112
- type: "number",
113
109
  prefix: "\u20B9",
114
- disabled: true,
115
- "data-test": dataTest ? "".concat(dataTest, "--part-price-").concat(spare.id) : undefined
110
+ disabled: true
111
+ // value={}
116
112
  })),
117
- partDiscount: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
118
- name: "partDiscount-".concat(spare.id),
113
+
114
+ discount: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
115
+ name: "discount-".concat(spare.scopeId),
119
116
  rules: [{
120
117
  required: true,
121
118
  message: ''
122
119
  // message: 'Enter the discount value.',
123
120
  }],
124
121
 
125
- initialValue: partObject === null || partObject === void 0 ? void 0 : partObject.partDiscount
122
+ initialValue: partObject === null || partObject === void 0 ? void 0 : partObject.discount
126
123
  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
127
- type: "number",
128
124
  prefix: "\u20B9",
129
- disabled: true,
130
- "data-test": dataTest ? "".concat(dataTest, "--part-discount-").concat(spare.id) : undefined
125
+ disabled: true
131
126
  })),
132
- partHsnCode: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
133
- name: "partHsnCode-".concat(spare.id),
127
+ hsnId: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
128
+ name: "hsnId-".concat(spare.scopeId),
134
129
  rules: [{
135
130
  required: true,
136
131
  message: ''
137
132
  // message: 'Enter the discount value.',
138
133
  }],
139
134
 
140
- initialValue: partObject === null || partObject === void 0 ? void 0 : partObject.partHsnCode
135
+ initialValue: partObject === null || partObject === void 0 ? void 0 : partObject.hsnId
141
136
  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
142
- disabled: true,
143
- "data-test": dataTest ? "".concat(dataTest, "--part-hsn-code-").concat(spare.id) : undefined
137
+ disabled: true
144
138
  }))
145
139
  };
146
140
  }
147
141
  return {
148
- key: spare.id,
149
- partName: spare.partName,
150
- partPrice: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
151
- name: "partPrice-".concat(spare.id),
142
+ key: spare.scopeId,
143
+ scopeName: spare.scopeName,
144
+ cost: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
145
+ name: "cost-".concat(spare.scopeId),
152
146
  rules: [{
153
- required: selectedParts.includes(spare.id),
147
+ required: selectedParts.includes(spare.scopeId),
154
148
  message: ''
155
149
  // message: 'Enter the discount value.',
156
150
  }],
157
151
 
158
152
  initialValue: ""
159
153
  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
160
- disabled: !selectedParts.includes(spare.id),
161
- prefix: "\u20B9",
162
- type: "number",
163
- "data-test": dataTest ? "".concat(dataTest, "--part-price-").concat(spare.id) : undefined
154
+ disabled: !selectedParts.includes(spare.scopeId),
155
+ prefix: "\u20B9"
164
156
  })),
165
- partDiscount: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
166
- name: "partDiscount-".concat(spare.id),
157
+ discount: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
158
+ name: "discount-".concat(spare.scopeId),
167
159
  rules: [{
168
- required: selectedParts.includes(spare.id),
160
+ required: selectedParts.includes(spare.scopeId),
169
161
  message: ''
170
162
  // message: 'Enter the discount value.',
171
163
  }],
172
164
 
173
165
  initialValue: ""
174
166
  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
175
- disabled: !selectedParts.includes(spare.id),
176
- prefix: "\u20B9",
177
- type: "number",
178
- "data-test": dataTest ? "".concat(dataTest, "--part-discount-").concat(spare.id) : undefined
167
+ disabled: !selectedParts.includes(spare.scopeId),
168
+ prefix: "\u20B9"
179
169
  })),
180
- partHsnCode: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
181
- name: "partHsnCode-".concat(spare.id),
170
+ hsnId: /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
171
+ name: "hsnId-".concat(spare.scopeId),
182
172
  rules: [{
183
- required: selectedParts.includes(spare.id),
173
+ required: selectedParts.includes(spare.scopeId),
184
174
  message: ''
185
175
  // message: 'Enter the discount value.',
186
176
  }],
187
177
 
188
178
  initialValue: ""
189
179
  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
190
- disabled: !selectedParts.includes(spare.id),
191
- "data-test": dataTest ? "".concat(dataTest, "--part-hsn-code-").concat(spare.id) : undefined
180
+ disabled: !selectedParts.includes(spare.scopeId)
192
181
  }))
193
182
  };
194
183
  });
195
184
  return /*#__PURE__*/_react.default.createElement(_CustomDrawer.default, _extends({
196
- "data-test": dataTest ? "".concat(dataTest, "--drawer") : undefined,
185
+ destroyOnClose: true,
197
186
  onClose: onClose,
198
187
  open: open,
199
188
  placement: "right",
@@ -203,8 +192,7 @@ function AddSparePartWidget(_ref) {
203
192
  disabled: !submittable,
204
193
  callback: handleSave,
205
194
  label: 'Save',
206
- type: 'primary',
207
- 'data-test': dataTest ? "".concat(dataTest, "--save-button") : undefined
195
+ type: 'primary'
208
196
  }],
209
197
  bodyStyle: {
210
198
  padding: '0px'
@@ -223,35 +211,34 @@ function AddSparePartWidget(_ref) {
223
211
  }, /*#__PURE__*/_react.default.createElement(_styles.StyledForm, {
224
212
  form: form
225
213
  }, /*#__PURE__*/_react.default.createElement(_antd.Table, {
226
- "data-test": dataTest ? "".concat(dataTest, "--table") : undefined,
227
214
  columns: [{
228
215
  title: '',
229
- dataIndex: 'partName',
230
- key: 'partName',
216
+ dataIndex: 'scopeName',
217
+ key: 'scopeName',
231
218
  width: '20%'
232
219
  }, {
233
220
  title: /*#__PURE__*/_react.default.createElement(_Typography.default, {
234
221
  color: "placeholder-text",
235
222
  typography: "type-sl1-700"
236
223
  }, "Spare part price (without gst)"),
237
- dataIndex: 'partPrice',
238
- key: 'partPrice',
224
+ dataIndex: 'cost',
225
+ key: 'cost',
239
226
  width: '30%'
240
227
  }, {
241
228
  title: /*#__PURE__*/_react.default.createElement(_Typography.default, {
242
229
  color: "placeholder-text",
243
230
  typography: "type-sl1-700"
244
231
  }, "discount (without Gst)"),
245
- dataIndex: 'partDiscount',
246
- key: 'partDiscount',
232
+ dataIndex: 'discount',
233
+ key: 'discount',
247
234
  width: '30%'
248
235
  }, {
249
236
  title: /*#__PURE__*/_react.default.createElement(_Typography.default, {
250
237
  color: "placeholder-text",
251
238
  typography: "type-sl1-700"
252
239
  }, "hsn code"),
253
- dataIndex: 'partHsnCode',
254
- key: 'partHsnCode',
240
+ dataIndex: 'hsnId',
241
+ key: 'hsnId',
255
242
  width: '20%'
256
243
  }],
257
244
  dataSource: dataSource,
@@ -263,14 +250,14 @@ function AddSparePartWidget(_ref) {
263
250
  onChange: selectedRowKeys => {
264
251
  const removedKeys = selectedParts.filter(part => !selectedRowKeys.includes(part));
265
252
  removedKeys.forEach(row => {
266
- form.setFieldValue("partHsnCode-".concat(row), '');
267
- form.setFieldValue("partDiscount-".concat(row), '');
268
- form.setFieldValue("partPrice-".concat(row), '');
253
+ form.setFieldValue("hsnId-".concat(row), '');
254
+ form.setFieldValue("discount-".concat(row), '');
255
+ form.setFieldValue("cost-".concat(row), '');
269
256
  });
270
257
  let submittableFieldPresent = false;
271
258
  selectedRowKeys.forEach(selectedPart => {
272
259
  // This part is not already added, so it can be submitted.
273
- if (!addedSpareList.some(addedSpare => addedSpare.id === selectedPart)) {
260
+ if (!addedSpareList.some(addedSpare => addedSpare.scopeId === selectedPart)) {
274
261
  submittableFieldPresent = true;
275
262
  }
276
263
  });
@@ -278,32 +265,29 @@ function AddSparePartWidget(_ref) {
278
265
  setSelectedParts(selectedRowKeys);
279
266
  },
280
267
  getCheckboxProps: record => ({
281
- 'data-test': dataTest ? "".concat(dataTest, "--part-select-").concat(record.key) : undefined,
282
- disabled: addedSpareList.some(spare => spare.id === record.key),
283
- name: record.partName
268
+ disabled: addedSpareList.some(spare => spare.scopeId === record.key),
269
+ scopeName: record.scopeName
284
270
  })
285
271
  },
286
272
  sticky: true
287
273
  }))));
288
274
  }
289
275
  AddSparePartWidget.propTypes = {
290
- 'data-test': _propTypes.default.string,
291
276
  onClose: _propTypes.default.func.isRequired,
292
277
  onSave: _propTypes.default.func.isRequired,
293
278
  open: _propTypes.default.bool,
294
279
  addedSpareList: _propTypes.default.arrayOf(_propTypes.default.shape({
295
- partName: _propTypes.default.string,
296
- partDiscount: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
297
- partPrice: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
298
- partHsnCode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
280
+ scopeName: _propTypes.default.string,
281
+ discount: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
282
+ cost: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
283
+ hsnId: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
299
284
  })),
300
285
  allSpareList: _propTypes.default.arrayOf(_propTypes.default.shape({
301
- partName: _propTypes.default.string.isRequired,
302
- id: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired
286
+ scopeName: _propTypes.default.string.isRequired,
287
+ scopeId: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired
303
288
  }))
304
289
  };
305
290
  AddSparePartWidget.defaultProps = {
306
- 'data-test': null,
307
291
  addedSpareList: [],
308
292
  allSpareList: [],
309
293
  open: true
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oa-componentbook",
3
- "version": "0.17.45",
3
+ "version": "0.17.47",
4
4
  "private": false,
5
5
  "description": "Reusable components",
6
6
  "main": "build/index.js",