diff --git a/health/micro-ui/web/micro-ui-internals/example/.env-hcm-demo b/health/micro-ui/web/micro-ui-internals/example/.env-hcm-demo new file mode 100644 index 0000000000..3e35042c58 --- /dev/null +++ b/health/micro-ui/web/micro-ui-internals/example/.env-hcm-demo @@ -0,0 +1,7 @@ +SKIP_PREFLIGHT_CHECK=true +REACT_APP_USER_TYPE=EMPLOYEE +REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a +REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c +REACT_APP_PROXY_API=https://hcm-demo.digit.org +REACT_APP_PROXY_ASSETS=https://hcm-demo.digit.org +REACT_APP_GLOBAL=https://hcm-demo-assets.s3.ap-south-1.amazonaws.com/demo/globalConfigsWorkbenchDemo.js diff --git a/health/micro-ui/web/micro-ui-internals/example/.env-unifieddev b/health/micro-ui/web/micro-ui-internals/example/.env-unifieddev index 81fd56e040..a0d4d30ce5 100644 --- a/health/micro-ui/web/micro-ui-internals/example/.env-unifieddev +++ b/health/micro-ui/web/micro-ui-internals/example/.env-unifieddev @@ -4,6 +4,6 @@ REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c REACT_APP_PROXY_API=https://unified-dev.digit.org REACT_APP_PROXY_ASSETS=https://unified-dev.digit.org -REACT_APP_GLOBAL=https://egov-dev-assets.s3.ap-south-1.amazonaws.com/globalConfigsMicroplan.js +REACT_APP_GLOBAL=https://egov-dev-assets.s3.ap-south-1.amazonaws.com/globalConfigsWorkbenchDev.js REACT_APP_CONTEXT=works WORKBENCH=https://egov-dev-assets.s3.ap-south-1.amazonaws.com/globalConfigsWorkbenchHCMMZ.js \ No newline at end of file diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js index cfc87a259f..611a08a6b5 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js @@ -48,13 +48,7 @@ const CampaignCard = () => { }, { label: t("NATIONAL_DASHBOARD"), - link: "/digit-ui/employee/utilities/iframe/elastic/national", - roles: ROLES.NATIONAL_SUPERVISOR, - // count: isLoading?"-":data - }, - { - label: t("NDSS_DASHBOARD"), - link: "/digit-ui/employee/dss/landing/national-health-dashboard", + link: "/digit-ui/employee", roles: ROLES.NATIONAL_SUPERVISOR, // count: isLoading?"-":data }, @@ -64,12 +58,12 @@ const CampaignCard = () => { roles: ROLES.BOUNDARY_MANAGER, // count: isLoading?"-":data }, - { - label: t("ACTION_TEST_APP_CONFIGURATION"), - link: `/workbench-ui/employee/campaign/app-configuration`, - roles: ROLES.CAMPAIGN_MANAGER, - // count: isLoading?"-":data - }, + // { + // label: t("ACTION_TEST_APP_CONFIGURATION"), + // link: `/workbench-ui/employee/campaign/app-configuration`, + // roles: ROLES.CAMPAIGN_MANAGER, + // // count: isLoading?"-":data + // }, WILLBEDISABLEDINPATCHRELEASE ]; links = links.filter((link) => (link?.roles && link?.roles?.length > 0 ? Digit.Utils.didEmployeeHasAtleastOneRole(link?.roles) : true)); diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js index 05ac4a2f87..b3d242742e 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js @@ -1,7 +1,7 @@ import React, { useState, useMemo, useRef, useEffect, Fragment } from "react"; import { Header } from "@egovernments/digit-ui-react-components"; import { useTranslation } from "react-i18next"; -import { LabelFieldPair } from "@egovernments/digit-ui-components"; +import { InfoCard, LabelFieldPair } from "@egovernments/digit-ui-components"; import { Button, CardText, Dropdown, ErrorMessage, PopUp, Stepper, TextBlock , Card, Loader} from "@egovernments/digit-ui-components"; const CampaignSelection = ({ onSelect, formData, formState, ...props }) => { @@ -158,16 +158,20 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => { return ( <> {loading && } - {!loading && + {!loading && (
-
- - +
+ + @@ -175,10 +179,10 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
- +
{t(`HCM_CAMPAIGN_TYPE_HEADER`)}

{t(`HCM_CAMPAIGN_TYPE_DESCRIPTION`)}

- +
{`${t("HCM_CAMPAIGN_TYPE")}`} * @@ -186,7 +190,7 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
{ - if (props?.props?.sessionData?.HCM_CAMPAIGN_TYPE?.projectType && !canUpdate && source!=="microplan") { + if (props?.props?.sessionData?.HCM_CAMPAIGN_TYPE?.projectType && !canUpdate && source !== "microplan") { setShowPopUp(true); return; } @@ -204,7 +208,6 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => { style={!showBeneficiary ? { width: "40rem", paddingBottom: 0, marginBottom: 0 } : { width: "40rem", paddingBottom: "1rem" }} variant={error ? "error" : ""} t={t} - // option={projectType?.["HCM-PROJECT-TYPES"]?.projectTypes} option={filteredProjectTypes} optionKey={"code"} selected={type} @@ -212,20 +215,28 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => { setStartValidation(true); handleChange(value); }} - disabled = {source === "microplan"} - + disabled={source === "microplan"} /> {error?.message && }
{showBeneficiary && ( - +
{`${t("HCM_BENEFICIARY_TYPE")}`}
{t(`CAMPAIGN_TYPE_${beneficiaryType}`)}
 )} +
+ {showPopUp && ( { />, ]} sortFooterChildren={true} - > + /> )}
- } + )} - ); }; -export default CampaignSelection; +export default CampaignSelection; \ No newline at end of file