Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed order in boundary details and changed hierarchy master #1786

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

Bhavya-egov
Copy link
Contributor

@Bhavya-egov Bhavya-egov commented Nov 8, 2024

\

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced data fetching and processing for hierarchy data across multiple components, now utilizing HierarchySchema for improved accuracy.
    • Improved error handling during file downloads and campaign setup processes, providing users with more specific feedback.
  • Bug Fixes

    • Updated logic for determining the lowest hierarchy and data validation, ensuring correct processing of boundary data.
  • Documentation

    • Adjusted campaign configuration to reflect new hierarchy data requirements and step sequencing.
  • Chores

    • Renamed variables and updated state management to align with the new data structure across various components.

@Bhavya-egov Bhavya-egov requested a review from a team as a code owner November 8, 2024 14:24
Copy link
Contributor

coderabbitai bot commented Nov 8, 2024

📝 Walkthrough

Walkthrough

This pull request introduces significant modifications across several components related to campaign management. Key changes include the renaming of data schemas from hierarchyConfig to HierarchySchema, alongside updates to data fetching logic and filtering conditions. Components such as CampaignModule, CampaignSummary, and others have been adjusted to accommodate the new schema, enhancing the handling of boundary data. Furthermore, several components have undergone structural changes, particularly in state management and error handling, ensuring they align with the updated data model while retaining their overall functionality.

Changes

File Change Summary
.../campaign-manager/src/Module.js Updated CampaignModule function to use HierarchySchema instead of hierarchyConfig, modified parameters and selection logic for hierarchy data.
.../campaign-manager/src/components/CampaignSummary.js Renamed sections and updated document filters for clarity; "target" to "facility", "facility" to "user", and "user" back to "target".
.../campaign-manager/src/components/CampaignUpdateSummary.js Updated boundaryDataGrp function to accept hierarchyDefinition for enhanced grouping logic; introduced a helper function for ordered boundary types.
.../campaign-manager/src/components/DateWithBoundary.js Modified data fetching logic to use HierarchySchema and updated selection logic for the lowest hierarchy.
.../campaign-manager/src/components/SelectingBoundaries.js Adjusted data fetching and processing logic to accommodate HierarchySchema, including updates to fetchOptions and fetchBoundaryTypeData functions.
.../campaign-manager/src/components/SelectingBoundariesDuplicate.js Updated to use HierarchySchema for data fetching and processing; adjusted useEffect hooks for new data structure.
.../campaign-manager/src/components/UpdateBoundaryWrapper.js Renamed and restructured data fetching logic to use HierarchySchema; updated logic for lowestHierarchy calculation.
.../campaign-manager/src/components/UploadData.js Enhanced error handling in the downloadTemplate function to differentiate between error types.
.../campaign-manager/src/configs/CampaignConfig.js Adjusted stepCount and added hierarchyData to customProps for component configuration.
.../campaign-manager/src/configs/UpdateBoundaryConfig.js Added hierarchyType property to customProps in CampaignUpdateSummary configuration.
.../campaign-manager/src/pages/employee/SetupCampaign.js Renamed hierarchyConfig to HierarchySchema, updated logic for lowestHierarchy, and refined state management for campaign setup.
.../campaign-manager/src/pages/employee/UpdateBoundary.js Replaced hierarchyConfig with HierarchySchema, updated lowestHierarchy logic and error handling for boundary validation.

Possibly related PRs

Suggested reviewers

  • jagankumar-egov

Poem

🐇 In the fields where data flows,
A schema change, as the rabbit knows.
From hierarchyConfig to a new name bright,
We fetch our data, all feels just right!
With boundaries set and campaigns in sight,
Hopping along, everything's light! 🌼

Warning

Tool Failures:

Tool Failure Count:


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jagankumar-egov jagankumar-egov merged commit 62b7995 into console Nov 8, 2024
3 checks passed
@jagankumar-egov jagankumar-egov deleted the HCMPRE-1164 branch November 8, 2024 14:29
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 15

🧹 Outside diff range comments (6)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js (1)

Line range hint 1-156: Consider component refactoring for better maintainability.

While the changes look good, consider these architectural improvements:

  1. Extract URL parameter management into a custom hook
  2. Consolidate the multiple useEffect hooks that sync state
  3. Consider splitting the component into smaller, more focused components

This would improve maintainability and make the code easier to test.

Would you like me to provide example implementations for any of these suggestions?

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js (1)

Line range hint 1-1: Consider adding parameter validation for hierarchyData.

The new hierarchyData parameter should be validated to ensure it meets the expected structure, especially since it's critical for boundary selection functionality.

-export const CampaignConfig = (totalFormData, dataParams, isSubmitting, summaryErrors , hierarchyData) => {
+export const CampaignConfig = (totalFormData, dataParams, isSubmitting, summaryErrors, hierarchyData) => {
+  if (!hierarchyData || !Array.isArray(hierarchyData)) {
+    console.warn('CampaignConfig: hierarchyData should be a valid array');
+  }
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (1)

Line range hint 1-1041: Consider architectural improvements for better maintainability

The component handles complex file upload scenarios but could benefit from some architectural improvements.

  1. State Management: Consider using a reducer to manage related states:
const initialState = {
  uploadStatus: {
    isError: false,
    isSuccess: false,
    isValidation: false,
    apiError: null,
    downloadError: false
  },
  fileData: {
    uploadedFile: [],
    fileName: null,
    resourceId: null
  },
  // ... other state groups
};
  1. Validation Logic: Extract validation logic into separate utility functions:
// utils/validators.js
export const validateExcelStructure = (file, type, headers) => {
  // Excel structure validation logic
};

export const validateTargetData = (data, type) => {
  // Target data validation logic
};
  1. Error Handling: Create a centralized error handling service:
// services/errorHandler.js
export const handleUploadError = (error, type) => {
  // Centralized error handling logic
  return {
    errorType: 'validation|api|download',
    message: getErrorMessage(error, type),
    severity: getErrorSeverity(error)
  };
};

These changes would improve code organization, testability, and maintenance.

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js (3)

Line range hint 232-267: Async operation fetchResourceFile may not complete before data usage

Within the select function of the useSearchCampaign hook, the asynchronous operation fetchResourceFile is initiated but not awaited, which may lead to processid being undefined when it's used later in the code.

Modify the code to properly handle the asynchronous call:

select: async (data) => {
  const resourceIdArr = [];
  data?.[0]?.resources?.forEach((i) => {
    if (i?.createResourceId && i?.type === "user") {
      resourceIdArr.push(i?.createResourceId);
    }
  });
  setprojectId(data?.[0]?.projectId);
  setCards(data?.cards);

- let processid;
- const ss = async () => {
-   let temp = await fetchResourceFile(tenantId, resourceIdArr);
-   processid = temp;
-   return;
- };
- ss();
+ const processid = await fetchResourceFile(tenantId, resourceIdArr);

  const target = data?.[0]?.deliveryRules;
  const boundaryData = boundaryDataGrp(data?.[0]?.boundaries, hierarchyDefinition);
  const hierarchyType = data?.[0]?.hierarchyType;

  return {
    // ...rest of the return object
  };
},

Line range hint 280-280: Remove unused variable updatedObject to clean up code

The variable updatedObject is created as a copy of data but isn't used elsewhere in the component. Removing it can simplify the code and prevent confusion.


Line range hint 306-312: Ensure consistent use of dependencies in useEffect hooks

In the useEffect hooks starting at lines 306 and 312, make sure all external variables used within the effect are included in the dependency array to prevent stale closures or unintended behaviors.

Review and update the dependency arrays as needed.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 993e202 and 79af8c4.

📒 Files selected for processing (12)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js (3 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js (4 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaries.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/UpdateBoundaryConfig.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (2 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateBoundary.js (1 hunks)
🧰 Additional context used
📓 Path-based instructions (12)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaries.js (1)

Pattern **/*.js: check

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

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/UpdateBoundaryConfig.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateBoundary.js (1)

Pattern **/*.js: check

🪛 Biome
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js

[error] 512-512: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event.

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.

(lint/a11y/useKeyWithClickEvents)


[error] 532-532: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event.

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.

(lint/a11y/useKeyWithClickEvents)


[error] 552-552: Enforce to have the onClick mouse event with the onKeyUp, the onKeyDown, or the onKeyPress keyboard event.

Actions triggered using mouse events should have corresponding keyboard events to account for keyboard-only navigation.

(lint/a11y/useKeyWithClickEvents)

🔇 Additional comments (16)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/UpdateBoundaryConfig.js (1)

128-129: LGTM! Verify prop handling in CampaignUpdateSummary.

The addition of summaryErrors and hierarchyType props aligns with the broader changes in hierarchy data handling. These changes support the updated boundary details ordering as intended in the PR.

Let's verify the prop handling in the CampaignUpdateSummary component:

✅ Verification successful

Props are properly handled in CampaignUpdateSummary component

The verification confirms that both summaryErrors and hierarchyType props are properly handled in the component:

  • summaryErrors is managed through local state and passed to ViewComposer component as cardErrors
  • hierarchyType is used for boundary data grouping and display in the card headers
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify proper prop handling in CampaignUpdateSummary component
# Expected: Find prop type definitions and usage of these props

# Search for CampaignUpdateSummary component definition and prop usage
ast-grep --pattern 'const CampaignUpdateSummary = ({ $$$, summaryErrors, hierarchyType, $$$ }) => {
  $$$
}'

# Search for prop type definitions if using PropTypes
rg "CampaignUpdateSummary.propTypes" -A 5

Length of output: 152


Script:

#!/bin/bash
# Let's try a broader search to locate the CampaignUpdateSummary component and its usage

# Find the component file
fd "CampaignUpdateSummary"

# Search for any file containing CampaignUpdateSummary
rg "CampaignUpdateSummary" -l

# If found, let's look at its content to verify prop handling
rg "CampaignUpdateSummary" -B 2 -A 10

Length of output: 8094


Script:

#!/bin/bash
# Let's examine the CampaignUpdateSummary component implementation to verify prop usage

# Get the full content of CampaignUpdateSummary component
cat "health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js"

# Search for specific usage of summaryErrors and hierarchyType props
rg -B 2 -A 5 "summaryErrors|hierarchyType" "health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js"

Length of output: 19873

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

14-17: 🧹 Nitpick (assertive)

Optimize the schema code and verify the filter condition.

The schema code string interpolation is redundant since CONSOLE_MDMS_MODULENAME is already a string.

Apply this diff to simplify the code:

  const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
    name: "HierarchySchema",
    "filter": "[?(@.type=='console')]"
-   }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
+   }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: CONSOLE_MDMS_MODULENAME + ".HierarchySchema" });

Let's verify if there are any other types besides 'console' that might be affected by this filter:

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js (3)

80-80: LGTM!

The schema code update is consistent with the schema renaming changes.


72-75: Verify the schema change impact across the application.

The change from hierarchyConfig to HierarchySchema with an added filter condition is a breaking change that could affect other components using this data.

Let's verify the usage and ensure consistent updates:

#!/bin/bash
# Search for any remaining references to the old schema name
echo "Checking for old schema references..."
rg "hierarchyConfig" --type js

# Search for the new schema usage to ensure consistency
echo "Checking new schema usage..."
rg "HierarchySchema" --type js

72-80: Verify component compatibility with the new schema.

The schema changes affect the BOUNDARY_HIERARCHY_TYPE which is passed to multiple components. Please ensure all affected components in componentsToRegister are updated to handle the new schema structure:

  • CampaignSummary
  • SelectingBoundaries
  • SelectingBoundariesDuplicate
  • UpdateBoundary
  • BoundaryDetailsSummary
  • And others that consume boundary data

Let's verify component compatibility:

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js (2)

Line range hint 147-164: Review the use of "Duplicate" in component name.

The component name SelectingBoundariesDuplicate suggests it might be a temporary solution. Consider:

  1. Is this intended to replace the commented-out SelectingBoundaries component?
  2. Should we plan to consolidate these components?
#!/bin/bash
# Check for usage of both boundary selection components
echo "Checking SelectingBoundaries usage:"
rg "SelectingBoundaries[^D]"
echo "Checking SelectingBoundariesDuplicate usage:"
rg "SelectingBoundariesDuplicate"

Consider consolidating these components if they share similar functionality to improve maintainability.


139-139: Verify step sequence consistency.

The step count change from "1" to "2" for the BoundarySummary component should maintain proper sequence with surrounding steps. Let's verify the step flow:

  1. Previous step (key "5") has stepCount "2"
  2. This step (key "6") now has stepCount "2"
  3. Next step (key "7") has stepCount "3"

The sequence appears correct, as it groups boundary-related steps together.

✅ Verification successful

Let me gather more information about the step sequence in the configuration file.


Step sequence is correctly maintained

The step count change from "1" to "2" for the BoundarySummary component (key "6") maintains proper sequence alignment. The configuration shows a clear grouping pattern:

  • Step 1 (keys 1-4): Campaign basics and details summary
  • Step 2 (keys 5-6): Boundary selection and summary
  • Step 3 (keys 7-9): Cycle configuration and delivery details
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Verify no other components in the codebase expect BoundarySummary to be in step 1
rg -B 5 -A 5 "BoundarySummary.*stepCount.*1" 

Length of output: 2594


Script:

#!/bin/bash
# Check the step sequence in CampaignConfig.js
rg -B 5 -A 5 "stepCount.*[123]" health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js

Length of output: 2234

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js (1)

108-122: Verify consistent schema usage across the codebase.

The change from hierarchyConfig to HierarchySchema should be consistently applied across all components.

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js (1)

504-510: LGTM! Document filtering logic is correctly implemented.

The changes to filter documents based on their types ("facility", "user", "boundaryWithTarget") are properly implemented and align with the component's requirements.

Also applies to: 524-530, 544-550

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignUpdateSummary.js (2)

38-67: Verify the traversal logic in getOrderedBoundaryTypes handles all hierarchy structures

In the boundaryDataGrp function, the helper function getOrderedBoundaryTypes constructs an ordered list of boundary types based on parent-child relationships. Ensure that this function correctly handles cases where the hierarchy might not be strictly linear or where some boundary types have multiple parents or children to prevent potential infinite loops or missed boundary types.


199-207: Ensure getOrderedBoundaryTypes safely handles missing or malformed hierarchy data

The getOrderedBoundaryTypes function assumes that the hierarchy data is well-formed and that there is a root boundary type with parentBoundaryType === null. If the hierarchy data is missing or doesn't conform to this structure, currentItem may be undefined, and the function might not behave as expected.

Ensure that the hierarchy data is validated before processing. You might add checks to handle cases where currentItem is undefined.

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (3)

61-65: Verify the correctness of the filter in useCustomMDMS hook

Ensure that the filter "[?(@.type=='console')]" correctly fetches the required data from the MDMS. Incorrect filters might lead to empty or unexpected results.


67-68: Confirm the data structure when accessing lowestHierarchy

The nested optional chaining suggests a complex data structure. Verify that HierarchySchema contains the expected properties to avoid undefined values when accessing lowestHierarchy.


608-608: ⚠️ Potential issue

Fix logical error: Duplicate condition in step navigation

The condition !totalFormData["HCM_CAMPAIGN_NAME"] || !totalFormData["HCM_CAMPAIGN_NAME"] checks the same property twice. This may lead to incorrect step navigation.

Apply this diff to correct the condition:

- } else if (!totalFormData["HCM_CAMPAIGN_NAME"] || !totalFormData["HCM_CAMPAIGN_NAME"]) {
+ } else if (!totalFormData["HCM_CAMPAIGN_NAME"] || !totalFormData["HCM_CAMPAIGN_TYPE"] || !totalFormData["HCM_CAMPAIGN_DATE"]) {

Likely invalid or redundant comment.

health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateBoundary.js (2)

103-104: LGTM!

The calculation of lowestHierarchy correctly utilizes the updated hierarchySchema data. The usage of useMemo with the appropriate dependency array is optimal.


97-100: Verify that all references to hierarchyConfig have been updated to HierarchySchema.

Since hierarchyConfig has been replaced with HierarchySchema, ensure that all instances of hierarchyConfig in the codebase have been updated to prevent potential runtime errors due to undefined variables.

Run the following script to check for any remaining references:

✅ Verification successful

Let me gather more context about the specific module and its dependencies.


Let me check if there are any other references to HierarchySchema in the campaign-manager module to ensure completeness.


Based on the search results, I can now generate the final response:

The change from hierarchyConfig to HierarchySchema is correctly implemented in the campaign-manager module

The verification shows that:

  • All instances in the campaign-manager module are consistently using HierarchySchema
  • No remaining references to hierarchyConfig exist in the campaign-manager module
  • The change is properly implemented across all relevant files:
    • Module.js
    • SetupCampaign.js
    • UpdateBoundary.js
    • UpdateBoundaryWrapper.js
    • SelectingBoundariesDuplicate.js
    • SelectingBoundaries.js
    • DateWithBoundary.js
    • useBoundaryHome.js
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Search the codebase for any remaining references to `hierarchyConfig`
# Expected Result: No occurrences of `hierarchyConfig` in the codebase

rg 'hierarchyConfig'

Length of output: 1930


Script:

#!/bin/bash
# Check if HierarchySchema is used in other files within the campaign-manager module
rg -l "HierarchySchema" health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/

# Check the specific file content for better context
cat health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateBoundary.js

Length of output: 36307


Script:

#!/bin/bash
# Search for HierarchySchema references with context
rg -A 2 -B 2 "HierarchySchema" health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/

# Check for any remaining hierarchyConfig references in campaign-manager
rg "hierarchyConfig" health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/

Length of output: 16385

Comment on lines +20 to +21
return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
}, [HierarchySchema]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add defensive check for empty array access.

The current code assumes that HierarchySchema[CONSOLE_MDMS_MODULENAME].HierarchySchema will always have at least one item. This could lead to runtime errors if the array is empty.

Apply this diff to add a defensive check:

-    return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
+    const schemas = HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema || [];
+    return schemas.length > 0 ? schemas[0].lowestHierarchy : undefined;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
}, [HierarchySchema]);
const schemas = HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema || [];
return schemas.length > 0 ? schemas[0].lowestHierarchy : undefined;
}, [HierarchySchema]);

select: (data) => {
return data?.[CONSOLE_MDMS_MODULENAME]?.hierarchyConfig?.find((item) => item.isActive)?.hierarchy;
return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add null checks and fallback handling.

The current implementation has potential issues:

  1. Removed the .find((item) => item.isActive) check without clear justification
  2. Directly accessing the first array element [0] without checking array length

Consider adding proper null checks and fallback handling:

-return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
+const schemas = data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema;
+if (!schemas?.length) {
+  console.error('No hierarchy schemas found');
+  return null;
+}
+return schemas[0]?.hierarchy;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
const schemas = data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema;
if (!schemas?.length) {
console.error('No hierarchy schemas found');
return null;
}
return schemas[0]?.hierarchy;

Comment on lines +116 to +119
const { isLoading, data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider optimizing duplicate MDMS calls.

The component makes two MDMS calls with identical parameters but different select functions. This could be optimized into a single call.

Consider refactoring to use a single MDMS call and derive both values using local transformations:

const { data: hierarchyData } = Digit.Hooks.useCustomMDMS(
  tenantId,
  CONSOLE_MDMS_MODULENAME,
  [{
    name: "HierarchySchema",
    filter: "[?(@.type=='console')]"
  }],
  {
    select: (data) => ({
      hierarchyType: data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy ?? [],
      fullSchema: data
    })
  },
  { schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` }
);

const BOUNDARY_HIERARCHY_TYPE = hierarchyData?.hierarchyType;
const HierarchySchema = hierarchyData?.fullSchema;

Comment on lines 120 to +122
const lowestHierarchy = useMemo(() => {
return hierarchyConfig?.[CONSOLE_MDMS_MODULENAME]?.hierarchyConfig?.find((item) => item.isActive)?.lowestHierarchy;
}, [hierarchyConfig]);
return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
}, [HierarchySchema]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Add null safety to lowestHierarchy computation.

The property access chain could fail if any intermediate value is undefined.

Consider adding optional chaining and a fallback value:

  const lowestHierarchy = useMemo(() => {
-    return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
+    return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy ?? null;
  }, [HierarchySchema]);
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const lowestHierarchy = useMemo(() => {
return hierarchyConfig?.[CONSOLE_MDMS_MODULENAME]?.hierarchyConfig?.find((item) => item.isActive)?.lowestHierarchy;
}, [hierarchyConfig]);
return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
}, [HierarchySchema]);
const lowestHierarchy = useMemo(() => {
return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy ?? null;
}, [HierarchySchema]);

Comment on lines +108 to +115
const { data: BOUNDARY_HIERARCHY_TYPE } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}], {
select: (data) => {
return data?.[CONSOLE_MDMS_MODULENAME]?.hierarchyConfig?.find((item) => item.isActive)?.hierarchy;
return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
},
},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.hierarchyConfig` });
const { isLoading, data: hierarchyConfig } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ name: "hierarchyConfig" }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.hierarchyConfig` });
},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Add null checks in the select function for better error handling.

The select function's chained property access could fail if any intermediate value is undefined.

Consider adding optional chaining for better error handling:

-      return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
+      return data?.CONSOLE_MDMS_MODULENAME?.HierarchySchema?.[0]?.hierarchy ?? [];
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const { data: BOUNDARY_HIERARCHY_TYPE } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}], {
select: (data) => {
return data?.[CONSOLE_MDMS_MODULENAME]?.hierarchyConfig?.find((item) => item.isActive)?.hierarchy;
return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
},
},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.hierarchyConfig` });
const { isLoading, data: hierarchyConfig } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ name: "hierarchyConfig" }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.hierarchyConfig` });
},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
const { data: BOUNDARY_HIERARCHY_TYPE } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}], {
select: (data) => {
return data?.CONSOLE_MDMS_MODULENAME?.HierarchySchema?.[0]?.hierarchy ?? [];
},
},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });

Comment on lines +11 to +36
// function boundaryDataGrp(boundaryData) {
// // Create an empty object to hold grouped data by type
// const groupedData = {};

// // Iterate through each boundary item in the data
// boundaryData.forEach((item) => {
// const { type } = item; // Extract the type

// // If the type doesn't exist in the groupedData, create an array for it
// if (!groupedData[type]) {
// groupedData[type] = [];
// }

// // Add the current item to its corresponding type array
// groupedData[type].push(item);
// });

// // Convert the grouped object into an array of objects
// const result = Object.keys(groupedData).map((type) => ({
// type,
// boundaries: groupedData[type],
// }));

// return result;
// }

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Consider removing commented-out code to improve maintainability

Lines 11-36 contain the old implementation of boundaryDataGrp which is now commented out. If this code is no longer needed, removing it can enhance code readability and maintainability.

Comment on lines +184 to +198
const reqCriteria = {
url: `/boundary-service/boundary-hierarchy-definition/_search`,
changeQueryName: `${params?.hierarchyType}`,
body: {
BoundaryTypeHierarchySearchCriteria: {
tenantId: tenantId,
limit: 2,
offset: 0,
hierarchyType: params?.hierarchyType,
},
},
};

const { data: hierarchyDefinition } = Digit.Hooks.useCustomAPIHook(reqCriteria);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Handle potential undefined params.hierarchyType to prevent runtime errors

The reqCriteria object utilizes params?.hierarchyType in both the changeQueryName and the request body. If params.hierarchyType is undefined, this could lead to unexpected behavior or runtime errors when making the API call.

Apply the following changes to ensure params.hierarchyType is defined before proceeding:

Committable suggestion skipped: line range outside the PR's diff.

Comment on lines +45 to +48
const { isLoading, data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME,[{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Correct the usage of 'useCustomMDMS' function parameters

The useCustomMDMS function accepts a maximum of four parameters. The schemaCode parameter should be included within the options object (the fourth parameter) rather than being passed as a separate fifth argument.

Apply this diff to fix the parameter usage:

- const { isLoading, data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME,[{ 
-   name: "HierarchySchema",
-   "filter": "[?(@.type=='console')]"
- }], { select: (MdmsRes) => MdmsRes }, { schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
+ const { isLoading, data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
+   name: "HierarchySchema",
+   "filter": "[?(@.type=='console')]"
+ }], { 
+   select: (MdmsRes) => MdmsRes, 
+   schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` 
+ });
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const { isLoading, data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME,[{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
const { isLoading, data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}], {
select: (MdmsRes) => MdmsRes,
schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema`
});

Comment on lines +51 to +52
return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.find(item => item.isActive)?.lowestHierarchy;
}, [HierarchySchema]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Simplify data access by modifying the 'select' function

Currently, you're accessing deeply nested properties in HierarchySchema, which can be simplified. Modify the select function to return the required data directly, enhancing readability and maintainability.

Update the select function and adjust the data access as shown:

- }], { 
-   select: (MdmsRes) => MdmsRes, 
-   schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` 
- });
+ }], { 
+   select: (MdmsRes) => MdmsRes?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema, 
+   schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` 
+ });

...

- return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.find(item => item.isActive)?.lowestHierarchy;
+ return HierarchySchema?.find(item => item.isActive)?.lowestHierarchy;

Committable suggestion skipped: line range outside the PR's diff.

Comment on lines +97 to +100
const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Consider renaming HierarchySchema to hierarchySchema for consistency.

In JavaScript, it's conventional to use camelCase for variable names unless they represent classes or constructors. Since HierarchySchema is a variable holding data, consider renaming it to hierarchySchema to improve code readability and maintain consistency with naming conventions.

Apply this diff to rename the variable:

- const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
+ const { data: hierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
    name: "HierarchySchema",
    "filter": "[?(@.type=='console')]"
- }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
+ }], { select: (MdmsRes) => MdmsRes }, { schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });

Ensure to update all references to HierarchySchema in the code accordingly.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
const { data: hierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{
name: "HierarchySchema",
"filter": "[?(@.type=='console')]"
}], { select: (MdmsRes) => MdmsRes }, { schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });

jagankumar-egov added a commit that referenced this pull request Dec 9, 2024
* fixed assumption audit fixes (#1758)

* fixed draft issue of Setup campaign (#1757)

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* Summary css fix (#1755)

* updated css for summary screen

* removed log

* added null check

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Breadcrumb for usermanagement (#1761)

* Breadcrumb changes

* console.log removed

* indentations

* Finalised microplan download (#1762)

* Feat : Added download button for finalised microplans

* Added Todo

* fixed HCMPRE-776 and removed updated old validation (#1763)

* fixed HCMPRE-776 and removed updated old validation

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/MapView.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update MyCampaign.js

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignDates.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update CampaignDates.js

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update SetupCampaign.js

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix key (#1764)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* Fixed UiCustomisation Digit issue (#1766)

Checking UisCustomisation

* Fixed double selection of boundaries (#1765)

Update MultiSelectDropdown.js

* Fixed loader,breadcrumb,table cells css and added placeholder text fo… (#1769)

Fixed loader,breadcrumb,table cells css and added placeholder text for assumption fields

* fixed targetvalidation and added no results in boundary (#1768)

* Dynamic column pop inbox (#1770)

* Added dynamic column inside pop inbox

* updated status to action in status logs

* updated status log

* added comment logs for edit population

* updated css version

* updated code rabbit comment and css version

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Feature/bug (#1773)

* z-index and camapaign-name in preview

* ui-ux-demo-review

* version updates

* ver

* Update ViewHierarchy.js

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* Updated the search dropdown (#1776)

updated the search dropdown

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Info ToolTip added (#1775)

* Added info icon on formula and assumptions

* Incremented CSS version

* Vesrion update (#1778)

* updated react-components version to fix icon issues in inbox screen

* updated versions everywhere

* myMicroplanFixes (#1777)

* My microplan data fixes, localisation fixes

* setup response screen fixes, breadcrumb localisation code correctify

* search bar fix

* fixes

* ADD NEW LOCALE

* roletable fixes for mobile number search, qa issue fix

* FIXES

* quickfixes

* quick fixes/ Tagging UI UX fixes

* fix

* added locale

* census table assignee issue fixes

* role table pop up css fix and my microplan click fix

* fixes and stepper click enable for back

* added user tag fixes

* UserAccessfixes

* Custom Assumption - Custom Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Updated date formate (#1779)

* updated date formate and css

* updated css

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Fix for cycle draft ::changes for the draft flow (#1780)

* Fixed assumption form multi save (#1781)

Update SetupMicroplan.js

* user tagging fixes (#1782)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* Usermanagement row on click redirect (#1783)

* Changes to usermanagement redirext on row click

* changes to onRow click in userManagement

* console removed

* changes

* null check

* changes

* removing extra mdms call

* changing useState

* removed var

* changes

* changes

* Plan and Pop inbox changes (#1784)

* removed popup for facilitya and population upload

* updated plan inbox

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Feature/bugs (#1785)

* bug/boundary

* changed field name

* added something

* Update checklistSearchConfig.js

* Update ViewHierarchy.js

* fixes

* fixes1

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/ViewHierarchy.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fixed order in boundary details and changed hierarchy master (#1786)

* added the checks for the update campaign flow (#1788)

* Open Boundary Management ui Info pending changes  (#1789)

* pending changes

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/GeoPode.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/GeoPode.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Reverted action in assign to all, updated the column heading with pro… (#1790)

* reverted action in assign to all, updated the column heading with projecttype

* removed logs

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Usermanagement css and boundaryScreen css (#1791)

Changes to userManagement, css for boundary

* Vehicle Change Assumptions & Formula (#1787)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* css fixes (#1792)

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* LCOALISATION FIXES (#1793)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* some-ui-fixes (#1794)

* some-ui-fixes

* version updates

* fixed boundary selection dropdown issue (#1796)

* fixed boundary selection dropdown issue

* fixed search juridiction dropdown

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Allowed to update the name of microplan (#1795)

* Allowed to update the name of microplan

* changed hardcoded date to 30 from 100

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* demo issue fixes (#1797)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* ui fixes (#1798)

* Added retry of failed campaign

* stepper rvert back (#1799)

* ESTIMATION & FORMULA FIXES (#1804)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

* estimationa and formula fixes

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* error toast and checklist updates (#1805)

error taost and cehcklist updates

* HCMPRE 1131 (#1807)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

* estimationa and formula fixes

* my microplan fix

* fixes

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Updated sidebar for microplan (#1802)

* Updated sidebar for microplan

* Update index.scss

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>
Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* style change of toolTip (#1806)

* toast and minor ui (#1809)

* ui/ux fixes (#1810)

* Changes to AssummptionList and stepper disable in setupConfig (#1811)

* Changes to assumptions list

* setupCompleted changes

* Formula View, and Select Acitivity Screen CSS changes (#1803)

* select-activity-commit

* Hover over formulaConfigView

* margin adjust

* removed console

* css changes

* package update

* changes to css

* package css update

* Revert "Allowed to update the name of microplan (#1795)" (#1812)

This reverts commit e32aad6.

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* updated message for header and label and added validation for max length (#1813)

* Cleaned up boundary Management code and add some validations

* redirect and ui (#1814)

* Assumptionlist fix (#1815)

changes

* changes in the delivery type and selection of boundary (#1816)

* to be picked (#1819)

* to be picked

* checklist and other changes

* role table fixes, drop down fix, pop up fix, use tag fix (#1820)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

* estimationa and formula fixes

* my microplan fix

* fixes

* pull fixes

* user tag changes

* fixes

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fetch data type from mdms (#1822)

* fixed app delivery condition (#1825)

* not selected added in single value list (#1824)

* not selected added in single value list

* isActive added

* one more fix

* Facility dropdown (#1817)

* Added single dropdown in facilityCatchment

* tenantId fix

* Hierarchies fix

* Microplan name update (#1821)

* updated start date for campaign

* added update microplan name changes

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Internal demo fixes (#1827)

* disabled the viewer card

* updated suggested microplan name formate

* updated assignee to assigner in timeline wrapper

* updated button side in my microplan screen

* updated sucurity and accessibility edit buttons

* commented tranportation mode from accessibility details

* added assignee next to village updated comment

* updated plan inbox

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* tenant logo css fix (#1828)

* Facility data fix (#1829)

FacilityData Fix

* Added boundary manager access to the home card

* Updated activity selection screen to have view also (#1830)

updated activity selection screen to have view also

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Added confirmation pop up to finalise actions (#1832)

added confimation pop up to finalize actions

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Popup for userAccess boundary area and toast message for assign unassign (#1831)

* Changed localization

* Loc

* Changes for popup in userAccess

* changes

* My MICROPLAN fixes, formula fixes (#1835)

* Hcmpre 1290 (#1834)

* fixed app delivery condition

* added my microplan screen

* changes in the url

* changes

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* Inbox (#1838)

* fixed app delivery condition

* fixed hover issue on search screen

* demo review changes in boudnary management (#1836)

* demo review changes in boudnary management

* different download template for hierarchy from geopode and completely new

* info cards added

* code clean

* Update searchSavedPlansWithCampaign.js (#1839)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Space (#1840)

* fixed app delivery condition

* added space

* fixed miner issues (#1837)

* fixed miner issues

* fixed pop inbox issue

* fixed status log issue

* Update PopInbox.js

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>
Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Update searchSavedPlansWithCampaign.js (#1841)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Gepspatial map view (#1842)

* added minor css changes and basic logic for geospatial view

* updated css version

* updated chooseactivity screen

* fixed syntax issue

* PO finding fixes (#1843)

* Fix campaign Type in draft (#1846)

* Plan Inbox patch fix (#1847)

* added workflow for toast message

* updated workflow button color

* added count for assign to me and all tabs

* added back button

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Go Back button and microplan name quotes fix (#1844)

* Updated the core and other component version for landing page card  override

* Po finding fixes2 (#1845)

* added tooltip for residing boundary

* registered hierarchy tooltip inside component

* added different workflow message and alert header

* updated button color for workflow actions

* added info icons in select activity card

* added back button

* fixed action for facility

* updated css version

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Summary user role tagging and Response Screen (#1852)

* Changes ro userAccessTableWrapper

* Response Screen

* comment removed

* minor updates (#1853)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* toast localistaion (#1855)

* updated core component & css version

* updating the module versions

* Reverting the libraries version update

* Updated all the core component version from 1.8.3 to 1.8.10

* PO fixes (#1857)

* reverted column freeze as it was causing issues (#1858)

reverted column fix as it was causing issues

* Added column in sorted way, added assignee, added total pop (#1859)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* added serving facility (#1860)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* updated code (#1861)

* Formcomposer action bar fixes (#1862)

* added serving facility

* form composer action bar fix

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* Updated few localisation messages

* added loader screen to ftech data from microplan integration screen

* Updated UI Customizations file

* Approved microplan integration

* Added toast & success for api response

* plan inbox assignee fix (#1863)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* formula and assumption refresh issue (#1864)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* minor changes (#1866)

* Action bar fixes, session fixes (#1867)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* Update index.js

* Update index.js

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* Download Button  (#1865)

* Loc changes to popInbox

* Loc

* Changes

* UICust update

* css package update

* Changes

* changes

* Update UICustomizations.js

* Name of file

* For Download update

* UI cust changes

* added return in UI

* Changes

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* User Role being displayed in Pop, Plan and Fac (#1854)

* changes localizations

* Adding userName and their roles

* resolved conflict

* css package update

* UIcustomization dropdown changes

* pop-inbox changes

* package update

* loc added

* loc changes

* dropdown options changed

* UICust making same as in example

* UnassignPopup

* comments

* loc

* Loader added

* changes

* changes to roletablecomposer for unassign popup

* changes

* Facility Catchment

* reverted facility popup

* Changes

* KPI Card

* package update

* Facility data keys

* changes according to comments

* Changes

* rowOn click redirection

* Dummy Data removed

* removed import

* removed for residing boundary

* removed 5000

* package update for css

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* fixes (#1869)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* patch fix (#1868)

* route back to home on back

* fixed refresh issue for pop inbox

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* polling fix (#1870)

* polling fix

* Update TimelineComponent.js

* assumptions fixes (#1871)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Facility pop up fix (#1872)

* Localizations and Actions being cut (#1874)

* Changes

* Package update

* Disabled updating security and accessibility details after finalize  … (#1873)

Disabled updating security and accessibility details after finalize  facility catchment

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Update PopInbox.js (#1875)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* scroll (#1876)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Update FacilityPopup.js (#1877)

* qquickfix (#1878)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* fix

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* Updated the microplan integration piece

* adhoc changes (#1879)

* some fixes

* Update PlanInbox.js

* added checklist redirection (#1880)

* added checklist redirection

* removed console

* Updated workbench module version

* Plan and Pop inbox fix (#1881)

* fixed pop inbox boundary getting empty issue

* fixed back button issue

* updated search juridiction component

* fixed facility pop up boundary refresh

* removed pending for approval from status filter

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* updated table and other fixes (#1882)

* updated table and other fixes

* fixed table issue

* Latest KPI values and Heading change (#1883)

* Popup changed to alert type

* UserName to name

* userName to name

* changes to heading font wieght

* css package
update

* Removed i icon

* changes

* removed comments

* removed comments

* changes

* isLoading removed

* updated css

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Added count of villages and facilities in confirmation messages (#1885)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Update UserUpload.js (#1886)

* fixed localization issue (#1888)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Removed  Core HRMS and updated the timeout of fetch from microplan

* changed residing-boundary to multiselect dropdown, fixed table scroll… (#1889)

* changed residing-boundary to multiselect dropdown, fixed table scroll styles, made boundary selection popup dropdown searcheable

* fixed dropdown alignment

* fixed validation in boundary create and timeline button in the summary (#1890)

* fixed validation in boundary create and timeline button in the summary

* changed localisation condition

* Added missing the translation

* Added list of assignee for pop and plan inbox (#1887)

* added list of assignee for pop and plan inbox

* updated comments

* updated assignee for plan inbox

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Re render assumption fix, atleast one mdms check, blank custom name check, (#1884)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* fix

* action bar fix, formula next back issue

* assumption and formula one mdms check and refetch blank label check

* remove status log column

* fix

* adhoc fix

* fix

* fix

* del session

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* fixed validation cond for app (#1891)

* fixed filestore call issue (#1895)

* toast fix, user tagging table dropdown fix and added comment toast (#1896)

* FIXES (#1893)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* fix

* action bar fix, formula next back issue

* assumption and formula one mdms check and refetch blank label check

* remove status log column

* fix

* adhoc fix

* fix

* fix

* del session

* FIXES
1. After clicking on nextin vehicle after addinginvalid valu3 it redirects me to 1st assumption page
2. yes no buttton ki jagah same rakho na dono pop up me in formula and assumption pop up
3. User can add same duplicate text assumption and same value comess. similary for same dropdowns can be selected multiple times(in vehicle). Applies for formula and assumption
4. cache issue in pop of add new in assumption and formula. Entered value is not reset if they close and reopen the popup. Applies for formula and assumption
5. need different loc code for description for vehicle assumption and vehicle estimation

* revert

* a

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* ui fixes. (#1897)

* ui fixes.

* review changes

* review changes1

* Fetch microplan related changes (#1898)

* mychange

* added changes for fetch from microplan screen

* updated packege

* added back button, redirected checklist success and fixed null issue … (#1894)

added back button, redirected checklist success and fixed null issue for app

* fixed finalized button issue (#1899)

* added fixes for the campaign update and fetch from mp

* added timeout cleaned up & fetch will start after the data template download

* Employee search fix (#1892)

* button change

* Changes

* Formula name validation

* Changes

* console log removed

* changes

* changes

* changes

* Original formula config

* Formula config change for toast

* Update FormulaConfiguration.js

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Bug fix (#1900)

* fixed decimal issue and total not getting validated issue

* fixed user tagging multiselect dropdown issue

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Added few extra waiting steps for templates

* KPI card fix, and css change (#1903)

* Heading added

* changes to query, for kpi card

* css change

* css package update

* update to inbox codes (#1904)

updates

* Added dynamic columns in facility screen (#1902)

* Added dynamic columns in facility screen

* changed the filter condition

* Update FacilityPopup.js

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>
Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* validations done for assumptions and formula (#1906)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* localisation and error codes (#1905)

* Added fixes for timeout and redirection for fetch microplan (#1901)

* Added fixes for timeout and redirection for fetch microplan

* Update useFetchFromMicroplan.js

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Added fixes for the template generation

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* wait and retry message (#1909)

* Updated toast wran to warning message toast type

* checking popup issue in facility screen (#1910)

Co-authored-by: Swathi-eGov <swathi.chatrathi@egovernments.org>

* Adhoc fixes 91 (#1912)

* updates to validation

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated regex

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Pop inbox Pagination fix (#1907)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Facility Pagination Fix (#1908)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Feature/er (#1914)

* wait and retry message

* type of structure changed for irs

* fixed plan inbox issues (#1915)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Table changes (#1913)

* a lot of changes

* small change

* changes

* loc

* removed

* added fixes for sort, view summary issue, no results in dropdown (#1916)

added fixes

* fixed facility catchment pop up issue (#1917)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Fixed Audit issues (#1918)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* removed alphanumeric valiadtion (#1922)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* updated the loader screen loader styles as per ux audit

* Kpis integrate (#1919)

* Kpis integration

* Some style changes

* Some validations

* Remove console

* Removed merged changes

* Data null handled

* Data null handled

* Assumption Toast Validation and Irs removed 1 (#1921)

* changes

* changes

* changes

* Fixed accessibility dropdown issue (#1923)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Added extra steps and styles updated

* Added toast and changes primary, seccondary in Assumption,Formula (#1924)

* changes

* changes

* changes

* changes

* Changed hierarchy schema for microplan (#1925)

* Changed hierarchy schema for microplan

* Update UserUpload.js

* removed duplicate campaignId

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Fixed small issues (#1927)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Audit fixes main (#1926)

* audit fixes

* fixed campaign details css issue

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

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated core, react-components,ui-components and releated css versions

* added icon for download and changed primary to secondary for action button

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* width fix for module card (#1929)

* Formula Checking Fix (#1930)

* small changes

* changes

* changes

* Edit Size button changed (#1931)

changes

* Update HypothesisWrapper.js (#1932)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Feature/fixes (#1928)

* microplan hover and campign fixes with checklist minor improvements

* bottom margin below add levels

* review changes

* Updates to formula (#1933)

* Update HypothesisWrapper.js

* Update FormulaConfigWrapper.js

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* fixed pop issue (#1934)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* css fix on card comp (#1935)

* Updated the campaign Card for the roles mapping

* Fixed screen breaking issue (#1936)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* validation update (#1937)

Update HypothesisWrapper.js

* Fixed assignee count for pop and plan inbox (#1938)

* Fixed assignee count for pop and plan inbox

* fixed back button issue in plan inbox

* removed logs

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Changes in facility kpis (#1939)

* Changes in facility kpis

* Some changes

* fixed product chip and summary issue (#1941)

fixed productchip and summary issue

* Mdms kpi (#1942)

* Kpis from mdms

* Some optimizations

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/useKpiDssSearch.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Dropdown popup fixes (#1943)

* removed custom loader, updated dropdown styles inside popup,fixed action drodpown css

* updated css version

* Added inline validations (#1944)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Added refetch (#1945)

* Assumption formula fixes (#1946)

* added a toast on back button

* updated formula source to CUSTOM when any custom assumption is used in

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Update createUpdatePlanProject.js (#1948)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Fixed back button and edit population error message logic (#1949)

* fixed back button and edit population error message logic

* updated back button in facility screen

* added show on ui conditions on fields

* added translation function

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* localizations for user management and user tag (#1950)

* Loc in userManagement

* Changes to user tag loc

* added status filters (#1952)

* additional validations on assumptions + showing formulas in plan inbox based on show on estimation dashboard (#1953)

additional validations

* Updated Bread crumbs (#1954)

* fixed back button and edit population error message logic

* Updated breadcrumbs

* removed unused import

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* sort issue fix, title for buttons, actionbar fix (#1955)

* Patch fix (#1956)

* added list of roles for assigner

* added null check

---------

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Popup fix (#1958)

* fixed popup scroll issue

* updated versions

* Changes for kpis (#1960)

* Fixed toast issue + fixed invalidation of assumption and formula (#1963)

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>

* Updated the loader text, updated the icon information, change log updated

* fixed error message issue (#1964)

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* Adhoc fixes 13: Fixed formula custom cascading changes + validations  (#1966)

* updated toast error in formulas

* Update createUpdatePlanProject.js

* updated mdms paths (#1968)

* Update searchDssChartV2.js (#1969)

* fixed resources,delivery screen issue and added campaign name (#1965)

* fixed resources,delivery screen issue and added campaign name

* added classname

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundarySummary.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* removed logs

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* bug bash bug of download popup openinng again and again (#1961)

* bug bash bug of download popup openinng again and again

* review changes

* Update UploadData.js

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* changes from count to quantity (#1970)

* changes from count to quantity

* removed logs

* Feature/time (#1971)

* timeline fix for microplan

* ui

* Update campaign.scss

---------

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* added campaign name in update (#1973)

* Updated loc codes (#1976)

Update Module.js

* Revert module changes for localisation (#1977)

Revert "Updated loc codes (#1976)"

This reverts commit cf596aa.

* Added fix for the buil issue for trying out the optional deepndency #1974 (#1978)

Added fix for the buil issue for trying out the optional deepndency

* Some handlings (#1980)

* Updated hrms path (#1979)

updated hrms path

Co-authored-by: rachana-egov <rachana.singh@egovernment.org>

* removed commented code

* fixed usermanagement toast issue (#1982)

* removed commented code

* Added core ui build to check performance

* Fixed error issue (#1983)

* updated the package version of campaign manager modules

* adding utils and remove hardcoding module name (#1984)

* adding utils and remove hardcoding module name

* Update UICustomizations.js

* Update index.js

---------

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* added title for all buttons (#1985)

* updated package versions

* filtering fixes (#1986)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* Updated the config for the core app

* updated directory

* Feature/hcmpre1418 (#1988)

rounding off to nearest integer in attributes

* formatted

* Update health/micro-ui/web/core/install-deps.sh

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/core/install-deps.sh

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated changeQueryName for planfacilityserach as residingBoundaries … (#1989)

* updated changeQueryName for planfacilityserach as residingBoundaries is changed to multiselect dropdown

* fixed length change issue

* fixed page responsiveness issue for formula configuration screen (#1990)

* clearing console (#1991)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>

* fixed rerendering of summary screen in update dates (#1992)

---------

Co-authored-by: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com>
Co-authored-by: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com>
Co-authored-by: rachana-egov <137176770+rachana-egov@users.noreply.github.com>
Co-authored-by: rachana-egov <rachana.singh@egovernment.org>
Co-authored-by: abishekTa-egov <abishek.t@egovernments.org>
Co-authored-by: ashish-egov <137176738+ashish-egov@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
Co-authored-by: suryansh-egov <suryansh.singh@egovernments.org>
Co-authored-by: Nipun Arora <aroranipun1@gmail.com>
Co-authored-by: Swathi-eGov <swathi.chatrathi@egovernments.org>
Co-authored-by: Shashwat Mishra <71879793+shashwat-egov@users.noreply.github.com>
Co-authored-by: Anuraj <154124191+anuraj-egov@users.noreply.github.com>
Co-authored-by: Bhavya-egov <bhavya.mangal@egovernments.org>
@nabeelmd-eGov nabeelmd-eGov mentioned this pull request Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants