fix(Lucene.Core): Add error message on unsuccessful index deletion

Kentico · Oct 21, 2024 · 9a12b22 · 9a12b22
1 parent b24d0d6
commit 9a12b22
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/Kentico.Xperience.Lucene.Admin/UIPages/IndexListingPage.cs b/src/Kentico.Xperience.Lucene.Admin/UIPages/IndexListingPage.cs
@@ -181,16 +181,21 @@ public async Task<ICommandResponse<RowActionResult>> Rebuild(int id, Cancellatio
     public Task<ICommandResponse> Delete(int id, CancellationToken _)
     {
         var index = indexManager.GetIndex(id);
+        var result = new RowActionResult(false);
 
         if (index is null)
         {
-            var result = new RowActionResult(false);
-
             return Task.FromResult<ICommandResponse>(ResponseFrom(result)
                 .AddErrorMessage(string.Format("Error loading Lucene index with identifier {0}.", id)));
         }
 
-        luceneClient.DeleteIndex(index!);
+        bool indexDeleted = luceneClient.DeleteIndex(index!);
+
+        if (!indexDeleted)
+        {
+            return Task.FromResult<ICommandResponse>(ResponseFrom(result)
+               .AddErrorMessage(string.Format("Errors occurred while deleting the '{0}' index. Please check the Event Log for more details.", index.IndexName)));
+        }
 
         configurationStorageService.TryDeleteIndex(id);
 

diff --git a/src/Kentico.Xperience.Lucene.Core/Indexing/DefaultLuceneClient.cs b/src/Kentico.Xperience.Lucene.Core/Indexing/DefaultLuceneClient.cs
@@ -127,8 +127,8 @@ public Task<int> UpsertRecords(IEnumerable<Document> documents, string indexName
         return UpsertRecordsInternal(documents, indexName);
     }
 
-    public void DeleteIndex(LuceneIndex luceneIndex) =>
-        luceneIndex?.StorageContext.DeleteIndex();
+    public bool DeleteIndex(LuceneIndex luceneIndex) =>
+        luceneIndex?.StorageContext.DeleteIndex() ?? false;
 
     private Task<int> DeleteRecordsInternal(IEnumerable<string> itemGuids, string indexName)
     {

diff --git a/src/Kentico.Xperience.Lucene.Core/Indexing/ILuceneClient.cs b/src/Kentico.Xperience.Lucene.Core/Indexing/ILuceneClient.cs
@@ -24,7 +24,7 @@ public interface ILuceneClient
     /// Removes Lucene index.
     /// </summary>
     /// <param name="luceneIndex">The index to be deleted.</param>
-    void DeleteIndex(LuceneIndex luceneIndex);
+    bool DeleteIndex(LuceneIndex luceneIndex);
 
     /// <summary>
     /// Gets the indices of the Lucene application with basic statistics.

diff --git a/src/Kentico.Xperience.Lucene.Core/Indexing/IndexStorageContext.cs b/src/Kentico.Xperience.Lucene.Core/Indexing/IndexStorageContext.cs
@@ -149,6 +149,6 @@ public void EnforceRetentionPolicy()
         storageStrategy.PerformCleanup(indexStoragePathRoot);
     }
 
-    public void DeleteIndex() =>
+    public bool DeleteIndex() =>
         storageStrategy.DeleteIndex(indexStoragePathRoot);
 }