Added ShowMore Popup for Boundary Summary Screen, Added Loader for Us…

…er Download Screen (#1670) * Added Loader for User Download Screen * Added ShowMore Popup for Boundary Summary Screen --------- Co-authored-by: Nipun Arora <aroranipun1@gmail.com>
egovernments · Oct 25, 2024 · d618c43 · d618c43
1 parent 2bd0dda
commit d618c43
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 61 deletions.
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/Module.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/Module.js
@@ -26,6 +26,7 @@ import FacilityPopup from "./components/FacilityPopup";
 import UserAccessMgmt from "./components/UserAccessMgmt";
 import UserAccessMgmtTableWrapper from "./components/UserAccessMgmtTableWrapper";
 import { DataMgmtComponent } from "./components/DataMgmtComponent";
+import { ShowMoreWrapper } from "./components/ShowMoreWrapper";
 
 export const MicroplanModule = ({ stateCode, userType, tenants }) => {
   const { path, url } = useRouteMatch();
@@ -82,7 +83,8 @@ const componentsToRegister = {
   FacilityPopup,
   UserAccessMgmt,
   UserAccessMgmtTableWrapper,
-  DataMgmtComponent
+  DataMgmtComponent,
+  ShowMoreWrapper,
 };
 
 export const initMicroplanComponents = () => {

diff --git a/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ShowMoreWrapper.js b/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ShowMoreWrapper.js
@@ -0,0 +1,41 @@
+import React, { Fragment, useEffect, useState } from "react";
+import { Button, PopUp, Chip, Loader,} from "@egovernments/digit-ui-components";
+import { useTranslation } from "react-i18next";
+
+
+export const ShowMoreWrapper = ({ setShowPopUp, alreadyQueuedSelectedState, heading="" }) => {
+    const { t } = useTranslation();
+
+    return (
+       <PopUp
+       className={""}
+       style={{
+           maxWidth: '40%'
+       }}
+       type={"default"}
+       heading={t(heading)}
+       children={[]}
+       onOverlayClick={() => {
+           setShowPopUp(false);
+       }}
+       onClose={() => {
+           setShowPopUp(false);
+       }}
+       >
+       <div className="digit-tag-container userAccessCell">
+      {alreadyQueuedSelectedState?.map((item, index) => (
+               <Chip 
+                key={index} 
+                text={t(item)} 
+                className=""
+                error=""
+                extraStyles={{}}
+                iconReq=""
+                hideClose={true}
+               />
+         ))}  
+         </div>
+       </PopUp>
+    );
+
+ };
diff --git a/...icro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js b/...icro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import DataTable from "react-data-table-component";
 import { CardSubHeader, Card } from "@egovernments/digit-ui-react-components";
 import { tableCustomStyle } from "./tableCustomStyle";
+import { ShowMoreWrapper } from "./ShowMoreWrapper";
 
 
 function groupEmployeesByPlan(data, planData) {
@@ -31,43 +32,6 @@ function groupEmployeesByPlan(data, planData) {
     return groupedEmployees ? Object.values(groupedEmployees) : [];
   }
 
-  const Wrapper = ({ setShowPopUp, alreadyQueuedSelectedState }) => {
-
-    const { t } = useTranslation();
-     return (
-        <PopUp
-        className={""}
-        style={{
-            maxWidth: '40%'
-        }}
-        type={"default"}
-        heading={t("MICROPLAN_ADMINISTRATIVE_AREA")}
-        children={[]}
-        onOverlayClick={() => {
-            setShowPopUp(false);
-        }}
-        onClose={() => {
-            setShowPopUp(false);
-        }}
-        >
-        <div className="digit-tag-container userAccessCell">
-       {alreadyQueuedSelectedState?.map((item, index) => (
-                <Chip 
-                 key={index} 
-                 text={t(item)} 
-                 className=""
-                 error=""
-                 extraStyles={{}}
-                 iconReq=""
-                 hideClose={true}
-                />
-          ))}  
-          </div>
-        </PopUp>
-     );
-
-  };
-
 const UserAccessMgmtTableWrapper = ({ role,}) => {
   const { t } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -189,10 +153,11 @@ const UserAccessMgmtTableWrapper = ({ role,}) => {
             />
           )}
            {showPopUp && (
-            <Wrapper
-              setShowPopUp={setShowPopUp}
-              alreadyQueuedSelectedState={row?.planData?.jurisdiction}
-            />
+            <ShowMoreWrapper
+            setShowPopUp={setShowPopUp}
+            alreadyQueuedSelectedState={row?.planData?.jurisdiction}
+            heading={"MICROPLAN_ADMINISTRATIVE_AREA"}
+          />
           )}
                 </div>
             );

diff --git a/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js b/...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js
@@ -1,32 +1,71 @@
-import React from 'react'
+import React, { useState } from 'react'
 import HeaderComp from './HeaderComp';
-import { Card } from '@egovernments/digit-ui-components';
-import { Chip } from '@egovernments/digit-ui-components';
+import { Card, Button, PopUp, Chip, Loader } from '@egovernments/digit-ui-components';
+import { ShowMoreWrapper } from './ShowMoreWrapper';
+import { useTranslation } from 'react-i18next';
 
 const SubBoundaryView = ({ title, arr }) => {
+    const [showPopUp, setShowPopUp] = useState(false);
+    const { t } = useTranslation();
+
+    const openPopUp = () => {
+        setShowPopUp(true);
+      };
+
     return (
         <div>
             {
                 arr && arr.length > 0 ? (
                     <Card>
                         <HeaderComp title={title} />
                         {/* Flex container for the chips */}
-                        <div className="subBoundarycomp-container">
-                            {arr.map((el, ind) => {
+                        <div className="digit-tag-container userAccessCell">
+                            {arr?.slice(0, 10)?.map((el, ind) => {
                                 return (
-                                    <div className="digit-tag-container">
                                         <Chip
+                                            key={ind}
                                             className=""
                                             error=""
                                             extraStyles={{}}
                                             iconReq=""
-                                            onClick={function noRefCheck() { }}
-                                            onTagClick={function noRefCheck() { }}
-                                            text={el}
+                                            hideClose={true}
+                                            text={t(el)}
                                         />
-                                    </div>
                                 );
-                            })}
+                            }
+
+
+                            )}
+                            {arr?.length > (10) && (
+                                <Button
+                                  label={`+${arr?.length - (10)} ${t("ES_MORE")}`}
+                                  onClick={() => openPopUp()}
+                                  variation="link"
+                                  style={{
+                                    height: "2rem",
+                                    minWidth: "4.188rem",
+                                    minHeight: "2rem",
+                                    padding: "0.5rem",
+                                    justifyContent: "center",
+                                    alignItems: "center",
+                                  }}
+                                  textStyles={{
+                                    height: "auto",
+                                    fontSize: "0.875rem",
+                                    fontWeight: "400",
+                                    width: "100%",
+                                    lineHeight: "16px",
+                                    color: "#C84C0E",
+                                  }}
+                                />
+                              )}
+                               {showPopUp && (
+                                <ShowMoreWrapper
+                                  setShowPopUp={setShowPopUp}
+                                  alreadyQueuedSelectedState={arr}
+                                  heading={title}
+                                />
+                              )}
                         </div>
                     </Card>
                 ) : (

diff --git a/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/UserDownload.js b/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/UserDownload.js
@@ -1,14 +1,14 @@
 import React, { useState, useEffect } from 'react';
 import FileComponent from '../../components/FileComponent';
-import { Card } from '@egovernments/digit-ui-components';
 import HeaderComp from '../../components/HeaderComp';
-import { TextBlock } from '@egovernments/digit-ui-components';
+import { TextBlock, Card } from '@egovernments/digit-ui-components';
+import {LoaderWithGap} from "@egovernments/digit-ui-react-components";
+import { useTranslation } from 'react-i18next';
+
 
 const UserDownload = () => {
-
+    const { t } = useTranslation();
     const [Files, setFile] = useState(""); // Initialize as an empty string
-
-
     const { data, isFetching, isLoading } = Digit.Hooks.microplanv1.useFileDownload({
         "SearchCriteria": {
             "tenantId": Digit.ULBService.getCurrentTenantId(),
@@ -53,11 +53,10 @@ const UserDownload = () => {
 
     return (
         <div>
-
-
+            {isLoading && <LoaderWithGap text={t("CS_LOADING")} />}
             <Card type="secondary" >
                 <HeaderComp title="DOWNLOAD_USER_DATA" styles={{ color: "black" }} />
-                <TextBlock body="DOWNLOAD_DESC" />
+                <TextBlock body={t("DOWNLOAD_DESC")} />
                     {data?.ResourceDetails &&
                         [...data?.ResourceDetails].reverse().map((item, index) => {
                             let fileName = item?.additionalDetails?.fileName || `FileNo${item?.processedFilestoreId?.slice(0, 4) || ''}`;