@djb25/digit-ui-module-ws 1.0.54 → 1.0.55

package/dist/index.js

@@ -9716,7 +9716,7 @@ const WSCalculation = _ref => {
   const watchPropertyCategory = watch("useDetails.propertyCategory");
   const watchWaterConnectionUsageType = watch("useDetails.WaterConnectionUsageType");
   const watchColonyName = watch("useDetails.colonyName");
-  const isCalculateButtonEnabled = watchCategoryType && watchPropertyCategory && watchPropertyType && watchWaterConnectionUsageType && watchColonyName && !calculationData;
+  const isCalculateButtonEnabled = watchCategoryType && watchPropertyCategory && watchPropertyType && watchWaterConnectionUsageType && watchColonyName;
   const isHospitalProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOSPITAL_NURSING_HOME" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "DharamshalasOrHostels" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HospitalNursingHome";
   const isHotelRestaurantProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HOTEL_OR_RESTAURANT" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "HotelOrRestaurant";
   const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
@@ -44539,8 +44539,8 @@ const DueVerification = _ref => {
       return newData;
     });
   }, [applicationData]);
-  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
-  const isActivation = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
+  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION";
+  const isActivation = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
   const columns = React.useMemo(() => {
     const baseColumns = [{
       Header: t("K No."),
@@ -44558,7 +44558,7 @@ const DueVerification = _ref => {
       Header: t("Total Amount"),
       accessor: "totalAmount"
     }];
-    if (isPendingApproval) {
+    if (isPendingApproval || isActivation) {
       baseColumns.push({
         Header: t("Remarks"),
         accessor: "remarks",
@@ -44577,7 +44577,7 @@ const DueVerification = _ref => {
       });
     }
     return baseColumns;
-  }, [t, handleRemarkChange, isPendingApproval]);
+  }, [t, handleRemarkChange, isPendingApproval, isActivation]);
   React.useEffect(() => {
     if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
       setTableData(applicationData.dueVerification);
@@ -44679,7 +44679,11 @@ const InspectionInformation = _ref => {
   let applicationData = _ref.applicationData;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  const _useState = React.useState(null),
+  const defaultInspectionType = {
+    i18nKey: "New Connection Visit",
+    code: "new_connection_visit"
+  };
+  const _useState = React.useState(defaultInspectionType),
     inspectionType = _useState[0],
     setInspectionType = _useState[1];
   const _useState2 = React.useState(""),
@@ -44689,20 +44693,23 @@ const InspectionInformation = _ref => {
     inspectorName = _useState3[0],
     setInspectorName = _useState3[1];
   React.useEffect(() => {
-    if (applicationData !== null && applicationData !== void 0 && applicationData.inspectionInformation) {
+    if (applicationData) {
+      if (!applicationData.inspectionInformation) {
+        applicationData.inspectionInformation = {};
+      }
+      if (!applicationData.inspectionInformation.inspectionType) {
+        applicationData.inspectionInformation.inspectionType = defaultInspectionType;
+      }
       const apiInspectionType = applicationData.inspectionInformation.inspectionType;
       let matchedType = null;
       const inspectionCode = typeof apiInspectionType === "object" && apiInspectionType !== null ? apiInspectionType.code : apiInspectionType;
       if (inspectionCode) {
         matchedType = [{
-          i18nKey: "ES_COMMON_SELECT",
-          code: ""
-        }, {
           i18nKey: "New Connection Visit",
           code: "new_connection_visit"
         }].find(opt => opt.code === inspectionCode || opt.i18nKey === inspectionCode);
       }
-      setInspectionType(matchedType || null);
+      setInspectionType(matchedType || defaultInspectionType);
       let dateValue = applicationData.inspectionInformation.inspectionDate || "";
       if (dateValue && typeof dateValue === 'number') {
         const d = new Date(dateValue);
@@ -44719,9 +44726,6 @@ const InspectionInformation = _ref => {
     }
   }, [applicationData]);
   const inspectionTypeOptions = [{
-    i18nKey: "ES_COMMON_SELECT",
-    code: ""
-  }, {
     i18nKey: "New Connection Visit",
     code: "new_connection_visit"
   }];
@@ -44741,7 +44745,7 @@ const InspectionInformation = _ref => {
     if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
     applicationData.inspectionInformation.inspectorName = val;
   };
-  const readOnly = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION";
+  const readOnly = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
   return /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginBottom: "20px"
@@ -45323,9 +45327,9 @@ function ApplicationDetailsContent(_ref) {
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React__default.createElement(PropertyDocuments, {
       documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents,
       applicationStatus: applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_RECONNECTION") && /*#__PURE__*/React__default.createElement(DueVerification, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_APPROVAL_FOR_CONNECTION", "PENDING_FOR_CONNECTION_ACTIVATION", "PENDING_FOR_RECONNECTION", "PENDING_FOR_DUE_VERIFICATION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React__default.createElement(DueVerification, {
       applicationData: applicationData
-    }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && ((applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION" || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_CONNECTION_ACTIVATION") && /*#__PURE__*/React__default.createElement(InspectionInformation, {
+    }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React__default.createElement(InspectionInformation, {
       applicationData: applicationData
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React__default.createElement(PropertyEstimates, {
       taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation