setup master screen enhancement (#1387)

* setup master enhancement * localisation code updated * updated components css version --------- Co-authored-by: NabeelAyubee <[email protected]>
egovernments · Sep 13, 2024 · 17dff87 · 17dff87
1 parent 082e71c
commit 17dff87
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 193 deletions.
diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -14,7 +14,7 @@
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
   <!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].26/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].32/dist/index.css" />
   <script src="%REACT_APP_GLOBAL%"></script>
 
 </head>

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
@@ -330,10 +330,17 @@
     margin-bottom: 0;
   }
 }
-.action-bar-wrap{
-  .menu-wrap{
-    p{
+.action-bar-wrap {
+  .menu-wrap {
+    p {
       margin: 0 !important;
     }
   }
-}
+}
+.digit-popup-wrapper.setupMasterPopUp.alert {
+  .digit-popup-alert-content{
+    .digit-popup-alert-heading {
+      color: #00703c;
+    }
+  }
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
@@ -16,7 +16,7 @@ const HRMSCard = () => {
   let propsForSandbox = [
     {
       label: t("CONFIGURE_MASTER"),
-      link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=HRMS`,
+      link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=HRMS&key=about`,
       isOutsideModule: true,
       roles: role,
     },

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -39,7 +39,7 @@ let propsForCSR = [
 let propsForSandbox = [
   {
     label: t("CONFIGURE_MASTER"),
-    link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=PGR`,
+    link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=PGR&key=about`,
     isOutsideModule : true,
     roles: role
   }

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
@@ -224,15 +224,17 @@ export const UICustomizations = {
                   value?.split(".")?.[1]
                 }`}
               >
-                {t(`SANDBOX_${value?.split(".")?.[0]}`)}
+                {t(Digit.Utils.workbench.getMDMSLabel(`SCHEMA_` + value))}
+                {/* {t(`SANDBOX_${value?.split(".")?.[0]}`)} */}
               </Link>
             </span>
           );
         case "SANDBOX_MASTER_NAME":
-          return row?.code?.split(".")?.[1] ? t(`SANDBOX_${row?.code?.split(".")?.[1]}`) : t(`SANDBOX_${row?.code?.split(".")?.[0]}`);
+          // return row?.code?.split(".")?.[1] ? t(`SANDBOX_${row?.code?.split(".")?.[1]}`) : t(`SANDBOX_${row?.code?.split(".")?.[0]}`);
+          return t(Digit.Utils.workbench.getMDMSLabel(`SCHEMA_` + row?.code));
 
         case "SANDBOX_MASTER_TYPE":
-          return t(`SANDBOX_${value}`);
+          return t(Digit.Utils.locale.getTransformedLocale(`SANDBOX_MASTERTYPE_${value}`));
 
         case "SANDBOX_ACTIONS":
           const handleRedirect = (value, type) => {

diff --git a/...-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ApplicationHome.js b/...-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ApplicationHome.js
@@ -34,7 +34,7 @@ const ApplicationHome = () => {
             className="sandbox-module-card"
             label={t(`SANDBOX_APPLICATION_MODULE_${item?.module}`)}
             buttonLabel={t(`SANDBOX_VIEW`)}
-            onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=${item?.module}`)}
+            onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=${item?.module}&key=about`)}
             // onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/module?module=${item?.module}`)}
           />
         ))}

diff --git a/...nternals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js b/...nternals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Header, InboxSearchComposer } from "@egovernments/digit-ui-react-components";
-import { Button, PopUp, Toast } from "@egovernments/digit-ui-components";
+import { Button, Toast } from "@egovernments/digit-ui-components";
 import { useHistory, useLocation } from "react-router-dom";
 import { moduleMasterConfig } from "./config/moduleMasterConfig";
 
@@ -63,38 +63,6 @@ const ModuleMasterTable = () => {
           }}
         ></InboxSearchComposer>
       </div>
-      {showPopUp && (
-        <PopUp
-          type={"default"}
-          className={"masterHandlerPopup"}
-          footerclassName={"masterHandlerPopUpFooter"}
-          heading={t("SANDBOX_SETUP_MASTER_MODAL_HEADER")}
-          children={[<div>{t("SANDBOX_SETUP_MASTER_MODAL_TEXT")}</div>]}
-          onOverlayClick={() => {}}
-          footerChildren={[
-            <Button
-              type={"button"}
-              size={"large"}
-              variation={"secondary"}
-              label={t("SANDBOX_MANNUAL_MASTER_LOAD")}
-              onClick={() => {
-                handleMasterData(true);
-              }}
-            />,
-            <Button
-              type={"button"}
-              size={"large"}
-              variation={"primary"}
-              label={t("SANDBOX_DEFAULT_MASTER_LOAD")}
-              onClick={() => {
-                handleMasterData(false);
-              }}
-            />,
-          ]}
-          sortFooterChildren={true}
-          onClose={() => {}}
-        ></PopUp>
-      )}
       {showToast && (
         <Toast
           type={showToast?.isError ? "error" : "success"}