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

Fix: CI Support #5

Merged
merged 4 commits into from
Feb 1, 2024
Merged

Fix: CI Support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
696ecad
fix(CRM.Common): update existing data class and form objects
seangwright Jan 31, 2024
195f7da
docs(CRM.Common): method comment
seangwright Jan 31, 2024
e362e35
build(sln): update NuGet pacakges
seangwright Feb 1, 2024
5702638
fix(CRM.Salesforce): casing typo file path
seangwright Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="NUnit" Version="4.0.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.0.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="Microsoft.PowerPlatform.Dataverse.Client" Version="1.1.17" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="2.1.0" />
<PackageVersion Include="IdentityModel" Version="6.2.0" />
<PackageVersion Include="NSwag.ApiDescription.Client" Version="13.20.0" />
<PackageVersion Include="NSwag.ApiDescription.Client" Version="[13.20.0, 14.0.0)" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/DancingGoat/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@
"kentico.xperience.crm.dynamics": {
"type": "Project",
"dependencies": {
"Kentico.Xperience.CRM.Common": "[1.0.0-prerelease-1, )",
"Kentico.Xperience.CRM.Common": "[1.0.0, )",
"Kentico.Xperience.Core": "[28.0.0, )",
"Microsoft.PowerPlatform.Dataverse.Client": "[1.1.17, )"
}
Expand All @@ -1406,7 +1406,7 @@
"dependencies": {
"Duende.AccessTokenManagement.OpenIdConnect": "[2.1.0, )",
"IdentityModel": "[6.2.0, )",
"Kentico.Xperience.CRM.Common": "[1.0.0-prerelease-1, )",
"Kentico.Xperience.CRM.Common": "[1.0.0, )",
"Kentico.Xperience.Core": "[28.0.0, )"
}
},
Expand Down
93 changes: 51 additions & 42 deletions src/Kentico.Xperience.CRM.Common/Admin/CRMModuleInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,13 @@ private void InstallModuleClasses(ResourceInfo resourceInfo)

private void InstallSyncedItemClass(ResourceInfo resourceInfo)
{
var failedSyncItemClass = DataClassInfoProvider.GetDataClassInfo(CRMSyncItemInfo.OBJECT_TYPE);
if (failedSyncItemClass is not null)
{
return;
}

failedSyncItemClass = DataClassInfo.New(CRMSyncItemInfo.OBJECT_TYPE);
var info = DataClassInfoProvider.GetDataClassInfo(CRMSyncItemInfo.OBJECT_TYPE) ?? DataClassInfo.New(CRMSyncItemInfo.OBJECT_TYPE);

failedSyncItemClass.ClassName = CRMSyncItemInfo.TYPEINFO.ObjectClassName;
failedSyncItemClass.ClassTableName = CRMSyncItemInfo.TYPEINFO.ObjectClassName.Replace(".", "_");
failedSyncItemClass.ClassDisplayName = "CRM Successful sync item";
failedSyncItemClass.ClassResourceID = resourceInfo.ResourceID;
failedSyncItemClass.ClassType = ClassType.OTHER;
info.ClassName = CRMSyncItemInfo.TYPEINFO.ObjectClassName;
info.ClassTableName = CRMSyncItemInfo.TYPEINFO.ObjectClassName.Replace(".", "_");
info.ClassDisplayName = "CRM Successful sync item";
info.ClassResourceID = resourceInfo.ResourceID;
info.ClassType = ClassType.OTHER;

var formInfo = FormHelper.GetBasicFormDefinition(nameof(CRMSyncItemInfo.CRMSyncItemID));

Expand Down Expand Up @@ -131,26 +125,23 @@ private void InstallSyncedItemClass(ResourceInfo resourceInfo)
};
formInfo.AddFormItem(formItem);

failedSyncItemClass.ClassFormDefinition = formInfo.GetXmlDefinition();
SetFormDefinition(info, formInfo);

DataClassInfoProvider.SetDataClassInfo(failedSyncItemClass);
if (info.HasChanged)
{
DataClassInfoProvider.SetDataClassInfo(info);
}
}

private void InstallFailedSyncItemClass(ResourceInfo resourceInfo)
{
var failedSyncItemClass = DataClassInfoProvider.GetDataClassInfo(FailedSyncItemInfo.OBJECT_TYPE);
if (failedSyncItemClass is not null)
{
return;
}

failedSyncItemClass = DataClassInfo.New(FailedSyncItemInfo.OBJECT_TYPE);
var info = DataClassInfoProvider.GetDataClassInfo(FailedSyncItemInfo.OBJECT_TYPE) ?? DataClassInfo.New(FailedSyncItemInfo.OBJECT_TYPE);

failedSyncItemClass.ClassName = FailedSyncItemInfo.TYPEINFO.ObjectClassName;
failedSyncItemClass.ClassTableName = FailedSyncItemInfo.TYPEINFO.ObjectClassName.Replace(".", "_");
failedSyncItemClass.ClassDisplayName = "CRM Failed sync item";
failedSyncItemClass.ClassResourceID = resourceInfo.ResourceID;
failedSyncItemClass.ClassType = ClassType.OTHER;
info.ClassName = FailedSyncItemInfo.TYPEINFO.ObjectClassName;
info.ClassTableName = FailedSyncItemInfo.TYPEINFO.ObjectClassName.Replace(".", "_");
info.ClassDisplayName = "CRM Failed sync item";
info.ClassResourceID = resourceInfo.ResourceID;
info.ClassType = ClassType.OTHER;

var formInfo = FormHelper.GetBasicFormDefinition(nameof(FailedSyncItemInfo.FailedSyncItemID));

Expand Down Expand Up @@ -214,26 +205,23 @@ private void InstallFailedSyncItemClass(ResourceInfo resourceInfo)
};
formInfo.AddFormItem(formItem);

failedSyncItemClass.ClassFormDefinition = formInfo.GetXmlDefinition();
SetFormDefinition(info, formInfo);

DataClassInfoProvider.SetDataClassInfo(failedSyncItemClass);
if (info.HasChanged)
{
DataClassInfoProvider.SetDataClassInfo(info);
}
}

private void InstallCRMIntegrationSettingsClass(ResourceInfo resourceInfo)
{
var settingsCRM = DataClassInfoProvider.GetDataClassInfo(CRMIntegrationSettingsInfo.OBJECT_TYPE);
if (settingsCRM is not null)
{
return;
}

settingsCRM = DataClassInfo.New(CRMIntegrationSettingsInfo.OBJECT_TYPE);
var info = DataClassInfoProvider.GetDataClassInfo(CRMIntegrationSettingsInfo.OBJECT_TYPE) ?? DataClassInfo.New(CRMIntegrationSettingsInfo.OBJECT_TYPE);

settingsCRM.ClassName = CRMIntegrationSettingsInfo.TYPEINFO.ObjectClassName;
settingsCRM.ClassTableName = CRMIntegrationSettingsInfo.TYPEINFO.ObjectClassName.Replace(".", "_");
settingsCRM.ClassDisplayName = "CRM integration settings";
settingsCRM.ClassResourceID = resourceInfo.ResourceID;
settingsCRM.ClassType = ClassType.OTHER;
info.ClassName = CRMIntegrationSettingsInfo.TYPEINFO.ObjectClassName;
info.ClassTableName = CRMIntegrationSettingsInfo.TYPEINFO.ObjectClassName.Replace(".", "_");
info.ClassDisplayName = "CRM integration settings";
info.ClassResourceID = resourceInfo.ResourceID;
info.ClassType = ClassType.OTHER;

var formInfo =
FormHelper.GetBasicFormDefinition(nameof(CRMIntegrationSettingsInfo.CRMIntegrationSettingsItemID));
Expand Down Expand Up @@ -315,9 +303,30 @@ private void InstallCRMIntegrationSettingsClass(ResourceInfo resourceInfo)
};
formInfo.AddFormItem(formItem);

SetFormDefinition(info, formInfo);

settingsCRM.ClassFormDefinition = formInfo.GetXmlDefinition();
if (info.HasChanged)
{
DataClassInfoProvider.SetDataClassInfo(info);
}
}

DataClassInfoProvider.SetDataClassInfo(settingsCRM);
/// <summary>
/// Ensure that the form is upserted with any existing form
/// </summary>
/// <param name="info"></param>
/// <param name="form"></param>
private static void SetFormDefinition(DataClassInfo info, FormInfo form)
{
if (info.ClassID > 0)
{
var existingForm = new FormInfo(info.ClassFormDefinition);
existingForm.CombineWithForm(form, new());
info.ClassFormDefinition = existingForm.GetXmlDefinition();
}
else
{
info.ClassFormDefinition = form.GetXmlDefinition();
}
}
}
2 changes: 1 addition & 1 deletion src/Kentico.Xperience.CRM.Salesforce/Kentico.Xperience.CRM.Salesforce.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<OpenApiReference Include=".\ApiClient\Salesforce_openapi3.json" CodeGenerator="NSwagCSharp" Namespace="Salesforce.OpenApi" ClassName="SalesforceApiClient">
<OpenApiReference Include=".\ApiClient\salesforce_openapi3.json" CodeGenerator="NSwagCSharp" Namespace="Salesforce.OpenApi" ClassName="SalesforceApiClient">
<Options>/UseBaseUrl:false /JsonLibrary:SystemTextJson /GenerateOptionalParameters:true /GenerateOptionalPropertiesAsNullable:true /GenerateNullableReferenceTypes:true /ExposeJsonSerializerSettings:true</Options>
</OpenApiReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Kentico.Xperience.CRM.Salesforce/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"NSwag.ApiDescription.Client": {
"type": "Direct",
"requested": "[13.20.0, )",
"requested": "[13.20.0, 14.0.0)",
"resolved": "13.20.0",
"contentHash": "ylDDEqtlSrTUH9oSPttT+ZoRCTusx8U8kbmqjfNuujvfLQz6KGPctkEhXLZYn4Bdy3v5z+a2koPN+DbeyyCxXA==",
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions test/Kentico.Xperience.CRM.Common.Tests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
},
"NUnit.Analyzers": {
"type": "Direct",
"requested": "[3.10.0, )",
"resolved": "3.10.0",
"contentHash": "+F2deTIQms+hJNzuoO68zgP1ftH61+meBx8iMn/90owv+eZpFTyQberapJ87jBm8f22/mwQnWufemjEVIvW11g=="
"requested": "[4.0.0, )",
"resolved": "4.0.0",
"contentHash": "cK9imCSUODS6zizYfrAWWHFSpGQCN8dP1QXVOtsgaCBEo0go1lrD+iBEjvVa+nkzppfzQGWYhFcrELYJ0RX9Qw=="
},
"NUnit3TestAdapter": {
"type": "Direct",
Expand Down
Loading