@bjsdistribution/dms-client-return 0.0.43 → 0.0.44

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.
@@ -9135,7 +9135,7 @@ function SelectionFilter() {
9135
9135
  placeholder: "Select Location",
9136
9136
  onChange: handleLocationChange,
9137
9137
  style: {
9138
- minWidth: '14vw'
9138
+ minWidth: '150px'
9139
9139
  },
9140
9140
  allowClear: true,
9141
9141
  mode: "multiple"
@@ -10386,6 +10386,46 @@ var OrderTable = function OrderTable(_ref) {
10386
10386
  setAssign = _useState[1];
10387
10387
  var _useCallApiAgain = useCallApiAgain(),
10388
10388
  setCallAPi = _useCallApiAgain[1];
10389
+ //sorting
10390
+ var _useState2 = React.useState(null),
10391
+ sortConfig = _useState2[0],
10392
+ setSortConfig = _useState2[1];
10393
+ var handleSort = function handleSort(key) {
10394
+ setSortConfig(function (prev) {
10395
+ if ((prev == null ? void 0 : prev.key) === key && prev.direction === 'asc') {
10396
+ return {
10397
+ key: key,
10398
+ direction: 'desc'
10399
+ };
10400
+ }
10401
+ return {
10402
+ key: key,
10403
+ direction: 'asc'
10404
+ };
10405
+ });
10406
+ };
10407
+ var sortedData = React.useMemo(function () {
10408
+ if (!returnAfterOrder || !sortConfig) return returnAfterOrder;
10409
+ var key = sortConfig.key,
10410
+ direction = sortConfig.direction;
10411
+ return [].concat(returnAfterOrder).sort(function (a, b) {
10412
+ var valueA = a[key];
10413
+ var valueB = b[key];
10414
+ if (typeof valueA === 'number' && typeof valueB === 'number') {
10415
+ return direction === 'asc' ? valueA - valueB : valueB - valueA;
10416
+ }
10417
+ if (typeof valueA === 'string' && typeof valueB === 'string') {
10418
+ return direction === 'asc' ? valueA.localeCompare(valueB) : valueB.localeCompare(valueA);
10419
+ }
10420
+ return 0;
10421
+ });
10422
+ }, [returnAfterOrder, sortConfig]);
10423
+ var renderSortIcon = function renderSortIcon(columnKey) {
10424
+ if (!sortConfig || sortConfig.key !== columnKey) {
10425
+ return React__default.createElement(SortIcon, null);
10426
+ }
10427
+ return sortConfig.direction === 'asc' ? React__default.createElement(CaretDownFilledIcon, null) : React__default.createElement(CaretDownFilledIcon, null);
10428
+ };
10389
10429
  var OpenDropDown = function OpenDropDown(index) {
10390
10430
  setPrintToggle(function (prevIndex) {
10391
10431
  return prevIndex === index ? null : index;
@@ -10521,7 +10561,37 @@ var OrderTable = function OrderTable(_ref) {
10521
10561
  }, [actionResponse, apiError]);
10522
10562
  return React__default.createElement(React__default.Fragment, null, AssignLoading && React__default.createElement(Loader, null), React__default.createElement(StyledTableWrapper, {
10523
10563
  className: "fortables"
10524
- }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", null, "Created"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Pick Up Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, " Client"), React__default.createElement("th", null, "Consignment"), React__default.createElement("th", null, "Return Order No"), React__default.createElement("th", null, " Total Parts"), React__default.createElement("th", null, "Total Weight"), React__default.createElement("th", null, "Total CBM"), React__default.createElement("th", null, "Assign"), React__default.createElement("th", null, "Status"), React__default.createElement("th", {
10564
+ }, React__default.createElement(StyledTable$1, null, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", {
10565
+ onClick: function onClick() {
10566
+ return handleSort('created_at');
10567
+ }
10568
+ }, React__default.createElement("div", {
10569
+ className: "sortIconClass"
10570
+ }, "Created ", renderSortIcon('created_at'))), React__default.createElement("th", {
10571
+ onClick: function onClick() {
10572
+ return handleSort('return_locations.location_name');
10573
+ }
10574
+ }, React__default.createElement("div", {
10575
+ className: "sortIconClass"
10576
+ }, "Return Location", ' ', renderSortIcon('return_locations.location_name'))), React__default.createElement("th", null, "Pick Up Location"), React__default.createElement("th", {
10577
+ onClick: function onClick() {
10578
+ return handleSort('order_recipient.recipient_name');
10579
+ }
10580
+ }, React__default.createElement("div", {
10581
+ className: "sortIconClass"
10582
+ }, "Recipient ", renderSortIcon('order_recipient.recipient_name'))), React__default.createElement("th", null, " Client"), React__default.createElement("th", null, "Consignment"), React__default.createElement("th", null, "Return Order No"), React__default.createElement("th", null, " Total Parts"), React__default.createElement("th", {
10583
+ onClick: function onClick() {
10584
+ return handleSort('weight');
10585
+ }
10586
+ }, React__default.createElement("div", {
10587
+ className: "sortIconClass"
10588
+ }, "Total Weight ", renderSortIcon('weight'))), React__default.createElement("th", {
10589
+ onClick: function onClick() {
10590
+ return handleSort('cube');
10591
+ }
10592
+ }, React__default.createElement("div", {
10593
+ className: "sortIconClass"
10594
+ }, "Total CBM ", renderSortIcon('cube'))), React__default.createElement("th", null, "Assign"), React__default.createElement("th", null, "Status"), React__default.createElement("th", {
10525
10595
  className: "emailInvoiceShare"
10526
10596
  }, "Labels"))), React__default.createElement("tbody", null, loadingskeleton ? React__default.createElement("tr", null, React__default.createElement("td", {
10527
10597
  colSpan: 16
@@ -10529,9 +10599,9 @@ var OrderTable = function OrderTable(_ref) {
10529
10599
  active: true
10530
10600
  })), React__default.createElement("td", {
10531
10601
  colSpan: 16
10532
- })) : (returnAfterOrder == null ? void 0 : returnAfterOrder.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
10602
+ })) : (sortedData == null ? void 0 : sortedData.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
10533
10603
  colSpan: 16
10534
- }, React__default.createElement(EmptyDataContainer$1, null, React__default.createElement(antd.Empty, null)))) : returnAfterOrder == null ? void 0 : returnAfterOrder.map(function (item, index) {
10604
+ }, React__default.createElement(EmptyDataContainer$1, null, React__default.createElement(antd.Empty, null)))) : sortedData == null ? void 0 : sortedData.map(function (item, index) {
10535
10605
  var _item$return_location, _item$order_recipient, _item$order_recipient2, _item$customer_data;
10536
10606
  var statusMapping = {
10537
10607
  cancelled: 'Cancelled',