Skip to content

Commit

Permalink
fix(Lucene.Core): upgrade to new version of Kentico, update web page …
Browse files Browse the repository at this point in the history
…unpublish events (#67)

* fix(Lucene.Core): upgrade to new version of Kentico, webpage events which are listened to by Lucene changed from archive to unpublish

* fix(docs): increment library matrix

* fix(Lucene.Core): reindex on unpublish event update client packages

* fix(Lucene.Core): package-lock.json xperience version
  • Loading branch information
bkapustik authored Aug 20, 2024
1 parent ca5bdd9 commit 0c4c85f
Show file tree
Hide file tree
Showing 11 changed files with 1,206 additions and 1,185 deletions.
14 changes: 7 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Kentico.Xperience.Admin" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Azurestorage" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Cloud" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Core" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Imageprocessing" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Core.Tests" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Admin" Version="29.3.3" />
<PackageVersion Include="Kentico.Xperience.Azurestorage" Version="29.3.3" />
<PackageVersion Include="Kentico.Xperience.Cloud" Version="29.3.3" />
<PackageVersion Include="Kentico.Xperience.Core" Version="29.3.3" />
<PackageVersion Include="Kentico.Xperience.Imageprocessing" Version="29.3.3" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="29.3.3" />
<PackageVersion Include="Kentico.Xperience.Core.Tests" Version="29.3.3" />
<PackageVersion Include="Kentico.Xperience.Lucene" Version="" Condition="'$(LOCAL_NUGET)' == 'true'" />
<PackageVersion Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Use `Kentico.Xperience.Lucene.Admin` in your Xperience by Kentico Administration

| Xperience Version | Library Version |
| ------------------- | --------------- |
| >= 29.3.3 | > 8.x.x |
| >= 29.0.0 | >= 6.1.x |
| >= 28.4.3, < 29.0.0 | >= 5.x.x |
| >= 28.0.0 | >= 3.x.x |
Expand Down
418 changes: 213 additions & 205 deletions examples/DancingGoat/packages.lock.json

Large diffs are not rendered by default.

709 changes: 359 additions & 350 deletions src/Kentico.Xperience.Lucene.Admin/Client/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Kentico.Xperience.Lucene.Admin/Client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"node": ">=18.12.0 <=19"
},
"dependencies": {
"@kentico/xperience-admin-base": "28.4.3",
"@kentico/xperience-admin-components": "28.4.3",
"@kentico/xperience-admin-base": "29.3.3",
"@kentico/xperience-admin-components": "29.3.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-icons": "5.0.1",
Expand Down
372 changes: 190 additions & 182 deletions src/Kentico.Xperience.Lucene.Admin/packages.lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private static LuceneTaskType GetTaskType(string eventName)
}

if (eventName.Equals(WebPageEvents.Delete.Name, StringComparison.OrdinalIgnoreCase) ||
eventName.Equals(WebPageEvents.Archive.Name, StringComparison.OrdinalIgnoreCase))
eventName.Equals(WebPageEvents.Unpublish.Name, StringComparison.OrdinalIgnoreCase))
{
return LuceneTaskType.DELETE;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Kentico.Xperience.Lucene.Core/LuceneSearchModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ protected override void OnInit(ModuleInitParameters parameters)

WebPageEvents.Publish.Execute += HandleEvent;
WebPageEvents.Delete.Execute += HandleEvent;
WebPageEvents.Archive.Execute += HandleEvent;
WebPageEvents.Unpublish.Execute += HandleEvent;
ContentItemEvents.Publish.Execute += HandleContentItemEvent;
ContentItemEvents.Delete.Execute += HandleContentItemEvent;
ContentItemEvents.Archive.Execute += HandleContentItemEvent;
ContentItemEvents.Unpublish.Execute += HandleContentItemEvent;

RequestEvents.RunEndRequestTasks.Execute += (sender, eventArgs) => LuceneQueueWorker.Current.EnsureRunningThread();
}
Expand Down
104 changes: 51 additions & 53 deletions src/Kentico.Xperience.Lucene.Core/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"net6.0": {
"Kentico.Xperience.Core": {
"type": "Direct",
"requested": "[29.0.0, )",
"resolved": "29.0.0",
"contentHash": "jG0gkDLE4H7ZNEdxdyZEzPxoAMlfx24oVdPeRa8RCUriOhBtleNREInbR9kYoMWwo456EaUaf3RPngArmZdy1g==",
"requested": "[29.3.3, )",
"resolved": "29.3.3",
"contentHash": "Vr704hfDI9V737qULMy8nSEjz3xuyXxlLcUSxiMDf7c2fBKAySRn4YjYiLd6qp+6HnSm129nBuavyxWOsvzARg==",
"dependencies": {
"AngleSharp": "0.17.1",
"MailKit": "4.5.0",
"Microsoft.Data.SqlClient": "5.2.0",
"MailKit": "4.7.1.1",
"Microsoft.Data.SqlClient": "5.2.1",
"Microsoft.Extensions.Caching.Memory": "6.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Configuration.Binder": "6.0.0",
"Microsoft.Extensions.DependencyInjection": "6.0.1",
"Microsoft.Extensions.FileProviders.Physical": "6.0.0",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
"Microsoft.Extensions.Localization": "6.0.29",
"Microsoft.Extensions.Localization": "6.0.32",
"Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0",
"Mono.Cecil": "0.11.5",
"Newtonsoft.Json": "13.0.3",
Expand Down Expand Up @@ -70,10 +70,11 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.35.0",
"contentHash": "hENcx03Jyuqv05F4RBEPbxz29UrM3Nbhnr6Wl6NQpoU9BCIbL3XLentrxDCTrH54NLS11Exxi/o8MYgT/cnKFA==",
"resolved": "1.38.0",
"contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.ClientModel": "1.0.0",
"System.Diagnostics.DiagnosticSource": "6.0.1",
"System.Memory.Data": "1.0.2",
"System.Numerics.Vectors": "4.5.0",
Expand All @@ -84,12 +85,12 @@
},
"Azure.Identity": {
"type": "Transitive",
"resolved": "1.10.3",
"contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==",
"resolved": "1.11.3",
"contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==",
"dependencies": {
"Azure.Core": "1.35.0",
"Microsoft.Identity.Client": "4.56.0",
"Microsoft.Identity.Client.Extensions.Msal": "4.56.0",
"Azure.Core": "1.38.0",
"Microsoft.Identity.Client": "4.60.3",
"Microsoft.Identity.Client.Extensions.Msal": "4.60.3",
"System.Memory": "4.5.4",
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Text.Json": "4.7.2",
Expand All @@ -98,8 +99,8 @@
},
"BouncyCastle.Cryptography": {
"type": "Transitive",
"resolved": "2.3.0",
"contentHash": "IaVIiYxZLaBulveGDRUx/pBoW/Rc8QeXGF5u2E8xL8RWhVKCgfmtX9NUyGRbnSqnbFQU2zyP3MkXIdH+jUuQBw=="
"resolved": "2.4.0",
"contentHash": "SwXsAV3sMvAU/Nn31pbjhWurYSjJ+/giI/0n6tCrYoupEK34iIHCuk3STAd9fx8yudM85KkLSVdn951vTng/vQ=="
},
"J2N": {
"type": "Transitive",
Expand Down Expand Up @@ -133,10 +134,11 @@
},
"MailKit": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "EaXHODUdIV5oPdWvBJGazwaEpKt1LI/H/S//EEozANYCsfOSKHntX+Skk2kW616lSQp+fkRTmSjk0CYxEuOyEA==",
"resolved": "4.7.1.1",
"contentHash": "Y3okmIxu8g/ZcoJiE2i+dCeKgnNyddsXmcJslZnCPGVPP0aRyeVINHV1h97V+OVMdqjQI6O12J2p8Duwq5UEqQ==",
"dependencies": {
"MimeKit": "4.5.0"
"MimeKit": "4.7.1",
"System.Formats.Asn1": "8.0.1"
}
},
"Microsoft.Bcl.AsyncInterfaces": {
Expand All @@ -151,12 +153,12 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "5.2.0",
"contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==",
"resolved": "5.2.1",
"contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==",
"dependencies": {
"Azure.Identity": "1.10.3",
"Azure.Identity": "1.11.3",
"Microsoft.Data.SqlClient.SNI.runtime": "5.2.0",
"Microsoft.Identity.Client": "4.56.0",
"Microsoft.Identity.Client": "4.60.3",
"Microsoft.IdentityModel.JsonWebTokens": "6.35.0",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0",
"Microsoft.SqlServer.Server": "1.0.0",
Expand Down Expand Up @@ -263,19 +265,19 @@
},
"Microsoft.Extensions.Localization": {
"type": "Transitive",
"resolved": "6.0.29",
"contentHash": "cZ5Tx6NtTZFzk+PWW2icApat7agQiMIFIsohsmHmz/scKRfAI/5XTa9lpZMwKowQBZm+ap0RwAJmQ2/5xoL+VQ==",
"resolved": "6.0.32",
"contentHash": "oT9/Odho4th/5aY+HztJMfRhAVR+6rZ9FqYYjRrRFDU2e6C+pBCQLSujQIjdAjuHlsUu4pNmHXoaaiaE/82pow==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Extensions.Localization.Abstractions": "6.0.29",
"Microsoft.Extensions.Localization.Abstractions": "6.0.32",
"Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Localization.Abstractions": {
"type": "Transitive",
"resolved": "6.0.29",
"contentHash": "4HVhh+V/7H2VMgFI8EP1kLgLpeRqm1kQOlXjHk4MHCVD5/pgWOTTbLEz9pdXymQQf/eRg1vNK8tG2MZstBHhlw=="
"resolved": "6.0.32",
"contentHash": "ZG8q0/GHhkfXa4ciGp23ax6bJBjFBMYldw8vDg3JIzBp7vYMg5+hGSmNzFMtZThyAr9ktvEQAJS7TUpEEpDT0A=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
Expand Down Expand Up @@ -313,19 +315,19 @@
},
"Microsoft.Identity.Client": {
"type": "Transitive",
"resolved": "4.56.0",
"contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==",
"resolved": "4.60.3",
"contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.22.0"
"Microsoft.IdentityModel.Abstractions": "6.35.0",
"System.Diagnostics.DiagnosticSource": "6.0.1"
}
},
"Microsoft.Identity.Client.Extensions.Msal": {
"type": "Transitive",
"resolved": "4.56.0",
"contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==",
"resolved": "4.60.3",
"contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==",
"dependencies": {
"Microsoft.Identity.Client": "4.56.0",
"System.IO.FileSystem.AccessControl": "5.0.0",
"Microsoft.Identity.Client": "4.60.3",
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
Expand Down Expand Up @@ -403,10 +405,11 @@
},
"MimeKit": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "OYn8b8b66J4mgtDzoImepiUtdkJOAVGoTj/ghzJ+az4wVixA5L5Z8GmgFhRvQ1btAIwZh/d9zvZLCALndQdz5w==",
"resolved": "4.7.1",
"contentHash": "Qoj4aVvhX14A1FNvaJ33hzOP4VZI2j+Mr38I9wSGcjMq4BYDtWLJG89aJ9nRW2cNfH6Czjwyp7+Mh++xv3AZvg==",
"dependencies": {
"BouncyCastle.Cryptography": "2.3.0",
"BouncyCastle.Cryptography": "2.4.0",
"System.Formats.Asn1": "8.0.1",
"System.Security.Cryptography.Pkcs": "8.0.0"
}
},
Expand All @@ -425,6 +428,15 @@
"resolved": "4.5.1",
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
},
"System.ClientModel": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==",
"dependencies": {
"System.Memory.Data": "1.0.2",
"System.Text.Json": "4.7.2"
}
},
"System.CodeDom": {
"type": "Transitive",
"resolved": "8.0.0",
Expand Down Expand Up @@ -457,8 +469,8 @@
},
"System.Formats.Asn1": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "AJukBuLoe3QeAF+mfaRKQb2dgyrvt340iMBHYv+VdBzCUM06IxGlvl0o/uPOS7lHnXPN6u8fFRHSHudx5aTi8w=="
"resolved": "8.0.1",
"contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A=="
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
Expand All @@ -469,15 +481,6 @@
"Microsoft.IdentityModel.Tokens": "6.35.0"
}
},
"System.IO.FileSystem.AccessControl": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==",
"dependencies": {
"System.Security.AccessControl": "5.0.0",
"System.Security.Principal.Windows": "5.0.0"
}
},
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.4",
Expand Down Expand Up @@ -551,11 +554,6 @@
"System.Windows.Extensions": "6.0.0"
}
},
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
},
"System.Text.Encoding": {
"type": "Transitive",
"resolved": "4.3.0",
Expand Down
Loading

0 comments on commit 0c4c85f

Please sign in to comment.