User upload (#1533)

* Added some enhancement in upload screen * User upload * Initialised User Upload * Removed lodash
egovernments · Oct 16, 2024 · 7bddb51 · 7bddb51
1 parent c56553d
commit 7bddb51
Show file tree

Hide file tree

Showing 3 changed files with 505 additions and 6 deletions.
diff --git a/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js b/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js
@@ -55,13 +55,16 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
   const [readMeInfo, setReadMeInfo] = useState({});
   const [showPopUp, setShowPopUp] = useState(true);
 
-  const { data: hierarchyConfig } = Digit.Hooks.useCustomMDMS(tenantId, "HCM-ADMIN-CONSOLE", [{ name: "hierarchyConfig" }]);
-  const boundaryHierarchy = useMemo(() => {
-    return hierarchyConfig?.["HCM-ADMIN-CONSOLE"]?.hierarchyConfig?.find((item) => item.isActive)?.hierarchy;
-  }, [hierarchyConfig]);
+  const { data: boundaryHierarchy } = Digit.Hooks.useCustomMDMS(tenantId, "hcm-microplanning", [{ name: "hierarchyConfig" }], {
+    select: (data) => {
+       const item = data?.["hcm-microplanning"]?.hierarchyConfig?.find((item) => item.isActive)
+       return item?.hierarchy
+      },
+  },{schemaCode:"BASE_MASTER_DATA_INITIAL"});
   const totalData = Digit.SessionStorage.get("MICROPLAN_DATA");
   const campaignType = totalData?.CAMPAIGN_DETAILS?.campaignDetails?.campaignType?.code
   const [loader, setLoader] = useState(false);
+  const [ downloadTemplateLoader,setDownloadTemplateLoader] = useState(false);
   const XlsPreview = Digit.ComponentRegistryService.getComponent("XlsPreview");
   const BulkUpload = Digit.ComponentRegistryService.getComponent("BulkUpload");
   const baseKey = 4;
@@ -572,6 +575,7 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
   const mutation = Digit.Hooks.useCustomAPIMutationHook(Template);
 
   const downloadTemplate = async () => {
+    setDownloadTemplateLoader(true);
     await mutation.mutate(
       {
         params: {
@@ -583,6 +587,7 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
       },
       {
         onSuccess: async (result) => {
+          setDownloadTemplateLoader(false);
           if (result?.GeneratedResource?.[0]?.status === "failed") {
             setDownloadError(true);
             generateData();
@@ -623,6 +628,7 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
           }
         },
         onError: (result) => {
+          setDownloadTemplateLoader(false);
           setDownloadError(true);
           generateData();
           setShowToast({ key: "error", label: t("ERROR_WHILE_DOWNLOADING") });
@@ -679,6 +685,7 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
           </Card>
         </div>
         {loader && <LoaderWithGap text={"CAMPAIGN_VALIDATION_INPROGRESS"} />}
+        {downloadTemplateLoader && <LoaderWithGap/>}
         <div className="card-container" style={{ width: "100%" }}>
           <Card>
             <div className="campaign-bulk-upload">
@@ -757,9 +764,9 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
                       {info?.descriptions.map((desc, i) => (
                         <li key={i} className="info-points">
                           {desc.isBold ? (
-                            <h2>{`Step ${i + 1}: ${desc.text}`}</h2>
+                            <h2>{`${i + 1}. ${desc.text}`}</h2>
                           ) : (
-                            <p>{`Step ${i + 1}: ${desc.text}`}</p>
+                            <p>{`${i + 1}. ${desc.text}`}</p>
                           )}
                         </li>
                       ))}