@djb25/digit-ui-module-ekyc 1.0.22 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djb25/digit-ui-module-ekyc",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Digit UI Module for Ekyc",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

package/src/components/AssignEkyc.js

@@ -7,7 +7,10 @@ import SearchFormFieldsComponents from "./SearchFormFieldsComponent";
 // Mock data removed in favor of API integration
 
 const AssignEkyc = () => {
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+  let tenantId = Digit.ULBService.getCurrentTenantId();
+  if (!tenantId || tenantId === "dl") {
+    tenantId = "dl.djb"; // Force tenantId to dl.djb for EKYC APIs in citizen portal
+  }
   const location = useLocation();
   const formInitValue = {
     filterForm: {},
@@ -30,48 +33,32 @@ const AssignEkyc = () => {
     sortOrder: formState?.tableForm?.sortOrder || "DESC",
   };
 
+  const mobileNumber = formState?.searchForm?.mobileNumber || "";
+  const isSearchActive = !!mobileNumber;
+
+  const filters = {
+    ...paginationParms,
+    status: "ACTIVE,DISABLED",
+  };
+
+  if (isSearchActive) {
+    filters.mobileNumber = mobileNumber;
+  }
+
   const { data: dashboardData, isLoading } = Digit.Hooks.fsm.useSurveyorSearch(
     tenantId,
-    { ...paginationParms, status: "ACTIVE,DISABLED", vendorId: userDetails?.info?.uuid },
+    filters,
     { enabled: !!tenantId, keepPreviousData: true }
   );
 
-  const searchDetails = useMemo(
-    () => ({
-      kno: formState?.searchForm?.kNumber || "",
-      name: formState?.searchForm?.kName || "",
-    }),
-    [formState?.searchForm?.kNumber, formState?.searchForm?.kName]
-  );
-
-  const isSearchActive = !!(searchDetails.kno || searchDetails.name);
-
-  const { isLoading: isSearchLoading, data: searchData } = Digit.Hooks.ekyc.useSearchConnection(
-    {
-      tenantId,
-      details: searchDetails,
-    },
-    {
-      enabled: !!tenantId && !!searchDetails.kno, // 🔥 important
-      keepPreviousData: true,
-    }
-  );
-  const { isLoading: isDataSearchLoading, data } = Digit.Hooks.ekyc.useEkycAssignmentProgress(
-    {},
-    {
-      enabled: !!tenantId && !!searchDetails.kno, // 🔥 important
-      keepPreviousData: true,
-    }
-  );
+  const { isLoading: isDataSearchLoading, data } = Digit.Hooks.ekyc.useEkycAssignmentProgress({
+    enabled: !!tenantId,
+    keepPreviousData: true,
+  });
 
   const sourceData = useMemo(() => {
-    if (isSearchActive) {
-      if (!searchData) return [];
-      return [searchData];
-    }
-
     return dashboardData?.surveyors || [];
-  }, [isSearchActive, searchData, dashboardData]);
+  }, [dashboardData]);
 
   const filteredData = useMemo(() => {
     return (sourceData || []).map((item) => {
@@ -246,7 +233,7 @@ const AssignEkyc = () => {
     },
   });
 
-  const isInboxLoading = isLoading || isSearchLoading;
+  const isInboxLoading = isLoading;
 
   const cards = [
     {

package/src/components/SearchFormFieldsComponent.js

@@ -9,7 +9,7 @@ const SearchFormFieldsComponents = ({ searchFormState, controlSearchForm }) => {
 
   return (
     <React.Fragment>
-      {/* K NUMBER */}
+      {/* MOBILE NUMBER */}
       <span className="mobile-input">
         <Label className="flex-roww flex-gap-2">
           {t("EKYC_MOBILE_NUMBER") || "Mobile Number"}
@@ -17,19 +17,19 @@ const SearchFormFieldsComponents = ({ searchFormState, controlSearchForm }) => {
         </Label>
 
         <Controller
-          name="kNumber"
+          name="mobileNumber"
           control={controlSearchForm}
           defaultValue=""
           rules={{
             pattern: {
-              value: /^[a-zA-Z0-9-_/]*$/,
-              message: t("ERR_INVALID_APPLICATION_NO"),
+              value: /^[0-9]{10}$/,
+              message: t("ERR_INVALID_MOBILE_NO"),
             },
           }}
           render={({ onChange, value }) => <TextInput value={value || ""} onChange={(e) => onChange(e.target.value)} />}
         />
 
-        {errors?.kNumber && <CardLabelError>{errors.kNumber.message}</CardLabelError>}
+        {errors?.mobileNumber && <CardLabelError>{errors.mobileNumber.message}</CardLabelError>}
       </span>
 
       {/* K NAME */}

package/src/components/SelectEkycZones.js

@@ -0,0 +1,71 @@
+import React, { useState, useEffect } from "react";
+import { CardLabel, LabelFieldPair, MultiSelectDropdown, Loader } from "@djb25/digit-ui-react-components";
+
+const SelectEkycZones = ({ config, onSelect, t, formData, isMultiSelect = true, placeHolder }) => {
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+
+  const [zones, setZones] = useState([]);
+
+  const [selectedZones, setSelectedZones] = useState(Array.isArray(formData?.zoneIds) ? formData.zoneIds : []);
+
+  const { data: boundaryData, isLoading } = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]);
+
+  useEffect(() => {
+    const tenantBoundary = boundaryData?.["egov-location"]?.TenantBoundary?.[0] || boundaryData?.MdmsRes?.["egov-location"]?.TenantBoundary?.[0];
+
+    const boundaries = tenantBoundary?.boundary || tenantBoundary?.children || [];
+
+    if (Array.isArray(boundaries?.children) && boundaries?.children.length > 0) {
+      const allZones = boundaries.children.flatMap((assembly) =>
+        (assembly?.children || []).map((zone) => ({
+          code: zone.code,
+          name: zone.name,
+        }))
+      );
+
+      const zonesList = [...new Map(allZones.map((zone) => [zone.code, zone])).values()];
+
+      setZones(zonesList);
+    }
+  }, [boundaryData]);
+
+  const handleSelect = (value) => {
+    if (isMultiSelect) {
+      const extractedValue = Array.isArray(value) ? value.map((v) => (Array.isArray(v) ? v[1] : v)).filter(Boolean) : [];
+
+      setSelectedZones(extractedValue);
+      onSelect(config.key, extractedValue);
+    } else {
+      const selectedZone = Array.isArray(value) ? (Array.isArray(value[0]) ? value[0][1] : value[0]) : value;
+
+      setSelectedZones(selectedZone ? [selectedZone] : []);
+
+      onSelect(config.key, selectedZone?.code || "");
+    }
+  };
+
+  if (isLoading) return <Loader />;
+
+  return (
+    <LabelFieldPair>
+      <CardLabel>{t(config.label) + (config.isMandatory ? " *" : "")}</CardLabel>
+
+      <div className="field" style={{ position: "relative", zIndex: 10 }}>
+        <MultiSelectDropdown
+          options={zones}
+          selected={selectedZones}
+          onSelect={handleSelect}
+          optionsKey="name"
+          t={t}
+          multiple={isMultiSelect}
+          ServerStyle={{ backgroundColor: "#fff" }}
+          isMultiSelect={isMultiSelect}
+          placeHolder={placeHolder}
+          showSelectedLabels={true}
+        />
+      </div>
+    </LabelFieldPair>
+  );
+};
+
+export default SelectEkycZones;

package/src/components/SurveyorDetailsCard.js

@@ -38,10 +38,14 @@ const SurveyorDetailsDashboard = () => {
     surveyorId: surveyor?.owner?.uuid,
   };
 
-  const { isFetching: isDashboardLoading, data: dashboardData = {} } = Digit.Hooks.ekyc.useEkycSurveyorDashboard({}, queryParams, {
-    enabled: !!queryParams.tenantId && !!queryParams.surveyorId,
-    keepPreviousData: true,
-  });
+  const { isFetching: isDashboardLoading, data: dashboardData = {}, refetch: refetchDashboard } = Digit.Hooks.ekyc.useEkycSurveyorDashboard(
+    {},
+    queryParams,
+    {
+      enabled: !!queryParams.tenantId && !!queryParams.surveyorId,
+      keepPreviousData: true,
+    }
+  );
 
   const knoColumns = useMemo(
     () => [
@@ -145,6 +149,11 @@ const SurveyorDetailsDashboard = () => {
     setShowModal(true);
   };
 
+  const closeModal = async () => {
+    await refetchDashboard();
+    setShowModal(false);
+  };
+
   return (
     <Card className="surveyor-dashboard">
       {/* Header */}
@@ -301,7 +310,7 @@ const SurveyorDetailsDashboard = () => {
         </ActionBar>
       )}
 
-      {showModal && <AssignEkycModal surveyor={surveyor} closeModal={() => setShowModal(false)} />}
+      {showModal && <AssignEkycModal surveyor={surveyor} closeModal={closeModal} />}
     </Card>
   );
 };