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 dummy admin-dashboard widget from the dashboard-wiget recipe #13486

Merged
merged 6 commits into from
May 4, 2023
Merged

Remove dummy admin-dashboard widget from the dashboard-wiget recipe #13486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e86ccb
Remove dummy admin-dashboard widget from the dashboard-wiget recipe
MikeAlhayek Mar 29, 2023
9d70566
adding a space
MikeAlhayek Mar 29, 2023
ff3ad4a
Add "Admin Dashboard Widget Sample" recipe
MikeAlhayek May 2, 2023
d443149
cleanup
MikeAlhayek May 2, 2023
1106b0a
cleanup
MikeAlhayek May 2, 2023
27ddb8a
Simplify
MikeAlhayek May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations/dashboard-widgets.recipe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,30 +58,6 @@
]
}
]
},
{
"name": "content",
"data": [
{
"ContentItemId": "[js: uuid()]",
"ContentType": "HtmlDashboardWidget",
"DisplayText": "Orchard Core",
"Latest": true,
"Published": true,
"HtmlDashboardWidget": {},
"DashboardPart": {
"Position": 0.0,
"Width": 1.0,
"Height": 2.0
},
"HtmlBodyPart": {
"Html": "<ul class=\"list-group list-group-flush\">\n\t<li class=\"list-group-item\"><a href=\"https://orchardcore.net\" target=\"_blank\">Orchard Core site</a></li>\n\t<li class=\"list-group-item\"><a href=\"https://docs.orchardcore.net\" target=\"_blank\">Orchard Core docs</a></li>\n\t<li class=\"list-group-item\"><a href=\"https://github.com/OrchardCMS/OrchardCore\" target=\"_blank\">Orchard Core repo</a></li>\n\t<li class=\"list-group-item\"><a href=\"https://gitter.im/OrchardCMS/OrchardCore\" target=\"_blank\">Orchard Core chat</a></li>\n</ul>"
},
"TitlePart": {
"Title": "Orchard Core"
}
}
]
}
]
}
}
37 changes: 37 additions & 0 deletions ...hardCore.Modules/OrchardCore.AdminDashboard/Recipes/dashboard-widgets-samples.recipe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"name": "dashboard-widgets-samples",
"displayName": "Admin Dashboard Widget Sample",
"description": "Provides a sample Admin Dashboard Widget.",
"author": "The Orchard Core Team",
"website": "https://orchardcore.net",
"version": "1.0.0",
"issetuprecipe": false,
"categories": [ "default" ],
"tags": [],
"steps": [
{
"name": "content",
"data": [
{
"ContentItemId": "[js: uuid()]",
"ContentType": "HtmlDashboardWidget",
"DisplayText": "Orchard Core",
"Latest": true,
"Published": true,
"HtmlDashboardWidget": {},
"DashboardPart": {
"Position": 0.0,
"Width": 1.0,
"Height": 2.0
},
"HtmlBodyPart": {
"Html": "<ul class=\"list-group list-group-flush\">\n\t<li class=\"list-group-item\"><a href=\"https://orchardcore.net\" target=\"_blank\">Orchard Core site</a></li>\n\t<li class=\"list-group-item\"><a href=\"https://docs.orchardcore.net\" target=\"_blank\">Orchard Core docs</a></li>\n\t<li class=\"list-group-item\"><a href=\"https://github.com/OrchardCMS/OrchardCore\" target=\"_blank\">Orchard Core repo</a></li>\n\t<li class=\"list-group-item\"><a href=\"https://gitter.im/OrchardCMS/OrchardCore\" target=\"_blank\">Orchard Core chat</a></li>\n</ul>"
},
"TitlePart": {
"Title": "Orchard Core"
}
}
]
}
]
}
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ private async Task<IEnumerable<RecipeDescriptor>> GetRecipesAsync(IEnumerable<IF
{
var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
var recipes = recipeCollections.SelectMany(x => x)
.Where(r => r.IsSetupRecipe == false &&
!r.Tags.Contains("hidden", StringComparer.InvariantCultureIgnoreCase) &&
features.Any(f => r.BasePath.Contains(f.Extension.SubPath, StringComparison.OrdinalIgnoreCase)));
.Where(r => !r.IsSetupRecipe &&
(r.Tags == null || !r.Tags.Contains("hidden", StringComparer.InvariantCultureIgnoreCase)) &&
features.Any(f => r.BasePath != null && f.Extension?.SubPath != null && r.BasePath.Contains(f.Extension.SubPath, StringComparison.OrdinalIgnoreCase)));

return recipes;
}
Expand Down
9 changes: 9 additions & 0 deletions src/docs/releases/1.7.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Orchard Core 1.7.0

Release date: Not yet released

## Change Logs

### `OrchardCore.AdminDashboard` Module

A sample widget is no longer auto created when the `OrchardCore.AdminDashboard` feature is enabled. If you like to see a sample widget, you may do so by executing the "Admin Dashboard Widget Sample" recipe by using the admin menu and navigate to **Configuration** >> **Recipes**