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

Form leads finished #3

Merged
merged 24 commits into from
Jan 24, 2024
Merged

Form leads finished #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8f6d0a7
leads finishing wip
martinfbluesoftcz Jan 7, 2024
9884f77
form leads new pairing, ui settings, sync service
martinfbluesoftcz Jan 8, 2024
1da2bad
sync service, salesforce pairing wip
martinfbluesoftcz Jan 8, 2024
31febeb
salesforce wip
martinfbluesoftcz Jan 8, 2024
c4dd96c
leads pairing logic finished
martinfbluesoftcz Jan 9, 2024
300174e
settings in CMS, contact form mapping start
martinfbluesoftcz Jan 9, 2024
1db4a2e
converters, auto mapping, UI listing for synced items
martinfbluesoftcz Jan 10, 2024
2dcaa94
salesforce converters finished
martinfbluesoftcz Jan 10, 2024
ba9e6e7
configuration simplify
martinfbluesoftcz Jan 10, 2024
f03a340
Merge remote-tracking branch 'origin/main' into form-leads-finished
martinfbluesoftcz Jan 12, 2024
a19fefc
comments
martinfbluesoftcz Jan 12, 2024
188ffc0
cleanup
martinfbluesoftcz Jan 12, 2024
b369d46
readme, some fixes
martinfbluesoftcz Jan 12, 2024
28c6b66
code review changes 1
martinfbluesoftcz Jan 17, 2024
7af14f8
version 28.0.0 upgrade
martinfbluesoftcz Jan 18, 2024
741147f
DancingGoat 28.0.0 src
martinfbluesoftcz Jan 18, 2024
6b2bc65
CRM setting info custom class - wip
martinfbluesoftcz Jan 18, 2024
6f4a570
admin settings re-work to custom class and ui edit pages
martinfbluesoftcz Jan 19, 2024
ac54f2e
readme more simple and usage guide doc filled
martinfbluesoftcz Jan 22, 2024
e73f825
Sync item listing typo fixes, email column, client secret as password…
martinfbluesoftcz Jan 23, 2024
d14e158
cln and settings desc
martinfbluesoftcz Jan 23, 2024
06f6989
CRM setting main application, added permissions
martinfbluesoftcz Jan 23, 2024
6efc8f7
refactor(sln): VSCode, NuGet, formatting, extension names, linting
seangwright Jan 24, 2024
9a7f643
build(CRM.SalesForce): revert NSwag package to highest previous major
seangwright Jan 24, 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
1 change: 1 addition & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,5 @@ dotnet_naming_style.begins_with_i.capitalization = pascal_case

# Exclude generated files from style rules
[**/Dataverse/**/*.cs]
generated_code = true
dotnet_diagnostic.CS8981.severity = none
1 change: 0 additions & 1 deletion .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"recommendations": [
"ms-dotnettools.csdevkit",
"k--kato.docomment",
"editorconfig.editorconfig",
"davidanson.vscode-markdownlint",
"tintoy.msbuild-project-tools",
Expand Down
12 changes: 5 additions & 7 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Kentico.Xperience.SalesforceSalesCloud.Sample/bin/Debug/net6.0/DancingGoat.dll",
"preLaunchTask": ".NET: build (Solution)",
"program": "${workspaceFolder}/examples/DancingGoat/bin/Debug/net6.0/DancingGoat.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Kentico.Xperience.SalesforceSalesCloud.Sample",
"cwd": "${workspaceFolder}/examples/DancingGoat",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_WATCH_RESTART_ON_RUDE_EDIT": "true"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
Expand Down
5 changes: 1 addition & 4 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,8 @@
"editor.defaultFormatter": "ms-dotnettools.csharp"
},

"dotnet.defaultSolution": "Kentico.Xperience.SalesforceSalesCloud.sln",
"dotnet.defaultSolution": "Kentico.Xperience.CRM.sln",

"eslint.workingDirectories": [
"./src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client"
],
"[aspnetcorerazor]": {
"editor.defaultFormatter": "ms-dotnettools.csharp"
},
Expand Down
97 changes: 46 additions & 51 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,74 +2,69 @@
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "install",
"path": "src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"group": "clean",
"problemMatcher": [],
"label": "npm: install - src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"detail": "install dependencies from package"
},
{
"type": "dotnet",
"task": "build",
"problemMatcher": ["$msCompile"],
"group": "build",
"label": "dotnet: build"
},
{
"type": "shell",
"label": ".NET: build (Solution)",
"command": "dotnet",
"args": ["format"],
"problemMatcher": ["$msCompile"],
"group": "none",
"options": {
"cwd": "${workspaceFolder}/src/Kentico.Xperience.SalesforceSalesCloud/"
},
"label": "dotnet: format"
"type": "process",
"args": [
"build",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"type": "dotnet",
"task": "clean",
"problemMatcher": ["$msCompile"],
"group": "clean",
"label": "dotnet: clean"
"label": ".NET: rebuild (Solution)",
"command": "dotnet",
"type": "process",
"args": [
"build",
"--no-incremental",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"type": "npm",
"script": "build",
"path": "src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"group": "build",
"problemMatcher": [],
"label": "npm: build - src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"detail": "webpack --mode=production"
"label": ".NET: clean (Solution)",
"command": "dotnet",
"type": "process",
"args": [
"clean",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"type": "npm",
"script": "build:dev",
"path": "src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"group": "build",
"problemMatcher": [],
"label": "npm: build:dev - src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"detail": "webpack --mode=development"
"label": ".NET: test (Solution)",
"command": "dotnet",
"type": "process",
"args": [
"test",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"type": "npm",
"script": "start",
"path": "src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"problemMatcher": [],
"label": "npm: start - src/Kentico.Xperience.SalesforceSalesCloud/Admin/Client",
"detail": "webpack serve --mode development"
"label": ".NET: format (src)",
"command": "dotnet",
"type": "process",
"args": ["format", "Kentico.Xperience.CRM.Libs.sln"],
"problemMatcher": "$msCompile",
"options": {
"cwd": "${workspaceFolder}/src/"
}
},
{
"label": "dotnet: watch DancingGoat",
"label": ".NET: watch (DancingGoat)",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/src/Kentico.Xperience.SalesforceSalesCloud.Sample/DancingGoat.csproj"
"${workspaceFolder}/examples/DancingGoat/DancingGoat.csproj"
],
"options": {
"env": {
Expand Down
9 changes: 4 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<Authors>$(Company)</Authors>
<Copyright>Copyright © $(Company) $([System.DateTime]::Now.Year)</Copyright>
<Trademark>$(Company)™</Trademark>
<VersionPrefix>1.0.0-prerelease-1</VersionPrefix>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>prerelease-1</VersionSuffix>
<PackageLicenseExpression>MIT</PackageLicenseExpression>

<PackageProjectUrl>https://github.com/Kentico/xperience-by-kentico-crm</PackageProjectUrl>
Expand All @@ -17,7 +18,7 @@

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\images\logo.png" Pack="true" Visible="false" PackagePath="" />
<None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>

<PropertyGroup>
Expand All @@ -28,15 +29,13 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<CopyDocumentationFilesFromPackages>true</CopyDocumentationFilesFromPackages>
<CopyDebugSymbolFilesFromPackages>true</CopyDebugSymbolFilesFromPackages>
<NoWarn>$(NoWarn);1591</NoWarn>
<NoWarn>$(NoWarn);1591;S101;S1121</NoWarn>

<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
</PropertyGroup>

<PropertyGroup Condition=" $(Configuration) == 'Release' ">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
Expand Down
27 changes: 13 additions & 14 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,20 @@
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Kentico.Xperience.Admin" Version="27.0.1" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="27.0.1" />
<PackageVersion Include="kentico.xperience.azurestorage" Version="27.0.1" />
<PackageVersion Include="kentico.xperience.imageprocessing" Version="27.0.1" />
<PackageVersion Include="Kentico.Xperience.Core" Version="27.0.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.6.0.74858" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="Kentico.Xperience.Admin" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="28.0.0" />
<PackageVersion Include="kentico.xperience.azurestorage" Version="28.0.0" />
<PackageVersion Include="kentico.xperience.imageprocessing" Version="28.0.0" />
<PackageVersion Include="Kentico.Xperience.Core" Version="28.0.0" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.17.0.82934" />
<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.9.0" />
<PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="Microsoft.PowerPlatform.Dataverse.Client" Version="1.1.14" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="2.0.3" />
<PackageVersion Include="IdentityModel" Version="6.2.0" />
<PackageVersion Include="NSwag.ApiDescription.Client" Version="13.18.2" />
<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" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions Kentico.Xperience.CRM.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{62
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DancingGoat", "examples\DancingGoat\DancingGoat.csproj", "{A512E2C5-03C4-4707-800F-4BC6AA4C875C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{DDCE1F24-20E6-4AF4-8D37-E90B2F6C6A2C}"
ProjectSection(SolutionItems) = preProject
docs\Usage-Guide.md = docs\Usage-Guide.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
Loading