Console v0.5

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

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

health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss

@@ -173,6 +173,7 @@ $border-color: rgba(214, 213, 212, 1);
     margin-left: 0.3rem;
     display: flex;
     align-items: flex-start;
+    flex-direction: row;
 
     .number {
       min-width: 1.2rem !important;

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

@@ -728,6 +728,9 @@
 
 .digit-dss-card-item-border {
   border-bottom: 0.063rem solid theme(digitv2.lightTheme.divider);
+  .digit-dss-insight-card {
+    margin-bottom: 2rem !important;
+  }
 }
 
 .digit-dss-insight-card {

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

@@ -3,7 +3,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 
-const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink , type , icon , disabled,isDraftCampaign }) => {
+const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink, type, icon, disabled, isDraftCampaign }) => {
   const { t } = useTranslation();
   const history = useHistory();
 
@@ -12,19 +12,24 @@ const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink , type ,
       <div className="details-heading">
         <div className="icon-heading">
           {icon}
-          <HeaderComponent className={"detail-header"} styles={{
-          color: disabled ? "#C5C5C5" : "#004b5e", // same gray for disabled header
-        }}>{headingName}</HeaderComponent>
+          <HeaderComponent
+            className={"detail-header"}
+            styles={{
+              color: disabled ? "#C5C5C5" : "#004b5e", // same gray for disabled header
+            }}
+          >
+            {headingName}
+          </HeaderComponent>
         </div>
         <Button
           label={buttonLabel}
           onClick={() => {
-            history.push(`/${window.contextPath}/employee/campaign/${navLink}`,{isDraftCampaign : isDraftCampaign});
+            history.push(`/${window.contextPath}/employee/campaign/${navLink}`, { isDraftCampaign: isDraftCampaign });
           }}
           variation={type}
-          style={{ width: '19rem' }}
-          isDisabled = {disabled}
-          title = {buttonLabel}
+          style={{ width: "19rem" }}
+          isDisabled={disabled}
+          title={buttonLabel}
         />
       </div>
       <div className="details-desc">{desc}</div>

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

@@ -0,0 +1,97 @@
+import React, { useState, Fragment, useEffect } from "react";
+import { TextInput, Dropdown, RadioButtons, Button, FieldV1, Switch, Loader } from "@egovernments/digit-ui-components";
+import { useTranslation } from "react-i18next";
+const FiltersRenderer = ({ cField, drawerState, setDrawerState, t, disabled }) => {
+  const [localSelectedSchema, setLocalSelectedSchema] = useState(null);
+  const [localActiveOptions, setLocalActiveOptions] = useState([]); // store codes
+
+  // Fetch MDMS data based on selected schema
+  const { isLoading, data: mdmsOptions = [] } = Digit.Hooks.useCustomMDMS(
+    Digit.ULBService.getCurrentTenantId(),
+    localSelectedSchema?.moduleName,
+    localSelectedSchema?.masterName ? [{ name: localSelectedSchema.masterName }] : [],
+    {
+      enabled: !!localSelectedSchema?.moduleName && !!localSelectedSchema?.masterName,
+      select: (data) => data?.[localSelectedSchema?.moduleName]?.[localSelectedSchema.masterName] || [],
+    },
+    { schemaCode: "FILTERSDROPDOWNLIST" }
+  );
+
+  // When MDMS options load, set default active
+  useEffect(() => {
+    if (mdmsOptions.length > 0) {
+      const defaultActive = mdmsOptions.filter((opt) => opt.active).map((opt) => opt.code);
+      setLocalActiveOptions(defaultActive);
+      // Also initialize enums in drawerState with these active objects
+      const activeObjects = mdmsOptions.filter((item) => defaultActive.includes(item.code));
+      setDrawerState((prev) => ({
+        ...prev,
+        enums: activeObjects,
+      }));
+    }
+  }, [mdmsOptions]);
+
+  // Handle toggle
+  const handleToggle = (code, checked) => {
+    setLocalActiveOptions((prev) => {
+      let updated = [...prev];
+      if (checked) {
+        if (!updated.includes(code)) updated.push(code);
+      } else {
+        updated = updated.filter((c) => c !== code);
+      }
+
+      // Map updated codes to full objects
+      const activeObjects = mdmsOptions.filter((item) => updated.includes(item.code));
+
+      // Update drawerState.enums directly
+      setDrawerState((prev) => ({
+        ...prev,
+        enums: activeObjects,
+      }));
+
+      return updated;
+    });
+  };
+
+  return (
+    <>
+      {/* Dropdown for selecting schema */}
+      <Dropdown
+        variant={""}
+        t={t}
+        disabled={disabled}
+        option={cField?.mdmsOptions || []}
+        optionKey={"schemaCode"}
+        selected={localSelectedSchema || {}}
+        select={(value) => {
+          setLocalSelectedSchema(value);
+          setLocalActiveOptions([]); // reset active when schema changes
+          setDrawerState((prev) => ({ ...prev, enums: [] })); // reset enums
+        }}
+      />
+
+      {isLoading && <Loader/>}
+
+      {!isLoading && mdmsOptions.length > 0 && (
+        <div style={{ marginTop: "1rem", display: "flex", flexDirection: "column", gap: "0.5rem" }}>
+          {mdmsOptions.map((opt) => {
+            const isActive = localActiveOptions.includes(opt.code);
+            return (
+              <Switch
+                key={opt.code}
+                label={t(opt.name)}
+                isCheckedInitially={isActive}
+                onToggle={(checked) => handleToggle(opt.code, checked)}
+                disable={false}
+                shapeOnOff
+              />
+            );
+          })}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default FiltersRenderer;

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

@@ -22,10 +22,11 @@ const GenericTemplateScreen = ({ components = [], t, selectedField, templateName
     .filter(
       (field) =>
         !field.hidden &&
-        (field.jsonPath === "PrimaryButton" || field.jsonPath === "SecondaryButton" || field.jsonPath === "qrscanner")
+        (field.jsonPath === "PrimaryButton" || field.jsonPath === "SecondaryButton" || field.jsonPath === "scanner")
     )
     .sort((a, b) => (a.order || 0) - (b.order || 0));
 
+
   return (
     <div
       style={{
@@ -94,11 +95,11 @@ const GenericTemplateScreen = ({ components = [], t, selectedField, templateName
             <div className={`${selectedField?.jsonPath === field.jsonPath ? "app-preview-field-pair app-preview-selected" : ""}`}>
             <Button
               key={index}
-              variation={field.jsonPath === "SecondaryButton" ? "secondary" : "primary"}
+              variation={field.jsonPath === "SecondaryButton" || field.jsonPath === "scanner" ? "secondary" : "primary"}
               label={t(field?.label)}
               onClick={() => { }}
               style={{ minWidth: "100%" }}
-              icon={field.icon || null}
+              icon={field.jsonPath === "scanner"  ? "QrCodeScanner" : null}
             />
             </div>
           ))}

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

@@ -2,7 +2,7 @@ import React, { useState, useMemo, Fragment, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useHistory } from "react-router-dom";
 import { Wrapper } from "./SelectingBoundaryComponent";
-import { AlertCard, Stepper, TextBlock, Tag, Card, HeaderComponent, Loader,Chip } from "@egovernments/digit-ui-components";
+import { AlertCard, Stepper, TextBlock, Tag, Card, HeaderComponent, Loader, PopUp, Button, Chip } from "@egovernments/digit-ui-components";
 import { CONSOLE_MDMS_MODULENAME } from "../Module";
 import TagComponent from "./TagComponent";
 
@@ -78,7 +78,7 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
     },
   };
 
-  const {  data: campaignData, isFetching } = Digit.Hooks.useCustomAPIHook(reqCriteria);
+  const { data: campaignData, isFetching } = Digit.Hooks.useCustomAPIHook(reqCriteria);
 
   useEffect(() => {
     onSelect("boundaryType", { selectedData: selectedData, boundaryData: boundaryOptions, updateBoundary: !restrictSelection });
@@ -107,9 +107,9 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
       setBoundaryOptions(sessionData?.boundaryData || {});
     }
     setTimeout(() => setIsLoading(false), 10);
-  }, [props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType , campaignData]);
+  }, [props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType, campaignData]);
 
- useEffect(() => {
+  useEffect(() => {
     if (
       props?.props?.sessionData?.HCM_CAMPAIGN_UPLOAD_BOUNDARY_DATA?.uploadBoundary?.uploadedFile?.length > 0 ||
       props?.props?.sessionData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.length > 0 ||
@@ -157,7 +157,7 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
       CampaignDetails: {
         tenantId: tenantId,
         campaignId: queryParams?.id,
-      }
+      },
     },
   };
   const mutation = Digit.Hooks.useCustomAPIMutationHook(Template);
@@ -167,7 +167,7 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
       {},
       {
         onSuccess: async (result) => {
-          history.push(`/${window?.contextPath}/employee/campaign/my-campaign-new`)
+          history.push(`/${window?.contextPath}/employee/campaign/my-campaign-new`);
         },
         onError: (error, result) => {
           const errorCode = error?.response?.data?.Errors?.[0]?.code;
@@ -184,20 +184,17 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
   return (
     <>
       <div className="container-full">
-
         <div className="card-container-delivery">
           <Card>
             <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}>
               <TagComponent campaignName={campaignName} />
-              {
-                isDraftCampaign ? (
-                  <div className="digit-tag-container" style={{margin:"0rem"}}>
-                    <Chip text={`${t(`CANCEL_CAMPAIGN`)}`} onClick={handleCancelClick} hideClose={false} />
-                  </div>
-                ) : null
-              }
+              {isDraftCampaign ? (
+                <div className="digit-tag-container" style={{ margin: "0rem" }}>
+                  <Chip text={`${t(`CANCEL_CAMPAIGN`)}`} onClick={handleCancelClick} hideClose={false} />
+                </div>
+              ) : null}
             </div>
-            <HeaderComponent className = "select-boundary">{t(`CAMPAIGN_SELECT_BOUNDARY`)}</HeaderComponent>
+            <HeaderComponent className="select-boundary">{t(`CAMPAIGN_SELECT_BOUNDARY`)}</HeaderComponent>
             <p className="dates-description">{t(`CAMPAIGN_SELECT_BOUNDARIES_DESCRIPTION`)}</p>
             <Wrapper
               hierarchyType={hierarchyType}

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

@@ -479,6 +479,7 @@ const AppConfigurationParentRedesign = ({
               parentDispatch={parentDispatch}
               AppConfigMdmsData={AppConfigMdmsData}
               localeModule={localeModule}
+              parentState={parentState}
               pageTag={`${t("CMN_PAGE")} ${currentStep} / ${stepper?.length}`}
             />
           </div>

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

@@ -287,7 +287,7 @@ const reducer = (state = initialState, action, updateLocalization) => {
 
 const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE";
 
-function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) {
+function AppConfigurationWrapper({ screenConfig, localeModule, pageTag,parentState }) {
     const queryClient = useQueryClient();
   const { locState, addMissingKey, updateLocalization, onSubmit, back, showBack, parentDispatch } = useAppLocalisationContext();
   const [state, dispatch] = useReducer((state, action) => reducer(state, action, updateLocalization), initialState);
@@ -395,7 +395,7 @@ function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) {
     for (let i = 0; i < headerFields.length; i++) {
       if (headerFields[i]?.jsonPath === "ScreenHeading") {
         const fieldItem = headerFields[i];
-        const value = locS?.find((i) => i?.code === fieldItem?.value)?.[cL] || null;
+        const value = (locS ||[])?.find((i) => i?.code === fieldItem?.value)?.[cL] || null;
         if (!value || value.trim() === "") {
           return { type: "error", value: `${t("HEADER_FIELD_EMPTY_ERROR")}` };
         }
@@ -633,7 +633,7 @@ function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) {
                   })
                 }
               />
-              <DrawerFieldComposer />
+              <DrawerFieldComposer parentState={parentState} screenConfig={screenConfig} selectedField={state?.drawerField}/>
             </>
           ) : (
             <DndProvider backend={HTML5Backend}>

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

@@ -38,7 +38,7 @@ const locReducer = (state = initialState, action) => {
 
 const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE";
 //TODO @nabeel @jagan move this component to ui-component repo & clean up
-function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, showBack, parentDispatch, ...props }) {
+function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, showBack, parentDispatch, parentState, ...props }) {
   if (!localeModule) {
     return <Loader />;
   }
@@ -129,7 +129,7 @@ function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back,
         localeModule,
       }}
     >
-      <AppConfigurationWrapper pageTag={props?.pageTag} screenConfig={screenConfig} localeModule={localeModule} />
+      <AppConfigurationWrapper pageTag={props?.pageTag} screenConfig={screenConfig} localeModule={localeModule} parentState={parentState} />
     </AppLocalisationContext.Provider>
   );
 }