Skip to content

VCST-4359: Use search store instead of query #54

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
basilkot merged 2 commits into from
Jan 20, 2026
Merged

VCST-4359: Use search store instead of query #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c15de0
use search store instead of query
basilkot Jan 13, 2026
ef16322
place loading flag in correct place
basilkot Jan 13, 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
16 changes: 8 additions & 8 deletions src/VirtoCommerce.DynamicAssociationsModule.Web/Scripts/blades/mainParameters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ angular.module('virtoCommerce.dynamicAssociationsModule')
blade.headIcon = 'fa fa-area-chart';
var formScope;
$scope.setForm = (form) => { formScope = form; };
$scope.storeDataSource = (criteria) => stores.search(criteria);

$scope.isValid = function() {
return formScope && formScope.$valid;
Expand All @@ -19,18 +20,17 @@ angular.module('virtoCommerce.dynamicAssociationsModule')
}
});

stores.query({}, response => {
$scope.stores = response;
if (parentRefresh) {
blade.parentBlade.refresh();
}
blade.isLoading = false;
});
if (parentRefresh) {
blade.parentBlade.refresh();
}
blade.isLoading = false;

blade.currentEntity = angular.copy(blade.originalEntity);
};

$scope.onStoreSelected = ($item) => blade.currentEntity.catalogId = $item.catalog;
$scope.onStoreSelected = (item) => {
blade.currentEntity.catalogId = item.catalog;
};

// datepicker
$scope.datepickers = {
Expand Down
12 changes: 6 additions & 6 deletions src/VirtoCommerce.DynamicAssociationsModule.Web/Scripts/blades/mainParameters.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
<div class="form-group __info list">
<label class="form-label">{{ 'dynamicAssociations.blades.dynamicAssociation-parameters.labels.store' | translate }}</label>
<div class="form-input">
<ui-select ng-model="blade.currentEntity.storeId" required on-select="onStoreSelected($item)">
<ui-select-match placeholder="{{'dynamicAssociations.blades.dynamicAssociation-parameters.placeholders.store' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="x.id as x in stores">
<span ng-bind-html="x.name | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
<ui-scroll-drop-down data="storeDataSource(criteria)"
required
on-select="onStoreSelected(item)"
placeholder="'dynamicAssociations.blades.dynamicAssociation-parameters.placeholders.store'"
ng-model="blade.currentEntity.storeId">
</ui-scroll-drop-down>
</div>
<div class="list-descr">{{ 'dynamicAssociations.blades.dynamicAssociation-parameters.descriptions.store' | translate }}</div>
</div>
Expand Down
Loading