Fix driver results initialization method usage with dynamic caching #16644
Conversation
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
MikeAlhayek
reviewed
Aug 31, 2024
src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildDisplayContext.cs
Outdated
Show resolved
Hide resolved
src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildShapeContext.cs
Outdated
Show resolved
Hide resolved
src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriverBase.cs
Show resolved
Hide resolved
| return shape; | ||
| }); | ||
| initialize?.Invoke(shape); | ||
| return Task.FromResult(shape); |
There was a problem hiding this comment.
Suggested change
| return Task.FromResult(shape); | |
| return Task.FromResult(shape); |
| initialize((TModel)shape); | ||
| return new ValueTask<IShape>(shape); | ||
| initialize?.Invoke(model); | ||
| return ValueTask.CompletedTask; |
There was a problem hiding this comment.
Suggested change
| return ValueTask.CompletedTask; | |
| return ValueTask.CompletedTask; |
| var contentShape = await factory.CreateAsync("Content"); | ||
| await shapeResult.ApplyAsync(new BuildDisplayContext(contentShape, "Detail", "", factory, null, null)); | ||
|
|
||
| // Shape is created and initialized |
There was a problem hiding this comment.
Suggested change
| // Shape is created and initialized | |
| // Shape is created and initialized. |
Comment on lines
220
to
221
|
|
||
|
|
| var buildDisplayContext = new BuildDisplayContext(contentShape, "Detail", "", factory, null, null); | ||
| var driverResult = new MyDisplayDriver().Display(contentItem, buildDisplayContext); | ||
| await driverResult.ApplyAsync(buildDisplayContext); | ||
| return driverResult; |
There was a problem hiding this comment.
Suggested change
| return driverResult; | |
| return driverResult; |
| public int MyProperty { get; set; } = 3; | ||
| } | ||
|
|
||
| public class MyDisplayDriver : ContentDisplayDriver |
There was a problem hiding this comment.
Suggested change
| public class MyDisplayDriver : ContentDisplayDriver | |
| public sealed class MyDisplayDriver : ContentDisplayDriver |
| { | ||
| public override IDisplayResult Display(ContentItem model, BuildDisplayContext context) | ||
| { | ||
| return Initialize<MyModel>(model => model.MyProperty++).Location("Content").Cache("id", ctx => ctx.WithExpiryAfter(TimeSpan.FromSeconds(1))); |
There was a problem hiding this comment.
Suggested change
| return Initialize<MyModel>(model => model.MyProperty++).Location("Content").Cache("id", ctx => ctx.WithExpiryAfter(TimeSpan.FromSeconds(1))); | |
| return Initialize<MyModel>(model => model.MyProperty++) | |
| .Location("Content") | |
| .Cache("id", ctx => ctx.WithExpiryAfter(TimeSpan.FromSeconds(1))); |
…splayContext.cs Co-authored-by: Mike Alhayek <[email protected]>
…apeContext.cs Co-authored-by: Mike Alhayek <[email protected]>
MikeAlhayek
approved these changes
Aug 31, 2024
This was referenced Sep 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Mike was reporting that when cache the delegate passed in the
Initializemethod of a driver was invoked every time. At some point this has been broken and the delegate was used directly instead of being provided as theShapeMetadata.OnProcessingvalue.This fixes it and adds unit tests. There is no breaking change, just a few refactorings to make the methods dependencies more logical.