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

Table changes #1913

Merged
merged 5 commits into from
Nov 27, 2024
Merged

Table changes #1913

merged 5 commits into from
Nov 27, 2024

Conversation

abishekTa-egov
Copy link
Contributor

@abishekTa-egov abishekTa-egov commented Nov 27, 2024

a lot of changes

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced pagination functionality in user access management, allowing dynamic adjustment of rows displayed per page.
    • Improved error handling for employee updates, providing clearer feedback to users.
  • Style

    • Increased font size for the "CAMPAIGN_DETAILS" section in the Summary Screen for better visibility.
  • Bug Fixes

    • Streamlined search criteria handling in API requests, improving overall performance and reliability.
    • Added validation checks for adding new formulas, ensuring data integrity during formula management.
    • Implemented checks to prevent deletion of mandatory formulas, enhancing formula management robustness.

@abishekTa-egov abishekTa-egov requested a review from a team as a code owner November 27, 2024 11:47
Copy link
Contributor

coderabbitai bot commented Nov 27, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

The pull request introduces modifications to several components within the microplan module, primarily focusing on enhancing pagination and error handling in the UserAccess and UserAccessMgmtTableWrapper components. Changes include replacing hardcoded pagination values with dynamic references, updating API call structures, and refining error message handling. Additionally, minor UI adjustments are made in the SummaryScreen component, specifically related to font size. Overall, the changes aim to improve user interaction and data management without altering the core functionality.

Changes

File Change Summary
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js Modified offset calculation in usePlanSearchEmployeeWithTagging to use rowsPerPage. Improved error handling in handleUpdateAssignEmployee for better user feedback.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js Added setRowsPerPage state variable for dynamic row management. Updated limit and offset in usePlanSearchEmployeeWithTagging. Introduced handleRowsPerPageChange function for handling pagination changes.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js Consolidated search criteria in searchPlanEmployeeWithTaggingConfig. Modified API call parameters to encapsulate tenantId, limit, and offset within the request body.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SummaryScreen.js Increased font size for "CAMPAIGN_DETAILS" section. Adjusted inline styles for card headers while maintaining existing component logic and structure.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js Enhanced formula management with validation checks for adding new formulas and preventing deletion of mandatory formulas. Updated UI components to reflect these changes.

Suggested reviewers

  • nipunarora-eGov

Poem

🐰 In the land of code where rabbits play,
Pagination dances, brightening the day.
With rows that change and errors that mend,
User access blooms, a joyful trend!
So hop along, let the data flow,
In our microplan garden, watch it grow! 🌼


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

🧹 Outside diff range comments (5)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1)

Line range hint 48-56: Enhance error handling with more specific messages

The current error handling could be more informative. Consider providing more specific error messages based on the context of the failure (first API call vs second API call).

 } catch (error) {
   if (error?.response?.data?.Errors) {
     throw new Error(error.response.data.Errors[0].message);
   }
-  throw new Error("An unknown error occurred");
+  throw new Error(
+    `Failed to fetch employee data: ${error.message || 'An unknown error occurred'}`
+  );
 }
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SummaryScreen.js (1)

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

While reviewing the component, I noticed several areas where the architecture could be improved:

  1. Props validation is missing, which could lead to runtime errors
  2. The component handles multiple responsibilities and could benefit from being broken down
  3. Error boundaries would help with graceful error handling

Consider these improvements:

  1. Add PropTypes validation:
import PropTypes from 'prop-types';

SummaryScreen.propTypes = {
  props: PropTypes.shape({
    sessionData: PropTypes.object.isRequired
  }).isRequired
};
  1. Extract card configurations into separate components or configuration files to reduce complexity
  2. Implement an error boundary to handle potential rendering errors:
import { ErrorBoundary } from '@egovernments/digit-ui-react-components';

// Wrap the component content
<ErrorBoundary>
  <ViewComposer data={data} />
</ErrorBoundary>
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js (3)

Line range hint 144-157: Improve error handling consistency and state management

  1. There's inconsistent usage of semicolons after statements
  2. Multiple state updates could potentially cause race conditions

Consider batching the state updates and maintaining consistent semicolon usage:

      onSuccess: (data) => {
        queryClient.invalidateQueries("PLAN_SEARCH_EMPLOYEE_WITH_TAGGING");
        refetchPlanEmployee();
-        setUnassignPopup(false)
-        setShowToast({ key: "success", label: t("UNASSIGNED_SUCCESSFULLY") });
-        setIsLoading(false);
+        setUnassignPopup(false);
+        setShowToast({ key: "success", label: t("UNASSIGNED_SUCCESSFULLY") });
+        setIsLoading(false);
      },
      onError: (error, variables) => {
-        setUnassignPopup(false)
-        setShowToast({ key: "error", label: error?.message ? error.message : t("FAILED_TO_UPDATE_RESOURCE") });
-        setIsLoading(false);
+        setUnassignPopup(false);
+        setShowToast({ key: "error", label: error?.message ? error.message : t("FAILED_TO_UPDATE_RESOURCE") });
+        setIsLoading(false);
      },

Line range hint 249-257: Remove commented code and implement search debouncing

The commented code in handleSearch function should be removed. Additionally, consider implementing debouncing for search to prevent excessive API calls.

  const handleSearch = (query) => {
-    // if (query?.length >= 2) {
    setSearchQuery(query);
-    // } else {
-    // setSearchQuery(null);
-    // }
-    // Handle search logic, such as filtering or API calls
  };

Consider implementing debouncing:

const debouncedSearch = Digit.Utils.debounce((query) => {
  setSearchQuery(query);
}, 300);

const handleSearch = (query) => {
  debouncedSearch(query);
};

Line range hint 91-94: Optimize useEffect dependencies

The useEffect has totalRows in its dependency array, but totalRows is only set based on planEmployee. This creates an unnecessary re-fetch cycle.

  useEffect(() => {
    refetchPlanEmployee();
-  }, [totalRows, currentPage, rowsPerPage, searchQuery]);
+  }, [currentPage, rowsPerPage, searchQuery]);
📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 3e214a9 and 2934e44.

📒 Files selected for processing (4)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (4 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (2 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SummaryScreen.js (1 hunks)
🧰 Additional context used
📓 Path-based instructions (4)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SummaryScreen.js (1)

Pattern **/*.js: check

📓 Learnings (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (1)
Learnt from: Ramkrishna-egov
PR: egovernments/DIGIT-Frontend#1670
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js:156-160
Timestamp: 2024-11-12T10:40:11.591Z
Learning: In the `UserAccessMgmtTableWrapper` component, since the `ShowMoreWrapper` is rendered within the cell, additional checks or row-specific state management are not required.
🔇 Additional comments (3)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (3)

41-41: LGTM: State management for pagination is properly implemented.

The addition of setRowsPerPage setter function enables dynamic pagination control.


230-230: LGTM: DataTable pagination configuration is complete.

The onChangeRowsPerPage prop is correctly connected to the handler, completing the pagination implementation.


51-52: Verify API contract for pagination and role parameters.

A few observations about the API configuration:

  1. The pagination logic is correctly implemented
  2. The role parameter is now passed as an array [role] - ensure this matches the API contract
  3. Consider adding rowsPerPage to the queryKey for proper cache invalidation when page size changes

Let's verify the API contract:

Also applies to: 57-58

✅ Verification successful

The role parameter format is correctly implemented as an array

Based on the codebase analysis:

  1. The pagination parameters (limit, offset) are correctly passed through to the API
  2. The role parameter is consistently used as an array across multiple components (UserAccess.js, UserAccessMgmtTableWrapper.js, PlanInbox.js, etc.)
  3. The service implementation (searchPlanEmployeeWithTaggingConfig.js) properly handles the role parameter in the API request
  4. The queryKey includes all necessary parameters (microplanId, role, currentPage) for proper cache management
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for other usages of this API to verify the role parameter format
ast-grep --pattern 'usePlanSearchEmployeeWithTagging({
  $$$
  body: {
    "PlanEmployeeAssignmentSearchCriteria": {
      $$$
      role: $_,
      $$$
    }
  }
})'

Length of output: 168


Script:

#!/bin/bash
# Let's try a broader search for the API usage patterns
rg -A 5 "usePlanSearchEmployeeWithTagging" 

# Also search for the role parameter usage in API calls
rg -A 5 "PlanEmployeeAssignmentSearchCriteria.*role"

# Search for any test files or mock data that might show the API contract
fd -e test.js -e spec.js -e mock.js -X rg "PlanEmployeeAssignmentSearchCriteria"

Length of output: 7852


Script:

#!/bin/bash
# Let's look at the specific file to see how role is being used
rg -A 10 "PlanEmployeeAssignmentSearchCriteria" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js

# Also check the hook implementation for any role parameter handling
cat health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/usePlanSearchEmployeeWithTagging.js

Length of output: 1145


Script:

#!/bin/bash
# Let's check the service implementation to see how the API call is made
cat health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js

# Also check other usages to see role parameter format
rg -A 5 "role: \[" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/

Length of output: 7372

@abishekTa-egov abishekTa-egov changed the title a lot of changes Table changes Nov 27, 2024
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: 0

🧹 Outside diff range comments (2)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (2)

Line range hint 24-29: Improve error handling specificity

The error message "Employee not found with the given role" is used for both API calls, making it difficult to identify which call failed. Consider using more specific error messages:

 if (!response) {
-  throw new Error("Employee not found with the given role");
+  throw new Error("No plan assignments found for the search criteria");
 }
 const uuids = response?.PlanEmployeeAssignment?.map((i) => i.employeeId);
 if (!uuids || uuids?.length === 0) {
   return null;
 }

Line range hint 30-39: Add batch processing for large UUID lists

The second API call concatenates all UUIDs into a single query parameter, which could cause issues with very long URLs or server-side limitations.

Consider implementing batch processing for large UUID lists:

const MAX_UUIDS_PER_BATCH = 50;
const processBatch = async (uuidBatch) => {
  return Digit.CustomService.getResponse({
    url: "/health-hrms/employees/_search",
    method: "POST",
    params: {
      ...params,
      userServiceUuids: uuidBatch.join(","),
    },
  });
};

// Process UUIDs in batches
const results = [];
for (let i = 0; i < uuids.length; i += MAX_UUIDS_PER_BATCH) {
  const batch = uuids.slice(i, i + MAX_UUIDS_PER_BATCH);
  const batchResult = await processBatch(batch);
  results.push(...batchResult.Employees);
}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 2934e44 and 4c1d484.

📒 Files selected for processing (1)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1)

Pattern **/*.js: check

🔇 Additional comments (2)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (2)

3-9: 🛠️ Refactor suggestion

Consider parameter override risks and add input validation

The spread operator could potentially override the new values if they exist in PlanEmployeeAssignmentSearchCriteria. Consider reversing the spread order:

 const updatedPlanEmployeeAssignmentSearchCriteria={
-  ...PlanEmployeeAssignmentSearchCriteria,
   tenantId: tenantId,
   limit: limit,
   offset: offset,
+  ...PlanEmployeeAssignmentSearchCriteria,
 }    

Also, as previously suggested, add validation for pagination parameters to prevent issues with invalid values.


16-21: 🛠️ Refactor suggestion

Remove unnecessary empty params object

The empty params object with commented code can be removed entirely since it serves no purpose.

-      params: {
-        
-        // sortOrder: sortOrder,
-      },
       body:{
-        PlanEmployeeAssignmentSearchCriteria:{...updatedPlanEmployeeAssignmentSearchCriteria}
+        PlanEmployeeAssignmentSearchCriteria: updatedPlanEmployeeAssignmentSearchCriteria
       }

Copy link
Contributor

@nipunarora-eGov nipunarora-eGov left a comment

Choose a reason for hiding this comment

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

check comments

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 (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1)

Line range hint 1-48: Consider splitting the service calls for better maintainability

The current function handles two distinct API calls (plan-service and health-hrms). Consider splitting these into separate service functions for better maintainability and reusability:

  1. searchPlanEmployeeAssignment
  2. searchEmployeeHRMS
  3. A wrapper function that combines both when needed

This would:

  • Make the code more modular
  • Allow independent usage of each service
  • Make testing easier
  • Improve error handling for each service

Would you like me to provide an example implementation of this refactoring?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 4c1d484 and fe5de89.

📒 Files selected for processing (3)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (4 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1)

Pattern **/*.js: check

📓 Learnings (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (1)
Learnt from: Ramkrishna-egov
PR: egovernments/DIGIT-Frontend#1670
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js:156-160
Timestamp: 2024-11-12T10:40:11.591Z
Learning: In the `UserAccessMgmtTableWrapper` component, since the `ShowMoreWrapper` is rendered within the cell, additional checks or row-specific state management are not required.
🔇 Additional comments (6)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (2)

10-12: 🧹 Nitpick (assertive)

Remove unnecessary empty params object and commented code

The empty params object with commented code should be removed for better code maintainability.

-      params: {
-        
-        // sortOrder: sortOrder,
-      },

13-15: Verify consistency of pagination implementation

The current implementation spreads the search criteria and adds pagination parameters, but we should verify if this matches the API contract and other similar implementations in the codebase.

✅ Verification successful

Let me gather more information about the pagination implementation by checking the contents of these files.


Based on the analysis of the codebase, I can now provide a final response:

Pagination implementation is consistent with codebase patterns

The current implementation in searchPlanEmployeeWithTaggingConfig.js follows the established pattern across the microplan module where:

  • Pagination parameters (limit and offset) are passed through the search criteria object
  • The parameters are consistently spread into the PlanEmployeeAssignmentSearchCriteria object
  • This matches other implementations like searchSavedPlansWithCampaign.js and similar search endpoints
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for similar API calls to verify consistency
rg -A 5 "plan-service/employee/_search" --type js

# Look for other pagination implementations
ast-grep --pattern 'body: {
  $$$
  limit: $_,
  offset: $_
  $$$
}'

Length of output: 3550


Script:

#!/bin/bash
# Check the implementation in SearchHRMSEmployeeConfig.js
cat health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/SearchHRMSEmployeeConfig.js

# Check the implementation in searchSavedPlansWithCampaign.js
cat health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlansWithCampaign.js

# Look for any other pagination implementations in the microplan module
rg -A 5 "limit.*offset" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/

Length of output: 23146

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js (4)

41-41: LGTM: State management for pagination is properly implemented.

The addition of setRowsPerPage enables dynamic pagination control with an appropriate initial value.


176-182: LGTM: Pagination handlers are correctly implemented.

The handlers properly update pagination state, and the refetch logic has been moved to the useEffect hook as requested.


230-230: LGTM: DataTable pagination configuration is complete.

The onChangeRowsPerPage prop is properly connected to the handler, completing the pagination implementation.


51-52: LGTM: API configuration is properly structured.

The pagination parameters and role filtering are correctly implemented. The queryKey configuration will ensure proper cache management.

Let's verify the API response handling:

Also applies to: 57-58

✅ Verification successful

LGTM: Pagination and API configuration are correctly implemented

The code inspection confirms:

  • The hook properly accepts and forwards pagination parameters (limit, offset)
  • The component correctly calculates pagination with (currentPage - 1) * rowsPerPage
  • The response data is properly handled through the select transform function
  • The pagination state is managed appropriately with handlePaginationChange and handleRowsPerPageChange
  • The component correctly updates when pagination changes through the useEffect hook
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if the component properly handles API responses with the new configuration
ast-grep --pattern 'usePlanSearchEmployeeWithTagging({
  $$$
  config: {
    select: ($_) => {
      $$$
    }
  }
})'

Length of output: 120


Script:

#!/bin/bash
# Let's first check if the hook exists and its usage pattern
rg -A 5 "usePlanSearchEmployeeWithTagging" 

# Also check for any API response handling patterns
rg -A 10 "select.*=.*{" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/

Length of output: 7901


Script:

#!/bin/bash
# Let's check the hook implementation and its response handling
cat health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/usePlanSearchEmployeeWithTagging.js

# Also check the component's usage of the response data
cat health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js

Length of output: 8504

coderabbitai[bot]
coderabbitai bot previously approved these changes Nov 27, 2024
@nipunarora-eGov nipunarora-eGov merged commit 266a3a9 into console Nov 27, 2024
3 checks passed
@nipunarora-eGov nipunarora-eGov deleted the abi-27-11 branch November 27, 2024 12:50
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 (2)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (2)

Line range hint 41-46: Enhance error handling structure

The current error handling can be improved to provide more context and preserve the original error for debugging.

Apply this diff to enhance error handling:

 } catch (error) {
   if (error?.response?.data?.Errors) {
-    throw new Error(error.response.data.Errors[0].message);
+    const apiError = error.response.data.Errors[0];
+    throw new Error(`API Error [${apiError.code}]: ${apiError.message}`);
   }
-  throw new Error("An unknown error occurred");
+  throw new Error(`Operation failed: ${error.message || 'Unknown error occurred'}`);
 }

This change:

  1. Includes error codes in API errors for better tracking
  2. Preserves the original error message when available
  3. Provides more context for debugging

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

Add response validation for both API calls

The code should validate both the plan employee assignment response and employee data response structures. The search results show consistent usage patterns:

  • PlanEmployeeAssignment is an array containing employee assignments
  • TotalCount is a number field used for pagination
  • Employee response contains an Employees array

Consider adding these validations:

const isValidPlanResponse = (resp) => 
  Array.isArray(resp?.PlanEmployeeAssignment) && 
  typeof resp?.TotalCount === 'number';

const isValidEmployeeResponse = (resp) =>
  Array.isArray(resp?.Employees);

if (!response || !isValidPlanResponse(response)) {
  return null;
}

if (!employeeData || !isValidEmployeeResponse(employeeData)) {
  return null;
}
🔗 Analysis chain

Line range hint 22-24: Add response structure validation

The code assumes specific response structures without validation. This could lead to runtime errors if the API response format changes.

Let's verify the response structure expectations:

Consider adding type checking:

+ const isValidResponse = (resp) => 
+   resp?.PlanEmployeeAssignment?.length >= 0 && 
+   typeof resp?.TotalCount === 'number';

- if (!response) {
+ if (!response || !isValidResponse(response)) {
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for usages of this response structure across the codebase
rg -A 2 'PlanEmployeeAssignment|TotalCount' --type js

# Search for similar response handling patterns
ast-grep --pattern 'const $_ = $_?.map((i) => i.$_)'

Length of output: 22521

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between fe5de89 and ae956ce.

📒 Files selected for processing (1)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1)

Pattern **/*.js: check

🔇 Additional comments (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchPlanEmployeeWithTaggingConfig.js (1)

9-10: Remove empty params object and commented code

The empty params object with commented code should be removed as it serves no purpose.

Comment on lines +12 to +14
body:{
PlanEmployeeAssignmentSearchCriteria:{...body.PlanEmployeeAssignmentSearchCriteria,limit,offset,tenantId}
}
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 safety checks and validation for request body

The current implementation needs additional safety measures:

  1. Add null checks before accessing nested properties
  2. Validate pagination parameters

Apply this diff to improve safety:

 body: {
-  PlanEmployeeAssignmentSearchCriteria:{...body.PlanEmployeeAssignmentSearchCriteria,limit,offset,tenantId}
+  PlanEmployeeAssignmentSearchCriteria: {
+    ...(body?.PlanEmployeeAssignmentSearchCriteria || {}),
+    limit: Math.max(1, limit || 10),  // Ensure positive limit with default
+    offset: Math.max(0, offset || 0),  // Ensure non-negative offset
+    tenantId
+  }
 }
📝 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
body:{
PlanEmployeeAssignmentSearchCriteria:{...body.PlanEmployeeAssignmentSearchCriteria,limit,offset,tenantId}
}
body:{
PlanEmployeeAssignmentSearchCriteria: {
...(body?.PlanEmployeeAssignmentSearchCriteria || {}),
limit: Math.max(1, limit || 10), // Ensure positive limit with default
offset: Math.max(0, offset || 0), // Ensure non-negative offset
tenantId
}
}

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