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

Show recipe error instead if throwing an exeption #16148

Merged
merged 21 commits into from
May 25, 2024
Merged

Show recipe error instead if throwing an exeption #16148

merged 21 commits into from
May 25, 2024

Conversation

MikeAlhayek
Copy link
Member

@MikeAlhayek MikeAlhayek commented May 23, 2024 •
edited
Loading

Fix #16056

/cc @hyzx86

Import from package

import-as-package

Import from text

import-as-json

Running a partial recipe

partial-recipe

@MikeAlhayek
Copy link
Member Author

Merge branch 'main' into ma/recipe-import

@hishamco why did you do that? Are you in the middle of reviewing this PR?

hyzx86
hyzx86 suggested changes May 24, 2024
View reviewed changes
Copy link
Contributor

@hyzx86 hyzx86 left a comment

Choose a reason for hiding this comment

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

Sorry, it's been a bit of a busy day lately,
I've tested this PR , and there are some issues that need to be tweaked

src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs Show resolved Hide resolved
test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs Outdated Show resolved Hide resolved
MikeAlhayek and others added 2 commits May 24, 2024 10:30
@MikeAlhayek @hyzx86
Update src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controll…
58879c8 
…ers/ImportRemoteInstanceController.cs

Co-authored-by: Tony Han <[email protected]>
@MikeAlhayek @hyzx86
Update src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controll…
3cb9f48 
…ers/ImportRemoteInstanceController.cs

Co-authored-by: Tony Han <[email protected]>
@MikeAlhayek MikeAlhayek requested a review from hyzx86 May 24, 2024 17:35
hyzx86
hyzx86 approved these changes May 24, 2024
View reviewed changes
Copy link
Contributor

@hyzx86 hyzx86 left a comment

Choose a reason for hiding this comment

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

Almost done, just a few alert messages left that may need to be changed to appropriate text

...hardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ImportRemoteInstanceController.cs Outdated Show resolved Hide resolved
@MikeAlhayek MikeAlhayek requested a review from hyzx86 May 24, 2024 19:34
hishamco
hishamco requested changes May 25, 2024
View reviewed changes
test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs Outdated Show resolved Hide resolved
src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs Show resolved Hide resolved
src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeExecutionException.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeStepResult.cs Show resolved Hide resolved
src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs Outdated Show resolved Hide resolved
src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs Show resolved Hide resolved
MikeAlhayek and others added 4 commits May 24, 2024 20:37
@MikeAlhayek @hishamco
Update ImportController.cs
838684d 
Co-authored-by: Hisham Bin Ateya <[email protected]>
@MikeAlhayek @hishamco
Update LayerStep.cs
0131af3 
Co-authored-by: Hisham Bin Ateya <[email protected]>
@MikeAlhayek @hishamco
Update RecipeExecutor.cs
02e12de 
Co-authored-by: Hisham Bin Ateya <[email protected]>
@MikeAlhayek @hishamco
Update RecipeExecutor.cs
5014c99 
Co-authored-by: Hisham Bin Ateya <[email protected]>
@hishamco
Copy link
Member

You can add suggestion as batch instead of committing one by one, because it will start the build everytime

hishamco
hishamco approved these changes May 25, 2024
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.

I need to go now to a workshop, so I approve this, hope almost if not all the suggested changes have been applied

I don't want to make this PR stay much until I come :)

@MikeAlhayek MikeAlhayek merged commit ff88852 into main May 25, 2024
22 checks passed
@MikeAlhayek MikeAlhayek deleted the ma/recipe-import branch May 25, 2024 04:34
This was referenced Jun 1, 2024
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

Show recipe error instead if throwing an exeption
3 participants
@MikeAlhayek @hishamco @hyzx86