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

BUGFIX/HCMPRE-1634: fix for versions #149 #158 #2031

Merged
merged 6 commits into from
Dec 16, 2024

Conversation

jagankumar-egov
Copy link
Collaborator

@jagankumar-egov jagankumar-egov commented Dec 16, 2024

Choose the appropriate template for your PR:

Feature PR

Feature Request

JIRA ID

Module

Description

Related Issues


Bugfix PR

Bugfix Request

JIRA ID

Module

Description

Root Cause

Related Issues


Release PR

Summary by CodeRabbit

  • New Features

    • Enhanced tab management in the MicroplanSearch and MyMicroplans components for improved re-rendering.
  • Bug Fixes

    • Updated CSS stylesheet links to the latest versions for better styling consistency.

Swathi-eGov and others added 6 commits December 16, 2024 10:37
Co-authored-by: Nipun Arora <aroranipun1@gmail.com>
* Update MicroplanSearch.js

* Pagination issues

---------

Co-authored-by: Nipun Arora <aroranipun1@gmail.com>
* Revert "Bugfix/hcmpre 1583 (#2021)"

This reverts commit 201a0ce.

* BUGFIX/HCMPRE-1634 Revert ing"updated core version (#2020)"

* BUGFIX/HCMPRE-1583 fixes

---------

Co-authored-by: Swathi-eGov <swathi.chatrathi@egovernments.org>
FEATURE/HCMPRE-1634: Fixed all the version updates
@jagankumar-egov jagankumar-egov requested a review from a team as a code owner December 16, 2024 06:00
Copy link
Contributor

coderabbitai bot commented Dec 16, 2024

📝 Walkthrough

Walkthrough

This pull request encompasses updates to stylesheet versions in multiple index.html files and modifications to React components in the microplan module. The changes primarily involve incrementing CSS stylesheet versions for @egovernments/digit-ui-components-css and @egovernments/digit-ui-health-css, and adding a key state variable in MicroplanSearch and MyMicroplans components to facilitate component re-rendering when tabs change.

Changes

File Change Summary
health/micro-ui/web/micro-ui-internals/example/public/index.html Updated CSS stylesheet versions: digit-ui-components-css from 0.0.2-beta.42 to 0.0.2-beta.43, digit-ui-health-css from 0.2.2 to 0.2.3
health/micro-ui/web/public/index.html Updated CSS stylesheet version: digit-ui-components-css from 0.0.2-beta.42 to 0.0.2-beta.43
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.js Added key state variable to force component re-rendering on tab change
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js Added key state variable to force component re-rendering on tab change

Possibly related PRs

Suggested Reviewers

  • nipunarora-eGov

Poem

🐰 A Rabbit's Stylesheet Dance

Versions hop, numbers climb high,
CSS links sparkle in the sky,
React components twirl and spin,
With keys that make re-renders win!
A microplan ballet, oh so neat! 🎨

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request.


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

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

CodeRabbit Configuration File (.coderabbit.yaml)

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

Documentation and Community

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

@jagankumar-egov jagankumar-egov merged commit 6f6f7d5 into master Dec 16, 2024
3 of 7 checks passed
@jagankumar-egov jagankumar-egov deleted the FEATURE/HCMPRE-1635 branch December 16, 2024 06:02
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: 5

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 3b51c0a and f707980.

⛔ Files ignored due to path filters (9)
  • health/micro-ui/web/core/package.json is excluded by !**/*.json
  • health/micro-ui/web/micro-ui-internals/example/package.json is excluded by !**/*.json
  • health/micro-ui/web/micro-ui-internals/package.json is excluded by !**/*.json
  • health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json is excluded by !**/*.json
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json is excluded by !**/*.json
  • health/micro-ui/web/micro-ui-internals/packages/modules/workbench-hcm/package.json is excluded by !**/*.json
  • health/micro-ui/web/microplan/package.json is excluded by !**/*.json
  • health/micro-ui/web/package.json is excluded by !**/*.json
  • health/micro-ui/web/workbench/package.json is excluded by !**/*.json
📒 Files selected for processing (4)
  • health/micro-ui/web/micro-ui-internals/example/public/index.html (1 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.js (2 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js (1 hunks)
  • health/micro-ui/web/public/index.html (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.js (1)

Pattern **/*.js: check

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

Pattern **/*.js: check

🪛 Biome (1.9.4)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js

[error] 26-26: Unnecessary use of boolean literals in conditional expression.

Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with

(lint/complexity/noUselessTernary)

🔇 Additional comments (3)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js (1)

26-26: Verify the impact of commented setConfig.

The commented out setConfig line suggests that tab configuration updates are no longer happening. This might affect the component's behavior when switching tabs.

🧰 Tools
🪛 Biome (1.9.4)

[error] 26-26: Unnecessary use of boolean literals in conditional expression.

Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with

(lint/complexity/noUselessTernary)

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

Line range hint 27-32: Verify tab configuration behavior.

Similar to MyMicroplans, the commented out setConfig line suggests tab configuration updates are disabled. Ensure this doesn't cause any unintended side effects.

✅ Verification successful

Let me gather more information about the TabSearchconfig usage and its potential impact.


Let me check one more thing to understand how this configuration is being used in the components.


Based on the gathered information, I can now provide the final response:

The commented out setConfig line is intentional and safe to ignore

The code analysis reveals that while the config state is initialized from TabSearchconfig?.TabSearchconfig?.[0], it's not being actively used in the component's rendering. The commented out line was likely removed during a refactoring where the tab configuration functionality was simplified to only handle tab selection and URL updates, without needing the additional configuration state.

  • Both MicroplanSearch.js and MyMicroplans.js follow the same pattern, suggesting this is an intentional design choice
  • The TabSearchconfig is only used for initial setup of tab labels and structure
  • No references to config. properties were found in the component's rendering logic
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any tests related to tab configuration
rg -l "TabSearchconfig.*test" --type js

# Look for any components using this configuration
ast-grep --pattern 'TabSearchconfig?.TabSearchconfig'

Length of output: 1097


Script:

#!/bin/bash
# Check the TabSearchconfig definition and structure
rg -A 5 "TabSearchconfig\s*=\s*" --type js

# Look for any references to config in the components
rg -A 3 "config\s*=\s*{" --type js health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/

# Check if there are any dependencies on this configuration
ast-grep --pattern 'const $_ = useState(TabSearchconfig?.TabSearchconfig?.$_)'

Length of output: 2066


Script:

#!/bin/bash
# Check how the config is being used in the components
rg -A 5 "const \[config, setConfig\]" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/

# Look for any references to this config in rendering
rg "config\." health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.js

Length of output: 2410

health/micro-ui/web/public/index.html (1)

11-11: Please provide context about the bug being fixed

The PR title references "fix for versions #149 #158", but there's no description of:

  1. The bug that was being experienced
  2. How these version updates fix the issue
  3. What was changed in these new versions

This context would help verify if the version updates actually resolve the intended issues.

@@ -20,18 +20,18 @@ const MyMicroplans = () => {
// Set default values when component mounts
setDefaultValues(defaultSearchValues);
}, []);

const [key,setKey] = useState(0);
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Consider using a more descriptive name for the key state variable.

The key state is used for forcing re-renders on tab changes. Consider using a more semantic name like tabChangeCounter or rerenderKey to better convey its purpose.

-const [key, setKey] = useState(0);
+const [tabChangeCounter, setTabChangeCounter] = useState(0);

-setKey((prev)=>prev+1);
+setTabChangeCounter((prev)=>prev+1);

-<React.Fragment key={key}>
+<React.Fragment key={tabChangeCounter}>

Also applies to: 31-31, 34-34

@@ -16,6 +16,7 @@ const MicroplanSearch = () => {
const [tabData, setTabData] = useState(
TabSearchconfig?.TabSearchconfig?.map((configItem, index) => ({ key: index, label: configItem.label, active: index === 0 ? true : false }))
); // setting number of tab component and making first index enable as default
const [key,setKey] = useState(0)
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Consider extracting tab management logic into a custom hook.

Both MicroplanSearch and MyMicroplans components share identical tab management logic. Consider extracting this into a custom hook to improve code reusability and maintainability.

Example implementation:

// useTabManagement.js
const useTabManagement = (initialConfig) => {
  const [tabChangeCounter, setTabChangeCounter] = useState(0);
  const [tabData, setTabData] = useState(
    initialConfig?.map((configItem, index) => ({
      key: index,
      label: configItem.label,
      active: index === 0
    }))
  );

  const handleTabChange = (tabIndex) => {
    setTabData((prev) => 
      prev.map((tab, index) => ({ ...tab, active: index === tabIndex }))
    );
    setTabChangeCounter((prev) => prev + 1);
    
    const url = new URL(window.location.href);
    url.searchParams.set("tabId", `${tabIndex}`);
    window.history.replaceState({}, "", url);
  };

  return {
    tabChangeCounter,
    tabData,
    handleTabChange
  };
};

This would simplify both components and eliminate code duplication.

Also applies to: 32-32, 35-35

Comment on lines +14 to +15
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.3/dist/index.css" />
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Consider adding integrity hashes for CDN resources

While using unpkg.com CDN is common, it's recommended to add integrity hashes to prevent potential security risks from CDN compromises.

Example implementation:

<link rel="stylesheet" 
      href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css"
      integrity="sha384-[calculated-hash]"
      crossorigin="anonymous" />

@@ -11,8 +11,8 @@
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT</title>
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.3/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.42/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.2/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css" />
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Switch to stable version 0.0.2-1 instead of beta

The package has a stable version 0.0.2-1 available which should be used instead of the beta version 0.0.2-beta.43 to ensure production stability. Update the CSS import URL to:

<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-1/dist/index.css" />
🔗 Analysis chain

Verify beta version stability in production

Using beta version (0.0.2-beta.43) in production could pose stability risks. Consider:

  1. Using a stable release version
  2. Documenting known limitations of the beta version
  3. Having a rollback plan if issues arise
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if there are any stable versions available
curl -s https://registry.npmjs.org/@egovernments/digit-ui-components-css | jq '.versions | keys[]' | grep -v beta

Length of output: 181

Comment on lines +11 to 13
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.2/dist/index.css" />
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

Version inconsistency detected between files

The version of digit-ui-health-css is inconsistent across files:

  • This file uses version 0.2.2
  • example/public/index.html uses version 0.2.3

This inconsistency could lead to UI discrepancies between environments.

Apply this update to maintain consistency:

-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.2/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.3/dist/index.css" />
📝 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
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.2/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.3/dist/index.css" />

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.

4 participants