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

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

@@ -1,105 +1,103 @@
 "use strict";
 
-require("core-js/modules/es.weak-map.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 _react = _interopRequireDefault(require("react"));
 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; }
 function TrackShipmentWidgetList(_ref) {
-  var _shipmentData$map;
+  var _assignments$map;
   let {
-    shipmentData
+    shipmentData,
+    onChange
   } = _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.");
+  const assignments = (shipmentData === null || shipmentData === void 0 ? void 0 : shipmentData.assignments) || [];
+  if (assignments.length === 0) {
+    return /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, (0, _fn.getSingleShipmentHistory)(shipmentData));
   }
-  if (shipmentData.length === 1) {
-    return /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, getSingleShipmentHistory(shipmentData[0]));
+  if (assignments.length === 1) {
+    return /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, (0, _fn.getSingleShipmentHistory)(assignments[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 lastReassignmentId = assignments && assignments.length > 0 ? assignments[assignments.length - 1].assignmentId || 0 : 0;
+  return assignments === null || assignments === void 0 || (_assignments$map = assignments.map) === null || _assignments$map === void 0 ? void 0 : _assignments$map.call(assignments, (item, index) => {
+    const {
+      assignmentId,
+      assignmentDate,
+      assignmentClosedTime,
+      status
+    } = item !== null && item !== void 0 ? item : {};
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "margin-bottom-16",
+      key: assignmentId
+    }, /*#__PURE__*/_react.default.createElement(_Accordion.default, {
+      defaultActiveKey: lastReassignmentId,
+      activeKey: assignmentId,
+      body: /*#__PURE__*/_react.default.createElement(_TrackShipmentWidget.default, (0, _fn.getSingleShipmentHistory)(item)),
+      headerText: (0, _fn.headerText)(index, assignmentDate, assignmentClosedTime, status)
+    }));
   });
 }
+const HistoryPropType = _propTypes.default.shape({
+  shipmentStatus: _propTypes.default.string.isRequired,
+  fromDate: _propTypes.default.string.isRequired,
+  toDate: _propTypes.default.string.isRequired,
+  partnerStatus: _propTypes.default.string,
+  customerDisplayStatus: _propTypes.default.string.isRequired,
+  oneassistDisplayStatus: _propTypes.default.string.isRequired,
+  stageConsistent: _propTypes.default.bool.isRequired
+});
+const AssignmentPropType = _propTypes.default.shape({
+  assignmentDate: _propTypes.default.number.isRequired,
+  assignmentClosedTime: _propTypes.default.number.isRequired,
+  logisticPartnerName: _propTypes.default.string.isRequired,
+  assignmentId: _propTypes.default.number.isRequired,
+  logisticPartnerRefNum: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  originAddressLine1: _propTypes.default.string.isRequired,
+  originDistrict: _propTypes.default.string.isRequired,
+  originPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired,
+  destAddressLine1: _propTypes.default.string.isRequired,
+  destDistrict: _propTypes.default.string,
+  destPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired,
+  history: _propTypes.default.arrayOf(HistoryPropType).isRequired,
+  origAddressFullName: _propTypes.default.string.isRequired,
+  destAddressFullName: _propTypes.default.string.isRequired,
+  assignments: _propTypes.default.arrayOf(_propTypes.default.shape({
+    logisticPartnerRefNum: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+    originAddressLine1: _propTypes.default.string.isRequired,
+    originDistrict: _propTypes.default.string.isRequired,
+    originPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired,
+    destAddressLine1: _propTypes.default.string.isRequired,
+    destDistrict: _propTypes.default.string,
+    destPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired,
+    history: _propTypes.default.arrayOf(HistoryPropType).isRequired,
+    origAddressFullName: _propTypes.default.string.isRequired,
+    destAddressFullName: _propTypes.default.string.isRequired,
+    assignments: _propTypes.default.array // Placeholder to break recursion
+  }))
+});
 TrackShipmentWidgetList.propTypes = {
-  shipmentData: _propTypes.default.arrayOf(_propTypes.default.shape({
-    reassignmentId: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
-    status: _propTypes.default.string.isRequired,
-    awb: _propTypes.default.string,
-    origAddressFullName: _propTypes.default.string,
-    originAddressLine1: _propTypes.default.string,
-    originPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
-    originDistrict: _propTypes.default.string,
-    destAddressFullName: _propTypes.default.string,
-    destAddressLine1: _propTypes.default.string,
-    destPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  shipmentData: _propTypes.default.shape({
+    logisticPartnerRefNum: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+    originAddressLine1: _propTypes.default.string.isRequired,
+    originDistrict: _propTypes.default.string.isRequired,
+    originPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired,
+    destAddressLine1: _propTypes.default.string.isRequired,
     destDistrict: _propTypes.default.string,
-    reassignmentTime: _propTypes.default.string,
-    modifiedTime: _propTypes.default.string,
-    stages: _propTypes.default.array
-  })).isRequired
+    destPincode: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired,
+    history: _propTypes.default.arrayOf(HistoryPropType).isRequired,
+    origAddressFullName: _propTypes.default.string.isRequired,
+    destAddressFullName: _propTypes.default.string.isRequired,
+    assignments: _propTypes.default.arrayOf(AssignmentPropType)
+  }),
+  onChange: _propTypes.default.func
+};
+TrackShipmentWidgetList.defaultProps = {
+  shipmentData: {},
+  onChange: () => {}
 };
 var _default = exports.default = TrackShipmentWidgetList;

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;
@@ -15,7 +15,7 @@ const getDateFromEpoch = date => {
   if (!date) {
     return '';
   }
-  const dateObj = new Date(date * 1000);
+  const dateObj = new Date(date);
   const day = dateObj.getDate();
   const month = dateObj.getMonth();
   const year = dateObj.getFullYear();
@@ -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 = time => time === null;
+exports.isActive = isActive;
+const headerText = (index, reassignmentTime, modifiedTime, status) => "".concat(getCurrentShipmentLabel(index + 1), " | ").concat(getDateString(reassignmentTime, modifiedTime)).concat(isActive(modifiedTime) ? ' - Present' : '');
+exports.headerText = headerText;
+const getSingleShipmentHistory = item => {
+  var _item$history;
+  return {
+    partnerName: item === null || item === void 0 ? void 0 : item.logisticPartnerName,
+    errorReason: item === null || item === void 0 ? void 0 : item.failureReason,
+    awbNumber: item === null || item === void 0 ? void 0 : item.logisticPartnerRefNum,
+    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$history = item === null || item === void 0 ? void 0 : item.history) !== null && _item$history !== void 0 ? _item$history : []
+  };
+};
+exports.getSingleShipmentHistory = getSingleShipmentHistory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oa-componentbook",
-  "version": "1.0.1-stage.5",
+  "version": "1.0.1-stage.51",
   "private": false,
   "description": "Reusable components",
   "main": "build/index.js",
@@ -27,7 +27,7 @@
     "react-markdown": "^8.0.7",
     "react-pattern-lock": "^12.0.12",
     "react-pdf": "^5.3.0",
-    "react-zoom-pan-pinch": "^3.4.4"
+    "react-zoom-pan-pinch": "^3.7.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.22.9",
@@ -47,6 +47,7 @@
     "babel-plugin-named-exports-order": "^0.0.2",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-storybook": "^0.6.15",
+    "onchange": "^6.1.0",
     "pre-commit": "^1.2.2",
     "react-scripts": "^5.0.1",
     "storybook": "^7.6.3",
@@ -66,6 +67,8 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "rm -rf build && NODE_ENV=production babel src/lib --out-dir build --copy-files",
+    "publish:local": "npm run build && yalc push --force",
+    "watch:publish": "onchange 'src/lib/**/*' -- npm run publish:local",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
     "update-package-lock": "npm i --package-lock-only",