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

Fix/configuration component content type #42

Merged
merged 11 commits into from
Apr 8, 2024
Merged

Fix/configuration component content type #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
78b1def
fix(docks): index managment
bkapustik Apr 8, 2024
cbe10f5
fix(Lucene): configuration component js packages
bkapustik Apr 8, 2024
9b05cd1
feat(Lucene): admin UI multiselect for content types shows display na…
bkapustik Apr 8, 2024
29621c5
Merge branch 'main' into fix/configuration-component-content-type
bkapustik Apr 8, 2024
d307561
feat(docs): update admin UI content type dropdown screenshot
bkapustik Apr 8, 2024
4fd5063
feat(docs): update kentico version in readme version table
bkapustik Apr 8, 2024
f4be3da
feat(DancingGoat): update to kentico v 28.4.3
bkapustik Apr 8, 2024
74a583e
fix(Tests): adapt to new content types
bkapustik Apr 8, 2024
e2a4066
fix(DancingGoat): resolve dancingGoat warnings
bkapustik Apr 8, 2024
2a1638a
fix(DancingGoat): revert repository.config
bkapustik Apr 8, 2024
c522f11
fix(DancingGoat): repository config
bkapustik Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Kentico.Xperience.Admin" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.Azurestorage" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.Cloud" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.Imageprocessing" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.Core.Tests" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.Admin" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Azurestorage" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Cloud" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Imageprocessing" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Core.Tests" Version="28.4.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
32 changes: 16 additions & 16 deletions Kentico.Xperience.Lucene.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0D915C08-611
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{57981684-9BC2-40B6-801F-22128F63F825}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DancingGoat", "examples\DancingGoat\DancingGoat.csproj", "{E4B3A52A-4054-40AF-891E-B579DFDB83CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EB35FFC8-6DD4-4EDF-8DB9-D9EFBCB9B6C8}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
Expand All @@ -31,7 +29,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DB735FC0
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{91F22D92-B6DD-4C46-9853-1A5B649DD04C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.Lucene.Tests", "tests\Kentico.Xperience.Lucene.Tests\Kentico.Xperience.Lucene.Tests.csproj", "{DEB25130-C00C-44E5-8393-07BB49F7480B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kentico.Xperience.Lucene.Tests", "tests\Kentico.Xperience.Lucene.Tests\Kentico.Xperience.Lucene.Tests.csproj", "{DEB25130-C00C-44E5-8393-07BB49F7480B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DancingGoat", "examples\DancingGoat\DancingGoat.csproj", "{A4F272B0-A8F0-4CFB-856D-DE88C0255339}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -55,18 +55,6 @@ Global
{1B7E6E21-7FC4-4D8C-ADD3-5783B3690761}.Release|x64.Build.0 = Release|Any CPU
{1B7E6E21-7FC4-4D8C-ADD3-5783B3690761}.Release|x86.ActiveCfg = Release|Any CPU
{1B7E6E21-7FC4-4D8C-ADD3-5783B3690761}.Release|x86.Build.0 = Release|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Debug|x64.ActiveCfg = Debug|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Debug|x64.Build.0 = Debug|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Debug|x86.ActiveCfg = Debug|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Debug|x86.Build.0 = Debug|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Release|Any CPU.Build.0 = Release|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Release|x64.ActiveCfg = Release|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Release|x64.Build.0 = Release|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Release|x86.ActiveCfg = Release|Any CPU
{E4B3A52A-4054-40AF-891E-B579DFDB83CB}.Release|x86.Build.0 = Release|Any CPU
{DEB25130-C00C-44E5-8393-07BB49F7480B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DEB25130-C00C-44E5-8393-07BB49F7480B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEB25130-C00C-44E5-8393-07BB49F7480B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -79,14 +67,26 @@ Global
{DEB25130-C00C-44E5-8393-07BB49F7480B}.Release|x64.Build.0 = Release|Any CPU
{DEB25130-C00C-44E5-8393-07BB49F7480B}.Release|x86.ActiveCfg = Release|Any CPU
{DEB25130-C00C-44E5-8393-07BB49F7480B}.Release|x86.Build.0 = Release|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Debug|x64.ActiveCfg = Debug|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Debug|x64.Build.0 = Debug|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Debug|x86.ActiveCfg = Debug|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Debug|x86.Build.0 = Debug|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Release|Any CPU.Build.0 = Release|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Release|x64.ActiveCfg = Release|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Release|x64.Build.0 = Release|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Release|x86.ActiveCfg = Release|Any CPU
{A4F272B0-A8F0-4CFB-856D-DE88C0255339}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1B7E6E21-7FC4-4D8C-ADD3-5783B3690761} = {0D915C08-6113-4ECF-BC23-1D315BA4C0A5}
{E4B3A52A-4054-40AF-891E-B579DFDB83CB} = {57981684-9BC2-40B6-801F-22128F63F825}
{DEB25130-C00C-44E5-8393-07BB49F7480B} = {91F22D92-B6DD-4C46-9853-1A5B649DD04C}
{A4F272B0-A8F0-4CFB-856D-DE88C0255339} = {57981684-9BC2-40B6-801F-22128F63F825}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DDFD806E-9ACE-48D6-BA63-57AEC6D0465B}
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ enabling auto-indexing of content in Xperience based on application-local, code-

| Xperience Version | Library Version |
| ------------------- | --------------- |
| >= 28.4.3 | >= 5.x.x |
| >= 28.0.0 | >= 3.x.x |
| >= 26.2.0, < 27.0.0 | >= 2.x, < 3.x.x |

Expand Down
134 changes: 67 additions & 67 deletions examples/DancingGoat/$CDRepository/repository.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<RepositoryConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<!-- Specifies which types of object operations are performed in the target database when restoring the repository:
Create - only creates new objects. Never deletes or modifies existing objects.
CreateUpdate - creates new objects and updates existing objects. Never deletes objects.
Full - creates new objects, updates existing objects, deletes objects that do not exist in the repository.
-->
<RestoreMode>CreateUpdate</RestoreMode>
<!-- Specifies which types of object operations are performed in the target database when restoring the repository:
Create - only creates new objects. Never deletes or modifies existing objects.
CreateUpdate - creates new objects and updates existing objects. Never deletes objects.
Full - creates new objects, updates existing objects, deletes objects that do not exist in the repository.
-->
<RestoreMode>CreateUpdate</RestoreMode>

<!-- After changing the included or excluded object types, you need to run serialization for all objects to bring
the repository folder into the required state. Use the CLI and execute the store command for Continuous Integration or Deployment.
Always synchronize the repository.config along with the other content of the repository folder. -->
<!-- After changing the included or excluded object types, you need to run serialization for all objects to bring
the repository folder into the required state. Use the CLI and execute the store command for Continuous Integration or Deployment.
Always synchronize the repository.config along with the other content of the repository folder. -->

<!-- To learn which object types can be used in the IncludedObjectTypes and ExcludedObjectTypes definitions,
visit the documentation: https://devnet.kentico.com/CMSPages/DocLinkMapper.ashx?version=xp&link=ci_object_types -->
<!-- To learn which object types can be used in the IncludedObjectTypes and ExcludedObjectTypes definitions,
visit the documentation: https://devnet.kentico.com/CMSPages/DocLinkMapper.ashx?version=xp&link=ci_object_types -->

<!-- If one or more main object types are specified, only objects of the given type and their child types are processed.
All supported object types are included if empty. -->
<IncludedObjectTypes>
<ObjectType>cms.consent</ObjectType>
<ObjectType>cms.contenttype</ObjectType>
<ObjectType>cms.contentlanguage</ObjectType>
<ObjectType>cms.scheduledtask</ObjectType>
<ObjectType>cms.settingscategory</ObjectType>
<ObjectType>cms.settingskey</ObjectType>
<ObjectType>cms.user</ObjectType>
<ObjectType>cms.role</ObjectType>
<ObjectType>cms.channel</ObjectType>
<ObjectType>cms.websitechannel</ObjectType>
<ObjectType>cms.websitecaptchasettings</ObjectType>
<ObjectType>cms.contentitem</ObjectType>
<ObjectType>cms.pagetemplateconfiguration</ObjectType>
<!-- If one or more main object types are specified, only objects of the given type and their child types are processed.
All supported object types are included if empty. -->
<IncludedObjectTypes>
<ObjectType>cms.consent</ObjectType>
<ObjectType>cms.contenttype</ObjectType>
<ObjectType>cms.contentlanguage</ObjectType>
<ObjectType>cms.scheduledtask</ObjectType>
<ObjectType>cms.settingscategory</ObjectType>
<ObjectType>cms.settingskey</ObjectType>
<ObjectType>cms.user</ObjectType>
<ObjectType>cms.role</ObjectType>
<ObjectType>cms.channel</ObjectType>
<ObjectType>cms.websitechannel</ObjectType>
<ObjectType>cms.websitecaptchasettings</ObjectType>
<ObjectType>cms.contentitem</ObjectType>
<ObjectType>cms.pagetemplateconfiguration</ObjectType>

<ObjectType>media.library</ObjectType>
<ObjectType>media.file</ObjectType>
<ObjectType>media.library</ObjectType>
<ObjectType>media.file</ObjectType>

<ObjectType>om.activitytype</ObjectType>
<ObjectType>om.recipientlist</ObjectType>
<ObjectType>om.contactgroup</ObjectType>
<ObjectType>cms.formclass</ObjectType>
<ObjectType>cms.formfeaturedfield</ObjectType>
<ObjectType>om.activitytype</ObjectType>
<ObjectType>om.recipientlist</ObjectType>
<ObjectType>om.contactgroup</ObjectType>
<ObjectType>cms.formclass</ObjectType>
<ObjectType>cms.formfeaturedfield</ObjectType>

<ObjectType>emaillibrary.emailchannel</ObjectType>
<ObjectType>emaillibrary.emailchannelsender</ObjectType>
<ObjectType>emaillibrary.emailconfiguration</ObjectType>
<ObjectType>emaillibrary.emailtemplatecontenttype</ObjectType>
<ObjectType>emaillibrary.recipientlistsettings</ObjectType>
<ObjectType>emaillibrary.sendconfiguration</ObjectType>
<ObjectType>emaillibrary.emailtemplate</ObjectType>
<ObjectType>emaillibrary.emailchannel</ObjectType>
<ObjectType>emaillibrary.emailchannelsender</ObjectType>
<ObjectType>emaillibrary.emailconfiguration</ObjectType>
<ObjectType>emaillibrary.emailtemplatecontenttype</ObjectType>
<ObjectType>emaillibrary.recipientlistsettings</ObjectType>
<ObjectType>emaillibrary.sendconfiguration</ObjectType>
<ObjectType>emaillibrary.emailtemplate</ObjectType>

<ObjectType>ma.automationprocess</ObjectType>
<ObjectType>ma.automationstep</ObjectType>
<ObjectType>ma.automationaction</ObjectType>
<ObjectType>ma.automationtemplate</ObjectType>
<ObjectType>cms.objectworkflowtrigger</ObjectType>
<ObjectType>cms.workflowtransition</ObjectType>
<ObjectType>ma.automationprocess</ObjectType>
<ObjectType>ma.automationstep</ObjectType>
<ObjectType>ma.automationaction</ObjectType>
<ObjectType>ma.automationtemplate</ObjectType>
<ObjectType>cms.objectworkflowtrigger</ObjectType>
<ObjectType>cms.workflowtransition</ObjectType>

<ObjectType>cms.webpageitem</ObjectType>
<ObjectType>cms.webpageurlpath</ObjectType>
<ObjectType>cms.webpageformerurlpath</ObjectType>
<ObjectType>om.trackedwebsite</ObjectType>
<ObjectType>cms.form</ObjectType>
</IncludedObjectTypes>
<ObjectType>cms.webpageitem</ObjectType>
<ObjectType>cms.webpageurlpath</ObjectType>
<ObjectType>cms.webpageformerurlpath</ObjectType>
<ObjectType>om.trackedwebsite</ObjectType>
<ObjectType>cms.form</ObjectType>
</IncludedObjectTypes>

<!-- Excluded object types filter the set of included object types. The specified object types are excluded from processing.
May include both main and child object types. -->
<ExcludedObjectTypes>
</ExcludedObjectTypes>
<!-- Excluded object types filter the set of included object types. The specified object types are excluded from processing.
May include both main and child object types. -->
<ExcludedObjectTypes>
</ExcludedObjectTypes>

<!-- You can exclude objects from processing by adding included or excluded code names for any object type.
Use the % wildcard at the start or end of the values to include or exclude multiple objects based on code name prefixes or suffixes.
You can add multiple code name values separated by semicolons for each object type. -->
<ObjectFilters>
<!-- If one or more code names are included, only objects matching the specified code names are included. Other objects are not processed.
All objects are included if empty. -->
<!-- <IncludedCodeNames>IncludedCodeNameA;IncludedCodeNameB</IncludedCodeNames> -->
<!-- <IncludedCodeNames ObjectType="ObjectTypeB">IncludedCodeNamePrefix%;%IncludedCodeNameSuffix</IncludedCodeNames> -->
<!-- You can exclude objects from processing by adding included or excluded code names for any object type.
Use the % wildcard at the start or end of the values to include or exclude multiple objects based on code name prefixes or suffixes.
You can add multiple code name values separated by semicolons for each object type. -->
<ObjectFilters>
<!-- If one or more code names are included, only objects matching the specified code names are included. Other objects are not processed.
All objects are included if empty. -->
<!-- <IncludedCodeNames>IncludedCodeNameA;IncludedCodeNameB</IncludedCodeNames> -->
<!-- <IncludedCodeNames ObjectType="ObjectTypeB">IncludedCodeNamePrefix%;%IncludedCodeNameSuffix</IncludedCodeNames> -->

<!-- Excluded code names add further filtering for the set of included objects. Objects that match the specified code names are excluded from processing. -->
</ObjectFilters>
<!-- Excluded code names add further filtering for the set of included objects. Objects that match the specified code names are excluded from processing. -->
</ObjectFilters>

</RepositoryConfiguration>
2 changes: 1 addition & 1 deletion examples/DancingGoat/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"kentico.xperience.dbmanager": {
"version": "28.0.0",
"version": "28.4.3",
"commands": [
"kentico-xperience-dbmanager"
]
Expand Down
11 changes: 6 additions & 5 deletions ...es/DancingGoat/AdminComponents/Apps/SampleDataGenerator/SampleDataGeneratorApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public class SampleDataGeneratorApplication : OverviewPageBase

private readonly IFormBuilderConfigurationSerializer formBuilderConfigurationSerializer;
private readonly IEventLogService eventLogService;
private readonly IConsentInfoProvider consentInfoProvider;
private readonly IBizFormInfoProvider bizFormInfoProvider;
private readonly IInfoProvider<ConsentInfo> consentInfoProvider;
private readonly IInfoProvider<BizFormInfo> bizFormInfoProvider;
private readonly IContactGroupInfoProvider contactGroupInfoProvider;
private readonly ISettingsKeyInfoProvider settingsKeyInfoProvider;
private readonly IInfoProvider<WebsiteChannelInfo> websiteChannelInfoProvider;
Expand All @@ -60,8 +60,8 @@ public class SampleDataGeneratorApplication : OverviewPageBase
public SampleDataGeneratorApplication(
IFormBuilderConfigurationSerializer formBuilderConfigurationSerializer,
IEventLogService eventLogService,
IConsentInfoProvider consentInfoProvider,
IBizFormInfoProvider bizFormInfoProvider,
IInfoProvider<ConsentInfo> consentInfoProvider,
IInfoProvider<BizFormInfo> bizFormInfoProvider,
IContactGroupInfoProvider contactGroupInfoProvider,
ISettingsKeyInfoProvider settingsKeyInfoProvider,
IInfoProvider<WebsiteChannelInfo> websiteChannelInfoProvider)
Expand Down Expand Up @@ -141,7 +141,8 @@ private OverviewCard GetGdprCard()
new Kentico.Xperience.Admin.Base.Action(ActionType.Command)
{
Label = "Generate",
Parameter = nameof(GenerateGdprSampleData)
Parameter = nameof(GenerateGdprSampleData),
ButtonColor = ButtonColor.Secondary
}
},
Components = new List<IOverviewCardComponent>()
Expand Down
Empty file removed examples/DancingGoat/App_Data/CIRepository/.lock/restoreAll.lock
View file
Open in desktop
Empty file.
Empty file removed examples/DancingGoat/App_Data/CIRepository/.lock/serialize.lock
View file
Open in desktop
Empty file.
Empty file removed examples/DancingGoat/App_Data/CIRepository/.lock/storeAll.lock
View file
Open in desktop
Empty file.
44 changes: 0 additions & 44 deletions ..._Data/CIRepository/@global/cms.alternativeform/cms.class_cms.alternativeform/formedit.xml
View file
Open in desktop

This file was deleted.

Loading
Loading