@mseva/digit-ui-module-garbagecollection 1.0.23 → 1.0.24

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.
Files changed (5) hide show
  1. package/dist/index.js +226 -98
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.modern.js +213 -94
  4. package/dist/index.modern.js.map +1 -1
  5. package/package.json +1 -1
package/dist/index.js CHANGED
@@ -2823,6 +2823,8 @@ const CHBCitizenSecond = _ref => {
2823
2823
  const isCitizen = window.location.href.includes("citizen");
2824
2824
  const [getPropertyId, setPropertyId] = React.useState(null);
2825
2825
  const [loader, setLoader] = React.useState(false);
2826
+ const [showToast, setShowToast] = React.useState(false);
2827
+ const [error, setError] = React.useState("");
2826
2828
  const {
2827
2829
  data: GCData = [],
2828
2830
  isLoading: GCLoading
@@ -2868,50 +2870,105 @@ const CHBCitizenSecond = _ref => {
2868
2870
  });
2869
2871
  const onSubmit = function (data) {
2870
2872
  try {
2871
- var _data$frequency, _data$typeOfWaste, _data$propertyType, _data$connectionCateg, _data$connectionCateg2;
2872
- setLoader(true);
2873
- console.log("data", data);
2874
- console.log("currentStepData", currentStepData);
2875
- const ownerData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
2876
- const payload = {
2877
- GarbageConnection: {
2878
- tenantId: tenantId,
2879
- propertyId: data === null || data === void 0 ? void 0 : data.propertyId,
2880
- frequency: data === null || data === void 0 ? void 0 : (_data$frequency = data.frequency) === null || _data$frequency === void 0 ? void 0 : _data$frequency.name,
2881
- typeOfWaste: data === null || data === void 0 ? void 0 : (_data$typeOfWaste = data.typeOfWaste) === null || _data$typeOfWaste === void 0 ? void 0 : _data$typeOfWaste.name,
2882
- propertyType: data === null || data === void 0 ? void 0 : (_data$propertyType = data.propertyType) === null || _data$propertyType === void 0 ? void 0 : _data$propertyType.name,
2883
- plotSize: data === null || data === void 0 ? void 0 : data.plotSize,
2884
- location: data === null || data === void 0 ? void 0 : data.location,
2885
- applicationType: "NEW_GARBAGE_CONNECTION",
2886
- connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg = data.connectionCategory) === null || _data$connectionCateg === void 0 ? void 0 : _data$connectionCateg.name,
2887
- connectionHolders: [{
2888
- name: ownerData === null || ownerData === void 0 ? void 0 : ownerData.name,
2889
- mobileNumber: ownerData === null || ownerData === void 0 ? void 0 : ownerData.mobileNumber,
2890
- address: ownerData === null || ownerData === void 0 ? void 0 : ownerData.address,
2891
- emailId: ownerData === null || ownerData === void 0 ? void 0 : ownerData.emailId,
2892
- type: "CITIZEN"
2893
- }],
2894
- processInstance: {
2895
- businessService: "NewGC",
2896
- action: "INITIATE",
2897
- moduleName: "gc-services"
2898
- },
2899
- additionalDetails: {
2900
- connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg2 = data.connectionCategory) === null || _data$connectionCateg2 === void 0 ? void 0 : _data$connectionCateg2.name
2901
- }
2873
+ const _temp3 = function (_currentStepData$venu, _currentStepData$apiR) {
2874
+ if (currentStepData !== null && currentStepData !== void 0 && (_currentStepData$venu = currentStepData.venueDetails) !== null && _currentStepData$venu !== void 0 && _currentStepData$venu.applicationNo || currentStepData !== null && currentStepData !== void 0 && (_currentStepData$apiR = currentStepData.apiResponseData) !== null && _currentStepData$apiR !== void 0 && _currentStepData$apiR.applicationNo) {
2875
+ var _data$frequency, _data$typeOfWaste, _data$propertyType, _data$connectionCateg, _currentStepData$venu2, _data$connectionCateg2;
2876
+ const ownerData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
2877
+ const updatedDatacheck = (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData);
2878
+ const payload = {
2879
+ GarbageConnection: _extends({}, updatedDatacheck, {
2880
+ tenantId: tenantId,
2881
+ propertyId: data === null || data === void 0 ? void 0 : data.propertyId,
2882
+ frequency: data === null || data === void 0 ? void 0 : (_data$frequency = data.frequency) === null || _data$frequency === void 0 ? void 0 : _data$frequency.name,
2883
+ typeOfWaste: data === null || data === void 0 ? void 0 : (_data$typeOfWaste = data.typeOfWaste) === null || _data$typeOfWaste === void 0 ? void 0 : _data$typeOfWaste.name,
2884
+ propertyType: data === null || data === void 0 ? void 0 : (_data$propertyType = data.propertyType) === null || _data$propertyType === void 0 ? void 0 : _data$propertyType.name,
2885
+ plotSize: data === null || data === void 0 ? void 0 : data.plotSize,
2886
+ location: data === null || data === void 0 ? void 0 : data.location,
2887
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg = data.connectionCategory) === null || _data$connectionCateg === void 0 ? void 0 : _data$connectionCateg.name,
2888
+ connectionHolders: [{
2889
+ name: ownerData === null || ownerData === void 0 ? void 0 : ownerData.name,
2890
+ mobileNumber: ownerData === null || ownerData === void 0 ? void 0 : ownerData.mobileNumber,
2891
+ permanentAddress: ownerData === null || ownerData === void 0 ? void 0 : ownerData.address,
2892
+ emailId: ownerData === null || ownerData === void 0 ? void 0 : ownerData.emailId,
2893
+ type: "CITIZEN"
2894
+ }],
2895
+ processInstance: _extends({}, currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$venu2 = currentStepData.venueDetails) === null || _currentStepData$venu2 === void 0 ? void 0 : _currentStepData$venu2.processInstance, {
2896
+ action: "DRAFT"
2897
+ }),
2898
+ additionalDetails: {
2899
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg2 = data.connectionCategory) === null || _data$connectionCateg2 === void 0 ? void 0 : _data$connectionCateg2.name
2900
+ }
2901
+ })
2902
+ };
2903
+ console.log("payload check", payload);
2904
+ setLoader(true);
2905
+ const _temp = _catch(function () {
2906
+ return Promise.resolve(Digit.GCService.update(payload)).then(function (response) {
2907
+ var _response$GarbageConn;
2908
+ setLoader(false);
2909
+ console.log("response", response);
2910
+ goNext(response === null || response === void 0 ? void 0 : (_response$GarbageConn = response.GarbageConnection) === null || _response$GarbageConn === void 0 ? void 0 : _response$GarbageConn[0]);
2911
+ });
2912
+ }, function (error) {
2913
+ var _error$response$data, _error$response$data$, _error$response$data$2;
2914
+ setLoader(false);
2915
+ console.log("Response Data:", error.response.data);
2916
+ setShowToast(true);
2917
+ setError((_error$response$data = error.response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message);
2918
+ });
2919
+ if (_temp && _temp.then) return _temp.then(function () {});
2920
+ } else {
2921
+ var _data$frequency2, _data$typeOfWaste2, _data$propertyType2, _data$connectionCateg3, _data$connectionCateg4;
2922
+ setLoader(true);
2923
+ console.log("data", data);
2924
+ console.log("currentStepData", currentStepData);
2925
+ const ownerData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
2926
+ const payload = {
2927
+ GarbageConnection: {
2928
+ tenantId: tenantId,
2929
+ propertyId: data === null || data === void 0 ? void 0 : data.propertyId,
2930
+ frequency: data === null || data === void 0 ? void 0 : (_data$frequency2 = data.frequency) === null || _data$frequency2 === void 0 ? void 0 : _data$frequency2.name,
2931
+ typeOfWaste: data === null || data === void 0 ? void 0 : (_data$typeOfWaste2 = data.typeOfWaste) === null || _data$typeOfWaste2 === void 0 ? void 0 : _data$typeOfWaste2.name,
2932
+ propertyType: data === null || data === void 0 ? void 0 : (_data$propertyType2 = data.propertyType) === null || _data$propertyType2 === void 0 ? void 0 : _data$propertyType2.name,
2933
+ plotSize: data === null || data === void 0 ? void 0 : data.plotSize,
2934
+ location: data === null || data === void 0 ? void 0 : data.location,
2935
+ applicationType: "NEW_GARBAGE_CONNECTION",
2936
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg3 = data.connectionCategory) === null || _data$connectionCateg3 === void 0 ? void 0 : _data$connectionCateg3.name,
2937
+ connectionHolders: [{
2938
+ name: ownerData === null || ownerData === void 0 ? void 0 : ownerData.name,
2939
+ mobileNumber: ownerData === null || ownerData === void 0 ? void 0 : ownerData.mobileNumber,
2940
+ permanentAddress: ownerData === null || ownerData === void 0 ? void 0 : ownerData.address,
2941
+ emailId: ownerData === null || ownerData === void 0 ? void 0 : ownerData.emailId,
2942
+ type: "CITIZEN"
2943
+ }],
2944
+ processInstance: {
2945
+ businessService: "NewGC",
2946
+ action: "INITIATE",
2947
+ moduleName: "gc-services"
2948
+ },
2949
+ additionalDetails: {
2950
+ connectionCategory: data === null || data === void 0 ? void 0 : (_data$connectionCateg4 = data.connectionCategory) === null || _data$connectionCateg4 === void 0 ? void 0 : _data$connectionCateg4.name
2951
+ }
2952
+ }
2953
+ };
2954
+ const _temp2 = _catch(function () {
2955
+ return Promise.resolve(Digit.GCService.create(payload)).then(function (response) {
2956
+ var _response$GarbageConn2;
2957
+ setLoader(false);
2958
+ console.log("response", response);
2959
+ goNext(response === null || response === void 0 ? void 0 : (_response$GarbageConn2 = response.GarbageConnection) === null || _response$GarbageConn2 === void 0 ? void 0 : _response$GarbageConn2[0]);
2960
+ });
2961
+ }, function (error) {
2962
+ var _error$response$data2, _error$response$data3, _error$response$data4;
2963
+ setLoader(false);
2964
+ console.log("Response Data:", error.response.data);
2965
+ setShowToast(true);
2966
+ setError((_error$response$data2 = error.response.data) === null || _error$response$data2 === void 0 ? void 0 : (_error$response$data3 = _error$response$data2.Errors) === null || _error$response$data3 === void 0 ? void 0 : (_error$response$data4 = _error$response$data3[0]) === null || _error$response$data4 === void 0 ? void 0 : _error$response$data4.message);
2967
+ });
2968
+ if (_temp2 && _temp2.then) return _temp2.then(function () {});
2902
2969
  }
2903
- };
2904
- const _temp = _catch(function () {
2905
- return Promise.resolve(Digit.GCService.create(payload)).then(function (response) {
2906
- var _response$GarbageConn;
2907
- setLoader(false);
2908
- console.log("response", response);
2909
- goNext(response === null || response === void 0 ? void 0 : (_response$GarbageConn = response.GarbageConnection) === null || _response$GarbageConn === void 0 ? void 0 : _response$GarbageConn[0]);
2910
- });
2911
- }, function () {
2912
- setLoader(false);
2913
- });
2914
- return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
2970
+ }();
2971
+ return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
2915
2972
  } catch (e) {
2916
2973
  return Promise.reject(e);
2917
2974
  }
@@ -2934,26 +2991,33 @@ const CHBCitizenSecond = _ref => {
2934
2991
  });
2935
2992
  React.useEffect(() => {
2936
2993
  console.log("propertyDetailsFetch==", propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties);
2937
- if (propertyDetailsFetch !== null && propertyDetailsFetch !== void 0 && propertyDetailsFetch.Properties || currentStepData !== null && currentStepData !== void 0 && currentStepData.venueDetails) {
2938
- var _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _GCData$swServicesC, _FreqType$gcServices, _WasteType$gcService, _propertyDetailsFetch7, _propertyDetailsFetch8, _backStepData$propert, _backStepData$frequen, _backStepData$typeOfW;
2939
- const backStepData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails;
2994
+ console.log("currentStepData==", currentStepData);
2995
+ if (propertyDetailsFetch !== null && propertyDetailsFetch !== void 0 && propertyDetailsFetch.Properties || currentStepData !== null && currentStepData !== void 0 && currentStepData.venueDetails || currentStepData !== null && currentStepData !== void 0 && currentStepData.apiResponseData) {
2996
+ var _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _GCData$swServicesC, _FreqType$gcServices, _WasteType$gcService, _connectionCategory$g, _propertyDetailsFetch7, _propertyDetailsFetch8;
2997
+ const backStepData = (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData);
2940
2998
  const location = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch2 = _propertyDetailsFetch[0]) === null || _propertyDetailsFetch2 === void 0 ? void 0 : (_propertyDetailsFetch3 = _propertyDetailsFetch2.owners) === null || _propertyDetailsFetch3 === void 0 ? void 0 : (_propertyDetailsFetch4 = _propertyDetailsFetch3[0]) === null || _propertyDetailsFetch4 === void 0 ? void 0 : _propertyDetailsFetch4.permanentAddress) || (backStepData === null || backStepData === void 0 ? void 0 : backStepData.location);
2941
2999
  const plotSize = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch5 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch5 === void 0 ? void 0 : (_propertyDetailsFetch6 = _propertyDetailsFetch5[0]) === null || _propertyDetailsFetch6 === void 0 ? void 0 : _propertyDetailsFetch6.landArea) || (backStepData === null || backStepData === void 0 ? void 0 : backStepData.plotSize);
2942
3000
  if (backStepData !== null && backStepData !== void 0 && backStepData.propertyId) setValue("propertyId", backStepData === null || backStepData === void 0 ? void 0 : backStepData.propertyId);
2943
3001
  setValue("location", location);
2944
3002
  setValue("plotSize", plotSize);
2945
3003
  const pTypeOptions = (GCData === null || GCData === void 0 ? void 0 : (_GCData$swServicesC = GCData["sw-services-calculation"]) === null || _GCData$swServicesC === void 0 ? void 0 : _GCData$swServicesC.PropertyUsageType) || [];
3004
+ console.log("pTypeOptions", pTypeOptions);
2946
3005
  const freqTypeOptions = (FreqType === null || FreqType === void 0 ? void 0 : (_FreqType$gcServices = FreqType["gc-services-masters"]) === null || _FreqType$gcServices === void 0 ? void 0 : _FreqType$gcServices.GarbageCollectionFrequency) || [];
2947
3006
  const wasteTypeOptions = (WasteType === null || WasteType === void 0 ? void 0 : (_WasteType$gcService = WasteType["gc-services-masters"]) === null || _WasteType$gcService === void 0 ? void 0 : _WasteType$gcService.TypeOfWaste) || [];
2948
- const usage = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch7 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch7 === void 0 ? void 0 : (_propertyDetailsFetch8 = _propertyDetailsFetch7[0]) === null || _propertyDetailsFetch8 === void 0 ? void 0 : _propertyDetailsFetch8.usageCategory) || (backStepData === null || backStepData === void 0 ? void 0 : (_backStepData$propert = backStepData.propertyType) === null || _backStepData$propert === void 0 ? void 0 : _backStepData$propert.code);
2949
- const frequency = backStepData === null || backStepData === void 0 ? void 0 : (_backStepData$frequen = backStepData.frequency) === null || _backStepData$frequen === void 0 ? void 0 : _backStepData$frequen.code;
2950
- const typeOfWaste = backStepData === null || backStepData === void 0 ? void 0 : (_backStepData$typeOfW = backStepData.typeOfWaste) === null || _backStepData$typeOfW === void 0 ? void 0 : _backStepData$typeOfW.code;
2951
- const pType = pTypeOptions === null || pTypeOptions === void 0 ? void 0 : pTypeOptions.find(item => item.code == usage);
2952
- const freType = freqTypeOptions === null || freqTypeOptions === void 0 ? void 0 : freqTypeOptions.find(item => item.code == frequency);
2953
- const wasteType = wasteTypeOptions === null || wasteTypeOptions === void 0 ? void 0 : wasteTypeOptions.find(item => item.code == typeOfWaste);
3007
+ const connectionCatoptions = (connectionCategory === null || connectionCategory === void 0 ? void 0 : (_connectionCategory$g = connectionCategory["gc-services-masters"]) === null || _connectionCategory$g === void 0 ? void 0 : _connectionCategory$g.connectionCategory) || [];
3008
+ console.log("connectionCatoptions", connectionCatoptions);
3009
+ const usage = (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch7 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch7 === void 0 ? void 0 : (_propertyDetailsFetch8 = _propertyDetailsFetch7[0]) === null || _propertyDetailsFetch8 === void 0 ? void 0 : _propertyDetailsFetch8.usageCategory) || (backStepData === null || backStepData === void 0 ? void 0 : backStepData.propertyType);
3010
+ const frequency = backStepData === null || backStepData === void 0 ? void 0 : backStepData.frequency;
3011
+ const typeOfWaste = backStepData === null || backStepData === void 0 ? void 0 : backStepData.typeOfWaste;
3012
+ const connetionType = backStepData === null || backStepData === void 0 ? void 0 : backStepData.connectionCategory;
3013
+ const pType = pTypeOptions === null || pTypeOptions === void 0 ? void 0 : pTypeOptions.find(item => item.name == usage);
3014
+ const freType = freqTypeOptions === null || freqTypeOptions === void 0 ? void 0 : freqTypeOptions.find(item => item.name == frequency);
3015
+ const wasteType = wasteTypeOptions === null || wasteTypeOptions === void 0 ? void 0 : wasteTypeOptions.find(item => item.name == typeOfWaste);
3016
+ const connectionCategoryType = connectionCatoptions === null || connectionCatoptions === void 0 ? void 0 : connectionCatoptions.find(item => item.code == connetionType);
2954
3017
  setValue("propertyType", pType || null);
2955
3018
  setValue("frequency", freType || null);
2956
3019
  setValue("typeOfWaste", wasteType || null);
3020
+ setValue("connectionCategory", connectionCategoryType || null);
2957
3021
  }
2958
3022
  }, [propertyDetailsFetch, GCData, setValue, currentStepData]);
2959
3023
  const searchProperty = function () {
@@ -2965,6 +3029,19 @@ const CHBCitizenSecond = _ref => {
2965
3029
  return Promise.reject(e);
2966
3030
  }
2967
3031
  };
3032
+ const closeToast = () => {
3033
+ setShowToast(false);
3034
+ setError("");
3035
+ };
3036
+ const handleReset = () => {
3037
+ setValue("propertyType", null);
3038
+ setValue("plotSize", "");
3039
+ setValue("location", "");
3040
+ setValue("frequency", null);
3041
+ setValue("typeOfWaste", null);
3042
+ setValue("connectionCategory", null);
3043
+ setPropertyId(null);
3044
+ };
2968
3045
  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("form", {
2969
3046
  style: {
2970
3047
  paddingBottom: "150px"
@@ -2997,6 +3074,7 @@ const CHBCitizenSecond = _ref => {
2997
3074
  value: props.value,
2998
3075
  onChange: e => {
2999
3076
  props.onChange(e.target.value);
3077
+ handleReset();
3000
3078
  },
3001
3079
  t: t
3002
3080
  })
@@ -3013,7 +3091,7 @@ const CHBCitizenSecond = _ref => {
3013
3091
  style: {
3014
3092
  color: "red"
3015
3093
  }
3016
- }, errors.propertyId.message)), ((propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails)) && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
3094
+ }, errors.propertyId.message)), ((propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.venueDetails) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData)) && /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
3017
3095
  style: {
3018
3096
  marginBottom: "20px"
3019
3097
  }
@@ -3183,7 +3261,7 @@ const CHBCitizenSecond = _ref => {
3183
3261
  required: t("GC_CONNECTION_TYPE_REQUIRED")
3184
3262
  },
3185
3263
  render: props => {
3186
- var _connectionCategory$g;
3264
+ var _connectionCategory$g2;
3187
3265
  return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
3188
3266
  style: {
3189
3267
  marginBottom: 0
@@ -3193,7 +3271,7 @@ const CHBCitizenSecond = _ref => {
3193
3271
  props.onChange(e);
3194
3272
  },
3195
3273
  selected: props.value,
3196
- option: connectionCategory === null || connectionCategory === void 0 ? void 0 : (_connectionCategory$g = connectionCategory["gc-services-masters"]) === null || _connectionCategory$g === void 0 ? void 0 : _connectionCategory$g.connectionCategory,
3274
+ option: connectionCategory === null || connectionCategory === void 0 ? void 0 : (_connectionCategory$g2 = connectionCategory["gc-services-masters"]) === null || _connectionCategory$g2 === void 0 ? void 0 : _connectionCategory$g2.connectionCategory,
3197
3275
  optionKey: "name"
3198
3276
  });
3199
3277
  }
@@ -3213,7 +3291,12 @@ const CHBCitizenSecond = _ref => {
3213
3291
  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
3214
3292
  label: "Next",
3215
3293
  submit: "submit"
3216
- }))), (loader || isLoading || GCLoading || WasteTypeLoading || FreqTypeLoading || connectionCategoryLoading) && /*#__PURE__*/React__default.createElement(Loader, {
3294
+ }))), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
3295
+ isDleteBtn: true,
3296
+ error: true,
3297
+ label: error,
3298
+ onClose: closeToast
3299
+ }), (loader || isLoading || GCLoading || WasteTypeLoading || FreqTypeLoading || connectionCategoryLoading) && /*#__PURE__*/React__default.createElement(Loader, {
3217
3300
  page: true
3218
3301
  }));
3219
3302
  };
@@ -9086,15 +9169,22 @@ const NewADSStepFormOne = _ref => {
9086
9169
  };
9087
9170
 
9088
9171
  const CHBCitizenDetailsNew = _ref => {
9089
- var _user$info, _user$info2, _user$info3;
9172
+ var _history$location, _user$info, _user$info2, _user$info3;
9090
9173
  let {
9091
9174
  t,
9092
9175
  goNext,
9093
9176
  currentStepData,
9094
9177
  onGoBack
9095
9178
  } = _ref;
9179
+ const dispatch = reactRedux.useDispatch();
9096
9180
  const isCitizen = window.location.href.includes("citizen");
9097
9181
  const user = Digit.UserService.getUser();
9182
+ const tenantId = window.location.href.includes("citizen") ? window.localStorage.getItem("CITIZEN.CITY") : window.localStorage.getItem("Employee.tenant-id");
9183
+ const history = reactRouterDom.useHistory();
9184
+ const [loader, setLoader] = React.useState(false);
9185
+ const pathname = (history === null || history === void 0 ? void 0 : (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.pathname) || "";
9186
+ const applicationNumber = pathname === null || pathname === void 0 ? void 0 : pathname.split("/").pop();
9187
+ console.log("applicationNumber", applicationNumber);
9098
9188
  const {
9099
9189
  control,
9100
9190
  handleSubmit,
@@ -9111,6 +9201,37 @@ const CHBCitizenDetailsNew = _ref => {
9111
9201
  address: ""
9112
9202
  }
9113
9203
  });
9204
+ const fetchChallans = function (filters) {
9205
+ try {
9206
+ setLoader(true);
9207
+ const _temp = _catch(function () {
9208
+ return Promise.resolve(Digit.GCService.search({
9209
+ tenantId,
9210
+ filters
9211
+ })).then(function (responseData) {
9212
+ var _responseData$Garbage;
9213
+ console.log("search ", responseData);
9214
+ dispatch(UPDATE_GarbageApplication_FORM("apiResponseData", responseData === null || responseData === void 0 ? void 0 : (_responseData$Garbage = responseData.GarbageConnection) === null || _responseData$Garbage === void 0 ? void 0 : _responseData$Garbage[0]));
9215
+ setLoader(false);
9216
+ });
9217
+ }, function (error) {
9218
+ console.log("error", error);
9219
+ setLoader(false);
9220
+ });
9221
+ return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
9222
+ } catch (e) {
9223
+ return Promise.reject(e);
9224
+ }
9225
+ };
9226
+ React.useEffect(() => {
9227
+ console.log("tes===", applicationNumber);
9228
+ if (applicationNumber) {
9229
+ console.log("here");
9230
+ const filters = {};
9231
+ filters.applicationNumber = applicationNumber;
9232
+ fetchChallans(filters);
9233
+ }
9234
+ }, [applicationNumber]);
9114
9235
  const onSubmit = function (data) {
9115
9236
  try {
9116
9237
  console.log("data===", data);
@@ -9123,12 +9244,20 @@ const CHBCitizenDetailsNew = _ref => {
9123
9244
  React.useEffect(() => {
9124
9245
  console.log("currentStepData", currentStepData);
9125
9246
  const formattedData = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails;
9247
+ const apiRes = currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.apiResponseData;
9126
9248
  if (formattedData) {
9127
9249
  setValue("address", formattedData === null || formattedData === void 0 ? void 0 : formattedData.address);
9128
9250
  setValue("emailId", formattedData === null || formattedData === void 0 ? void 0 : formattedData.emailId);
9129
9251
  setValue("mobileNumber", formattedData === null || formattedData === void 0 ? void 0 : formattedData.mobileNumber);
9130
9252
  setValue("name", formattedData === null || formattedData === void 0 ? void 0 : formattedData.name);
9131
9253
  }
9254
+ if (apiRes) {
9255
+ var _apiRes$connectionHol, _apiRes$connectionHol2, _apiRes$connectionHol3, _apiRes$connectionHol4, _apiRes$connectionHol5, _apiRes$connectionHol6, _apiRes$connectionHol7, _apiRes$connectionHol8;
9256
+ setValue("address", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol = apiRes.connectionHolders) === null || _apiRes$connectionHol === void 0 ? void 0 : (_apiRes$connectionHol2 = _apiRes$connectionHol[0]) === null || _apiRes$connectionHol2 === void 0 ? void 0 : _apiRes$connectionHol2.permanentAddress);
9257
+ setValue("emailId", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol3 = apiRes.connectionHolders) === null || _apiRes$connectionHol3 === void 0 ? void 0 : (_apiRes$connectionHol4 = _apiRes$connectionHol3[0]) === null || _apiRes$connectionHol4 === void 0 ? void 0 : _apiRes$connectionHol4.emailId);
9258
+ setValue("mobileNumber", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol5 = apiRes.connectionHolders) === null || _apiRes$connectionHol5 === void 0 ? void 0 : (_apiRes$connectionHol6 = _apiRes$connectionHol5[0]) === null || _apiRes$connectionHol6 === void 0 ? void 0 : _apiRes$connectionHol6.mobileNumber);
9259
+ setValue("name", apiRes === null || apiRes === void 0 ? void 0 : (_apiRes$connectionHol7 = apiRes.connectionHolders) === null || _apiRes$connectionHol7 === void 0 ? void 0 : (_apiRes$connectionHol8 = _apiRes$connectionHol7[0]) === null || _apiRes$connectionHol8 === void 0 ? void 0 : _apiRes$connectionHol8.name);
9260
+ }
9132
9261
  }, [currentStepData, setValue]);
9133
9262
  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("form", {
9134
9263
  onSubmit: handleSubmit(onSubmit)
@@ -9280,7 +9409,9 @@ const CHBCitizenDetailsNew = _ref => {
9280
9409
  }, errors.address.message))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
9281
9410
  label: "Next",
9282
9411
  submit: "submit"
9283
- }))));
9412
+ }))), loader && /*#__PURE__*/React__default.createElement(Loader, {
9413
+ page: true
9414
+ }));
9284
9415
  };
9285
9416
 
9286
9417
  const NewADSStepFormTwo = _ref => {
@@ -9347,7 +9478,6 @@ const NewADSStepFormThree = _ref => {
9347
9478
  });
9348
9479
  const goNext = function (finalData) {
9349
9480
  try {
9350
- var _checkFormData$docume, _checkFormData$docume2, _checkFormData$venueD;
9351
9481
  const missingFields = validation(finalData);
9352
9482
  if (missingFields.length > 0) {
9353
9483
  setError("" + t("GC_" + missingFields[0].replace(".", "_").toUpperCase()));
@@ -9355,28 +9485,8 @@ const NewADSStepFormThree = _ref => {
9355
9485
  setTimeout(() => setShowToast(false), 3000);
9356
9486
  return Promise.resolve();
9357
9487
  }
9358
- console.log("checkFormData", checkFormData);
9359
- setLoader(true);
9360
- const payload = {
9361
- GarbageConnection: _extends({}, checkFormData === null || checkFormData === void 0 ? void 0 : checkFormData.venueDetails, {
9362
- documents: checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$docume = checkFormData.documents) === null || _checkFormData$docume === void 0 ? void 0 : (_checkFormData$docume2 = _checkFormData$docume.documents) === null || _checkFormData$docume2 === void 0 ? void 0 : _checkFormData$docume2.documents,
9363
- processInstance: _extends({}, checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$venueD = checkFormData.venueDetails) === null || _checkFormData$venueD === void 0 ? void 0 : _checkFormData$venueD.processInstance, {
9364
- action: "DRAFT"
9365
- })
9366
- })
9367
- };
9368
- const _temp = _catch(function () {
9369
- return Promise.resolve(Digit.GCService.update(payload)).then(function (response) {
9370
- var _response$GarbageConn;
9371
- console.log("response", response);
9372
- setLoader(false);
9373
- dispatch(UPDATE_GarbageApplication_FORM("venueDetails", response === null || response === void 0 ? void 0 : (_response$GarbageConn = response.GarbageConnection) === null || _response$GarbageConn === void 0 ? void 0 : _response$GarbageConn[0]));
9374
- onGoNext();
9375
- });
9376
- }, function () {
9377
- setLoader(false);
9378
- });
9379
- return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
9488
+ onGoNext();
9489
+ return Promise.resolve();
9380
9490
  } catch (e) {
9381
9491
  return Promise.reject(e);
9382
9492
  }
@@ -9579,7 +9689,7 @@ function ChallanDocument(_ref2) {
9579
9689
  }
9580
9690
 
9581
9691
  function CHBSummary(_ref) {
9582
- var _formData$documents, _formData$documents$d, _formData$apiData, _formData$apiData$App, _formData$apiData$App2, _formData$venueDetail, _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _formData$ownerDetail, _formData$ownerDetail2, _formData$ownerDetail3, _formData$ownerDetail4, _formData$venueDetail2, _formData$venueDetail3, _formData$venueDetail4, _formData$venueDetail5, _formData$venueDetail6, _formData$venueDetail7, _formData$venueDetail8, _formData$venueDetail9, _formData$venueDetail0, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
9692
+ var _formData$documents, _formData$documents$d, _formData$apiData, _formData$apiData$App, _formData$apiData$App2, _formData$venueDetail, _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _formData$ownerDetail, _formData$ownerDetail2, _formData$ownerDetail3, _formData$ownerDetail4, _formData$venueDetail2, _formData$venueDetail3, _formData$venueDetail4, _formData$venueDetail5, _formData$venueDetail6, _formData$venueDetail7, _formData$venueDetail8, _formData$venueDetail9, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
9583
9693
  let {
9584
9694
  formData,
9585
9695
  goNext,
@@ -9672,13 +9782,13 @@ function CHBSummary(_ref) {
9672
9782
  style: {
9673
9783
  fontSize: "24px"
9674
9784
  }
9675
- }, t("PT_DETAILS")), renderLabel(t("NDC_MSG_PROPERTY_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail2 = formData.venueDetails) === null || _formData$venueDetail2 === void 0 ? void 0 : _formData$venueDetail2.propertyId), renderLabel(t("NDC_MSG_PROPERTY_TYPE_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail3 = formData.venueDetails) === null || _formData$venueDetail3 === void 0 ? void 0 : (_formData$venueDetail4 = _formData$venueDetail3.propertyType) === null || _formData$venueDetail4 === void 0 ? void 0 : _formData$venueDetail4.name), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail5 = formData.venueDetails) === null || _formData$venueDetail5 === void 0 ? void 0 : _formData$venueDetail5.plotSize), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ADDRESS"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail6 = formData.venueDetails) === null || _formData$venueDetail6 === void 0 ? void 0 : _formData$venueDetail6.location)), /*#__PURE__*/React__default.createElement("div", {
9785
+ }, t("PT_DETAILS")), renderLabel(t("NDC_MSG_PROPERTY_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail2 = formData.venueDetails) === null || _formData$venueDetail2 === void 0 ? void 0 : _formData$venueDetail2.propertyId), renderLabel(t("NDC_MSG_PROPERTY_TYPE_LABEL"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail3 = formData.venueDetails) === null || _formData$venueDetail3 === void 0 ? void 0 : _formData$venueDetail3.propertyType), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail4 = formData.venueDetails) === null || _formData$venueDetail4 === void 0 ? void 0 : _formData$venueDetail4.plotSize), renderLabel(t("PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ADDRESS"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail5 = formData.venueDetails) === null || _formData$venueDetail5 === void 0 ? void 0 : _formData$venueDetail5.location)), /*#__PURE__*/React__default.createElement("div", {
9676
9786
  style: sectionStyle
9677
9787
  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
9678
9788
  style: {
9679
9789
  fontSize: "24px"
9680
9790
  }
9681
- }, t("GC_CONNECTION_DETAILS")), renderLabel(t("GC_CONNECTION_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail7 = formData.venueDetails) === null || _formData$venueDetail7 === void 0 ? void 0 : _formData$venueDetail7.connectionCategory), renderLabel(t("GC_FREQUENCY"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail8 = formData.venueDetails) === null || _formData$venueDetail8 === void 0 ? void 0 : _formData$venueDetail8.frequency), renderLabel(t("GC_WASTE_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail9 = formData.venueDetails) === null || _formData$venueDetail9 === void 0 ? void 0 : _formData$venueDetail9.typeOfWaste), renderLabel(t("GC_LOCATION"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail0 = formData.venueDetails) === null || _formData$venueDetail0 === void 0 ? void 0 : _formData$venueDetail0.location)), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
9791
+ }, t("GC_CONNECTION_DETAILS")), renderLabel(t("GC_CONNECTION_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail6 = formData.venueDetails) === null || _formData$venueDetail6 === void 0 ? void 0 : _formData$venueDetail6.connectionCategory), renderLabel(t("GC_FREQUENCY"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail7 = formData.venueDetails) === null || _formData$venueDetail7 === void 0 ? void 0 : _formData$venueDetail7.frequency), renderLabel(t("GC_WASTE_TYPE"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail8 = formData.venueDetails) === null || _formData$venueDetail8 === void 0 ? void 0 : _formData$venueDetail8.typeOfWaste), renderLabel(t("GC_LOCATION"), formData === null || formData === void 0 ? void 0 : (_formData$venueDetail9 = formData.venueDetails) === null || _formData$venueDetail9 === void 0 ? void 0 : _formData$venueDetail9.location)), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
9682
9792
  style: {
9683
9793
  fontSize: "24px",
9684
9794
  marginTop: "30px"
@@ -9764,13 +9874,20 @@ const NewADSStepFormFour = _ref => {
9764
9874
  };
9765
9875
  const onSubmit = function (data, actionStatus) {
9766
9876
  try {
9767
- var _data$venueDetails;
9877
+ var _data$apiResponseData, _data$documents, _data$documents$docum, _data$venueDetails;
9768
9878
  setLoader(true);
9879
+ console.log("data", data);
9880
+ const apiDocs = (data === null || data === void 0 ? void 0 : (_data$apiResponseData = data.apiResponseData) === null || _data$apiResponseData === void 0 ? void 0 : _data$apiResponseData.documents) || [];
9881
+ const formDocs = (data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : (_data$documents$docum = _data$documents.documents) === null || _data$documents$docum === void 0 ? void 0 : _data$documents$docum.documents) || [];
9882
+ const existingFileStoreIds = apiDocs === null || apiDocs === void 0 ? void 0 : apiDocs.map(doc => doc.fileStoreId);
9883
+ const newDocuments = formDocs.filter(doc => !(existingFileStoreIds !== null && existingFileStoreIds !== void 0 && existingFileStoreIds.includes(doc.fileStoreId)));
9884
+ console.log("NEW DOCUMENTS TO SEND:", newDocuments);
9769
9885
  const payload = {
9770
9886
  GarbageConnection: _extends({}, data === null || data === void 0 ? void 0 : data.venueDetails, {
9771
9887
  processInstance: _extends({}, data === null || data === void 0 ? void 0 : (_data$venueDetails = data.venueDetails) === null || _data$venueDetails === void 0 ? void 0 : _data$venueDetails.processInstance, {
9772
9888
  action: actionStatus
9773
- })
9889
+ }),
9890
+ documents: newDocuments
9774
9891
  })
9775
9892
  };
9776
9893
  return Promise.resolve(_catch(function () {
@@ -9827,18 +9944,19 @@ const SelectNDCDocuments = _ref => {
9827
9944
  formState
9828
9945
  } = _ref;
9829
9946
  const tenantId = window.location.href.includes("employee") ? Digit.ULBService.getCurrentPermanentCity() : localStorage.getItem("CITIZEN.CITY");
9830
- const checkFormData = reactRedux.useSelector(state => state.ndc.NDCForm.formData || {});
9947
+ const checkFormData = reactRedux.useSelector(state => state.gc.GarbageApplicationFormReducer.formData || {});
9831
9948
  const stateId = Digit.ULBService.getStateId();
9832
9949
  const [documents, setDocuments] = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : _formData$documents.documents) || []);
9833
9950
  const [error, setError] = React.useState(null);
9834
9951
  React.useEffect(() => {
9835
- var _checkFormData$respon, _checkFormData$respon2, _checkFormData$respon3;
9836
- if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$respon = checkFormData.responseData) !== null && _checkFormData$respon !== void 0 && (_checkFormData$respon2 = _checkFormData$respon[0]) !== null && _checkFormData$respon2 !== void 0 && (_checkFormData$respon3 = _checkFormData$respon2.Documents) !== null && _checkFormData$respon3 !== void 0 && _checkFormData$respon3.length && documents.length === 0) {
9837
- var _checkFormData$respon4, _checkFormData$respon5, _checkFormData$respon6;
9838
- const apiDocs = checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$respon4 = checkFormData.responseData) === null || _checkFormData$respon4 === void 0 ? void 0 : (_checkFormData$respon5 = _checkFormData$respon4[0]) === null || _checkFormData$respon5 === void 0 ? void 0 : (_checkFormData$respon6 = _checkFormData$respon5.Documents) === null || _checkFormData$respon6 === void 0 ? void 0 : _checkFormData$respon6.map(doc => ({
9952
+ var _checkFormData$venueD, _checkFormData$venueD2;
9953
+ console.log("checkFormData", checkFormData);
9954
+ if (checkFormData !== null && checkFormData !== void 0 && (_checkFormData$venueD = checkFormData.venueDetails) !== null && _checkFormData$venueD !== void 0 && (_checkFormData$venueD2 = _checkFormData$venueD.documents) !== null && _checkFormData$venueD2 !== void 0 && _checkFormData$venueD2.length && documents.length === 0) {
9955
+ var _checkFormData$venueD3, _checkFormData$venueD4;
9956
+ const apiDocs = checkFormData === null || checkFormData === void 0 ? void 0 : (_checkFormData$venueD3 = checkFormData.venueDetails) === null || _checkFormData$venueD3 === void 0 ? void 0 : (_checkFormData$venueD4 = _checkFormData$venueD3.documents) === null || _checkFormData$venueD4 === void 0 ? void 0 : _checkFormData$venueD4.map(doc => ({
9839
9957
  documentType: doc === null || doc === void 0 ? void 0 : doc.documentType,
9840
- fileStoreId: doc === null || doc === void 0 ? void 0 : doc.documentAttachment,
9841
- documentUid: doc === null || doc === void 0 ? void 0 : doc.documentAttachment
9958
+ fileStoreId: doc === null || doc === void 0 ? void 0 : doc.fileStoreId,
9959
+ documentUid: doc === null || doc === void 0 ? void 0 : doc.fileStoreId
9842
9960
  }));
9843
9961
  setDocuments(apiDocs);
9844
9962
  }
@@ -9854,6 +9972,8 @@ const SelectNDCDocuments = _ref => {
9854
9972
  }]);
9855
9973
  const ndcDocuments = data === null || data === void 0 ? void 0 : (_data$gcServicesMas = data["gc-services-masters"]) === null || _data$gcServicesMas === void 0 ? void 0 : _data$gcServicesMas.Documents;
9856
9974
  const goNext = () => {
9975
+ console.log("here stop");
9976
+ console.log("formData", formData);
9857
9977
  onSelect(config.key, {
9858
9978
  documents,
9859
9979
  ndcDocumentsLength: ndcDocuments === null || ndcDocuments === void 0 ? void 0 : ndcDocuments.length
@@ -9897,7 +10017,8 @@ function SelectDocument(_ref2) {
9897
10017
  documents,
9898
10018
  setFormError,
9899
10019
  config,
9900
- formState
10020
+ formState,
10021
+ formData
9901
10022
  } = _ref2;
9902
10023
  const filteredDocument = documents === null || documents === void 0 ? void 0 : documents.filter(item => {
9903
10024
  var _item$documentType;
@@ -9916,6 +10037,7 @@ function SelectDocument(_ref2) {
9916
10037
  }
9917
10038
  }, [filteredDocument]);
9918
10039
  React.useEffect(() => {
10040
+ console.log("here come", documents);
9919
10041
  if (uploadedFile) {
9920
10042
  setDocuments(prev => {
9921
10043
  const filteredDocumentsByDocumentType = prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.documentType) !== (doc === null || doc === void 0 ? void 0 : doc.code));
@@ -10836,6 +10958,7 @@ const MyChallanResult = _ref => {
10836
10958
  }
10837
10959
  }, t(header), " (", getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.length, ")"), getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.map((bill, index) => {
10838
10960
  const connectionCount = connectionCountMap[bill === null || bill === void 0 ? void 0 : bill.connectionNo] || 0;
10961
+ console.log("bill", bill);
10839
10962
  const showDiscontinueButton = bill.applicationStatus === "CONNECTION_ACTIVATED" && connectionCount === 1;
10840
10963
  return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
10841
10964
  key: index
@@ -10857,7 +10980,12 @@ const MyChallanResult = _ref => {
10857
10980
  to: "/digit-ui/citizen/garbagecollection/application/" + (bill === null || bill === void 0 ? void 0 : bill.applicationNo) + "/" + (bill === null || bill === void 0 ? void 0 : bill.tenantId)
10858
10981
  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
10859
10982
  label: t("CS_VIEW_DETAILS")
10860
- })), showDiscontinueButton && /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
10983
+ })), (bill.applicationStatus == "PENDING_FOR_CITIZEN_ACTION" || bill.applicationStatus == "INITIATED") && /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
10984
+ label: t("WF_GC_EDIT"),
10985
+ onSubmit: () => {
10986
+ history.push("/digit-ui/citizen/garbagecollection/create-application/" + (bill === null || bill === void 0 ? void 0 : bill.applicationNo));
10987
+ }
10988
+ }), showDiscontinueButton && /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
10861
10989
  style: {
10862
10990
  width: "200px"
10863
10991
  },
@@ -11494,7 +11622,7 @@ const ChallanApplicationDetails = () => {
11494
11622
  React.useEffect(() => {
11495
11623
  if (acknowledgementIds) {
11496
11624
  const filters = {};
11497
- filters.acknowledgementIds = acknowledgementIds;
11625
+ filters.applicationNumber = acknowledgementIds;
11498
11626
  fetchChallans(filters);
11499
11627
  }
11500
11628
  }, [acknowledgementIds]);
@@ -11583,7 +11711,7 @@ const ChallanApplicationDetails = () => {
11583
11711
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationNo) || t("CS_NA")
11584
11712
  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
11585
11713
  className: "border-none",
11586
- label: t("reports.mcollect.status"),
11714
+ label: t("ACTION_TEST_APPLICATION_STATUS"),
11587
11715
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationStatus) || t("CS_NA")
11588
11716
  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
11589
11717
  className: "border-none",
@@ -12250,7 +12378,7 @@ const ChallanApplicationDetails$1 = () => {
12250
12378
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationNo) || t("CS_NA")
12251
12379
  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
12252
12380
  className: "border-none",
12253
- label: t("reports.mcollect.status"),
12381
+ label: t("ACTION_TEST_APPLICATION_STATUS"),
12254
12382
  text: t(getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.applicationStatus) || t("CS_NA")
12255
12383
  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
12256
12384
  className: "border-none",