-
-
Notifications
You must be signed in to change notification settings - Fork 9.8k
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: route for the tag is not registered when halo starts #3322
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
src/main/java/run/halo/app/core/extension/reconciler/TagRouteReconciler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
package run.halo.app.core.extension.reconciler; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
import org.apache.commons.lang3.StringUtils; | ||
import org.springframework.stereotype.Component; | ||
import run.halo.app.content.permalinks.TagPermalinkPolicy; | ||
import run.halo.app.core.extension.content.Tag; | ||
import run.halo.app.extension.ExtensionClient; | ||
import run.halo.app.extension.controller.Controller; | ||
import run.halo.app.extension.controller.ControllerBuilder; | ||
import run.halo.app.extension.controller.Reconciler; | ||
|
||
@Component | ||
@RequiredArgsConstructor | ||
public class TagRouteReconciler implements Reconciler<Reconciler.Request> { | ||
private final ExtensionClient client; | ||
private final TagPermalinkPolicy tagPermalinkPolicy; | ||
|
||
@Override | ||
public Result reconcile(Request request) { | ||
client.fetch(Tag.class, request.name()) | ||
.ifPresent(tag -> { | ||
if (tag.getMetadata().getDeletionTimestamp() != null) { | ||
// TagReconciler already did it, so there is no need to remove permalink | ||
return; | ||
} | ||
|
||
reconcilePermalinkRoute(request.name()); | ||
}); | ||
return new Result(false, null); | ||
} | ||
|
||
private void reconcilePermalinkRoute(String tagName) { | ||
client.fetch(Tag.class, tagName) | ||
.ifPresent(tag -> { | ||
final String oldPermalink = tag.getStatusOrDefault().getPermalink(); | ||
|
||
tagPermalinkPolicy.onPermalinkDelete(tag); | ||
|
||
String permalink = tagPermalinkPolicy.permalink(tag); | ||
tag.getStatusOrDefault().setPermalink(permalink); | ||
tagPermalinkPolicy.onPermalinkAdd(tag); | ||
|
||
if (!StringUtils.equals(permalink, oldPermalink)) { | ||
client.update(tag); | ||
} | ||
}); | ||
} | ||
|
||
@Override | ||
public Controller setupWith(ControllerBuilder builder) { | ||
return builder | ||
.extension(new Tag()) | ||
.build(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
注: 这里不再删除路由,这个逻辑在 TagReconciler 已经做了就不在修改,因为此 Reconciler 没有添加 Finalizer 如果在这里做可能不可靠