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.

Sign up for GitHub

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

Jump to bottom

Workflow trimming (pruning) improvements #16565

Merged
merged 36 commits into from
Aug 15, 2024
Merged

Workflow trimming (pruning) improvements #16565

merged 36 commits into from
Aug 15, 2024

Conversation

Piedone
Copy link
Member

@Piedone Piedone commented Aug 15, 2024 •
edited
Loading

This addresses the feedback from #16533. Improves trimming for #11609.

@Piedone Piedone mentioned this pull request Aug 15, 2024
Merged
deanmarcussen
deanmarcussen reviewed Aug 15, 2024
View reviewed changes
Copy link
Member

@deanmarcussen deanmarcussen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

100% fine with me, apologies for not having the time to do it myself

...rchardCore.Modules/OrchardCore.Workflows/Trimming/Services/WorkflowTrimmingBackgroundTask.cs Show resolved Hide resolved
MikeAlhayek
MikeAlhayek requested changes Aug 15, 2024
View reviewed changes
...rchardCore.Modules/OrchardCore.Workflows/Trimming/Services/WorkflowTrimmingBackgroundTask.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Services/WorkflowTrimmingManager.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Services/WorkflowTrimmingManager.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Startup.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/ViewModels/WorkflowTrimmingViewModel.cs Outdated Show resolved Hide resolved
...OrchardCore/OrchardCore.Workflows.Abstractions/Trimming/Services/IWorkflowTrimmingManager.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Startup.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Views/WorkflowTrimming.Fields.Edit.cshtml Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Views/WorkflowTrimming.Fields.Edit.cshtml Outdated Show resolved Hide resolved
MikeAlhayek
MikeAlhayek requested changes Aug 15, 2024
View reviewed changes
src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Drivers/WorkflowTrimmingDisplayDriver.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/ViewModels/WorkflowTrimmingViewModel.cs Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/ViewModels/WorkflowTrimmingViewModel.cs Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/ViewModels/WorkflowTrimmingViewModel.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Views/WorkflowTrimming.Fields.Edit.cshtml Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Workflows/Views/WorkflowTrimming.Fields.Edit.cshtml Outdated Show resolved Hide resolved
src/docs/reference/modules/Workflows/README.md Outdated Show resolved Hide resolved
src/docs/releases/2.0.0.md Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

This pull request has merge conflicts. Please resolve those before requesting a review.

Piedone and others added 10 commits August 15, 2024 21:06
@Piedone
Refactoring
aad7b0d
@Piedone
Some margins on the form
da58975
@Piedone @MikeAlhayek
Formatting
2d915ad 
Co-authored-by: Mike Alhayek <mike@crestapps.com>
@Piedone @MikeAlhayek
Formatting
a61cf0a 
Co-authored-by: Mike Alhayek <mike@crestapps.com>
@Piedone @hishamco
Formatting
4451d0a 
Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
@Piedone @hishamco
Formatting
549412e 
Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
@Piedone @hishamco
Formatting
445581e 
Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
@Piedone
Revert "Formatting"
0bd774b 
This reverts commit 2d915ad.
@Piedone
Formatting
51cd4e3
@Piedone
Merge remote-tracking branch 'official/main' into issue/OCORE-194
0b9682d 
# Conflicts:
#	src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Services/WorkflowStatusBuilder.cs
@hishamco
Copy link
Member

I will leave the other feedback to Mike

MikeAlhayek
MikeAlhayek approved these changes Aug 15, 2024
View reviewed changes
Copy link
Member

@MikeAlhayek MikeAlhayek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to merge... unless you want to wait for 2 more approvals :)

@Piedone
Copy link
Member Author

Piedone commented Aug 15, 2024

My approach to approvals: https://www.youtube.com/watch?v=OKrbcCm04Yg

Two are more than enough :).

@Piedone Piedone merged commit 39ffdff into OrchardCMS:main Aug 15, 2024
21 checks passed
This was referenced Sep 1, 2024
Open
Closed
Open
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deanmarcussen deanmarcussen deanmarcussen left review comments

@sebastienros sebastienros sebastienros left review comments

@MikeAlhayek MikeAlhayek MikeAlhayek approved these changes

@hishamco hishamco hishamco approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Piedone @hishamco @sebastienros @deanmarcussen @MikeAlhayek