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

fix: missing route data in guard of web-ele and web-naive, fixed: #41… #4117

Merged
merged 1 commit into from
Aug 11, 2024
Merged

fix: missing route data in guard of web-ele and web-naive, fixed: #41… #4117

merged 1 commit into from
Aug 11, 2024

Conversation

falcon-jin
Copy link
Contributor

@falcon-jin falcon-jin commented Aug 11, 2024

…08 (#4115)

Description

此PR解决以下web-ele和web-naive的BUG:

直接在浏览器地址栏输入带query的链接来访问,打开页面时query参数会丢失。如:https://www.vben.pro/#/demos/nested/menu1?id=123
未登录状态访问此链接会转到登录页面,登录成功后重定向时会丢失id=123
已登录状态下访问此链接会被直接重定向到不带query参数的地址

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)

Summary by CodeRabbit

  • New Features
    • Improved navigation experience by ensuring that redirections now include full paths with query parameters.
  • Bug Fixes
    • Enhanced routing logic to better preserve user context during navigation.

@falcon-jin falcon-jin requested review from anncwb, vince292007 and a team as code owners August 11, 2024 04:15
Copy link

changeset-bot bot commented Aug 11, 2024

⚠️ No Changeset found

Latest commit: 89408b9

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.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

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 Aug 11, 2024

Walkthrough

The recent updates enhance the setupAccessGuard function in the routing logic by improving how the redirect path is determined. Instead of using only the path component, the changes now incorporate the full path, including query parameters. This adjustment ensures that users maintain their context during navigation, leading to a more seamless experience when redirection occurs.

Changes

Files Change Summary
apps/web-ele/src/router/guard.ts, apps/web-naive/src/router/guard.ts Updated redirectPath determination to use to.fullPath instead of to.path, enhancing redirection logic by preserving query parameters. Adjusted return statements to resolve full paths, improving navigation context.

Poem

🐇 In the garden, paths entwine,
Full of queries, sweet as wine.
Redirects now, with joy, we hold,
Navigation's tale, a sight to behold!
Hopping forward, no more to stray,
Every step clear, come what may! 🌼


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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 as 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.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

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

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 9d6cc22 and 89408b9.

Files selected for processing (2)
  • apps/web-ele/src/router/guard.ts (1 hunks)
  • apps/web-naive/src/router/guard.ts (1 hunks)
Additional comments not posted (2)
apps/web-ele/src/router/guard.ts (1)

118-121: LGTM! Verify the usage of redirectPath.

The changes ensure that the full path, including query parameters, is preserved during redirection. This aligns with the PR objectives.

However, verify that the redirectPath logic is correctly used throughout the codebase.

Verification successful

Usage of redirectPath is consistent and correct across the codebase.

The redirectPath logic is uniformly applied in the guard.ts files of web-naive, web-antd, and web-ele applications, ensuring that the full path, including query parameters, is preserved during redirection. This aligns with the PR objectives.

  • apps/web-naive/src/router/guard.ts
  • apps/web-antd/src/router/guard.ts
  • apps/web-ele/src/router/guard.ts
Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the usage of `redirectPath` in the codebase.

# Test: Search for `redirectPath` usage. Expect: Consistent usage with the new logic.
rg --type typescript 'redirectPath'

Length of output: 70


Script:

#!/bin/bash
# Description: Verify the usage of `redirectPath` in the codebase with correct file type.

# Test: Search for `redirectPath` usage in TypeScript files. Expect: Consistent usage with the new logic.
rg --type ts 'redirectPath' -A 3

Length of output: 1292

apps/web-naive/src/router/guard.ts (1)

118-121: LGTM! Verify the usage of redirectPath.

The changes ensure that the full path, including query parameters, is preserved during redirection. This aligns with the PR objectives.

However, verify that the redirectPath logic is correctly used throughout the codebase.

Verification successful

Usage of redirectPath is consistent across the codebase.

The redirectPath is used consistently in the files apps/web-naive/src/router/guard.ts, apps/web-antd/src/router/guard.ts, and apps/web-ele/src/router/guard.ts, following the same logic pattern. This confirms that the implementation aligns with the PR objectives.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the usage of `redirectPath` in the codebase.

# Test: Search for `redirectPath` usage. Expect: Consistent usage with the new logic.
rg --type typescript 'redirectPath'

Length of output: 70


Script:

#!/bin/bash
# Description: Verify the usage of `redirectPath` in TypeScript files.

# Test: Search for `redirectPath` usage. Expect: Consistent usage with the new logic.
rg 'redirectPath' --glob '*.ts'

Length of output: 631

@mynetfan
Copy link
Collaborator

这些更改已经包含在 #4116 中。

@anncwb anncwb merged commit 654bf90 into vbenjs:main Aug 11, 2024
16 checks passed
@anncwb anncwb added the bug Something isn't working label Aug 11, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Sep 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants