Remove dummy admin-dashboard widget from the dashboard-wiget recipe (#…

…13486)
OrchardCMS · May 4, 2023 · bbea6f7 · bbea6f7
1 parent 4b8fee0
commit bbea6f7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 28 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations/dashboard-widgets.recipe.json b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations/dashboard-widgets.recipe.json
@@ -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"
-          }
-        }
-      ]
     }
   ]
-}
+}
diff --git a/...hardCore.Modules/OrchardCore.AdminDashboard/Recipes/dashboard-widgets-samples.recipe.json b/...hardCore.Modules/OrchardCore.AdminDashboard/Recipes/dashboard-widgets-samples.recipe.json
@@ -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"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs
@@ -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;
         }

diff --git a/src/docs/releases/1.7.0.md b/src/docs/releases/1.7.0.md
@@ -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**