Skip to content

Using the new script type provider handles new dependency related col… #56

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

Merged
frederik5480 merged 1 commit into from
Jan 28, 2025
Merged

Using the new script type provider handles new dependency related col… #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Dynamicweb.DataIntegration.Providers.DynamicwebProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dynamicweb.DataIntegration" Version="10.9.0" />
<PackageReference Include="Dynamicweb.DataIntegration" Version="10.11.2" />
<PackageReference Include="Dynamicweb.Ecommerce" Version="10.9.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
Expand Down
13 changes: 9 additions & 4 deletions src/DynamicwebProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Dynamicweb.Data;
using Dynamicweb.DataIntegration.Integration;
using Dynamicweb.DataIntegration.Integration.Interfaces;
using Dynamicweb.DataIntegration.Integration.ScriptTypes;
using Dynamicweb.DataIntegration.ProviderHelpers;
using Dynamicweb.Extensibility.AddIns;
using Dynamicweb.Extensibility.Editors;
Expand Down Expand Up @@ -226,7 +227,7 @@
xmlTextWriter.WriteElementString("Shop", Shop);
xmlTextWriter.WriteElementString("DeleteProductsAndGroupForSpecificLanguage", DeleteProductsAndGroupForSpecificLanguage.ToString(CultureInfo.CurrentCulture));
xmlTextWriter.WriteElementString("DefaultLanguage", DefaultLanguage);
xmlTextWriter.WriteElementString("RepositoriesIndexUpdate", RepositoriesIndexUpdate);

Check warning on line 230 in src/DynamicwebProvider.cs

View workflow job for this annotation

GitHub Actions / call-workflow / Build 

'DynamicwebProvider.RepositoriesIndexUpdate' is obsolete: 'Use Job.RepositoriesIndexSettings'
xmlTextWriter.WriteElementString("DiscardDuplicates", DiscardDuplicates.ToString(CultureInfo.CurrentCulture));
xmlTextWriter.WriteElementString("HideDeactivatedProducts", HideDeactivatedProducts.ToString(CultureInfo.CurrentCulture));
xmlTextWriter.WriteElementString("SkipFailingRows", SkipFailingRows.ToString(CultureInfo.CurrentCulture));
Expand Down Expand Up @@ -329,7 +330,7 @@
case "RepositoriesIndexUpdate":
if (node.HasChildNodes)
{
RepositoriesIndexUpdate = node.FirstChild.Value;

Check warning on line 333 in src/DynamicwebProvider.cs

View workflow job for this annotation

GitHub Actions / call-workflow / Build 

'DynamicwebProvider.RepositoriesIndexUpdate' is obsolete: 'Use Job.RepositoriesIndexSettings'
}
break;
case "DiscardDuplicates":
Expand Down Expand Up @@ -498,8 +499,10 @@
{
Column randomColumn = mapping.SourceTable.Columns.First();
var languageColumnMapping = mapping.AddMapping(randomColumn, mapping.DestinationTable.Columns.Find(c => string.Compare(c.Name, MappingExtensions.GetLanguageIdColumnName(mapping.DestinationTable.Name), true) == 0));
languageColumnMapping.ScriptType = ScriptType.Constant;
languageColumnMapping.ScriptValue = defaultLanguage;
languageColumnMapping.ScriptTypeProvider = new ConstantScriptType()
{
ScriptValue = defaultLanguage
};
}
}

Expand All @@ -510,8 +513,10 @@
{
Column randomColumn = mapping.SourceTable.Columns.First();
var shopColumnMapping = mapping.AddMapping(randomColumn, mapping.DestinationTable.Columns.Find(c => string.Compare(c.Name, MappingExtensions.GetShopIdColumnName(mapping.DestinationTable.Name), true) == 0));
shopColumnMapping.ScriptType = ScriptType.Constant;
shopColumnMapping.ScriptValue = Shop;
shopColumnMapping.ScriptTypeProvider = new ConstantScriptType()
{
ScriptValue = Shop
};
}
}

Expand Down Expand Up @@ -704,15 +709,15 @@

private void MoveRepositoriesIndexToJob(Job job)
{
if (!string.IsNullOrEmpty(RepositoriesIndexUpdate))

Check warning on line 712 in src/DynamicwebProvider.cs

View workflow job for this annotation

GitHub Actions / call-workflow / Build 

'DynamicwebProvider.RepositoriesIndexUpdate' is obsolete: 'Use Job.RepositoriesIndexSettings'
{
char[] separator = [','];
// if the provider already have RepositoriesIndexUpdate set, then we move them to the job, and set the add-in to string.empty
if (job.RepositoriesIndexSettings?.RepositoriesIndexes?.Count == 0)
{
job.RepositoriesIndexSettings = new RepositoriesIndexSettings(new Collection<string>([.. RepositoriesIndexUpdate.Split(separator, StringSplitOptions.RemoveEmptyEntries)]));

Check warning on line 718 in src/DynamicwebProvider.cs

View workflow job for this annotation

GitHub Actions / call-workflow / Build 

'DynamicwebProvider.RepositoriesIndexUpdate' is obsolete: 'Use Job.RepositoriesIndexSettings'
}
RepositoriesIndexUpdate = string.Empty;

Check warning on line 720 in src/DynamicwebProvider.cs

View workflow job for this annotation

GitHub Actions / call-workflow / Build 

'DynamicwebProvider.RepositoriesIndexUpdate' is obsolete: 'Use Job.RepositoriesIndexSettings'
job.Save();
}
}
Expand Down
Loading