@djb25/digit-ui-module-vendor 1.0.3 → 1.0.5

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.
@@ -1,7 +1,7 @@
1
- import { Header, SearchForm, SearchField, Dropdown as Dropdown$2, MobileNumber, CardLabelError, DatePicker as DatePicker$3, SubmitBar, Card, Table, Loader, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, HomeIcon, PropertyHouse, EmployeeModuleCard, TickMark, FormComposer, FormStep, CardLabel, TextInput, LabelFieldPair, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, Label, LinkLabel, ToggleSwitch, CardSectionHeader, StatusTable, Row, EditIcon, DeleteIcon, Modal, InfoIcon, CardHeader, LinkButton, Banner } from '@djb25/digit-ui-react-components';
1
+ import { Header, SearchForm, SearchField, Dropdown as Dropdown$2, MobileNumber, CardLabelError, DatePicker as DatePicker$3, SubmitBar, Card, Table, Loader, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, HomeIcon, PropertyHouse, EmployeeModuleCard, Stepper, FormComposer, TickMark, FormStep, CardLabel, TextInput, LabelFieldPair, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, Label, LinkLabel, ToggleSwitch, CardSectionHeader, StatusTable, Row, EditIcon, DeleteIcon, Modal, InfoIcon, CardHeader, LinkButton, Banner } from '@djb25/digit-ui-react-components';
2
2
  import React, { useEffect, useMemo, useCallback, useState, useRef, Fragment } from 'react';
3
3
  import { useTranslation } from 'react-i18next';
4
- import { useParams, useLocation, Switch, useHistory, Link, useRouteMatch, Route, Redirect } from 'react-router-dom';
4
+ import { useParams, useLocation, Switch, Link, useHistory, useRouteMatch, Route, Redirect } from 'react-router-dom';
5
5
  import { useForm, Controller } from 'react-hook-form';
6
6
  import { useQueryClient } from 'react-query';
7
7
 
@@ -316,7 +316,6 @@ const EmployeeApp = ({
316
316
  url,
317
317
  userType
318
318
  }) => {
319
- console.log("tttttttttttt", path);
320
319
  const {
321
320
  t
322
321
  } = useTranslation();
@@ -376,16 +375,16 @@ const EmployeeApp = ({
376
375
  return crumbs;
377
376
  };
378
377
  return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
379
- className: "ground-container"
380
- }, /*#__PURE__*/React.createElement("div", {
381
- className: "form-container"
378
+ className: "ground-container employee-app-container form-container"
382
379
  }, /*#__PURE__*/React.createElement(ModuleHeader, {
383
380
  leftContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowLeft, {
384
381
  className: "icon"
385
382
  }), "Back"),
386
383
  onLeftClick: () => window.history.back(),
387
384
  breadcrumbs: getDynamicBreadcrumbs()
388
- }), /*#__PURE__*/React.createElement(PrivateRoute, {
385
+ }), /*#__PURE__*/React.createElement("div", {
386
+ className: "employee-form"
387
+ }, /*#__PURE__*/React.createElement(PrivateRoute, {
389
388
  path: `${path}/registry/new-vendor`,
390
389
  component: () => /*#__PURE__*/React.createElement(AddVendor, {
391
390
  parentRoute: path
@@ -700,36 +699,6 @@ const VendorConfig = (t, disabled = false) => {
700
699
  }];
701
700
  };
702
701
 
703
- const Timeline = ({
704
- steps: _steps = [],
705
- currentStep: _currentStep = 1
706
- }) => {
707
- const {
708
- t
709
- } = useTranslation();
710
- return /*#__PURE__*/React.createElement("div", {
711
- className: "custom-stepper-card"
712
- }, _steps.map((label, index) => {
713
- const stepNumber = index + 1;
714
- const isActive = stepNumber === _currentStep;
715
- const isCompleted = stepNumber < _currentStep;
716
- return /*#__PURE__*/React.createElement("div", {
717
- className: "stepper-row",
718
- key: index
719
- }, /*#__PURE__*/React.createElement("div", {
720
- className: "stepper-left"
721
- }, /*#__PURE__*/React.createElement("div", {
722
- className: `step-circle ${isActive ? "active" : ""} ${isCompleted ? "completed" : ""}`
723
- }, isCompleted ? /*#__PURE__*/React.createElement(TickMark, {
724
- fillColor: "red"
725
- }) : stepNumber), index !== _steps.length - 1 && /*#__PURE__*/React.createElement("div", {
726
- className: `step-line ${isCompleted ? "completed-line" : ""}`
727
- })), /*#__PURE__*/React.createElement("div", {
728
- className: `step-label ${isActive ? "active-text" : ""} ${isCompleted ? "completed-text" : ""}`
729
- }, t(label)));
730
- }));
731
- };
732
-
733
702
  const AddVendor = ({
734
703
  parentUrl,
735
704
  heading
@@ -739,9 +708,7 @@ const AddVendor = ({
739
708
  const {
740
709
  t
741
710
  } = useTranslation();
742
- const history = useHistory();
743
- const queryClient = useQueryClient();
744
- const [currentStep, setCurrentStep] = useState(1);
711
+ const [currentStep, setCurrentStep] = useState(2);
745
712
  const [showToast, setShowToast] = useState(null);
746
713
  const [canSubmit, setCanSubmit] = useState(false);
747
714
  const step1DataRef = useRef({});
@@ -770,7 +737,11 @@ const AddVendor = ({
770
737
  };
771
738
  const vendorStepConfig = Config.filter(config => config.head === "ES_VRNDOR_NEW_VENDOR_DETAILS");
772
739
  const addressStepConfig = Config.filter(config => config.head === "ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS");
773
- const steps = [t("ES_VRNDOR_NEW_VENDOR_DETAILS"), t("ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS")];
740
+ const steps = [{
741
+ label: "ES_VRNDOR_NEW_VENDOR_DETAILS"
742
+ }, {
743
+ label: "ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS"
744
+ }];
774
745
  const onFormValueChange = (setValue, formData) => {
775
746
  var _formData$selectGende;
776
747
  if (formData !== null && formData !== void 0 && formData.vendorName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$selectGende = formData.selectGender) !== null && _formData$selectGende !== void 0 && _formData$selectGende.code) {
@@ -877,15 +848,11 @@ const AddVendor = ({
877
848
  }
878
849
  });
879
850
  };
880
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
881
- style: {
882
- display: "flex",
883
- width: "100%",
884
- gap: "24px"
885
- }
886
- }, /*#__PURE__*/React.createElement(Timeline, {
851
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Stepper, {
887
852
  steps: steps,
888
- currentStep: currentStep
853
+ currentStep: currentStep - 1,
854
+ onStepClick: step => setCurrentStep(step + 1),
855
+ t: t
889
856
  }), /*#__PURE__*/React.createElement("div", {
890
857
  style: {
891
858
  flex: "1",
@@ -919,7 +886,37 @@ const AddVendor = ({
919
886
  error: showToast.key === "error",
920
887
  label: t(showToast.key === "success" ? `ES_FSM_REGISTRY_${showToast.action}_SUCCESS` : showToast.action),
921
888
  onClose: closeToast
922
- }))));
889
+ })));
890
+ };
891
+
892
+ const Timeline = ({
893
+ steps: _steps = [],
894
+ currentStep: _currentStep = 1
895
+ }) => {
896
+ const {
897
+ t
898
+ } = useTranslation();
899
+ return /*#__PURE__*/React.createElement("div", {
900
+ className: "custom-stepper-card"
901
+ }, _steps.map((label, index) => {
902
+ const stepNumber = index + 1;
903
+ const isActive = stepNumber === _currentStep;
904
+ const isCompleted = stepNumber < _currentStep;
905
+ return /*#__PURE__*/React.createElement("div", {
906
+ className: "stepper-row",
907
+ key: index
908
+ }, /*#__PURE__*/React.createElement("div", {
909
+ className: "stepper-left"
910
+ }, /*#__PURE__*/React.createElement("div", {
911
+ className: `step-circle ${isActive ? "active" : ""} ${isCompleted ? "completed" : ""}`
912
+ }, isCompleted ? /*#__PURE__*/React.createElement(TickMark, {
913
+ fillColor: "red"
914
+ }) : stepNumber), index !== _steps.length - 1 && /*#__PURE__*/React.createElement("div", {
915
+ className: `step-line ${isCompleted ? "completed-line" : ""}`
916
+ })), /*#__PURE__*/React.createElement("div", {
917
+ className: `step-label ${isActive ? "active-text" : ""} ${isCompleted ? "completed-text" : ""}`
918
+ }, t(label)));
919
+ }));
923
920
  };
924
921
 
925
922
  const VendorDetails = ({
@@ -1712,7 +1709,7 @@ const VendorSelectAddress = ({
1712
1709
  userType,
1713
1710
  formData
1714
1711
  }) => {
1715
- var _sessionStorage, _formData$cpt4, _formData$cpt4$detail;
1712
+ var _sessionStorage, _formData$cpt3, _formData$cpt3$detail;
1716
1713
  const allCities = Digit.Hooks.vendor.useTenants();
1717
1714
  let tenantId = Digit.ULBService.getCurrentTenantId();
1718
1715
  const {
@@ -1728,7 +1725,6 @@ const VendorSelectAddress = ({
1728
1725
  var _sessionStorage2;
1729
1726
  property = JSON.parse((_sessionStorage2 = sessionStorage) === null || _sessionStorage2 === void 0 ? void 0 : _sessionStorage2.getItem("Digit_FSM_PT"));
1730
1727
  }
1731
- console.log("properfferrfrty", property);
1732
1728
  let cityDetail = {};
1733
1729
  if (property) {
1734
1730
  cityDetail = cities.filter(city => {
@@ -1759,25 +1755,24 @@ const VendorSelectAddress = ({
1759
1755
  }, [cities]);
1760
1756
  useEffect(() => {
1761
1757
  if (selectedCity && fetchedLocalities) {
1762
- var _formData$address3, _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _property3, _property3$propertyDe, _property3$propertyDe2, _formData$address4, _formData$cpt3, _formData$cpt3$detail, _formData$cpt3$detail2, _property4, _property4$propertyDe, _property4$propertyDe2, _formData$address5;
1758
+ var _formData$address3, _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _property3, _property3$propertyDe, _property3$propertyDe2, _formData$address4;
1763
1759
  let __localityList = fetchedLocalities;
1764
1760
  let filteredLocalityList = [];
1765
- console.log("formData?.address?.locality", formData === null || formData === void 0 ? void 0 : (_formData$address3 = formData.address) === null || _formData$address3 === void 0 ? void 0 : _formData$address3.locality, formData === null || formData === void 0 ? void 0 : (_formData$cpt2 = formData.cpt) === null || _formData$cpt2 === void 0 ? void 0 : (_formData$cpt2$detail = _formData$cpt2.details) === null || _formData$cpt2$detail === void 0 ? void 0 : (_formData$cpt2$detail2 = _formData$cpt2$detail.address) === null || _formData$cpt2$detail2 === void 0 ? void 0 : _formData$cpt2$detail2.locality, (_property3 = property) === null || _property3 === void 0 ? void 0 : (_property3$propertyDe = _property3.propertyDetails) === null || _property3$propertyDe === void 0 ? void 0 : (_property3$propertyDe2 = _property3$propertyDe.address) === null || _property3$propertyDe2 === void 0 ? void 0 : _property3$propertyDe2.locality);
1766
- if (formData !== null && formData !== void 0 && (_formData$address4 = formData.address) !== null && _formData$address4 !== void 0 && _formData$address4.locality) {
1761
+ if (formData !== null && formData !== void 0 && (_formData$address3 = formData.address) !== null && _formData$address3 !== void 0 && _formData$address3.locality) {
1767
1762
  setSelectedLocality(formData.address.locality);
1768
- } else if (formData !== null && formData !== void 0 && (_formData$cpt3 = formData.cpt) !== null && _formData$cpt3 !== void 0 && (_formData$cpt3$detail = _formData$cpt3.details) !== null && _formData$cpt3$detail !== void 0 && (_formData$cpt3$detail2 = _formData$cpt3$detail.address) !== null && _formData$cpt3$detail2 !== void 0 && _formData$cpt3$detail2.locality) {
1763
+ } else if (formData !== null && formData !== void 0 && (_formData$cpt2 = formData.cpt) !== null && _formData$cpt2 !== void 0 && (_formData$cpt2$detail = _formData$cpt2.details) !== null && _formData$cpt2$detail !== void 0 && (_formData$cpt2$detail2 = _formData$cpt2$detail.address) !== null && _formData$cpt2$detail2 !== void 0 && _formData$cpt2$detail2.locality) {
1769
1764
  setSelectedLocality(formData.cpt.details.address.locality);
1770
- } else if ((_property4 = property) !== null && _property4 !== void 0 && (_property4$propertyDe = _property4.propertyDetails) !== null && _property4$propertyDe !== void 0 && (_property4$propertyDe2 = _property4$propertyDe.address) !== null && _property4$propertyDe2 !== void 0 && _property4$propertyDe2.locality) {
1771
- var _property5, _property5$propertyDe, _property5$propertyDe2;
1772
- setSelectedLocality((_property5 = property) === null || _property5 === void 0 ? void 0 : (_property5$propertyDe = _property5.propertyDetails) === null || _property5$propertyDe === void 0 ? void 0 : (_property5$propertyDe2 = _property5$propertyDe.address) === null || _property5$propertyDe2 === void 0 ? void 0 : _property5$propertyDe2.locality);
1765
+ } else if ((_property3 = property) !== null && _property3 !== void 0 && (_property3$propertyDe = _property3.propertyDetails) !== null && _property3$propertyDe !== void 0 && (_property3$propertyDe2 = _property3$propertyDe.address) !== null && _property3$propertyDe2 !== void 0 && _property3$propertyDe2.locality) {
1766
+ var _property4, _property4$propertyDe, _property4$propertyDe2;
1767
+ setSelectedLocality((_property4 = property) === null || _property4 === void 0 ? void 0 : (_property4$propertyDe = _property4.propertyDetails) === null || _property4$propertyDe === void 0 ? void 0 : (_property4$propertyDe2 = _property4$propertyDe.address) === null || _property4$propertyDe2 === void 0 ? void 0 : _property4$propertyDe2.locality);
1773
1768
  }
1774
- if (formData !== null && formData !== void 0 && (_formData$address5 = formData.address) !== null && _formData$address5 !== void 0 && _formData$address5.pincode) {
1775
- var _formData$address6;
1769
+ if (formData !== null && formData !== void 0 && (_formData$address4 = formData.address) !== null && _formData$address4 !== void 0 && _formData$address4.pincode) {
1770
+ var _formData$address5;
1776
1771
  filteredLocalityList = __localityList.filter(obj => {
1777
1772
  var _obj$pincode;
1778
1773
  return (_obj$pincode = obj.pincode) === null || _obj$pincode === void 0 ? void 0 : _obj$pincode.find(item => item == formData.address.pincode);
1779
1774
  });
1780
- if (!(formData !== null && formData !== void 0 && (_formData$address6 = formData.address) !== null && _formData$address6 !== void 0 && _formData$address6.locality)) setSelectedLocality();
1775
+ if (!(formData !== null && formData !== void 0 && (_formData$address5 = formData.address) !== null && _formData$address5 !== void 0 && _formData$address5.locality)) setSelectedLocality();
1781
1776
  }
1782
1777
  if (userType === "employee") {
1783
1778
  onSelect(config.key, {
@@ -1796,7 +1791,7 @@ const VendorSelectAddress = ({
1796
1791
  }
1797
1792
  }
1798
1793
  }
1799
- }, [selectedCity, formData === null || formData === void 0 ? void 0 : (_formData$cpt4 = formData.cpt) === null || _formData$cpt4 === void 0 ? void 0 : (_formData$cpt4$detail = _formData$cpt4.details) === null || _formData$cpt4$detail === void 0 ? void 0 : _formData$cpt4$detail.address, fetchedLocalities]);
1794
+ }, [selectedCity, formData === null || formData === void 0 ? void 0 : (_formData$cpt3 = formData.cpt) === null || _formData$cpt3 === void 0 ? void 0 : (_formData$cpt3$detail = _formData$cpt3.details) === null || _formData$cpt3$detail === void 0 ? void 0 : _formData$cpt3$detail.address, fetchedLocalities]);
1800
1795
  function selectCity(city) {
1801
1796
  setSelectedLocality(null);
1802
1797
  setLocalities(null);
@@ -1819,9 +1814,7 @@ const VendorSelectAddress = ({
1819
1814
  });
1820
1815
  }
1821
1816
  if (userType === "employee") {
1822
- return /*#__PURE__*/React.createElement("div", {
1823
- className: ""
1824
- }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
1817
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
1825
1818
  className: "card-label-smaller"
1826
1819
  }, t("MYCITY_CODE_LABEL"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
1827
1820
  className: "",
@@ -8481,7 +8474,7 @@ const VendorInbox = props => {
8481
8474
  }
8482
8475
  }, {
8483
8476
  Header: t("ES_VENDOR_INBOX_DATE_VENDOR_CREATION"),
8484
- accessor: "VendorInboxcreatedTime",
8477
+ accessor: "createdTime",
8485
8478
  Cell: ({
8486
8479
  row
8487
8480
  }) => {
@@ -11372,13 +11365,14 @@ const SelectVehicleType = ({
11372
11365
  formData,
11373
11366
  setValue
11374
11367
  }) => {
11375
- var _formData$additionalD;
11368
+ var _formData$serviceType;
11376
11369
  const stateId = Digit.ULBService.getStateId();
11377
11370
  const tenantId = Digit.ULBService.getCurrentTenantId();
11378
11371
  const {
11379
11372
  data: vehicleData,
11380
11373
  isLoading: vehicleLoading
11381
- } = Digit.Hooks.fsm.useMDMS(stateId, "Vehicle", "VehicleMakeModel");
11374
+ } = Digit.Hooks.wt.useMDMS(stateId, "Vehicle", "VehicleMakeModel");
11375
+ console.log("vehicleData", vehicleData);
11382
11376
  const {
11383
11377
  data: serviceTypeData,
11384
11378
  isLoading: serviceLoading
@@ -11396,15 +11390,15 @@ const SelectVehicleType = ({
11396
11390
  const [types, setTypes] = useState([]);
11397
11391
  const [selectedType, setSelectedType] = useState({});
11398
11392
  const [selectedCapacity, setSelectedCapacity] = useState("");
11399
- const selectedServiceType = formData === null || formData === void 0 ? void 0 : (_formData$additionalD = formData.additionalDetails) === null || _formData$additionalD === void 0 ? void 0 : _formData$additionalD.code;
11393
+ const selectedServiceType = (formData === null || formData === void 0 ? void 0 : (_formData$serviceType = formData.serviceType) === null || _formData$serviceType === void 0 ? void 0 : _formData$serviceType.code) || (formData === null || formData === void 0 ? void 0 : formData.serviceType);
11400
11394
  const memoizedServiceTypeFilters = useMemo(() => {
11401
11395
  if (!serviceTypeData || !vehicleData) return {};
11402
11396
  const filters = {};
11403
11397
  serviceTypeData.forEach(service => {
11404
11398
  if (service.code === "WT") {
11405
- filters[service.code] = ["TANKER"];
11406
- } else if (service.code === "FSM" || service.code === "CND") {
11407
11399
  filters[service.code] = vehicleData.filter(vehicle => ["MAHINDRA", "TATA", "TRACTOR", "TAFE", "SONALIKA"].includes(vehicle.code)).map(vehicle => vehicle.code);
11400
+ } else if (service.code === "CND") {
11401
+ filters[service.code] = vehicleData.filter(vehicle => ["MAHINDRA", "TATA"].includes(vehicle.code)).map(vehicle => vehicle.code);
11408
11402
  }
11409
11403
  });
11410
11404
  return filters;
@@ -11414,8 +11408,8 @@ const SelectVehicleType = ({
11414
11408
  }, [memoizedServiceTypeFilters]);
11415
11409
  useEffect(() => {
11416
11410
  if (!vehicleData) return;
11417
- const allowedModels = serviceTypeFilters[selectedServiceType] || [];
11418
- const filteredModals = vehicleData.filter(vehicle => allowedModels.includes(vehicle.code));
11411
+ const allowedModels = serviceTypeFilters[selectedServiceType];
11412
+ const filteredModals = allowedModels ? vehicleData.filter(vehicle => allowedModels.includes(vehicle.code)) : vehicleData;
11419
11413
  setModals(filteredModals);
11420
11414
  setSelectedModal({});
11421
11415
  setTypes([]);