From 9d46f884b48d529deecf1a2a94f642d44ad33dfa Mon Sep 17 00:00:00 2001
From: Aleksandr Andreev <alivemenone@gmail.com>
Date: Wed, 25 Sep 2019 17:38:54 +0300
Subject: [PATCH 1/2] add isPreview flag

---
 VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs     | 4 ++++
 .../Scripts/blades/export-generic-viewer.js                   | 1 +
 .../VirtoCommerce.ExportModule.Web.csproj                     | 4 ++--
 VirtoCommerce.ExportModule.Web/packages.config                | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs b/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs
index 1f71573..e3f957d 100644
--- a/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs
+++ b/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs
@@ -39,5 +39,9 @@ public abstract class ExportDataQuery : ValueObject
         /// Paging: records in one page
         /// </summary>
         public int? Take { get; set; }
+        /// <summary>
+        /// If TRUE we don't load binary data 
+        /// </summary>
+        public bool IsPreview { get; set; }
     }
 }
diff --git a/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.js b/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.js
index a159d10..6580a8b 100644
--- a/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.js
+++ b/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.js
@@ -117,6 +117,7 @@ angular.module('virtoCommerce.exportModule')
         function getEmptyDataQuery() {
 
             var dataQuery = {
+                IsPreview: true,
                 exportTypeName: blade.exportDataRequest.dataQuery.exportTypeName,
                 includedProperties: blade.exportDataRequest.dataQuery.includedProperties,
                 sort: uiGridHelper.getSortExpression($scope)
diff --git a/VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj b/VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj
index b101135..ca5888f 100644
--- a/VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj
+++ b/VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj
@@ -229,9 +229,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
-    <Error Condition="!Exists('..\packages\VirtoCommerce.Module.0.12.0\build\VirtoCommerce.Module.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\VirtoCommerce.Module.0.12.0\build\VirtoCommerce.Module.targets'))" />
+    <Error Condition="!Exists('..\packages\VirtoCommerce.Module.0.18.0\build\VirtoCommerce.Module.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\VirtoCommerce.Module.0.18.0\build\VirtoCommerce.Module.targets'))" />
   </Target>
-  <Import Project="..\packages\VirtoCommerce.Module.0.12.0\build\VirtoCommerce.Module.targets" Condition="Exists('..\packages\VirtoCommerce.Module.0.12.0\build\VirtoCommerce.Module.targets')" />
+  <Import Project="..\packages\VirtoCommerce.Module.0.18.0\build\VirtoCommerce.Module.targets" Condition="Exists('..\packages\VirtoCommerce.Module.0.18.0\build\VirtoCommerce.Module.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/VirtoCommerce.ExportModule.Web/packages.config b/VirtoCommerce.ExportModule.Web/packages.config
index ce74670..b113e9b 100644
--- a/VirtoCommerce.ExportModule.Web/packages.config
+++ b/VirtoCommerce.ExportModule.Web/packages.config
@@ -18,7 +18,7 @@
   <package id="Unity" version="4.0.1" targetFramework="net461" />
   <package id="valueinjecter" version="2.3.3" targetFramework="net461" />
   <package id="VirtoCommerce.Domain" version="2.25.27" targetFramework="net461" />
-  <package id="VirtoCommerce.Module" version="0.12.0" targetFramework="net461" developmentDependency="true" />
+  <package id="VirtoCommerce.Module" version="0.18.0" targetFramework="net461" developmentDependency="true" />
   <package id="VirtoCommerce.Platform.Core" version="2.13.42" targetFramework="net461" />
   <package id="VirtoCommerce.Platform.Core.Web" version="2.13.42" targetFramework="net461" />
   <package id="VirtoCommerce.Platform.Data" version="2.13.42" targetFramework="net461" />

From 77cd3efea6577c6211df5e75b2146bf263b933c7 Mon Sep 17 00:00:00 2001
From: Aleksandr Andreev <alivemenone@gmail.com>
Date: Thu, 26 Sep 2019 08:59:32 +0300
Subject: [PATCH 2/2] remove IsPreview before export fix comment

---
 VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs       | 2 +-
 .../Scripts/blades/export-settings.js                           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs b/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs
index e3f957d..da7dd17 100644
--- a/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs
+++ b/VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs
@@ -40,7 +40,7 @@ public abstract class ExportDataQuery : ValueObject
         /// </summary>
         public int? Take { get; set; }
         /// <summary>
-        /// If TRUE we don't load binary data 
+        /// True means preview (lightweight) data is queried, false - full version requested 
         /// </summary>
         public bool IsPreview { get; set; }
     }
diff --git a/VirtoCommerce.ExportModule.Web/Scripts/blades/export-settings.js b/VirtoCommerce.ExportModule.Web/Scripts/blades/export-settings.js
index b1faa23..c5b8f12 100644
--- a/VirtoCommerce.ExportModule.Web/Scripts/blades/export-settings.js
+++ b/VirtoCommerce.ExportModule.Web/Scripts/blades/export-settings.js
@@ -131,6 +131,7 @@ angular.module('virtoCommerce.exportModule')
             blade.exportDataRequest.providerName = blade.selectedProvider.id;
             delete blade.exportDataRequest.dataQuery.skip;
             delete blade.exportDataRequest.dataQuery.take;
+            delete blade.exportDataRequest.dataQuery.IsPreview;
             blade.isExporting = true;
 
             var progressBlade = {