Merge branch 'console' into feature/new-demo-cl

egovernments · Oct 16, 2024 · 1987af5 · 1987af5
2 parents ed16dc8 + f887c42
commit 1987af5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/...o-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js b/...o-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js
@@ -116,7 +116,7 @@ const BoundaryDetailsSummary = (props) => {
         <PopUp
           // className={"boundaries-pop-module"}
           type={"default"}
-          // heading={t("ES_CAMPAIGN_UPDATE_TYPE_MODAL_HEADER")}
+          heading= {t(( props?.hierarchyType + "_" + props?.boundaries?.type).toUpperCase())} 
           children={[]}
           onOverlayClick={() => {
             setShowPopUp(false);

diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundarySummary.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundarySummary.js
@@ -104,6 +104,7 @@ const BoundarySummary = (props) => {
                     // ),
                     props: {
                       boundaries: item,
+                      hierarchyType: hierarchyType
                     },
                   },
                 ],

diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js
@@ -385,6 +385,7 @@ const CampaignSummary = (props) => {
                     ),
                     props: {
                       boundaries: item,
+                      hierarchyType: hierarchyType
                     },
                   },
                 ],

diff --git a/...ro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js b/...ro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js
@@ -186,7 +186,7 @@ const CampaignUpdateSummary = (props) => {
                   {
                     name: `HIERARCHY_${index + 1}`,
                     type: "COMPONENT",
-                    cardHeader: { value: `${t(item?.type)}`, inlineStyles: { color: "#0B4B66" } },
+                    cardHeader:  { value: `${t(( hierarchyType + "_" + item?.type).toUpperCase())}`, inlineStyles: { color: "#0B4B66" } },
                     // cardHeader: { value: t("item?.boundaries?.type") },
                     component: "BoundaryDetailsSummary",
                     cardSecondaryAction: noAction !== "false" && (
@@ -197,6 +197,7 @@ const CampaignUpdateSummary = (props) => {
                     ),
                     props: {
                       boundaries: item,
+                      hierarchyType: hierarchyType
                     },
                   },
                 ],

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
@@ -39,7 +39,7 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
   const [resourceId, setResourceId] = useState(null);
   const [showPreview, setShowPreview] = useState(false);
   // TODO : Remove hard coded id
-  const id = searchParams.get("campaignId") || "274f60e0-f6d8-4bf9-b4da-a714a9046e93";
+  const id = searchParams.get("campaignId") || null;
   const { data: Schemas, isLoading: isThisLoading } = Digit.Hooks.useCustomMDMS(
     tenantId,
     "HCM-ADMIN-CONSOLE",
@@ -125,9 +125,8 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
     }
   }, [type, props?.props?.sessionData]);
 
-
-  useEffect(() => {
-    const fetchData = async () => {
+  const generateData = async () => {
+    if(boundaryHierarchy && type && id) {
       const ts = new Date().getTime();
       const reqCriteria = {
         url: `/project-factory/v1/data/_generate`,
@@ -154,11 +153,13 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
       } catch (error) {
         console.error("Error fetching data:", error);
       }
-    };
-    if(boundaryHierarchy && downloadError){
-      fetchData();
     }
-  }, [type, boundaryHierarchy, downloadError]);
+  };
+
+
+  useEffect(() => {
+      generateData();
+  }, [type, boundaryHierarchy, id]);
 
 
   useEffect(() => {
@@ -584,6 +585,7 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
         onSuccess: async (result) => {
           if (result?.GeneratedResource?.[0]?.status === "failed") {
             setDownloadError(true);
+            generateData();
             setShowToast({ key: "error", label: t("ERROR_WHILE_DOWNLOADING") });
             return;
           }
@@ -594,7 +596,8 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
           }
           if (!result?.GeneratedResource?.[0]?.fileStoreid || result?.GeneratedResource?.length == 0) {
             setDownloadError(true);
-            setShowToast({ key: "info", label: t("HCM_PLEASE_WAIT_TRY_IN_SOME_TIME") });
+            generateData();
+            setShowToast({ key: "info", label: t("ERROR_WHILE_DOWNLOADING") });
             return;
           }
           const filesArray = [result?.GeneratedResource?.[0]?.fileStoreid];
@@ -616,11 +619,12 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
             }
           } else {
             setDownloadError(true);
-            setShowToast({ key: "info", label: t("HCM_PLEASE_WAIT") });
+            setShowToast({ key: "info", label: t("ERROR_WHILE_DOWNLOADING_FROM_FILESTORE") });
           }
         },
         onError: (result) => {
           setDownloadError(true);
+          generateData();
           setShowToast({ key: "error", label: t("ERROR_WHILE_DOWNLOADING") });
         },
       }