VCST-2482: Fix value cannot be null. (Parameter 'element') at System.…

…ArgumentNullException (#87)
VirtoCommerce · Dec 26, 2024 · 5d9ee77 · 5d9ee77
1 parent e09868d
commit 5d9ee77
Show file tree

Hide file tree

Showing 9 changed files with 301 additions and 292 deletions.
diff --git a/...toCommerce.PriceExportImportModule.Core/VirtoCommerce.PriceExportImportModule.Core.csproj b/...toCommerce.PriceExportImportModule.Core/VirtoCommerce.PriceExportImportModule.Core.csproj
@@ -7,10 +7,10 @@
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.PricingModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.PricingModule.Data" Version="3.800.0" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.853.0" />
+    <PackageReference Include="VirtoCommerce.PricingModule.Core" Version="3.809.0" />
+    <PackageReference Include="VirtoCommerce.PricingModule.Data" Version="3.809.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Events\" />

diff --git a/src/VirtoCommerce.PriceExportImportModule.Data/Services/CsvPriceImportReporter.cs b/src/VirtoCommerce.PriceExportImportModule.Data/Services/CsvPriceImportReporter.cs
@@ -29,7 +29,7 @@ public CsvPriceImportReporter(string reportFilePath, IBlobStorageProvider blobSt
 
         public async Task WriteAsync(ImportError error)
         {
-            using (await AsyncLock.GetLockByKey(_reportFilePath).GetReleaserAsync())
+            using (await AsyncLock.GetLockByKey(_reportFilePath).LockAsync())
             {
                 ReportIsNotEmpty = true;
                 await _streamWriter.WriteLineAsync(GetLine(error));
@@ -55,7 +55,7 @@ public void WriteHeader(string header)
 
         public async ValueTask DisposeAsync()
         {
-            using (await AsyncLock.GetLockByKey(_reportFilePath).GetReleaserAsync())
+            using (await AsyncLock.GetLockByKey(_reportFilePath).LockAsync())
             {
                 await _streamWriter.DisposeAsync();
 

diff --git a/...toCommerce.PriceExportImportModule.Data/VirtoCommerce.PriceExportImportModule.Data.csproj b/...toCommerce.PriceExportImportModule.Data/VirtoCommerce.PriceExportImportModule.Data.csproj
@@ -16,12 +16,12 @@
     <Folder Include="Repositories\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="FluentValidation" Version="11.8.1" />
-    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.PricingModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.800.0" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="FluentValidation" Version="11.10.0" />
+    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.808.0" />
+    <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.822.0" />
+    <PackageReference Include="VirtoCommerce.PricingModule.Core" Version="3.809.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.853.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.853.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.PriceExportImportModule.Web/Scripts/blades/import-preview.js b/src/VirtoCommerce.PriceExportImportModule.Web/Scripts/blades/import-preview.js
@@ -19,7 +19,7 @@ angular.module('virtoCommerce.priceExportImportModule')
             importResources.preview({ filePath: blade.csvFilePath}, (data) => {
                 blade.currentEntities = data.results;
                 blade.totalCount = data.totalCount;
-                $scope.pageSettings.totalItems = 10;
+                $scope.pageSettings.totalItems = Math.min(10, blade.totalCount);
                 getInvalidRowsCount();
                 blade.isLoading = false;
             }, (error) => { bladeNavigationService.setError('Error ' + error.status, blade); });

diff --git a/src/VirtoCommerce.PriceExportImportModule.Web/Scripts/blades/import-processing.js b/src/VirtoCommerce.PriceExportImportModule.Web/Scripts/blades/import-processing.js
@@ -29,7 +29,12 @@ angular.module('virtoCommerce.priceExportImportModule')
                 );
             }
 
-            bladeNavigationService.closeBlade(blade);
+            if (blade.notification.finished) {
+                bladeNavigationService.closeChildrenBlades(blade.parentBlade.parentBlade.parentBlade, function () { });
+            }
+            else {
+                bladeNavigationService.closeBlade(blade);
+            }
         }
 
     }]);
diff --git a/...irtoCommerce.PriceExportImportModule.Web/VirtoCommerce.PriceExportImportModule.Web.csproj b/...irtoCommerce.PriceExportImportModule.Web/VirtoCommerce.PriceExportImportModule.Web.csproj
@@ -10,11 +10,6 @@
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.PriceExportImportModule.Data\VirtoCommerce.PriceExportImportModule.Data.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="module.manifest">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Controllers\Api\" />
     <Folder Include="Scripts\blades\" />

diff --git a/src/VirtoCommerce.PriceExportImportModule.Web/module.manifest b/src/VirtoCommerce.PriceExportImportModule.Web/module.manifest
@@ -4,12 +4,12 @@
   <version>3.802.0</version>
   <version-tag />
 
-  <platformVersion>3.800.0</platformVersion>
+  <platformVersion>3.853.0</platformVersion>
   <dependencies>
-      <dependency id="VirtoCommerce.Pricing" version="3.800.0" />
-      <dependency id="VirtoCommerce.Catalog" version="3.800.0" />
+      <dependency id="VirtoCommerce.Assets" version="3.808.0" />
+      <dependency id="VirtoCommerce.Catalog" version="3.822.0" />
       <dependency id="VirtoCommerce.Export" version="3.800.0" />
-      <dependency id="VirtoCommerce.Assets" version="3.800.0" />
+      <dependency id="VirtoCommerce.Pricing" version="3.809.0" />
   </dependencies>
 
   <title>Price Export Import</title>