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

not selected added in single value list #1824

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Conversation

suryansh-egov
Copy link
Contributor

@suryansh-egov suryansh-egov commented Nov 13, 2024

Choose the appropriate template for your PR:

Summary by CodeRabbit

  • New Features

    • Enhanced handling for "SingleValueList" question types in checklist creation and updating, including default value management.
    • Improved error handling with toast notifications for checklist submission failures, providing user feedback.
    • Standardized data structure for checklist payloads, particularly for "Short Answer" questions, ensuring consistency.
    • Updated search functionality to only retrieve active checklist templates and entries.
    • Added functionality to manage question options, ensuring only active options are displayed.
  • Bug Fixes

    • Refined logic for generating question codes, ensuring all questions are accounted for regardless of their active status.
  • Improvements

    • Overall robustness of the checklist creation and updating processes has been increased, enhancing user experience and data handling.

@suryansh-egov suryansh-egov requested a review from a team as a code owner November 13, 2024 12:56
Copy link
Contributor

coderabbitai bot commented Nov 13, 2024

Caution

Review failed

The pull request is closed.

📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes involve modifications to the CreateChecklist, UpdateChecklist, CreateQuestion, checklistSearchConfig, and SearchChecklist components within their respective JavaScript files. Enhancements include the addition of conditional checks for handling specific question types, improved error handling during submission processes, and adjustments to payload data structures. The onSubmit function in both CreateChecklist and UpdateChecklist now utilizes mutateAsync for better asynchronous operation management. Additionally, the useEffect hooks have been updated to manage user feedback more effectively through toast notifications, and the search configuration now filters for active entries.

Changes

File Change Summary
.../CreateChecklist.js - Updated createQuestionObject to handle "SingleValueList".
- Enhanced onSubmit with mutateAsync and improved error handling.
- Modified payloadData for "Short Answer" type.
.../UpdateChecklist.js - Added conditional check in createQuestionObject for "SingleValueList".
- Improved error handling in onSubmit with toast notifications.
- Adjusted generateCodes to process all questions.
.../CreateQuestion.js - Added isActive: true to reqCriteria for fetching active field types.
- Enhanced option management functions in FieldSelector.
.../checklistSearchConfig.js - Added isActive: true in MdmsCriteria to filter for active checklist templates.
.../SearchChecklist.js - Updated request criteria to include isActive: true for fetching active roles and checklist types.

Possibly related PRs

  • checklist-bugs-fixes #1513: The changes in the CreateChecklist component are related to the updates made in the UpdateChecklist component, particularly in how both components handle the createQuestionObject and payloadData functions, which now utilize additionalFields instead of additionalDetails.
  • error toast and checklist updates #1805: This PR also modifies the CreateChecklist component, specifically updating the createQuestionObject and payloadData functions to reflect the renaming of additionalDetails to additionalFields, aligning with the changes made in the main PR.
  • toast and minor ui #1809: The changes in this PR focus on UI elements and toast notifications, which are relevant to the user feedback mechanisms enhanced in the main PR's onSubmit function, where error handling and user notifications are improved.

Suggested reviewers

  • jagankumar-egov

🐇 In the garden where bunnies play,
New checklists bloom, brightening the day.
With toasts of joy for tasks we create,
Single values now have a lovely fate!
So hop along, let’s celebrate,
For every change, we appreciate! 🌼


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.

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: 3

🧹 Outside diff range comments (4)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js (2)

Line range hint 590-614: Enhance error handling in onSubmit function

The current error handling could be improved to provide more specific feedback and better error tracking.

Consider applying this enhancement:

   try {
     const data = await mutateAsync(payload);
-    // Handle successful checklist creation  
     if (data.success) {
       const localisations = uniqueLocal;
       const localisationResult = await localisationMutateAsync(localisations);
       if (!localisationResult.success) {
         setShowToast({ label: "CHECKLIST_CREATED_LOCALISATION_ERROR", isError: "true" });
+        console.error("Localization failed:", localisationResult.error);
         return;
       }
       history.push(`/${window.contextPath}/employee/campaign/response?isSuccess=${true}`, {
         message: "ES_CHECKLIST_CREATE_SUCCESS_RESPONSE",
         preText: "ES_CHECKLIST_CREATE_SUCCESS_RESPONSE_PRE_TEXT",
         actionLabel: "CS_CHECKLIST_NEW_RESPONSE_ACTION",
         actionLink: `/${window.contextPath}/employee/campaign/checklist/search?name=${projectName}&campaignId=${campaignId}&projectType=${projectType}`,
         secondaryActionLabel: "MY_CAMPAIGN",
         secondaryActionLink: `/${window?.contextPath}/employee/campaign/my-campaign`,
       });
     } else {
-      setShowToast({ label: "CHECKLIST_CREATED_FAILED", isError: "true" });
+      setShowToast({ 
+        label: data.error?.message || "CHECKLIST_CREATED_FAILED", 
+        isError: "true" 
+      });
+      console.error("Checklist creation failed:", data.error);
     }
   } catch (error) {
-    setShowToast({ label: "CHECKLIST_CREATED_FAILED", isError: "true" });
+    const isNetworkError = error.name === 'NetworkError';
+    setShowToast({ 
+      label: isNetworkError ? "NETWORK_ERROR" : "CHECKLIST_CREATED_FAILED", 
+      isError: "true" 
+    });
+    console.error("Error in checklist creation:", error);
   } finally {
     setSubmitting(false);
   }

Line range hint 1-24: Consider component decomposition and code organization

The component is quite large and handles multiple responsibilities. Consider breaking it down into smaller, more manageable pieces.

Suggestions for improvement:

  1. Extract utility functions (generateCodes, createQuestionObject, transformQuestions) into a separate utils file
  2. Create custom hooks for form state management and API interactions
  3. Split the preview functionality into a separate component

Example structure:

// utils/checklistUtils.js
export const generateCodes = (questions) => { ... }
export const createQuestionObject = (item, tenantId, idCodeMap) => { ... }
export const transformQuestions = (questions, tenantId, idCodeMap) => { ... }

// hooks/useChecklistForm.js
export const useChecklistForm = (initialData) => {
  const [formData, setFormData] = useState(initialData);
  // ... other form-related state and logic
  return { formData, ... };
}

// components/ChecklistPreview.js
export const ChecklistPreview = ({ data, onSubmit, onClose }) => { ... }

// CreateChecklist.js
const CreateChecklist = () => {
  const { formData, ... } = useChecklistForm(initialData);
  // ... reduced component logic
}
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js (2)

Line range hint 1-24: Consider extracting toast configuration to constants

The toast timeout and other UI-related constants should be defined as named constants at the top of the file.

Add these constants:

const TOAST_TIMEOUT_MS = 5000;
const LOADING_STATES = {
  IDLE: 'idle',
  SUBMITTING: 'submitting',
  ERROR: 'error',
  SUCCESS: 'success'
};

Line range hint 1-700: Consider restructuring for better maintainability

The component is handling too many responsibilities and could benefit from better separation of concerns.

Consider these architectural improvements:

  1. Extract utility functions to a separate file:

    • generateCodes
    • createQuestionObject
    • transformQuestions
    • organizeQuestions
  2. Create separate custom hooks for:

    • Form state management
    • API interactions
    • Toast notifications
  3. Split the component into smaller, focused components:

    • ChecklistForm
    • ChecklistPreview
    • ChecklistHeader

This would improve maintainability, testability, and reusability of the code.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 28c5ea4 and 1be0b62.

📒 Files selected for processing (2)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js (1)

Pattern **/*.js: check

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

Pattern **/*.js: check

Comment on lines 332 to 335
console.log("hieeee", String(item?.type?.code));
if(String(item?.type?.code) === "SingleValueList"){
labelsArray.push("NOT_SELECTED");
}
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

Remove console.log and improve type comparison

The code has two issues:

  1. Console.log statement should be removed from production code
  2. String comparison can be made more robust

Apply this diff to fix both issues:

-    console.log("hieeee", String(item?.type?.code));
-    if(String(item?.type?.code) === "SingleValueList"){
+    if(String(item?.type?.code)?.toLowerCase() === "singlevaluelist"){
       labelsArray.push("NOT_SELECTED");
     }
📝 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
console.log("hieeee", String(item?.type?.code));
if(String(item?.type?.code) === "SingleValueList"){
labelsArray.push("NOT_SELECTED");
}
if(String(item?.type?.code)?.toLowerCase() === "singlevaluelist"){
labelsArray.push("NOT_SELECTED");
}

Comment on lines +279 to +281
if(String(item?.type?.code) === "SingleValueList"){
labelsArray.push("NOT_SELECTED");
}
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

Improve error handling specificity

The error handling could be more specific about what went wrong during the update process.

Consider enhancing the error handling:

 } catch (error) {
-    setShowToast({ label: "CHECKLIST_UPDATE_FAILED", isError: "true" });
+    const errorMessage = error.response?.data?.message || "CHECKLIST_UPDATE_FAILED";
+    setShowToast({ 
+      label: errorMessage,
+      isError: "true",
+      details: error.message 
+    });
     // console.error("Error creating checklist:", error);
 }

Also applies to: 279-281


🧹 Nitpick (assertive)

Improve string comparison robustness

The string comparison for question type could be more resilient to edge cases.

Consider this improvement:

-if(String(item?.type?.code) === "SingleValueList"){
+if(String(item?.type?.code)?.toUpperCase() === "SINGLEVALUELIST"){

This change makes the comparison case-insensitive and more maintainable.

📝 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
if(String(item?.type?.code) === "SingleValueList"){
labelsArray.push("NOT_SELECTED");
}
if(String(item?.type?.code)?.toUpperCase() === "SINGLEVALUELIST"){
labelsArray.push("NOT_SELECTED");
}

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: 1

🧹 Outside diff range comments (8)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SearchChecklist.js (4)

Line range hint 56-67: Consider adding error handling for MDMS data fetch

The useEffect for processing MDMS data should handle potential errors and edge cases.

 useEffect(() => {
   const data = dataBT?.mdms;
-  if(data)
+  if (!data) {
+    console.error('Failed to fetch MDMS roles data');
+    return;
+  }
+  try {
     const newCodesOpt = data.map((item) => ({
       code: `ACCESSCONTROL_ROLES_ROLES_${item?.data?.code}`
     }));
     setCodesOpt(newCodesOpt)
+  } catch (error) {
+    console.error('Error processing MDMS roles data:', error);
+    setCodesOpt([]);
+  }
 }, [dataBT]);

Line range hint 82-93: Add error handling for HCM data processing

Similar to the previous comment, the HCM data processing should include error handling.

 useEffect(() => {
   let data = HCM?.mdms;
-  if(data)
+  if (!data) {
+    console.error('Failed to fetch HCM data');
+    return;
+  }
+  try {
     const newListsOpt = data.map((item) => ({
       list: `HCM_CHECKLIST_TYPE_${item?.data?.code}`
     }));
     setListsOpt(newListsOpt)
+  } catch (error) {
+    console.error('Error processing HCM data:', error);
+    setListsOpt([]);
+  }
 }, [HCM]);

Line range hint 119-122: Improve loading state handling

The current loading state implementation could be enhanced to provide better user feedback.

-if (isFetching) return <div></div>;
+if (isFetching) {
+  return (
+    <div className="loader-container">
+      <Loader /> {/* Assuming you have a Loader component */}
+    </div>
+  );
+}

Line range hint 95-98: Remove commented code

There's commented code that appears to be obsolete. If it's no longer needed, it should be removed for better code maintainability.

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

Line range hint 28-108: Consider refactoring option management for better maintainability

The option management logic (handleAddOption, handleUpdateOption, handleOptionDependency, etc.) follows similar patterns and could be consolidated using a reducer pattern. This would:

  • Centralize option state management
  • Reduce code duplication
  • Make the logic more maintainable

Consider refactoring the option management code to use a reducer:

+const optionReducer = (state, action) => {
+  switch (action.type) {
+    case 'ADD_OPTION':
+      return [...state, {
+        id: crypto.randomUUID(),
+        key: state.length + 1,
+        parentQuestionId: action.parentId,
+        label: `${action.t("HCM_CHECKLIST_OPTION")} ${state.length + 1}`,
+        optionDependency: false,
+        optionComment: false,
+      }];
+    case 'UPDATE_OPTION':
+      return state.map(item => 
+        item.key === action.payload.id 
+          ? { ...item, label: action.payload.value }
+          : item
+      );
+    case 'TOGGLE_DEPENDENCY':
+      return state.map(option =>
+        option.id === action.id
+          ? { ...option, optionDependency: !option.optionDependency }
+          : option
+      );
+    // Add other cases...
+    default:
+      return state;
+  }
+};
+
+const [options, dispatch] = useReducer(optionReducer, initialOptions);
+
+const handleAddOption = () => {
+  dispatch({ type: 'ADD_OPTION', parentId: field.id, t });
+};
+
+const handleUpdateOption = (param) => {
+  dispatch({ type: 'UPDATE_OPTION', payload: param });
+};

Line range hint 437-611: Consider splitting the component for better separation of concerns

The CreateQuestion component currently handles multiple responsibilities:

  • Question creation
  • Question updates
  • View mode rendering
  • Option management
  • Sub-question handling

This makes the component complex and harder to maintain. Consider splitting it into smaller, more focused components:

  • QuestionForm (base form structure)
  • QuestionOptions (option management)
  • SubQuestions (nested question handling)

This would:

  • Improve code organization
  • Make testing easier
  • Reduce cognitive load when maintaining the code
  • Make it easier to add new features or modify existing ones
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js (2)

Line range hint 590-596: Consider using a cleanup function in useEffect

The current implementation might lead to race conditions if multiple toasts are triggered in quick succession. Consider using a cleanup function.

 useEffect(()=>{
+  let timeoutId;
   if(showToast !== null)
   {
     setShowPopUp(false);
+    timeoutId = setTimeout(() => setShowToast(null), 5000);
   }
+  return () => {
+    if (timeoutId) clearTimeout(timeoutId);
+  };
 }, [showToast])

Line range hint 526-548: Enhance error handling in onSubmit

The error handling could be more specific to help users understand and resolve issues better.

 } catch (error) {
-  // Handle error scenario
-  setShowToast({ label: "CHECKLIST_CREATED_FAILED", isError: "true" });
-  // console.error("Error creating checklist:", error);
+  const errorMessage = error.response?.data?.message || "CHECKLIST_CREATED_FAILED";
+  setShowToast({ 
+    label: errorMessage, 
+    isError: "true",
+    details: error.response?.data?.errors?.map(e => e.message).join(', ')
+  });
 } finally {
📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 1be0b62 and e1e08be.

📒 Files selected for processing (4)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/checklistSearchConfig.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js (2 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SearchChecklist.js (2 hunks)
🧰 Additional context used
📓 Path-based instructions (4)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js (1)

Pattern **/*.js: check

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

Pattern **/*.js: check

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

Pattern **/*.js: check

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

Pattern **/*.js: check

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

18-18: Verify the impact of filtering only active templates.

The addition of isActive: true will filter out inactive checklist templates from search results. While this aligns with showing active status in the results table, please ensure this is the intended behavior.

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

53-53: MDMS filtering looks good, but verify data consistency

The addition of isActive filters and type constraints in the MDMS criteria will help ensure only relevant data is fetched. However, we should verify that this doesn't accidentally filter out valid entries.

Also applies to: 75-76

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

259-259: LGTM: Filtering for active field types

The addition of isActive: true improves the UX by filtering out inactive field types from the dropdown options.

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

75-76: LGTM: Improved MDMS search criteria

Adding isActive: true to the search criteria is a good optimization that ensures only active checklist templates are retrieved.


333-335: Past review comment is still applicable

A previous review has already addressed the string comparison improvement needed in this code segment.

@@ -15,6 +15,7 @@
MdmsCriteria: {
tenantId: tenantId,
schemaCode: `HCM-ADMIN-CONSOLE.ChecklistTemplates`,
isActive: true,
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)

Document the active-only filtering behavior.

Consider adding a code comment to document that this configuration only returns active checklist templates. This helps other developers understand the filtering behavior.

 schemaCode: `HCM-ADMIN-CONSOLE.ChecklistTemplates`,
+// Only fetch active checklist templates
 isActive: true,
 filters : {},
📝 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
isActive: true,
schemaCode: `HCM-ADMIN-CONSOLE.ChecklistTemplates`,
// Only fetch active checklist templates
isActive: true,
filters : {},

@jagankumar-egov jagankumar-egov merged commit eb972fc into console Nov 13, 2024
3 checks passed
@jagankumar-egov jagankumar-egov deleted the feature/cl-new-req branch November 13, 2024 13:26
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 <[email protected]>

* Summary css fix (#1755)

* updated css for summary screen

* removed log

* added null check

---------

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix key (#1764)

Co-authored-by: NabeelAyubee <[email protected]>

* 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 <[email protected]>

* Feature/bug (#1773)

* z-index and camapaign-name in preview

* ui-ux-demo-review

* version updates

* ver

* Update ViewHierarchy.js

---------

Co-authored-by: Jagankumar <[email protected]>

* Updated the search dropdown (#1776)

updated the search dropdown

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
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 <[email protected]>
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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* css fixes (#1792)

Co-authored-by: Jagankumar <[email protected]>

* 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 <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* demo issue fixes (#1797)

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

added confimation pop up to finalize actions

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>

* Update searchSavedPlansWithCampaign.js (#1841)

Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

* Changes ro userAccessTableWrapper

* Response Screen

* comment removed

* minor updates (#1853)

Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* added serving facility (#1860)

Co-authored-by: NabeelAyubee <[email protected]>

* updated code (#1861)

* Formcomposer action bar fixes (#1862)

* added serving facility

* form composer action bar fix

---------

Co-authored-by: NabeelAyubee <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* patch fix (#1868)

* route back to home on back

* fixed refresh issue for pop inbox

---------

Co-authored-by: rachana-egov <[email protected]>

* polling fix (#1870)

* polling fix

* Update TimelineComponent.js

* assumptions fixes (#1871)

Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* Update PopInbox.js (#1875)

Co-authored-by: Nipun Arora <[email protected]>

* scroll (#1876)

Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

Co-authored-by: rachana-egov <[email protected]>

* Update UserUpload.js (#1886)

* fixed localization issue (#1888)

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Bug fix (#1900)

* fixed decimal issue and total not getting validated issue

* fixed user tagging multiselect dropdown issue

---------

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>

* validations done for assumptions and formula (#1906)

Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Pop inbox Pagination fix (#1907)

Co-authored-by: rachana-egov <[email protected]>

* Facility Pagination Fix (#1908)

Co-authored-by: rachana-egov <[email protected]>

* Feature/er (#1914)

* wait and retry message

* type of structure changed for irs

* fixed plan inbox issues (#1915)

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>

* Fixed Audit issues (#1918)

Co-authored-by: rachana-egov <[email protected]>

* removed alphanumeric valiadtion (#1922)

Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Fixed small issues (#1927)

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* fixed pop issue (#1934)

Co-authored-by: rachana-egov <[email protected]>

* css fix on card comp (#1935)

* Updated the campaign Card for the roles mapping

* Fixed screen breaking issue (#1936)

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Update createUpdatePlanProject.js (#1948)

Co-authored-by: Nipun Arora <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

* fixed error message issue (#1964)

Co-authored-by: rachana-egov <[email protected]>

* 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 <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Jagankumar <[email protected]>

* added title for all buttons (#1985)

* updated package versions

* filtering fixes (#1986)

Co-authored-by: NabeelAyubee <[email protected]>

* 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 <[email protected]>

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

---------

Co-authored-by: Swathi-eGov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: rachana-egov <[email protected]>
Co-authored-by: rachana-egov <[email protected]>
Co-authored-by: abishekTa-egov <[email protected]>
Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: suryansh-egov <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>
Co-authored-by: Swathi-eGov <[email protected]>
Co-authored-by: Shashwat Mishra <[email protected]>
Co-authored-by: Anuraj <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
@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