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 #2029

Closed
wants to merge 6 commits into from

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 functionality in the MicroplanSearch and MyMicroplans components to ensure proper re-rendering when tabs are changed.
  • Bug Fixes

    • Updated stylesheet links to the latest versions for improved styling consistency.
  • Documentation

    • Minor updates to HTML structure without altering functionality.

Swathi-eGov and others added 6 commits December 16, 2024 10:37
* Update MicroplanSearch.js

* Pagination issues

---------

Co-authored-by: Nipun Arora <[email protected]>
* 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 <[email protected]>
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 05:30
Copy link
Contributor

coderabbitai bot commented Dec 16, 2024

📝 Walkthrough

Walkthrough

This pull request involves updates to stylesheet links in two index.html files and modifications to two React components (MicroplanSearch.js and MyMicroplans.js). The stylesheet updates increment versions for @egovernments/digit-ui-components-css and @egovernments/digit-ui-health-css. In the React components, a new state variable key is introduced to manage component re-rendering when tabs change, enhancing the user interface's responsiveness.

Changes

File Change Summary
health/micro-ui/web/micro-ui-internals/example/public/index.html Updated stylesheet links:
- 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 stylesheet link:
- digit-ui-components-css from 0.0.2-beta.42 to 0.0.2-beta.43
health/micro-ui/.../MicroplanSearch.js Added key state variable for component re-rendering
health/micro-ui/.../MyMicroplans.js Added key state variable for component re-rendering

Possibly related PRs

Suggested Reviewers

  • nipunarora-eGov

Poem

🐰 Stylesheet dance, versions advance,
Tabs leap with a new key's glance,
Components refresh, smooth and bright,
Microplan magic takes its flight!
Code hops forward with glee 🌈

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.

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

🔭 Outside diff range comments (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js (1)

Line range hint 34-47: Consider a more targeted re-rendering approach

While using a key on Fragment works for forcing re-renders, it might be more efficient to identify and re-render only the specific components that need updating when tabs change. This could improve performance by avoiding unnecessary re-renders of the entire tree.

Consider these alternatives:

  1. Move the key to the specific component that needs re-rendering
  2. Use React's useEffect to handle tab-specific updates
  3. Consider using React Query or similar solutions for data fetching and cache invalidation
🧰 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)

📜 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/MyMicroplans.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.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 (4)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js (1)

23-23: LGTM: Clean state implementation

The new state variable follows React best practices and serves its purpose of managing component re-renders.

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

Line range hint 27-33: Same issues as in MyMicroplans.js

This code segment has the same concerns regarding error handling and commented code as discussed in MyMicroplans.js.


Line range hint 35-47: Same re-rendering concerns as in MyMicroplans.js

This implementation has the same concerns regarding unnecessary re-renders as discussed in MyMicroplans.js.

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

14-15: Verify version compatibility and check for breaking changes.

Please ensure that:

  1. The version updates don't introduce breaking changes
  2. The versions are consistent with other dependencies

Comment on lines 24 to 32
const onTabChange = (n) => {

setTabData((prev) => prev.map((i, c) => ({ ...i, active: c === n ? true : false }))); //setting tab enable which is being clicked
// setConfig(TabSearchconfig?.TabSearchconfig?.[n]);// as per tab number filtering the config
const url = new URL(window.location.href);
url.searchParams.set("tabId", `${n}`);
window.history.replaceState({}, "", url);

setKey((prev)=>prev+1);
};
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 addressing the commented code and adding error handling

  1. The commented line setConfig(TabSearchconfig?.TabSearchconfig?.[n]) suggests incomplete functionality. Either implement it or remove if not needed.
  2. The URL manipulation could benefit from error handling for cases where window.location might be undefined (e.g., in tests).

Consider this improvement:

  const onTabChange = (n) => {
    setTabData((prev) => prev.map((i, c) => ({ ...i, active: c === n ? true : false })));
-   // setConfig(TabSearchconfig?.TabSearchconfig?.[n]);
-   const url = new URL(window.location.href);
-   url.searchParams.set("tabId", `${n}`);
-   window.history.replaceState({}, "", url);
+   try {
+     const url = new URL(window.location.href);
+     url.searchParams.set("tabId", `${n}`);
+     window.history.replaceState({}, "", url);
+   } catch (error) {
+     console.error("Error updating URL:", error);
+   }
    setKey((prev)=>prev+1);
  };
📝 Committable suggestion

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

Suggested change
const onTabChange = (n) => {
setTabData((prev) => prev.map((i, c) => ({ ...i, active: c === n ? true : false }))); //setting tab enable which is being clicked
// setConfig(TabSearchconfig?.TabSearchconfig?.[n]);// as per tab number filtering the config
const url = new URL(window.location.href);
url.searchParams.set("tabId", `${n}`);
window.history.replaceState({}, "", url);
setKey((prev)=>prev+1);
};
const onTabChange = (n) => {
setTabData((prev) => prev.map((i, c) => ({ ...i, active: c === n ? true : false })));
try {
const url = new URL(window.location.href);
url.searchParams.set("tabId", `${n}`);
window.history.replaceState({}, "", url);
} catch (error) {
console.error("Error updating URL:", error);
}
setKey((prev)=>prev+1);
};
🧰 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)

@@ -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.

🛠️ Refactor suggestion

Consider extracting tab logic into a custom hook

The key state and tab handling logic is duplicated between MyMicroplans.js and MicroplanSearch.js. This could be abstracted into a custom hook for better maintainability.

Consider creating a custom hook like this:

// useTabNavigation.js
export const useTabNavigation = (initialConfig) => {
  const [key, setKey] = useState(0);
  const [tabData, setTabData] = useState(initialConfig);

  const onTabChange = useCallback((n) => {
    setTabData((prev) => prev.map((i, c) => ({ ...i, active: c === n ? true : false })));
    try {
      const url = new URL(window.location.href);
      url.searchParams.set("tabId", `${n}`);
      window.history.replaceState({}, "", url);
    } catch (error) {
      console.error("Error updating URL:", error);
    }
    setKey((prev) => prev + 1);
  }, []);

  return { key, tabData, onTabChange };
};

Comment on lines +14 to +15
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].43/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].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 and fallback sources for CDN resources.

While updating the CSS versions, consider implementing these security and reliability improvements:

  1. Add integrity hashes to verify the content hasn't been tampered with
  2. Include fallback sources in case the CDN is unavailable

Example implementation:

-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
+  <link rel="stylesheet" 
+        href="https://unpkg.com/@egovernments/[email protected]/dist/index.css"
+        integrity="sha384-[computed-hash]"
+        crossorigin="anonymous"
+        onerror="this.onerror=null;this.href='[fallback-url]';" />
+  <link rel="stylesheet"
+        href="https://unpkg.com/@egovernments/[email protected]/dist/index.css"
+        integrity="sha384-[computed-hash]"
+        crossorigin="anonymous"
+        onerror="this.onerror=null;this.href='[fallback-url]';" />

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

Comment on lines +11 to 13
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].43/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/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

Fix version inconsistency in digit-ui-health-css.

The version of digit-ui-health-css (0.2.2) is inconsistent with the version used in the example/public/index.html file (0.2.3). This could lead to styling inconsistencies.

Apply this update:

-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />

Also, consider implementing the same security improvements suggested for the other file (integrity hashes and fallback sources).

📝 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/[email protected]/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].2/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].3/dist/index.css" />

@jagankumar-egov jagankumar-egov changed the title FEATURE/HCMPRE-1635: Updated versions with fixes #2028 BUGFIX/HCMPRE-1634: fix for versions #149 Dec 16, 2024
@jagankumar-egov jagankumar-egov deleted the FEATURE/HCMPRE-1635 branch December 16, 2024 06:02
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