diff --git a/examples/DancingGoat/AdminComponents/Apps/SampleDataGenerator/SampleDataGeneratorApplication.cs b/examples/DancingGoat/AdminComponents/Apps/SampleDataGenerator/SampleDataGeneratorApplication.cs index 326dafc..1e0251e 100644 --- a/examples/DancingGoat/AdminComponents/Apps/SampleDataGenerator/SampleDataGeneratorApplication.cs +++ b/examples/DancingGoat/AdminComponents/Apps/SampleDataGenerator/SampleDataGeneratorApplication.cs @@ -40,9 +40,9 @@ public class SampleDataGeneratorApplication : OverviewPageBase private readonly IFormBuilderConfigurationSerializer formBuilderConfigurationSerializer; private readonly IEventLogService eventLogService; - private readonly IConsentInfoProvider consentInfoProvider; - private readonly IBizFormInfoProvider bizFormInfoProvider; - private readonly IContactGroupInfoProvider contactGroupInfoProvider; + private readonly IInfoProvider consentInfoProvider; + private readonly IInfoProvider bizFormInfoProvider; + private readonly IInfoProvider contactGroupInfoProvider; private readonly ISettingsKeyInfoProvider settingsKeyInfoProvider; private readonly IInfoProvider websiteChannelInfoProvider; @@ -60,9 +60,9 @@ public class SampleDataGeneratorApplication : OverviewPageBase public SampleDataGeneratorApplication( IFormBuilderConfigurationSerializer formBuilderConfigurationSerializer, IEventLogService eventLogService, - IConsentInfoProvider consentInfoProvider, - IBizFormInfoProvider bizFormInfoProvider, - IContactGroupInfoProvider contactGroupInfoProvider, + IInfoProvider consentInfoProvider, + IInfoProvider bizFormInfoProvider, + IInfoProvider contactGroupInfoProvider, ISettingsKeyInfoProvider settingsKeyInfoProvider, IInfoProvider websiteChannelInfoProvider) { diff --git a/examples/DancingGoat/Components/ViewComponents/TrackingConsent/TrackingConsentViewComponent.cs b/examples/DancingGoat/Components/ViewComponents/TrackingConsent/TrackingConsentViewComponent.cs index c3ade28..5aba6e7 100644 --- a/examples/DancingGoat/Components/ViewComponents/TrackingConsent/TrackingConsentViewComponent.cs +++ b/examples/DancingGoat/Components/ViewComponents/TrackingConsent/TrackingConsentViewComponent.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using CMS.ContactManagement; +using CMS.DataEngine; using CMS.DataProtection; using CMS.Websites; using CMS.Websites.Routing; @@ -17,7 +18,7 @@ namespace DancingGoat.ViewComponents { public class TrackingConsentViewComponent : ViewComponent { - private readonly IConsentInfoProvider consentInfoProvider; + private readonly IInfoProvider consentInfoProvider; private readonly IConsentAgreementService consentAgreementService; private readonly IPreferredLanguageRetriever currentLanguageRetriever; private readonly IWebPageDataContextRetriever webPageDataContextRetriever; @@ -26,7 +27,7 @@ public class TrackingConsentViewComponent : ViewComponent public TrackingConsentViewComponent( - IConsentInfoProvider consentInfoProvider, + IInfoProvider consentInfoProvider, IConsentAgreementService consentAgreementService, IPreferredLanguageRetriever currentLanguageRetriever, IWebPageDataContextRetriever webPageDataContextRetriever, diff --git a/examples/DancingGoat/Controllers/ConsentController.cs b/examples/DancingGoat/Controllers/ConsentController.cs index 2d148e7..5e11048 100644 --- a/examples/DancingGoat/Controllers/ConsentController.cs +++ b/examples/DancingGoat/Controllers/ConsentController.cs @@ -1,4 +1,5 @@ using CMS.ContactManagement; +using CMS.DataEngine; using CMS.DataProtection; using CMS.Helpers; @@ -13,10 +14,10 @@ public class ConsentController : Controller { private readonly ICurrentCookieLevelProvider cookieLevelProvider; private readonly IConsentAgreementService consentAgreementService; - private readonly IConsentInfoProvider consentInfoProvider; + private readonly IInfoProvider consentInfoProvider; - public ConsentController(ICurrentCookieLevelProvider cookieLevelProvider, IConsentAgreementService consentAgreementService, IConsentInfoProvider consentInfoProvider) + public ConsentController(ICurrentCookieLevelProvider cookieLevelProvider, IConsentAgreementService consentAgreementService, IInfoProvider consentInfoProvider) { this.cookieLevelProvider = cookieLevelProvider; this.consentAgreementService = consentAgreementService; diff --git a/examples/DancingGoat/Controllers/DancingGoatPrivacyController.cs b/examples/DancingGoat/Controllers/DancingGoatPrivacyController.cs index 8971c48..8c1fa4f 100644 --- a/examples/DancingGoat/Controllers/DancingGoatPrivacyController.cs +++ b/examples/DancingGoat/Controllers/DancingGoatPrivacyController.cs @@ -2,6 +2,7 @@ using System.Linq; using CMS.ContactManagement; +using CMS.DataEngine; using CMS.DataProtection; using DancingGoat; @@ -24,7 +25,7 @@ public class DancingGoatPrivacyController : Controller private const string ERROR_RESULT = "error"; private readonly IConsentAgreementService consentAgreementService; - private readonly IConsentInfoProvider consentInfoProvider; + private readonly IInfoProvider consentInfoProvider; private readonly IPreferredLanguageRetriever currentLanguageRetriever; private ContactInfo currentContact; @@ -43,7 +44,7 @@ private ContactInfo CurrentContact } - public DancingGoatPrivacyController(IConsentAgreementService consentAgreementService, IConsentInfoProvider consentInfoProvider, IPreferredLanguageRetriever currentLanguageRetriever) + public DancingGoatPrivacyController(IConsentAgreementService consentAgreementService, IInfoProvider consentInfoProvider, IPreferredLanguageRetriever currentLanguageRetriever) { this.consentAgreementService = consentAgreementService; this.consentInfoProvider = consentInfoProvider; diff --git a/examples/DancingGoat/DancingGoat.csproj b/examples/DancingGoat/DancingGoat.csproj index 99407a6..dd6367e 100644 --- a/examples/DancingGoat/DancingGoat.csproj +++ b/examples/DancingGoat/DancingGoat.csproj @@ -1,7 +1,7 @@ DancingGoat - 7e8a56d7-ac0a-4d47-af57-fc423c65eafb + 7e8a56d7-ac0a-4d47-af57-fc423c65gafb false annotations false diff --git a/examples/DancingGoat/DataProtectionSamples/DancingGoatSamplesModule.cs b/examples/DancingGoat/DataProtectionSamples/DancingGoatSamplesModule.cs index a566a7a..ce69a66 100644 --- a/examples/DancingGoat/DataProtectionSamples/DancingGoatSamplesModule.cs +++ b/examples/DancingGoat/DataProtectionSamples/DancingGoatSamplesModule.cs @@ -30,16 +30,16 @@ internal class DancingGoatSamplesModule : Module { private const string DATA_PROTECTION_SAMPLES_ENABLED_SETTINGS_KEY_NAME = "DataProtectionSamplesEnabled"; - private IContactInfoProvider contactInfoProvider; + private IInfoProvider contactInfoProvider; private IMemberInfoProvider memberInfoProvider; - private IConsentAgreementInfoProvider consentAgreementInfoProvider; - private IBizFormInfoProvider bizFormInfoProvider; - private IAccountContactInfoProvider accountContactInfoProvider; - private ISettingsKeyInfoProvider settingsKeyInfoProvider; - private IActivityInfoProvider activityInfoProvider; - private ICountryInfoProvider countryInfoProvider; - private IStateInfoProvider stateInfoProvider; - private IAccountInfoProvider accountInfoProvider; + private IInfoProvider consentAgreementInfoProvider; + private IInfoProvider bizFormInfoProvider; + private IInfoProvider accountContactInfoProvider; + private IInfoProvider settingsKeyInfoProvider; + private IInfoProvider activityInfoProvider; + private IInfoProvider countryInfoProvider; + private IInfoProvider stateInfoProvider; + private IInfoProvider accountInfoProvider; /// @@ -57,16 +57,16 @@ protected override void OnInit() { base.OnInit(); - contactInfoProvider = Service.Resolve(); + contactInfoProvider = Service.Resolve>(); memberInfoProvider = Service.Resolve(); - consentAgreementInfoProvider = Service.Resolve(); - bizFormInfoProvider = Service.Resolve(); - accountContactInfoProvider = Service.Resolve(); - settingsKeyInfoProvider = Service.Resolve(); - activityInfoProvider = Service.Resolve(); - countryInfoProvider = Service.Resolve(); - stateInfoProvider = Service.Resolve(); - accountInfoProvider = Service.Resolve(); + consentAgreementInfoProvider = Service.Resolve>(); + bizFormInfoProvider = Service.Resolve>(); + accountContactInfoProvider = Service.Resolve>(); + settingsKeyInfoProvider = Service.Resolve>(); + activityInfoProvider = Service.Resolve>(); + countryInfoProvider = Service.Resolve>(); + stateInfoProvider = Service.Resolve>(); + accountInfoProvider = Service.Resolve>(); InitializeSamples(); } @@ -78,7 +78,7 @@ protected override void OnInit() /// private void InitializeSamples() { - var dataProtectionSamplesEnabledSettingsKey = settingsKeyInfoProvider.Get(DATA_PROTECTION_SAMPLES_ENABLED_SETTINGS_KEY_NAME); + var dataProtectionSamplesEnabledSettingsKey = settingsKeyInfoProvider.Get().WhereEquals(nameof(SettingsKeyInfo.KeyName), DATA_PROTECTION_SAMPLES_ENABLED_SETTINGS_KEY_NAME).FirstOrDefault(); if (dataProtectionSamplesEnabledSettingsKey?.KeyValue.ToBoolean(false) ?? false) { RegisterSamples(); diff --git a/examples/DancingGoat/DataProtectionSamples/IdentityCollectors/SampleContactInfoIdentityCollector.cs b/examples/DancingGoat/DataProtectionSamples/IdentityCollectors/SampleContactInfoIdentityCollector.cs index b546b27..40ed5be 100644 --- a/examples/DancingGoat/DataProtectionSamples/IdentityCollectors/SampleContactInfoIdentityCollector.cs +++ b/examples/DancingGoat/DataProtectionSamples/IdentityCollectors/SampleContactInfoIdentityCollector.cs @@ -12,14 +12,14 @@ namespace Samples.DancingGoat /// internal class SampleContactInfoIdentityCollector : IIdentityCollector { - private readonly IContactInfoProvider contactInfoProvider; + private readonly IInfoProvider contactInfoProvider; /// /// Initializes a new instance of the class. /// /// Contact info provider. - public SampleContactInfoIdentityCollector(IContactInfoProvider contactInfoProvider) + public SampleContactInfoIdentityCollector(IInfoProvider contactInfoProvider) { this.contactInfoProvider = contactInfoProvider; } diff --git a/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollector.cs b/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollector.cs index 954f3bd..47fcdb7 100644 --- a/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollector.cs +++ b/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollector.cs @@ -14,13 +14,13 @@ namespace Samples.DancingGoat /// internal class SampleContactDataCollector : IPersonalDataCollector { - private readonly IActivityInfoProvider activityInfoProvider; - private readonly ICountryInfoProvider countryInfoProvider; - private readonly IStateInfoProvider stateInfoProvider; - private readonly IConsentAgreementInfoProvider consentAgreementInfoProvider; - private readonly IAccountContactInfoProvider accountContactInfoProvider; - private readonly IAccountInfoProvider accountInfoProvider; - private readonly IBizFormInfoProvider bizFormInfoProvider; + private readonly IInfoProvider activityInfoProvider; + private readonly IInfoProvider countryInfoProvider; + private readonly IInfoProvider stateInfoProvider; + private readonly IInfoProvider consentAgreementInfoProvider; + private readonly IInfoProvider accountContactInfoProvider; + private readonly IInfoProvider accountInfoProvider; + private readonly IInfoProvider bizFormInfoProvider; /// @@ -34,13 +34,13 @@ internal class SampleContactDataCollector : IPersonalDataCollector /// Account info provider. /// BizForm info provider. public SampleContactDataCollector( - IActivityInfoProvider activityInfoProvider, - ICountryInfoProvider countryInfoProvider, - IStateInfoProvider stateInfoProvider, - IConsentAgreementInfoProvider consentAgreementInfoProvider, - IAccountContactInfoProvider accountContactInfoProvider, - IAccountInfoProvider accountInfoProvider, - IBizFormInfoProvider bizFormInfoProvider) + IInfoProvider activityInfoProvider, + IInfoProvider countryInfoProvider, + IInfoProvider stateInfoProvider, + IInfoProvider consentAgreementInfoProvider, + IInfoProvider accountContactInfoProvider, + IInfoProvider accountInfoProvider, + IInfoProvider bizFormInfoProvider) { this.activityInfoProvider = activityInfoProvider; this.countryInfoProvider = countryInfoProvider; diff --git a/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollectorCore.cs b/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollectorCore.cs index 19b3175..ad4afe7 100644 --- a/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollectorCore.cs +++ b/examples/DancingGoat/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollectorCore.cs @@ -20,13 +20,13 @@ namespace Samples.DancingGoat internal class SampleContactDataCollectorCore { private readonly IPersonalDataWriter writer; - private readonly IActivityInfoProvider activityInfoProvider; - private readonly ICountryInfoProvider countryInfoProvider; - private readonly IStateInfoProvider stateInfoProvider; - private readonly IConsentAgreementInfoProvider consentAgreementInfoProvider; - private readonly IAccountContactInfoProvider accountContactInfoProvider; - private readonly IAccountInfoProvider accountInfoProvider; - private readonly IBizFormInfoProvider bizFormInfoProvider; + private readonly IInfoProvider activityInfoProvider; + private readonly IInfoProvider countryInfoProvider; + private readonly IInfoProvider stateInfoProvider; + private readonly IInfoProvider consentAgreementInfoProvider; + private readonly IInfoProvider accountContactInfoProvider; + private readonly IInfoProvider accountInfoProvider; + private readonly IInfoProvider bizFormInfoProvider; // Lists store Tuples of database column names and their corresponding display names. private readonly List contactInfoColumns = new List { @@ -325,13 +325,13 @@ private object TransformConsentAction(string columnName, object columnValue) /// BizForm info provider. public SampleContactDataCollectorCore( IPersonalDataWriter writer, - IActivityInfoProvider activityInfoProvider, - ICountryInfoProvider countryInfoProvider, - IStateInfoProvider stateInfoProvider, - IConsentAgreementInfoProvider consentAgreementInfoProvider, - IAccountContactInfoProvider accountContactInfoProvider, - IAccountInfoProvider accountInfoProvider, - IBizFormInfoProvider bizFormInfoProvider) + IInfoProvider activityInfoProvider, + IInfoProvider countryInfoProvider, + IInfoProvider stateInfoProvider, + IInfoProvider consentAgreementInfoProvider, + IInfoProvider accountContactInfoProvider, + IInfoProvider accountInfoProvider, + IInfoProvider bizFormInfoProvider) { this.writer = writer; this.activityInfoProvider = activityInfoProvider; @@ -401,11 +401,11 @@ private void WriteContacts(IEnumerable contacts) var stateID = contactInfo.ContactStateID; if (countryID != 0) { - writer.WriteBaseInfo(countryInfoProvider.Get(countryID), countryInfoColumns); + writer.WriteBaseInfo(countryInfoProvider.Get().WithID(countryID).FirstOrDefault(), countryInfoColumns); } if (stateID != 0) { - writer.WriteBaseInfo(stateInfoProvider.Get(stateID), stateInfoColumns); + writer.WriteBaseInfo(stateInfoProvider.Get().WithID(stateID).FirstOrDefault(), stateInfoColumns); } writer.WriteEndSection(); diff --git a/examples/DancingGoat/DataProtectionSamples/PersonalDataErasers/SampleContactPersonalDataEraser.cs b/examples/DancingGoat/DataProtectionSamples/PersonalDataErasers/SampleContactPersonalDataEraser.cs index 7a0971d..ab67294 100644 --- a/examples/DancingGoat/DataProtectionSamples/PersonalDataErasers/SampleContactPersonalDataEraser.cs +++ b/examples/DancingGoat/DataProtectionSamples/PersonalDataErasers/SampleContactPersonalDataEraser.cs @@ -35,10 +35,10 @@ internal class SampleContactPersonalDataEraser : IPersonalDataEraser { new Guid("DAAA080A-7B6B-489E-8150-290B1F24E715"), "Email" } }; - private readonly IConsentAgreementInfoProvider consentAgreementInfoProvider; - private readonly IBizFormInfoProvider bizFormInfoProvider; - private readonly IAccountContactInfoProvider accountContactInfoProvider; - private readonly IContactInfoProvider contactInfoProvider; + private readonly IInfoProvider consentAgreementInfoProvider; + private readonly IInfoProvider bizFormInfoProvider; + private readonly IInfoProvider accountContactInfoProvider; + private readonly IInfoProvider contactInfoProvider; /// @@ -49,10 +49,10 @@ internal class SampleContactPersonalDataEraser : IPersonalDataEraser /// Account contact info provider. /// Contact info provider. public SampleContactPersonalDataEraser( - IConsentAgreementInfoProvider consentAgreementInfoProvider, - IBizFormInfoProvider bizFormInfoProvider, - IAccountContactInfoProvider accountContactInfoProvider, - IContactInfoProvider contactInfoProvider) + IInfoProvider consentAgreementInfoProvider, + IInfoProvider bizFormInfoProvider, + IInfoProvider accountContactInfoProvider, + IInfoProvider contactInfoProvider) { this.consentAgreementInfoProvider = consentAgreementInfoProvider; this.bizFormInfoProvider = bizFormInfoProvider; @@ -210,4 +210,4 @@ private void DeleteContacts(IEnumerable contacts, IDictionary contactGroupInfoProvider; /// /// Initializes a new instance of the class. /// /// Contact group info provider. - public FormContactGroupGenerator(IContactGroupInfoProvider contactGroupInfoProvider) + public FormContactGroupGenerator(IInfoProvider contactGroupInfoProvider) { this.contactGroupInfoProvider = contactGroupInfoProvider; } diff --git a/examples/DancingGoat/Helpers/Generators/DataProtection/FormConsentGenerator.cs b/examples/DancingGoat/Helpers/Generators/DataProtection/FormConsentGenerator.cs index 64f7ee6..305093a 100644 --- a/examples/DancingGoat/Helpers/Generators/DataProtection/FormConsentGenerator.cs +++ b/examples/DancingGoat/Helpers/Generators/DataProtection/FormConsentGenerator.cs @@ -28,8 +28,8 @@ public class FormConsentGenerator private const string CONSENT_SHORT_TEXT_ES = "

Por lo presente acepto que esta información proporcionada puede ser utilizada con fines de marketing y contenido de sitios web dirigidos.

"; private readonly IFormBuilderConfigurationSerializer formBuilderConfigurationSerializer; - private readonly IConsentInfoProvider consentInfoProvider; - private readonly IBizFormInfoProvider bizFormInfoProvider; + private readonly IInfoProvider consentInfoProvider; + private readonly IInfoProvider bizFormInfoProvider; /// @@ -40,8 +40,8 @@ public class FormConsentGenerator /// BizForm info provide. public FormConsentGenerator( IFormBuilderConfigurationSerializer formBuilderConfigurationSerializer, - IConsentInfoProvider consentInfoProvider, - IBizFormInfoProvider bizFormInfoProvider) + IInfoProvider consentInfoProvider, + IInfoProvider bizFormInfoProvider) { this.formBuilderConfigurationSerializer = formBuilderConfigurationSerializer; this.consentInfoProvider = consentInfoProvider; diff --git a/examples/DancingGoat/Helpers/Generators/DataProtection/TrackingConsentGenerator.cs b/examples/DancingGoat/Helpers/Generators/DataProtection/TrackingConsentGenerator.cs index 5acfae3..2462ec9 100644 --- a/examples/DancingGoat/Helpers/Generators/DataProtection/TrackingConsentGenerator.cs +++ b/examples/DancingGoat/Helpers/Generators/DataProtection/TrackingConsentGenerator.cs @@ -1,4 +1,5 @@ -using CMS.DataProtection; +using CMS.DataEngine; +using CMS.DataProtection; namespace DancingGoat.Helpers.Generator { @@ -25,13 +26,13 @@ public class TrackingConsentGenerator + "visitantes. Además, almacenaremos pequeñas cantidades de datos en las cookies del navegador. Nos comprometemos a tratar " + "sus datos con respeto, almacenarlo en un almacenamiento seguro, y no lo lanzará a terceros.

"; - private readonly IConsentInfoProvider consentInfoProvider; + private readonly IInfoProvider consentInfoProvider; /// /// Initializes a new instance of the class. /// /// Consent info provider. - public TrackingConsentGenerator(IConsentInfoProvider consentInfoProvider) + public TrackingConsentGenerator(IInfoProvider consentInfoProvider) { this.consentInfoProvider = consentInfoProvider; } diff --git a/src/Kentico.Xperience.Algolia/Admin/Client/package-lock.json b/src/Kentico.Xperience.Algolia/Admin/Client/package-lock.json index 3117273..0ba1a6c 100644 --- a/src/Kentico.Xperience.Algolia/Admin/Client/package-lock.json +++ b/src/Kentico.Xperience.Algolia/Admin/Client/package-lock.json @@ -12,8 +12,8 @@ "@kentico/xperience-admin-components": "28.4.3", "react": "18.2.0", "react-dom": "18.2.0", - "react-icons": "^5.1.0", - "react-tooltip": "^5.26.3" + "react-icons": "5.1.0", + "react-tooltip": "^5.26.4" }, "devDependencies": { "@babel/core": "7.23.9", @@ -10243,9 +10243,9 @@ } }, "node_modules/react-tooltip": { - "version": "5.26.3", - "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.26.3.tgz", - "integrity": "sha512-MpYAws8CEHUd/RC4GaDCdoceph/T4KHM5vS5Dbk8FOmLMvvIht2ymP2htWdrke7K6lqPO8rz8+bnwWUIXeDlzg==", + "version": "5.26.4", + "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.26.4.tgz", + "integrity": "sha512-5WyDrsfw1+6qNVSr3IjqElqJ+cCwE8+44b+HpJ8qRLv7v0a3mcKf8wvv+NfgALFS6QpksGFqTLV2JQ60c+okZQ==", "dependencies": { "@floating-ui/dom": "^1.6.1", "classnames": "^2.3.0" diff --git a/src/Kentico.Xperience.Algolia/Admin/Client/package.json b/src/Kentico.Xperience.Algolia/Admin/Client/package.json index 0a6b23e..27fc4cd 100644 --- a/src/Kentico.Xperience.Algolia/Admin/Client/package.json +++ b/src/Kentico.Xperience.Algolia/Admin/Client/package.json @@ -18,7 +18,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-icons": "5.1.0", - "react-tooltip": "^5.26.3" + "react-tooltip": "^5.26.4" }, "devDependencies": { "@babel/core": "7.23.9",