oa-componentbook 1.0.1-stage.5 → 1.0.1-stage.7

package/build/index.js

@@ -485,6 +485,12 @@ Object.defineProperty(exports, "TrackShipmentWidget", {
     return _TrackShipmentWidget.default;
   }
 });
+Object.defineProperty(exports, "TrackShipmentWidgetList", {
+  enumerable: true,
+  get: function get() {
+    return _TrackShipmentWidgetList.default;
+  }
+});
 Object.defineProperty(exports, "Typographies", {
   enumerable: true,
   get: function get() {
@@ -603,6 +609,7 @@ var _SparePartsWidget = _interopRequireDefault(require("./widgets/oa-widget-spar
 var _SparePartsCollapseWidget = _interopRequireDefault(require("./widgets/oa-widget-spare-part/SparePartsCollapseWidget"));
 var _StageTimelineWidget = _interopRequireWildcard(require("./widgets/oa-widget-stage-timeline/StageTimelineWidget"));
 var _TrackShipmentWidget = _interopRequireDefault(require("./widgets/oa-widget-track-shipment/TrackShipmentWidget"));
+var _TrackShipmentWidgetList = _interopRequireDefault(require("./widgets/oa-widget-track-shipment-list/TrackShipmentWidgetList"));
 var _UploadDownloadWidget = _interopRequireDefault(require("./widgets/oa-widget-upload-download/UploadDownloadWidget"));
 var _ViewHistoryWidget = _interopRequireDefault(require("./widgets/oa-widget-view-history/ViewHistoryWidget"));
 var _ViewPreviousDescriptionWidget = _interopRequireDefault(require("./widgets/oa-widget-view-previous-description/ViewPreviousDescriptionWidget"));

package/build/widgets/oa-widget-track-shipment-list/TrackShipmentWidgetList.js

@@ -8,10 +8,10 @@ exports.default = void 0;
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.promise.js");
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _fn = require("./fn");
 var _TrackShipmentWidget = _interopRequireDefault(require("../oa-widget-track-shipment/TrackShipmentWidget"));
+var _Accordion = _interopRequireDefault(require("../../components/oa-component-accordion/Accordion"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -23,65 +23,24 @@ function TrackShipmentWidgetList(_ref) {
   const [historyData, setHistoryData] = (0, _react.useState)({});
   const [loading, setLoading] = (0, _react.useState)({});
   const fetchStatusXData = async reassignmentId => {};
-  const getSingleShipmentHistory = item => {
-    var _item$stages;
-    return {
-      awbNumber: item === null || item === void 0 ? void 0 : item.awb,
-      partnerName: item === null || item === void 0 ? void 0 : item.partnerName,
-      fromAddress: {
-        heading: 'From Address:',
-        addressLine1: item === null || item === void 0 ? void 0 : item.origAddressFullName,
-        addressLine2: item === null || item === void 0 ? void 0 : item.originAddressLine1,
-        pincode: item === null || item === void 0 ? void 0 : item.originPincode,
-        city: item === null || item === void 0 ? void 0 : item.originDistrict
-      },
-      toAddress: {
-        heading: 'To Address:',
-        addressLine1: item === null || item === void 0 ? void 0 : item.destAddressFullName,
-        addressLine2: item === null || item === void 0 ? void 0 : item.destAddressLine1,
-        pincode: item === null || item === void 0 ? void 0 : item.destPincode,
-        city: item === null || item === void 0 ? void 0 : item.destDistrict
-      },
-      tableData: (_item$stages = item === null || item === void 0 ? void 0 : item.stages) !== null && _item$stages !== void 0 ? _item$stages : []
-    };
-  };
   if (!shipmentData || shipmentData.length === 0) {
     return /*#__PURE__*/_react.default.createElement("p", null, "No shipment data available.");
   }
   if (shipmentData.length === 1) {
-    return /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, getSingleShipmentHistory(shipmentData[0]));
+    return /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, (0, _fn.getSingleShipmentHistory)(shipmentData[0]));
   }
   return shipmentData === null || shipmentData === void 0 || (_shipmentData$map = shipmentData.map) === null || _shipmentData$map === void 0 ? void 0 : _shipmentData$map.call(shipmentData, (item, index) => {
-    if ((item === null || item === void 0 ? void 0 : item.status) === 'X') {
-      var _historyData$reassign;
-      const reassignmentId = item === null || item === void 0 ? void 0 : item.reassignmentId;
-      return /*#__PURE__*/_react.default.createElement(_antd.Collapse, {
-        key: reassignmentId,
-        onChange: keys => {
-          console.log('keys:', keys);
-          if (keys.length > 0) {
-            fetchStatusXData(reassignmentId);
-          }
-        },
-        items: [{
-          key: reassignmentId,
-          label: "".concat((0, _fn.getCurrentShipmentLabel)(index + 1), " | ").concat((0, _fn.getDateString)(item === null || item === void 0 ? void 0 : item.reassignmentTime, item === null || item === void 0 ? void 0 : item.modifiedTime)),
-          children: loading[reassignmentId] ? /*#__PURE__*/_react.default.createElement(_antd.Spin, null) : /*#__PURE__*/_react.default.createElement("p", null, ((_historyData$reassign = historyData[reassignmentId]) === null || _historyData$reassign === void 0 ? void 0 : _historyData$reassign.details) || 'No details available')
-        }]
-      });
-    }
-    if ((item === null || item === void 0 ? void 0 : item.status) === 'A') {
-      console.log('item:', item);
-      return /*#__PURE__*/_react.default.createElement(_antd.Collapse, {
-        key: item === null || item === void 0 ? void 0 : item.reassignmentId,
-        items: [{
-          key: item === null || item === void 0 ? void 0 : item.reassignmentId,
-          label: "".concat((0, _fn.getCurrentShipmentLabel)(index + 1), " | ").concat((0, _fn.getDateString)(item === null || item === void 0 ? void 0 : item.reassignmentTime, item === null || item === void 0 ? void 0 : item.modifiedTime), "-Present"),
-          children: /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, getSingleShipmentHistory(item))
-        }]
-      });
-    }
-    return null;
+    const {
+      reassignmentId,
+      reassignmentTime,
+      modifiedTime,
+      status
+    } = item !== null && item !== void 0 ? item : {};
+    return /*#__PURE__*/_react.default.createElement(_Accordion.default, {
+      key: reassignmentId,
+      body: /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, (0, _fn.getSingleShipmentHistory)(item)),
+      headerText: (0, _fn.headerText)(index, reassignmentTime, modifiedTime, status)
+    });
   });
 }
 TrackShipmentWidgetList.propTypes = {

package/build/widgets/oa-widget-track-shipment-list/fn.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDateString = exports.getCurrentShipmentLabel = void 0;
+exports.isActive = exports.headerText = exports.getSingleShipmentHistory = exports.getDateString = exports.getCurrentShipmentLabel = void 0;
 function numberToOrdinal(number) {
   const suffixes = ['th', 'st', 'nd', 'rd'];
   const value = number % 100;
@@ -36,6 +36,34 @@ const getDateString = (startTime, endTime) => {
 exports.getDateString = getDateString;
 const getCurrentShipmentLabel = number => {
   const ordinalNumber = numberToOrdinal(number);
-  return "Shipment ".concat(ordinalNumber);
+  return "".concat(ordinalNumber, " Shipment");
 };
-exports.getCurrentShipmentLabel = getCurrentShipmentLabel;
+exports.getCurrentShipmentLabel = getCurrentShipmentLabel;
+const isActive = status => status === 'A';
+exports.isActive = isActive;
+const headerText = (index, reassignmentTime, modifiedTime, status) => "".concat(getCurrentShipmentLabel(index + 1), " | ").concat(getDateString(reassignmentTime, modifiedTime)).concat(isActive(status) ? ' - Present' : '');
+exports.headerText = headerText;
+const getSingleShipmentHistory = item => {
+  var _item$stages;
+  return {
+    partnerName: item === null || item === void 0 ? void 0 : item.partnerName,
+    errorReason: item === null || item === void 0 ? void 0 : item.errorReason,
+    awbNumber: item === null || item === void 0 ? void 0 : item.awb,
+    fromAddress: {
+      heading: 'From Address:',
+      addressLine1: item === null || item === void 0 ? void 0 : item.origAddressFullName,
+      addressLine2: item === null || item === void 0 ? void 0 : item.originAddressLine1,
+      pincode: item === null || item === void 0 ? void 0 : item.originPincode,
+      city: item === null || item === void 0 ? void 0 : item.originDistrict
+    },
+    toAddress: {
+      heading: 'To Address:',
+      addressLine1: item === null || item === void 0 ? void 0 : item.destAddressFullName,
+      addressLine2: item === null || item === void 0 ? void 0 : item.destAddressLine1,
+      pincode: item === null || item === void 0 ? void 0 : item.destPincode,
+      city: item === null || item === void 0 ? void 0 : item.destDistrict
+    },
+    tableData: (_item$stages = item === null || item === void 0 ? void 0 : item.stages) !== null && _item$stages !== void 0 ? _item$stages : []
+  };
+};
+exports.getSingleShipmentHistory = getSingleShipmentHistory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oa-componentbook",
-  "version": "1.0.1-stage.5",
+  "version": "1.0.1-stage.7",
   "private": false,
   "description": "Reusable components",
   "main": "build/index.js",