Merge branch 'console' into FEATURE/HCMPRE-2661

Author: Bhavya-egov

health/micro-ui/web/micro-ui-internals/packages/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-health-css",
-  "version": "0.2.63",
+  "version": "0.2.64",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",

health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss

@@ -252,7 +252,7 @@
   width: 25rem;
   height: 40rem;
   overflow-y: auto;
-  border: 0rem solid #ccc;
+  border: 1px solid theme(digitv2.lightTheme.primary);;
   border-radius: 1rem;
   background-color: white;
   box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.1);

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js

@@ -56,15 +56,21 @@ const CampaignCard = () => {
       roles: ROLES.BOUNDARY_MANAGER,
       // count: isLoading?"-":data
     },
+    // {
+    //   label: t("ACTION_TEST_APP_CONFIGURATION_PARENT_MOBILE"),
+    //   link: `/workbench-ui/employee/campaign/app-configuration-parent?variant=app&masterName=SimplifiedAppConfigOne&fieldType=AppFieldType&prefix=APPONE&localeModule=APPONE`,
+    //   roles: ROLES.CAMPAIGN_MANAGER,
+    //   // count: isLoading?"-":data
+    // },
+    // {
+    //   label: t("ACTION_TEST_APP_CONFIGURATION_PARENT_WEB"),
+    //   link: `/workbench-ui/employee/campaign/app-configuration-parent?variant=web&masterName=FormBuilderConfig&fieldType=FormBuilderFieldType&prefix=FORMONE`,
+    //   roles: ROLES.CAMPAIGN_MANAGER,
+    //   // count: isLoading?"-":data
+    // },
     {
-      label: t("ACTION_TEST_APP_CONFIGURATION_PARENT_MOBILE"),
-      link: `/workbench-ui/employee/campaign/app-configuration-parent?variant=app&masterName=SimplifiedAppConfigOne&fieldType=AppFieldType&prefix=APPONE&localeModule=APPONE`,
-      roles: ROLES.CAMPAIGN_MANAGER,
-      // count: isLoading?"-":data
-    },
-    {
-      label: t("ACTION_TEST_APP_CONFIGURATION_PARENT_WEB"),
-      link: `/workbench-ui/employee/campaign/app-configuration-parent?variant=web&masterName=FormBuilderConfig&fieldType=FormBuilderFieldType&prefix=FORMONE`,
+      label: t("ACTION_TEST_APP_CONFIGURATION_3.0"),
+      link: `/workbench-ui/employee/campaign/app-configuration-redesign?variant=app&masterName=SimplifiedAppConfigOne&fieldType=AppFieldType&prefix=APPONE&localeModule=APPONE&formId=default`,
       roles: ROLES.CAMPAIGN_MANAGER,
       // count: isLoading?"-":data
     },

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js

@@ -403,7 +403,7 @@ function AppConfigurationWrapper({ screenConfig }) {
                 icon={"Translate"}
                 label={t("ADD_LOCALISATION")}
                 onClick={() => {
-                  setShowPopUp(true);
+                  // setShowPopUp(true);
                 }}
               />
               {/* <Button
@@ -602,7 +602,7 @@ function AppConfigurationWrapper({ screenConfig }) {
             <Button
               type={"button"}
               size={"large"}
-              variation={"primary"}
+              variation={"secondary"}
               label={t("CLOSE")}
               onClick={() => {
                 setPopupData(null);

health/micro-ui/web/public/index.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].63/dist/index.css" /> 
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].64/dist/index.css" /> 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT HCM</title>