oa-componentbook 1.0.1-stage.8 → 1.0.1-stage.80

package/build/widgets/oa-widget-reupload-drawer/ReUploadDrawer.js

@@ -0,0 +1,163 @@
+"use strict";
+
+require("core-js/modules/es.object.assign.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.js");
+require("core-js/modules/es.promise.js");
+var _react = _interopRequireDefault(require("react"));
+var _Info = _interopRequireDefault(require("@material-ui/icons/Info"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _antd = require("antd");
+var _CustomDrawer = _interopRequireDefault(require("../../components/oa-component-drawer/CustomDrawer"));
+var _MaterialIcon = _interopRequireDefault(require("../../components/oa-component-icons/MaterialIcon"));
+var _CustomInfo = _interopRequireDefault(require("../../components/oa-component-info/CustomInfo"));
+var _Typography = _interopRequireDefault(require("../../components/oa-component-typography/Typography"));
+var _CustomUpload = _interopRequireDefault(require("../../dev/oa-component-upload/CustomUpload"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function GenericUpload(_ref) {
+  var _config$documents;
+  let {
+    config,
+    uploadHandler,
+    deleteHandler: _deleteHandler,
+    downloadHandler,
+    previewHandler,
+    visible,
+    onClose,
+    validationConfig = {
+      maxSize: 5,
+      allowedTypes: ['image/jpeg', 'image/png', 'image/jpg', 'application/pdf'],
+      customValidation: null
+    },
+    uploadedDocuments,
+    showDelete = true,
+    showPreview = false,
+    form
+  } = _ref;
+  const validateFile = (file, docTypeId) => {
+    const isValidType = validationConfig.allowedTypes.includes(file.type);
+    if (!isValidType) {
+      form.setFields([{
+        name: docTypeId,
+        errors: ["Only ".concat(validationConfig.allowedTypes.map(type => type.split('/')[1].toUpperCase()).join('/'), " files are allowed!")]
+      }]);
+      return false;
+    }
+    const isValidSize = file.size / 1024 / 1024 < validationConfig.maxSize;
+    if (!isValidSize) {
+      form.setFields([{
+        name: docTypeId,
+        errors: ["File must be smaller than ".concat(validationConfig.maxSize, "MB!")]
+      }]);
+      return false;
+    }
+    if (validationConfig.customValidation) {
+      return validationConfig.customValidation(file, docTypeId);
+    }
+    return true;
+  };
+  const handleUpload = async (file, docTypeId, documentId) => {
+    if (!validateFile(file, docTypeId)) {
+      return null;
+    }
+    return uploadHandler(file, docTypeId, documentId);
+  };
+  return /*#__PURE__*/_react.default.createElement(_CustomDrawer.default, {
+    title: config.title,
+    width: config.width,
+    open: visible,
+    onClose: onClose,
+    buttonConfig: config.buttonConfig
+  }, config.systemInfo && /*#__PURE__*/_react.default.createElement("div", {
+    className: "margin-bottom-32"
+  }, /*#__PURE__*/_react.default.createElement(_CustomInfo.default, _extends({}, config.systemInfo, {
+    iconConfig: {
+      icon: /*#__PURE__*/_react.default.createElement(_MaterialIcon.default, {
+        icon: _Info.default,
+        size: 24,
+        color: "negative"
+      }),
+      position: 'left'
+    }
+  }))), (config === null || config === void 0 ? void 0 : config.heading) && /*#__PURE__*/_react.default.createElement("div", {
+    className: "padding-bottom-32"
+  }, /*#__PURE__*/_react.default.createElement(_Typography.default, {
+    className: "type-t1-500",
+    color: "primary-content"
+  }, config.heading, ' ')), /*#__PURE__*/_react.default.createElement(_antd.Form, {
+    form: form
+  }, (_config$documents = config.documents) === null || _config$documents === void 0 ? void 0 : _config$documents.map(item => /*#__PURE__*/_react.default.createElement("div", {
+    key: item.docTypeId
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "padding-bottom-4"
+  }, /*#__PURE__*/_react.default.createElement(_Typography.default, {
+    typography: "type-b2-500",
+    color: "primary-content"
+  }, item === null || item === void 0 ? void 0 : item.docName)), /*#__PURE__*/_react.default.createElement(_CustomUpload.default, {
+    isMandatory: true,
+    handleCustomOnChange: (file, status) => handleUpload(file, item.docTypeId, item.documentId),
+    formName: item.docTypeId,
+    uploadedDocuments: uploadedDocuments && uploadedDocuments[item.docTypeId] ? [uploadedDocuments[item.docTypeId]] : [],
+    deleteHandler: selectedFile => _deleteHandler(item.docTypeId),
+    downloadCallback: file => downloadHandler(item.docTypeId),
+    getPreview: previewHandler || (() => {}),
+    showDelete: showDelete,
+    showPreview: showPreview,
+    accept: validationConfig.allowedTypes.join(', '),
+    docName: item.docName
+  })))));
+}
+GenericUpload.propTypes = {
+  config: _propTypes.default.shape({
+    title: _propTypes.default.string.isRequired,
+    width: _propTypes.default.number,
+    buttonConfig: _propTypes.default.arrayOf(_propTypes.default.shape({
+      callback: _propTypes.default.func,
+      label: _propTypes.default.string,
+      type: _propTypes.default.string
+    })),
+    systemInfo: _propTypes.default.shape({
+      title: _propTypes.default.string,
+      color: _propTypes.default.string,
+      description: _propTypes.default.node
+    }),
+    heading: _propTypes.default.string,
+    documents: _propTypes.default.arrayOf(_propTypes.default.shape({
+      title: _propTypes.default.string,
+      docTypeId: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+      docName: _propTypes.default.string
+    }))
+  }).isRequired,
+  uploadHandler: _propTypes.default.func.isRequired,
+  deleteHandler: _propTypes.default.func.isRequired,
+  downloadHandler: _propTypes.default.func.isRequired,
+  previewHandler: _propTypes.default.func,
+  validationConfig: _propTypes.default.shape({
+    maxSize: _propTypes.default.number,
+    allowedTypes: _propTypes.default.arrayOf(_propTypes.default.string),
+    customValidation: _propTypes.default.func
+  }),
+  uploadedDocuments: _propTypes.default.object,
+  showDelete: _propTypes.default.bool,
+  showPreview: _propTypes.default.bool,
+  form: _propTypes.default.object.isRequired,
+  visible: _propTypes.default.bool.isRequired,
+  onClose: _propTypes.default.func.isRequired
+};
+GenericUpload.defaultProps = {
+  previewHandler: () => {},
+  validationConfig: {
+    maxSize: 5,
+    allowedTypes: ['image/jpeg', 'image/png', 'image/jpg', 'application/pdf'],
+    customValidation: null
+  },
+  uploadedDocuments: {},
+  showDelete: true,
+  showPreview: false
+};
+var _default = exports.default = GenericUpload;

package/build/widgets/oa-widget-track-shipment/TrackShipmentWidget.js

@@ -121,7 +121,9 @@ function TrackShipmentWidget(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_CustomTimeline.default, {
     currentStep: isOnDeliveryStage ? stepsData.length : stepsData.length - 1,
     stepsData: stepsData
-  })), errorReason && /*#__PURE__*/_react.default.createElement(_CustomInfo.default, {
+  })), errorReason && /*#__PURE__*/_react.default.createElement("div", {
+    className: "margin-top-16 margin-bottom-16"
+  }, /*#__PURE__*/_react.default.createElement(_CustomInfo.default, {
     iconConfig: {
       icon: /*#__PURE__*/_react.default.createElement(_MaterialIcon.default, {
         color: "warning",
@@ -131,7 +133,7 @@ function TrackShipmentWidget(_ref) {
       position: 'left'
     },
     description: errorReason
-  }), (tableData === null || tableData === void 0 ? void 0 : tableData.length) > 0 && /*#__PURE__*/_react.default.createElement(_CustomTable.default, {
+  })), (tableData === null || tableData === void 0 ? void 0 : tableData.length) > 0 && /*#__PURE__*/_react.default.createElement(_CustomTable.default, {
     bordered: true,
     rowKey: "key",
     columns: [{

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

@@ -1,64 +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 _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 => {};
-  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, {
-      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.8",
+  "version": "1.0.1-stage.80",
   "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"