@crystaldesign/diva-archive 25.7.0-beta.9 → 25.7.0-rc.1
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/build/esm/index.js
CHANGED
|
@@ -261,13 +261,24 @@ function useActions(_ref) {
|
|
|
261
261
|
}];
|
|
262
262
|
}
|
|
263
263
|
var actions = config.actions || defaultActions;
|
|
264
|
+
|
|
265
|
+
// Remove the order action if the organization settings don't allow sending orders
|
|
266
|
+
if (!organization.settings.sendOrders) {
|
|
267
|
+
var orderActionIndex = actions.findIndex(function (action) {
|
|
268
|
+
return action.type === 'order';
|
|
269
|
+
});
|
|
270
|
+
if (orderActionIndex !== -1) {
|
|
271
|
+
actions.splice(orderActionIndex, 1);
|
|
272
|
+
}
|
|
273
|
+
}
|
|
264
274
|
var gridActions = actions.map(function (action) {
|
|
265
275
|
return {
|
|
266
276
|
label: t(action.label),
|
|
267
|
-
disabled: action.disabled ? function (item) {
|
|
268
|
-
var _action$disabled;
|
|
269
|
-
return item[action.disabled.field] == undefined && action.disabled.value == '' || item[action.disabled.field] == ((_action$
|
|
270
|
-
} :
|
|
277
|
+
disabled: typeof action.disabled !== 'boolean' && action.disabled ? function (item) {
|
|
278
|
+
var _action$disabled, _action$disabled2;
|
|
279
|
+
return item[action.disabled.field] == undefined && ((_action$disabled = action.disabled) === null || _action$disabled === void 0 ? void 0 : _action$disabled.value) == '' || item[action.disabled.field] == ((_action$disabled2 = action.disabled) === null || _action$disabled2 === void 0 ? void 0 : _action$disabled2.value);
|
|
280
|
+
} : action.disabled,
|
|
281
|
+
disabledTooltip: action.disabledTooltip,
|
|
271
282
|
onClick: getAction({
|
|
272
283
|
sendEmail: sendEmail,
|
|
273
284
|
openComponent: openComponent,
|
|
@@ -334,7 +345,8 @@ function getAction(_ref2) {
|
|
|
334
345
|
t: t,
|
|
335
346
|
action: action,
|
|
336
347
|
organization: organization,
|
|
337
|
-
jwt: jwt
|
|
348
|
+
jwt: jwt,
|
|
349
|
+
setReloadPage: setReloadPage
|
|
338
350
|
});
|
|
339
351
|
case 'email':
|
|
340
352
|
return openEmailAction(sendEmail, t, action, organization, user);
|
|
@@ -344,13 +356,22 @@ function getAction(_ref2) {
|
|
|
344
356
|
}
|
|
345
357
|
function openBasketAction(openComponent) {
|
|
346
358
|
return function (item) {
|
|
359
|
+
var params = {
|
|
360
|
+
module: 'Basket',
|
|
361
|
+
divaNr: item.DivaNrVersion
|
|
362
|
+
};
|
|
363
|
+
if (item.OrderStatus === 'SEND') {
|
|
364
|
+
params = _objectSpread$2(_objectSpread$2({}, params), {}, {
|
|
365
|
+
assignNewDivaNr: 'true'
|
|
366
|
+
});
|
|
367
|
+
} else {
|
|
368
|
+
params = _objectSpread$2(_objectSpread$2({}, params), {}, {
|
|
369
|
+
check: '1'
|
|
370
|
+
});
|
|
371
|
+
}
|
|
347
372
|
openComponent({
|
|
348
373
|
type: 'SELLER',
|
|
349
|
-
parameters:
|
|
350
|
-
module: 'Basket',
|
|
351
|
-
divaNr: item.DivaNrVersion,
|
|
352
|
-
check: '1'
|
|
353
|
-
}
|
|
374
|
+
parameters: params
|
|
354
375
|
});
|
|
355
376
|
};
|
|
356
377
|
}
|
|
@@ -429,7 +450,8 @@ function openPlannerAction(openComponent, updateBreadcrumbs) {
|
|
|
429
450
|
component: {
|
|
430
451
|
type: 'DIVA_WEBPLANNER',
|
|
431
452
|
parameters: {
|
|
432
|
-
divaNr: item.DivaNrVersion
|
|
453
|
+
divaNr: item.DivaNrVersion,
|
|
454
|
+
assignNewDivaNr: item.OrderStatus === 'SEND' ? 'true' : 'false'
|
|
433
455
|
}
|
|
434
456
|
}
|
|
435
457
|
}]
|
|
@@ -437,7 +459,8 @@ function openPlannerAction(openComponent, updateBreadcrumbs) {
|
|
|
437
459
|
openComponent({
|
|
438
460
|
type: 'DIVA_WEBPLANNER',
|
|
439
461
|
parameters: {
|
|
440
|
-
divaNr: item.DivaNrVersion
|
|
462
|
+
divaNr: item.DivaNrVersion,
|
|
463
|
+
assignNewDivaNr: item.OrderStatus === 'SEND' ? 'true' : 'false'
|
|
441
464
|
}
|
|
442
465
|
});
|
|
443
466
|
if (DivaUtils.bridge) {
|
|
@@ -506,7 +529,8 @@ function placeOrderAction(_ref4) {
|
|
|
506
529
|
sendEmail = _ref4.sendEmail,
|
|
507
530
|
openModal = _ref4.openModal,
|
|
508
531
|
t = _ref4.t,
|
|
509
|
-
action = _ref4.action
|
|
532
|
+
action = _ref4.action,
|
|
533
|
+
setReloadPage = _ref4.setReloadPage;
|
|
510
534
|
return /*#__PURE__*/function () {
|
|
511
535
|
var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(item, id, updateOne) {
|
|
512
536
|
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
@@ -518,6 +542,10 @@ function placeOrderAction(_ref4) {
|
|
|
518
542
|
}
|
|
519
543
|
return _context3.abrupt("return");
|
|
520
544
|
case 2:
|
|
545
|
+
// Add sendOrdersEmail to the 'to' field, with a comma if action.to already has content
|
|
546
|
+
if (organization.settings.sendOrdersEmail) {
|
|
547
|
+
action.to = action.to ? "".concat(action.to, ",").concat(organization.settings.sendOrdersEmail) : organization.settings.sendOrdersEmail;
|
|
548
|
+
}
|
|
521
549
|
triggerSendEmail({
|
|
522
550
|
sendEmail: sendEmail,
|
|
523
551
|
t: t,
|
|
@@ -535,7 +563,10 @@ function placeOrderAction(_ref4) {
|
|
|
535
563
|
}
|
|
536
564
|
openModal({
|
|
537
565
|
accept: true,
|
|
538
|
-
title: t('order.send.success')
|
|
566
|
+
title: t('order.send.success'),
|
|
567
|
+
callback: function callback() {
|
|
568
|
+
return setReloadPage(1);
|
|
569
|
+
}
|
|
539
570
|
});
|
|
540
571
|
_context2.next = 4;
|
|
541
572
|
return setOrdered(apiConfig, organization._id, jwt, item.DivaNr, parseInt(item.DocumentVersion));
|
|
@@ -563,7 +594,7 @@ function placeOrderAction(_ref4) {
|
|
|
563
594
|
return callback;
|
|
564
595
|
}()
|
|
565
596
|
});
|
|
566
|
-
case
|
|
597
|
+
case 4:
|
|
567
598
|
case "end":
|
|
568
599
|
return _context3.stop();
|
|
569
600
|
}
|
|
@@ -1215,7 +1246,7 @@ function SubRow$1 (_ref) {
|
|
|
1215
1246
|
})), {}, {
|
|
1216
1247
|
className: cell.column.fixed ? 'fixed' : '',
|
|
1217
1248
|
children: cell.render('Cell', {
|
|
1218
|
-
value: cell
|
|
1249
|
+
value: getCellValue(cell, x),
|
|
1219
1250
|
row: _objectSpread(_objectSpread({}, row), {}, {
|
|
1220
1251
|
original: x,
|
|
1221
1252
|
canExpand: false
|
|
@@ -1228,6 +1259,20 @@ function SubRow$1 (_ref) {
|
|
|
1228
1259
|
})
|
|
1229
1260
|
});
|
|
1230
1261
|
}
|
|
1262
|
+
function getCellValue(cell, x) {
|
|
1263
|
+
if (cell.column.valueMapping) {
|
|
1264
|
+
return getCellDisplayValue(x, cell.column);
|
|
1265
|
+
}
|
|
1266
|
+
return cell.column.id !== 'DivaNr' ? x[cell.column.id.replaceAll(/\[/g, '.').replaceAll(/\]/g, '')] : undefined;
|
|
1267
|
+
}
|
|
1268
|
+
function getCellDisplayValue(origData, column) {
|
|
1269
|
+
var valueMapping = column.valueMapping;
|
|
1270
|
+
var value = origData[column.id.replaceAll(/\[/g, '.').replaceAll(/\]/g, '')];
|
|
1271
|
+
var mapping = valueMapping.find(function (m) {
|
|
1272
|
+
return m.origValue === value;
|
|
1273
|
+
});
|
|
1274
|
+
return mapping ? mapping.displayValue : value;
|
|
1275
|
+
}
|
|
1231
1276
|
|
|
1232
1277
|
function SubRow (_ref) {
|
|
1233
1278
|
var row = _ref.row,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACzE,gBAAgB,EAAE,CAAC,IAAI,EAAE,sBAAsB,KAAK,IAAI,CAAC;IACzD,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB;AACD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE;QACV,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,qBAAqB,CAAC,EAAE,OAAO,CAAC;KACjC,CAAC;IACF,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,EAAE;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,GAAG,eAAe,CAAC;IACzE,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useActions.d.ts","sourceRoot":"","sources":["../../../../src/useActions.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAiB,WAAW,EAAE,aAAa,EAA0B,MAAM,SAAS,CAAC;AAI5F,UAAU,KAAK;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7D;AAID,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"useActions.d.ts","sourceRoot":"","sources":["../../../../src/useActions.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAiB,WAAW,EAAE,aAAa,EAA0B,MAAM,SAAS,CAAC;AAI5F,UAAU,KAAK;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7D;AAID,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,KAAK,iEA6EtF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@crystaldesign/diva-archive",
|
|
3
|
-
"version": "25.7.0-
|
|
3
|
+
"version": "25.7.0-rc.1",
|
|
4
4
|
"license": "COMMERCIAL",
|
|
5
5
|
"devDependencies": {
|
|
6
6
|
"@testing-library/jest-dom": "^6.5.0",
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"react-dom": "^18.3.1"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@crystaldesign/grid": "25.7.0-
|
|
18
|
+
"@crystaldesign/grid": "25.7.0-rc.1",
|
|
19
19
|
"flat": "^5.0.2"
|
|
20
20
|
},
|
|
21
21
|
"module": "build/esm/index.js",
|
|
22
22
|
"types": "./build/types/archive/src/index.d.ts",
|
|
23
|
-
"gitHead": "
|
|
23
|
+
"gitHead": "a55e0aa12ebe4a78cd39362a91ed42da957c2b19"
|
|
24
24
|
}
|