From c0358c488e4ac68915857f783fde445a6291943b Mon Sep 17 00:00:00 2001 From: Elena Kutasina Date: Wed, 17 Jun 2026 01:06:15 +0300 Subject: [PATCH 1/8] fix(export): align data-selector toolbar to searchrow layout (VCST-5276) Hand-rolled inline position:absolute styles collapsed the .blade-static toolbar height, letting it overlap the grid . Adopt the platform searchrow/column-half flex convention (as Pricing/Contract blades) so the toolbar reserves its own height. Co-Authored-By: Claude --- .../blades/export-generic-viewer.tpl.html | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html index b03d1a0..b176cd2 100644 --- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html +++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html @@ -1,21 +1,21 @@
-
+

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

-
- +
+ - - {{$select.selected.name | translate}} - - - - - -
+
+ + {{$select.selected.name | translate}} + + + + +
From 7ced4b6de0f5ef59c5861e6eee833f74c3c875dd Mon Sep 17 00:00:00 2001 From: Elena Kutasina Date: Wed, 17 Jun 2026 13:34:32 +0300 Subject: [PATCH 2/8] fix(export): match platform searchrow convention for clear button and filter edit (VCST-5276) The prior commit left the clear button offset (inline right:45px) and the pencil on non-canonical classes. Align fully to the contract/pricing searchrow reference: plain .btn clear with the export reset ng-click, .filter-edit pencil, and drop the __search modifier. Co-Authored-By: Claude --- .../Scripts/blades/export-generic-viewer.tpl.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html index b176cd2..b19bad9 100644 --- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html +++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html @@ -3,11 +3,9 @@

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

-
+
- +
{{$select.selected.name | translate}} @@ -15,7 +13,7 @@ - +
From bd053b629794aec03908cc765779dabcbbd4a9da Mon Sep 17 00:00:00 2001 From: Elena Kutasina Date: Wed, 17 Jun 2026 16:54:07 +0300 Subject: [PATCH 3/8] fix(export): move restrict-selectivity warning out of searchrow to stop toolbar shift (VCST-5276) The searchrow flex row included the restrictDataSelectivity warning block, so when the warning shows (Catalog/restrictDataSelectivity) it shared the row and squeezed the search/filter controls to the right. Move the warning to its own row above the toolbar. Co-Authored-By: Claude --- .../Scripts/blades/export-generic-viewer.tpl.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html index b19bad9..11059ba 100644 --- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html +++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html @@ -1,8 +1,8 @@
+
+

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

+
-
-

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

-
From 6dde0487b33c60cb54a6301e37b137633a23aa33 Mon Sep 17 00:00:00 2001 From: Elena Kutasina Date: Wed, 17 Jun 2026 17:05:39 +0300 Subject: [PATCH 4/8] fix(export): gate restrict-selectivity warning wrapper with ng-if to avoid empty toolbar gap (VCST-5276) Co-Authored-By: Claude --- .../Scripts/blades/export-generic-viewer.tpl.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html index 11059ba..df7b531 100644 --- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html +++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html @@ -1,6 +1,6 @@
-
-

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

+
+

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

From 7700fe1d4b0819562c958492a0c73c42640d226b Mon Sep 17 00:00:00 2001 From: Elena Kutasina Date: Wed, 17 Jun 2026 17:30:40 +0300 Subject: [PATCH 5/8] fix(export): let data-selector blade-static auto-size like canonical blades (VCST-5276) The legacy ng-style set a fixed height:140px only when restrictDataSelectivity was true, constraining the container so the warning + searchrow toolbar overflowed onto the grid. Remove the ng-style height so .blade-static auto-sizes, matching the Contract/Pricing filter blades. Co-Authored-By: Claude --- .../Scripts/blades/export-generic-viewer.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html index df7b531..e956dbf 100644 --- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html +++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html @@ -1,4 +1,4 @@ -
+

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

From 5f2c3b7030d1c73b3cfb92012f3630dca377d397 Mon Sep 17 00:00:00 2001 From: Elena Mutykova <56412054+Lenajava1@users.noreply.github.com> Date: Wed, 17 Jun 2026 18:38:49 +0200 Subject: [PATCH 6/8] fix(export): restore search clear-icon + __search padding on data-selector toolbar (VCST-5276) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The searchrow refactor dropped two affordances the original toolbar had: the search input lost the `__search` class (the right-padding that makes room for the clear button) and the clear button lost its X icon (it became an empty
-
+
- +
{{$select.selected.name | translate}} From 23312016c5944c94f208e3c70fa67059e7a98e65 Mon Sep 17 00:00:00 2001 From: Elena Mutykova <56412054+Lenajava1@users.noreply.github.com> Date: Wed, 17 Jun 2026 18:50:01 +0200 Subject: [PATCH 7/8] Revert "fix(export): restore search clear-icon + __search padding on data-selector toolbar (VCST-5276)" This reverts commit 5f2c3b7030d1c73b3cfb92012f3630dca377d397. --- .../Scripts/blades/export-generic-viewer.tpl.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html index b43f45c..e956dbf 100644 --- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html +++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html @@ -3,9 +3,9 @@

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

-
+
- +
{{$select.selected.name | translate}} From 416cc9ada751d16605bd3a3eadc8fd1855b02f7c Mon Sep 17 00:00:00 2001 From: Lenajava1 Date: Thu, 18 Jun 2026 10:20:46 +0200 Subject: [PATCH 8/8] fix(export): move data-selector note out of fixed-height blade-static (VCST-5276) The "Select data to export" picker stacked the Important! note and the search/filter searchrow inside the fixed-height (70px) blade-static. With restrictDataSelectivity=true the note made the searchrow overflow ~65px onto the ui-grid header (measured live). PR #101 removed the absolute-positioning hacks but deleted the height reservation, leaving the overflow. Relocate the note into blade-content above the grid so blade-static holds only the single-row searchrow (fits 70px). Matches the canonical pricelist-list sibling; no inline position/fixed-px/ng-style. Live geometry: overlap 65px -> 0. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../Scripts/blades/export-generic-viewer.tpl.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html index e956dbf..1e59387 100644 --- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html +++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html @@ -1,7 +1,4 @@
-
-

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}

-
@@ -34,6 +31,7 @@ }, { name: 'name', displayName: 'export.blades.export-generic-viewer.labels.name', cellTemplate: 'export-item-list-name.cell.html' }, ]})"> +

{{ 'export.blades.export-generic-viewer.labels.important' | translate }} {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}