DUCE-10 :: added country code and validation for MOZ and ET

micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Complaint.js

@@ -14,11 +14,13 @@ export const Complaint = {
  uploadedImages,
  mobileNumber,
  name,
+ user,
  }) => {
  const tenantId = Digit.ULBService.getCurrentTenantId();
  const defaultData = {
  service: {
  tenantId: cityCode,
+ active :true,
  serviceCode: complaintType,
  description: description,
  additionalDetail: {},
@@ -36,15 +38,18 @@ export const Complaint = {
  },
  geoLocation: {},
  },
+ user: user, 
  },
  workflow: {
- action: "APPLY",
- verificationDocuments: uploadedImages,
+ // action: "APPLY",
+ // verificationDocuments: uploadedImages,
+ action: "CREATE", assignes: [], hrmsAssignes: [], comments: ""
  },
  };
 
+
  if (Digit.SessionStorage.get("user_type") === "employee") {
- defaultData.service.citizen = {
+ defaultData.service.user = {
  name: name,
  type: "CITIZEN",
  mobileNumber: mobileNumber,
@@ -59,6 +64,7 @@ export const Complaint = {
  tenantId: tenantId,
  };
  }
+
  const response = await Digit.PGRService.create(defaultData, cityCode);
  return response;
  },
@@ -79,8 +85,7 @@ export const Complaint = {
  : null;
 
  if (!uploadedDocument) complaintDetails.workflow.verificationDocuments = [];
-
- //TODO: get tenant id
+
  const response = await Digit.PGRService.update(complaintDetails, tenantId);
  return response;
  },

micro-ui/web/micro-ui-internals/packages/modules/pgr/src/constants/PGRConstants.js

@@ -0,0 +1,16 @@
+export const PGRConstants = {
+ INDIA: {
+ countryCode: '+91',
+ regex: /^[6-9]\d{9}$/,
+ },
+ MOZ: {
+ countryCode: '+258',
+ regex: /^[0-9]\d{8}$/,
+ },
+ ET: {
+ countryCode: '+251',
+ regex: /^[0-9]\d{9}$/, 
+ },
+
+
+};

micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js

@@ -7,7 +7,7 @@ import { useQueryClient } from "react-query";
 
 import { FormComposer } from "../../../components/FormComposer";
 import { createComplaint } from "../../../redux/actions/index";
-
+import { PGRConstants } from "../../../constants/PGRConstants";
 export const CreateComplaint = ({ parentUrl }) => {
  const cities = Digit.Hooks.pgr.useTenants();
  const { t } = useTranslation();
@@ -31,7 +31,7 @@ export const CreateComplaint = ({ parentUrl }) => {
 
  const [localities, setLocalities] = useState(fetchedLocalities);
  const [selectedLocality, setSelectedLocality] = useState(null);
- const [canSubmit, setSubmitValve] = useState(false);
+ //const [canSubmit, setSubmitValve] = useState(false);
  const [submitted, setSubmitted] = useState(false);
 
  const [pincodeNotValid, setPincodeNotValid] = useState(false);
@@ -43,14 +43,26 @@ export const CreateComplaint = ({ parentUrl }) => {
  const history = useHistory();
  const serviceDefinitions = Digit.GetServiceDefinitions;
  const client = useQueryClient();
+ const [selectedCountryCode, setSelectedCountryCode] = useState(PGRConstants.INDIA_COUNTRY_CODE);
+ const countryOptions = Object.values(PGRConstants).map(({ countryCode }, index) => (
+ <option key={index} value={countryCode}>
+ {countryCode}
+ </option>
+ ));
 
- useEffect(() => {
- if (complaintType?.key && subType?.key && selectedCity?.code && selectedLocality?.code) {
- setSubmitValve(true);
- } else {
- setSubmitValve(false);
+ const getPhonePattern=(selectedCountryCode) =>{
+ return Object.values(PGRConstants).filter(e=>e.countryCode==selectedCountryCode)?.[0]?.regex;
+
  }
- }, [complaintType, subType, selectedCity, selectedLocality]);
+
+
+ // useEffect(() => {
+ // if (complaintType?.key && subType?.key && selectedCity?.code && selectedLocality?.code) {
+ // setSubmitValve(true);
+ // } else {
+ // setSubmitValve(false);
+ // }
+ // }, [complaintType, subType, selectedCity, selectedLocality]);
 
  useEffect(() => {
  setLocalities(fetchedLocalities);
@@ -102,14 +114,54 @@ export const CreateComplaint = ({ parentUrl }) => {
  }
 
  const wrapperSubmit = (data) => {
- if (!canSubmit) return;
+ // if (!canSubmit) return;
  setSubmitted(true);
- !submitted && onSubmit(data);
+ //!submitted && 
+ onSubmit(data);
  };
 
  //On SUbmit
+ // const onSubmit = async (data) => 
+ // {
+ // // if (!canSubmit) return;
+ // const cityCode = selectedCity.code;
+ // const city = selectedCity.city.name;
+ // const district = selectedCity.city.name;
+ // const region = selectedCity.city.name;
+ // const localityCode = selectedLocality.code;
+ // const localityName = selectedLocality.name;
+ // const landmark = data.landmark;
+ // const { key } = subType;
+ // const complaintType = key;
+ // const mobileNumber = data.mobileNumber;
+ // const name = data.name;
+
+ // const formData = { ...data, cityCode, city, district, region,user, localityCode, localityName, landmark, complaintType, mobileNumber, name };
+ // await dispatch(createComplaint(formData));
+ // await client.refetchQueries(["fetchInboxData"]);
+ // history.push(parentUrl + "/response");
+ // const user = 
+ // {
+ // userName: "9846966111", // or use actual data from your context or state
+ // name: "jdjjdk", // or use actual data from your context or state
+ // type: "EMPLOYEE",
+ // mobileNumber: "9846966111",
+ // roles: [], // or use actual roles if applicable
+ // tenantId: "mz", // or use actual tenantId from context or state
+ // uuid: "c9623295-7921-47ca-9994-aa19f47276ee", // or use actual UUID from context or state
+ // active: true,
+ // isDeleted: false,
+ // rowVersion: 1,
+ // auditDetails: {
+ // createdBy: "c9623295-7921-47ca-9994-aa19f47276ee",
+ // createdTime: Date.now(),
+ // lastModifiedBy: "c9623295-7921-47ca-9994-aa19f47276ee",
+ // lastModifiedTime: Date.now()
+ // }
+ // };
+ // }
  const onSubmit = async (data) => {
- if (!canSubmit) return;
+ //if (!canSubmit) return;
  const cityCode = selectedCity.code;
  const city = selectedCity.city.name;
  const district = selectedCity.city.name;
@@ -121,12 +173,30 @@ export const CreateComplaint = ({ parentUrl }) => {
  const complaintType = key;
  const mobileNumber = data.mobileNumber;
  const name = data.name;
- const formData = { ...data, cityCode, city, district, region, localityCode, localityName, landmark, complaintType, mobileNumber, name };
+ const user = {
+ userName: "9846966111",
+ name: "jdjjdk",
+ type: "EMPLOYEE",
+ mobileNumber: "9846966111",
+ roles: [],
+ tenantId: "mz",
+ uuid: "c9623295-7921-47ca-9994-aa19f47276ee",
+ active: true,
+ isDeleted: false,
+ rowVersion: 1,
+ auditDetails: {
+ createdBy: "c9623295-7921-47ca-9994-aa19f47276ee",
+ createdTime: Date.now(),
+ lastModifiedBy: "c9623295-7921-47ca-9994-aa19f47276ee",
+ lastModifiedTime: Date.now()
+ }
+ };
+ const formData = { ...data, cityCode, city, district, region, localityCode, localityName, landmark, complaintType, mobileNumber, name,user };
  await dispatch(createComplaint(formData));
  await client.refetchQueries(["fetchInboxData"]);
  history.push(parentUrl + "/response");
  };
-
+ 
  const handlePincode = (event) => {
  const { value } = event.target;
  setPincode(value);
@@ -135,7 +205,7 @@ export const CreateComplaint = ({ parentUrl }) => {
  }
  };
 
- const isPincodeValid = () => !pincodeNotValid;
+ //const isPincodeValid = () => pincodeNotValid;
 
  const config = [
  {
@@ -149,11 +219,18 @@ export const CreateComplaint = ({ parentUrl }) => {
  name: "mobileNumber",
  validation: {
  required: true,
- pattern: /^[6-9]\d{9}$/,
+ pattern: getPhonePattern(selectedCountryCode),
+
  },
- componentInFront: <div className="employee-card-input employee-card-input--front">+91</div>,
+ componentInFront: <div className="employee-card-input employee-card-input--front">
+ <select value={selectedCountryCode} onChange={(e) => setSelectedCountryCode(e.target.value)}>
+ {countryOptions} 
+ </select>
+ </div>,
  error: t("CORE_COMMON_MOBILE_ERROR"),
+
  },
+
  },
  {
  label: t("ES_CREATECOMPLAINT_COMPLAINT_NAME"),
@@ -196,7 +273,7 @@ export const CreateComplaint = ({ parentUrl }) => {
  type: "text",
  populators: {
  name: "pincode",
-  validation: { pattern: /^[1-9][0-9]{5}$/, validate: isPincodeValid },
+ //validation: { pattern: /^[1-9][0-9]{5}$/, validate: isPincodeValid },
  error: t("CORE_COMMON_PINCODE_INVALID"),
  onChange: handlePincode,
  },
@@ -224,7 +301,7 @@ export const CreateComplaint = ({ parentUrl }) => {
  isMandatory: true,
  dependency: selectedCity && localities ? true : false,
  populators: (
- <Dropdown isMandatory selected={selectedLocality} optionKey="i18nkey" id="locality" option={localities} select={selectLocality} t={t} />
+ <Dropdown selected={selectedLocality} optionKey="i18nkey" id="locality" option={[{i18nkey:"i18nkey",name:"gggg",code:"code"}]} select={selectLocality} t={t} />
  ),
  },
  {
@@ -254,7 +331,7 @@ export const CreateComplaint = ({ parentUrl }) => {
  heading={t("ES_CREATECOMPLAINT_NEW_COMPLAINT")}
  config={config}
  onSubmit={wrapperSubmit}
- isDisabled={!canSubmit && !submitted}
+ isDisabled={false}
  label={t("CS_ADDCOMPLAINT_ADDITIONAL_DETAILS_SUBMIT_COMPLAINT")}
  />
  );

micro-ui/web/micro-ui-internals/packages/modules/pgr/src/redux/actions/complaint.js

@@ -15,9 +15,12 @@ const createComplaint = ({
  uploadedImages,
  mobileNumber,
  name,
+ user
 }) => async (dispatch, getState) => {
+ //func
  const response = await Digit.Complaint.create({
  cityCode,
+ user,
  complaintType,
  description,
  landmark,
@@ -31,6 +34,7 @@ const createComplaint = ({
  uploadedImages,
  mobileNumber,
  name,
+
  });
  dispatch({
  type: CREATE_COMPLAINT,