oa-componentbook 1.0.1-stage.9 → 1.0.1-stage.90

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

@@ -11,52 +11,93 @@ var _TrackShipmentWidget = _interopRequireDefault(require("../oa-widget-track-sh
 var _Accordion = _interopRequireDefault(require("../../components/oa-component-accordion/Accordion"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function TrackShipmentWidgetList(_ref) {
-  var _shipmentData$map;
+  var _assignments$map;
   let {
     shipmentData,
-    onChange: _onChange
+    onChange
   } = _ref;
-  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, (0, _fn.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) => {
+  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 {
-      reassignmentId,
-      reassignmentTime,
-      modifiedTime,
+      assignmentId,
+      assignmentDate,
+      assignmentClosedTime,
       status
     } = item !== null && item !== void 0 ? item : {};
-    return /*#__PURE__*/_react.default.createElement(_Accordion.default, {
-      onChange: () => _onChange(reassignmentId),
-      key: reassignmentId,
+    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, reassignmentTime, modifiedTime, status)
-    });
+      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

@@ -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();
@@ -39,16 +39,16 @@ const getCurrentShipmentLabel = number => {
   return "".concat(ordinalNumber, " Shipment");
 };
 exports.getCurrentShipmentLabel = getCurrentShipmentLabel;
-const isActive = status => status === 'A';
+const isActive = time => time === null;
 exports.isActive = isActive;
-const headerText = (index, reassignmentTime, modifiedTime, status) => "".concat(getCurrentShipmentLabel(index + 1), " | ").concat(getDateString(reassignmentTime, modifiedTime)).concat(isActive(status) ? ' - Present' : '');
+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$stages;
+  var _item$history;
   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,
+    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,
@@ -63,7 +63,7 @@ const getSingleShipmentHistory = item => {
       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 : []
+    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.9",
+  "version": "1.0.1-stage.90",
   "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,10 +67,12 @@
   "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",
-    "lint": "eslint src/** --ext .js,.jsx",
+    "lint": "eslint \"src/**/*.{js,jsx}\"",
     "lint-fix": "npm run lint -- --fix",
     "lint-fix-quiet": "npm run lint-fix -- --quiet",
     "pre-commit": "./pre-commit.sh"