From ab35508894e63f15e143e4563e788153e175e566 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Fri, 19 Jul 2024 14:23:22 -0700
Subject: [PATCH 1/2] Correct zero length check expressions

---
 .../Controllers/AdminController.cs               |  2 +-
 .../Drivers/FlowPartDisplayDriver.cs             |  2 +-
 .../Settings/MediaFieldSettingsDriver.cs         |  2 +-
 .../Views/AzureAISearchSettings.Edit.cshtml      |  2 +-
 .../DefaultContentManager.cs                     |  2 +-
 .../Services/DefaultQueryManager.cs              |  2 +-
 .../Recipes/AzureAISearchIndexSettingsStep.cs    | 16 +++++++++++-----
 .../ElasticConnectionOptionsConfigurations.cs    |  2 +-
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs
index db2c0cd9e69..0c639eebe1e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs
@@ -111,7 +111,7 @@ private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesA
         {
             var settings = (await _contentDefinitionManager.GetTypeDefinitionAsync(contentType))?.Parts.SingleOrDefault(x => x.Name == partName)?.GetSettings<FlowPartSettings>();
 
-            if (settings?.ContainedContentTypes?.Length == 0)
+            if (settings?.ContainedContentTypes == null || settings.ContainedContentTypes.Length == 0)
             {
                 return (await _contentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.StereotypeEquals("Widget"));
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs
index 9f361066cd5..efbd89db5d2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs
@@ -132,7 +132,7 @@ private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesA
         {
             var settings = typePartDefinition.GetSettings<FlowPartSettings>();
 
-            if (settings?.ContainedContentTypes?.Length == 0)
+            if (settings?.ContainedContentTypes == null || settings.ContainedContentTypes.Length == 0)
             {
                 return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
                     .Where(t => t.StereotypeEquals("Widget"));
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs
index ff290147dd0..47c63661ea4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs
@@ -41,7 +41,7 @@ public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefiniti
                 model.Multiple = settings.Multiple;
                 model.AllowMediaText = settings.AllowMediaText;
                 model.AllowAnchors = settings.AllowAnchors;
-                model.AllowAllDefaultMediaTypes = settings.AllowedExtensions?.Length == 0;
+                model.AllowAllDefaultMediaTypes = settings.AllowedExtensions == null || settings.AllowedExtensions.Length == 0;
 
                 var items = new List<MediaTypeViewModel>();
                 foreach (var extension in _mediaOptions.AllowedFileExtensions)
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/AzureAISearchSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/AzureAISearchSettings.Edit.cshtml
index 5b8e1ec43ea..a1836ac1de4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/AzureAISearchSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/AzureAISearchSettings.Edit.cshtml
@@ -28,7 +28,7 @@
     return;
 }
 
-@if (Model.SearchIndexes == null || Model.SearchIndexes?.Count == 0)
+@if (Model.SearchIndexes == null || Model.SearchIndexes.Count == 0)
 {
     <div class="alert alert-warning" role="alert">
         @T["No indices exist! Please create at least one index to configure Azure AI Search service."]
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
index 4cefbae3906..b5ef54feaf6 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
@@ -201,7 +201,7 @@ public async Task<IEnumerable<ContentItem>> GetAsync(IEnumerable<string> content
                 .Distinct()
                 .ToArray();
 
-            if (ids?.Length == 0)
+            if (ids == null || ids.Length == 0)
             {
                 return [];
             }
diff --git a/src/OrchardCore/OrchardCore.Queries.Core/Services/DefaultQueryManager.cs b/src/OrchardCore/OrchardCore.Queries.Core/Services/DefaultQueryManager.cs
index 963b5138d91..adb185168cc 100644
--- a/src/OrchardCore/OrchardCore.Queries.Core/Services/DefaultQueryManager.cs
+++ b/src/OrchardCore/OrchardCore.Queries.Core/Services/DefaultQueryManager.cs
@@ -205,7 +205,7 @@ public async Task UpdateAsync(Query query, JsonNode data = null)
 
     public async Task SaveAsync(params Query[] queries)
     {
-        if (queries?.Length == 0)
+        if (queries == null || queries.Length == 0)
         {
             return;
         }
diff --git a/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs b/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs
index 6e4167b6614..aac9cdfc6fd 100644
--- a/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs
@@ -3,6 +3,7 @@
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using OrchardCore.BackgroundJobs;
 using OrchardCore.Recipes.Models;
@@ -14,24 +15,29 @@
 
 namespace OrchardCore.Search.AzureAI.Recipes;
 
-public class AzureAISearchIndexSettingsStep : IRecipeStepHandler
+public sealed class AzureAISearchIndexSettingsStep : IRecipeStepHandler
 {
     public const string Name = "azureai-index-create";
 
     private readonly AzureAISearchIndexManager _indexManager;
     private readonly AzureAIIndexDocumentManager _azureAIIndexDocumentManager;
     private readonly AzureAISearchIndexSettingsService _azureAISearchIndexSettingsService;
+
+    internal IStringLocalizer S;
+
     private readonly ILogger _logger;
 
     public AzureAISearchIndexSettingsStep(
         AzureAISearchIndexManager indexManager,
         AzureAIIndexDocumentManager azureAIIndexDocumentManager,
         AzureAISearchIndexSettingsService azureAISearchIndexSettingsService,
+        IStringLocalizer<AzureAISearchIndexSettingsStep> stringLocalizer,
         ILogger<AzureAISearchIndexSettingsStep> logger)
     {
         _indexManager = indexManager;
         _azureAIIndexDocumentManager = azureAIIndexDocumentManager;
         _azureAISearchIndexSettingsService = azureAISearchIndexSettingsService;
+        S = stringLocalizer;
         _logger = logger;
     }
 
@@ -55,21 +61,21 @@ public async Task ExecuteAsync(RecipeExecutionContext context)
 
             if (string.IsNullOrWhiteSpace(indexInfo.IndexName))
             {
-                _logger.LogError("No index name was provided in the '{Name}' recipe step.", Name);
+                context.Errors.Add(S["No index name was provided in the '{0}' recipe step.", Name]);
 
                 continue;
             }
 
             if (!AzureAISearchIndexNamingHelper.TryGetSafeIndexName(indexInfo.IndexName, out var indexName))
             {
-                _logger.LogError("Invalid index name was provided in the recipe step. IndexName: {IndexName}.", indexInfo.IndexName);
+                context.Errors.Add(S["Invalid index name was provided in the recipe step. IndexName: {0}.", indexInfo.IndexName]);
 
                 continue;
             }
 
-            if (indexInfo.IndexedContentTypes?.Length == 0)
+            if (indexInfo.IndexedContentTypes == null || indexInfo.IndexedContentTypes.Length == 0)
             {
-                _logger.LogError("No {IndexedContentTypes} were provided in the recipe step. IndexName: {IndexName}.", nameof(indexInfo.IndexedContentTypes), indexInfo.IndexName);
+                context.Errors.Add(S["No {0} were provided in the recipe step. IndexName: {1}.", nameof(indexInfo.IndexedContentTypes), indexInfo.IndexName]);
 
                 continue;
             }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticConnectionOptionsConfigurations.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticConnectionOptionsConfigurations.cs
index 2c6a35df030..24391fe1f89 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticConnectionOptionsConfigurations.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticConnectionOptionsConfigurations.cs
@@ -62,7 +62,7 @@ private bool HasConnectionInfo(ElasticConnectionOptions elasticConnectionOptions
             optionsAreValid = false;
         }
 
-        if (elasticConnectionOptions.Ports?.Length == 0)
+        if (elasticConnectionOptions.Ports == null || elasticConnectionOptions.Ports.Length == 0)
         {
             _logger.LogError("Elasticsearch is enabled but not active because a port is missing in application configuration.");
             optionsAreValid = false;

From 111e42b903de36b2b45c66d5cc82d148193cfa6a Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Mon, 22 Jul 2024 11:31:14 -0700
Subject: [PATCH 2/2] removed unused log instance

---
 .../Recipes/AzureAISearchIndexSettingsStep.cs                 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs b/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs
index 78ec8e156e5..7291fe8e191 100644
--- a/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Recipes/AzureAISearchIndexSettingsStep.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using OrchardCore.BackgroundJobs;
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
@@ -22,7 +21,6 @@ public sealed class AzureAISearchIndexSettingsStep : IRecipeStepHandler
     private readonly AzureAISearchIndexManager _indexManager;
     private readonly AzureAIIndexDocumentManager _azureAIIndexDocumentManager;
     private readonly AzureAISearchIndexSettingsService _azureAISearchIndexSettingsService;
-    private readonly ILogger _logger;
 
     internal IStringLocalizer S;
 
@@ -30,13 +28,11 @@ public AzureAISearchIndexSettingsStep(
         AzureAISearchIndexManager indexManager,
         AzureAIIndexDocumentManager azureAIIndexDocumentManager,
         AzureAISearchIndexSettingsService azureAISearchIndexSettingsService,
-        ILogger<AzureAISearchIndexSettingsStep> logger,
         IStringLocalizer<AzureAISearchIndexSettingsStep> stringLocalizer)
     {
         _indexManager = indexManager;
         _azureAIIndexDocumentManager = azureAIIndexDocumentManager;
         _azureAISearchIndexSettingsService = azureAISearchIndexSettingsService;
-        _logger = logger;
         S = stringLocalizer;
     }