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

dev_486_traffic_optimization #24

Merged
merged 2 commits into from
Sep 26, 2019
Merged

dev_486_traffic_optimization #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d46f88
add isPreview flag
AliveMen Sep 25, 2019
77cd3ef
remove IsPreview before export
AliveMen Sep 26, 2019
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: 4 additions & 0 deletions VirtoCommerce.ExportModule.Core/Models/ExportDataQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,9 @@ public abstract class ExportDataQuery : ValueObject
/// Paging: records in one page
/// </summary>
public int? Take { get; set; }
/// <summary>
/// True means preview (lightweight) data is queried, false - full version requested
/// </summary>
public bool IsPreview { get; set; }
}
}
1 change: 1 addition & 0 deletions VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ angular.module('virtoCommerce.exportModule')
function getEmptyDataQuery() {

var dataQuery = {
IsPreview: true,
AliveMen marked this conversation as resolved.
Show resolved Hide resolved
exportTypeName: blade.exportDataRequest.dataQuery.exportTypeName,
includedProperties: blade.exportDataRequest.dataQuery.includedProperties,
sort: uiGridHelper.getSortExpression($scope)
Expand Down
1 change: 1 addition & 0 deletions VirtoCommerce.ExportModule.Web/Scripts/blades/export-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion VirtoCommerce.ExportModule.Web/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down