Skip to content

VCST-5276: Fix Export data-selector toolbar overlapping the grid header #101

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
OlegoO merged 8 commits into from
Jun 19, 2026
Merged

VCST-5276: Fix Export data-selector toolbar overlapping the grid header #101

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0358c4
fix(export): align data-selector toolbar to searchrow layout (VCST-5276)
kutasinaelena Jun 16, 2026
7ced4b6
fix(export): match platform searchrow convention for clear button and…
kutasinaelena Jun 17, 2026
bd053b6
fix(export): move restrict-selectivity warning out of searchrow to st…
kutasinaelena Jun 17, 2026
6dde048
fix(export): gate restrict-selectivity warning wrapper with ng-if to …
kutasinaelena Jun 17, 2026
7700fe1
fix(export): let data-selector blade-static auto-size like canonical …
kutasinaelena Jun 17, 2026
5f2c3b7
fix(export): restore search clear-icon + __search padding on data-sel…
Lenajava1 Jun 17, 2026
2331201
Revert "fix(export): restore search clear-icon + __search padding on …
Lenajava1 Jun 17, 2026
416cc9a
fix(export): move data-selector note out of fixed-height blade-static…
Lenajava1 Jun 18, 2026
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
30 changes: 13 additions & 17 deletions src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<div class="blade-static" ng-style="blade.exportDataRequest.restrictDataSelectivity && {'height': '140px'}" ng-if="blade.isExpanded">
<div class="form-group">
<div class="inner-block">
<p ng-if="blade.exportDataRequest.restrictDataSelectivity" class="text __note"><span>{{ 'export.blades.export-generic-viewer.labels.important' | translate }}</span> {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}</p>
<div class="blade-static" ng-if="blade.isExpanded">
<div class="form-group searchrow">
<div class="form-input column-half">
<input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()">
<button class="btn" title="Clear" ng-click="filter.resetKeyword();filter.criteriaChanged()"></button>
</div>
<div class="form-input __search">
<input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" style="width: 190px">
<button class="btn __other" style="position: relative;right: 45px;">
<i class="btn-ico fa fa-remove" title="Clear" ng-click="filter.resetKeyword();filter.criteriaChanged()"></i>
</button>
<ui-select ng-model="filter.current" ng-change="filter.change()" style="left: 220px;position: absolute;width: 190px;top: 0px;">
<ui-select-match allow-clear="true" placeholder="{{'export.blades.export-generic-viewer.placeholders.select-filter' | translate}}">{{$select.selected.name | translate}}</ui-select-match>
<ui-select-choices repeat="x in exportSearchFilters | filter: $select.search">
<span ng-bind-html="x.name | translate | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
<a href="" ng-click="filter.edit()" style="left: 416px; position:absolute;" class="form-edit"><i class="form-ico fa fa-pencil"></i></a>
</div>
<ui-select ng-model="filter.current" ng-change="filter.change()" class="column-half">
<ui-select-match allow-clear="true" placeholder="{{'export.blades.export-generic-viewer.placeholders.select-filter' | translate}}">{{$select.selected.name | translate}}</ui-select-match>
<ui-select-choices repeat="x in exportSearchFilters | filter: $select.search">
<span ng-bind-html="x.name | translate | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
<a href="" ng-click="filter.edit()" class="filter-edit"><i class="fa fa-pencil"></i></a>
</div>
</div>
<div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel.tpl.html'"></div>
Expand All @@ -36,6 +31,7 @@
},
{ name: 'name', displayName: 'export.blades.export-generic-viewer.labels.name', cellTemplate: 'export-item-list-name.cell.html' },
]})">
<p ng-if="blade.exportDataRequest.restrictDataSelectivity" class="text __note"><span>{{ 'export.blades.export-generic-viewer.labels.important' | translate }}</span> {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}</p>
<div class="table-wrapper" ng-if="items.length > 0">
<div ui-grid="gridOptions" ui-grid-auto-resize ui-grid-save-state ui-grid-selection ui-grid-resize-columns ui-grid-move-columns ui-grid-pinning ui-grid-height ui-grid-infinite-scroll></div>
</div>
Expand Down
Loading