Skip to content

fix: fix LoginExpiredModal in some cases, message may be obscured #6086

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

Merged
merged 1 commit into from
May 1, 2025

Conversation

ming4762
Copy link
Contributor

@ming4762 ming4762 commented Apr 30, 2025

Trigger condition

  1. Message rendering first
  2. Refresh browser

Summary by CodeRabbit

  • Bug Fixes
    • Improved z-index calculation for the login expiration modal to prevent interference from notification and loading elements, ensuring the modal displays correctly above other content.

Copy link

changeset-bot bot commented Apr 30, 2025

⚠️ No Changeset found

Latest commit: 8b1b031

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Apr 30, 2025

Walkthrough

A filtering mechanism has been added to the login expired modal component to exclude elements with specific CSS classes ('ant-message' and 'loading') when calculating the maximum z-index on the page. This is achieved by introducing a helper function that checks for these classes and updating the z-index calculation function to skip such elements, ensuring they do not affect the modal's stacking context.

Changes

File(s) Change Summary
packages/effects/common-ui/src/ui/authentication/login-expired-modal.vue Added a helper function to filter out elements with 'ant-message' and 'loading' classes from z-index calculation; updated z-index computation logic accordingly.

Suggested reviewers

  • mynetfan
  • anncwb
  • jinmao88

Poem

A modal floats above the rest,
But some classes must not join the quest.
With z-index filtered, order is restored,
No 'loading' or 'ant-message' ignored.
Now the modal shines, so bold and bright—
Thanks to clever code, it’s stacked just right!
🐇✨


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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: 0

🧹 Nitpick comments (1)
packages/effects/common-ui/src/ui/authentication/login-expired-modal.vue (1)

38-46: Use English for code comments for consistency

The added comment is in Chinese while the rest of the codebase appears to be in English. Consider translating it to maintain consistency across the codebase.

-/**
- * 排除ant-message和loading:9999的z-index
- */
+/**
+ * Exclude ant-message and loading elements (with z-index:9999) from z-index calculation
+ */

The implementation of the exclusion list and helper function looks good and will effectively prevent these specific elements from influencing the modal's z-index.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 20c15f3 and 8b1b031.

📒 Files selected for processing (1)
  • packages/effects/common-ui/src/ui/authentication/login-expired-modal.vue (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: Lint (ubuntu-latest)
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: Test (windows-latest)
  • GitHub Check: Check (ubuntu-latest)
  • GitHub Check: Lint (windows-latest)
  • GitHub Check: Check (windows-latest)
  • GitHub Check: post-update (ubuntu-latest)
  • GitHub Check: post-update (windows-latest)
🔇 Additional comments (1)
packages/effects/common-ui/src/ui/authentication/login-expired-modal.vue (1)

57-61: Good fix that prevents the modal from being obscured

The additional condition to exclude specific elements when calculating the maximum z-index will resolve the issue where the login expired modal message was being obscured. This is a focused fix that addresses the specific problem described in the PR.

A minor readability improvement could be to extract the condition into a single expression:

    if (
      zIndex &&
      !Number.isNaN(Number.parseInt(zIndex)) &&
-     !isZIndexExcludeClass(element)
+     !isZIndexExcludeClass(element)
    ) {

The solution correctly filters out elements that should not influence the modal's z-index calculation.

@anncwb anncwb merged commit 5de954b into vbenjs:main May 1, 2025
14 checks passed
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