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

Remove ShellDescriptorManager dependency on YesSql.ISession #12906

Merged
merged 5 commits into from
Dec 15, 2022
Merged

Remove ShellDescriptorManager dependency on YesSql.ISession #12906

merged 5 commits into from
Dec 15, 2022

Conversation

TFleury
Copy link
Contributor

@TFleury TFleury commented Dec 3, 2022

Fixes #10311

@TFleury TFleury requested a review from jtkech as a code owner December 3, 2022 12:34
@TFleury
Remove unnecessary CommitAsync
ddc5557 
CommitAsync is done in ShellScope BeforeDispose
@sebastienros
Copy link
Member

I can't edit the files in this PR, did you revoke these permissions in your fork?
I wanted to fix a code style issue, { are on new lines.

@sebastienros sebastienros dismissed hishamco’s stale review December 8, 2022 19:07

Aknowledged it's not a problem

@sebastienros
Copy link
Member

Waiting for @jtkech to approve the change

@jtkech
Copy link
Member

jtkech commented Dec 8, 2022

Okay, looks good, I will look at it asap

@TFleury TFleury requested review from hishamco and removed request for jtkech December 9, 2022 17:36
hishamco
hishamco approved these changes Dec 9, 2022
View reviewed changes
Copy link
Member

@hishamco hishamco left a comment

Choose a reason for hiding this comment

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

Just waiting for a final approval from @jtkech

jtkech
jtkech reviewed Dec 10, 2022
View reviewed changes
src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Show resolved Hide resolved
src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Outdated

// In the 'ChangedAsync()' event the shell will be released so that, on request, a new one will be built.
// So, we commit the session earlier to prevent a new shell from being built from an outdated descriptor.

await _session.SaveChangesAsync();

await _shellDescriptorManagerEventHandlers.InvokeAsync((handler, shellDescriptorRecord, _shellSettings) =>
Copy link
Member

Choose a reason for hiding this comment

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

So here we could name the delegate parameter shellDescriptor in place of shellDescriptorRecord.

src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs Outdated Show resolved Hide resolved
@TFleury TFleury requested review from jtkech and MikeAlhayek and removed request for jtkech and MikeAlhayek December 13, 2022 11:06
@jtkech
Copy link
Member

jtkech commented Dec 15, 2022

@TFleury Okay I approved, thanks for the last changes ;)

@MikeAlhayek MikeAlhayek merged commit 53cfa4c into OrchardCMS:main Dec 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MikeAlhayek MikeAlhayek MikeAlhayek left review comments

@hishamco hishamco hishamco approved these changes

@jtkech jtkech jtkech 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.

ShellDescriptorManager depends on YesSql.ISession and isn't ideal when only using OrchardCore without the CMS
5 participants
@TFleury @sebastienros @jtkech @hishamco @MikeAlhayek