From c244c0a766103d7824bc97f589bb89a663ed78a2 Mon Sep 17 00:00:00 2001 From: Michael Bromley Date: Tue, 19 Jan 2021 10:34:55 +0100 Subject: [PATCH] feat(admin-ui): Filter Asset list by tags Relates to #316. --- packages/admin-ui/i18n-coverage.json | 26 +++--- .../asset-list/asset-list.component.html | 15 ++- .../asset-list/asset-list.component.ts | 50 ++++++---- .../product-search-input.component.html | 2 +- .../product-search-input.component.ts | 11 +-- .../core/src/common/base-list.component.ts | 9 +- .../data/definitions/product-definitions.ts | 6 +- .../admin-ui/src/lib/core/src/public_api.ts | 3 + .../asset-gallery/asset-gallery.component.ts | 2 + .../asset-picker-dialog.component.html | 16 ++-- .../asset-picker-dialog.component.scss | 2 +- .../asset-picker-dialog.component.ts | 61 ++++++------ .../asset-search-input.component.html | 35 +++++++ .../asset-search-input.component.scss | 26 ++++++ .../asset-search-input.component.ts | 92 +++++++++++++++++++ .../tag-selector/tag-selector.component.html | 4 +- .../tag-selector/tag-selector.component.scss | 6 ++ .../tag-selector/tag-selector.component.ts | 6 +- .../src/lib/core/src/shared/shared.module.ts | 2 + .../src/lib/static/i18n-messages/cs.json | 1 + .../src/lib/static/i18n-messages/de.json | 1 + .../src/lib/static/i18n-messages/en.json | 1 + .../src/lib/static/i18n-messages/es.json | 1 + .../src/lib/static/i18n-messages/fr.json | 1 + .../src/lib/static/i18n-messages/pl.json | 1 + .../src/lib/static/i18n-messages/pt_BR.json | 1 + .../src/lib/static/i18n-messages/zh_Hans.json | 1 + .../src/lib/static/i18n-messages/zh_Hant.json | 1 + 28 files changed, 284 insertions(+), 99 deletions(-) create mode 100644 packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.html create mode 100644 packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.scss create mode 100644 packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.ts diff --git a/packages/admin-ui/i18n-coverage.json b/packages/admin-ui/i18n-coverage.json index bf84930fc8..1b693d7a38 100644 --- a/packages/admin-ui/i18n-coverage.json +++ b/packages/admin-ui/i18n-coverage.json @@ -1,49 +1,49 @@ { - "generatedOn": "2021-01-18T19:42:25.183Z", - "lastCommit": "cd645caa10aac99dfb3268624888835e8dcf3a2d", + "generatedOn": "2021-01-19T09:29:39.498Z", + "lastCommit": "c63f9ace215e3a452785cf212f820b7d00933032", "translationStatus": { "cs": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 755, "percentage": 100 }, "de": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 596, "percentage": 79 }, "en": { - "tokenCount": 757, - "translatedCount": 756, + "tokenCount": 758, + "translatedCount": 757, "percentage": 100 }, "es": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 458, - "percentage": 61 + "percentage": 60 }, "fr": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 692, "percentage": 91 }, "pl": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 551, "percentage": 73 }, "pt_BR": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 642, "percentage": 85 }, "zh_Hans": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 533, "percentage": 70 }, "zh_Hant": { - "tokenCount": 757, + "tokenCount": 758, "translatedCount": 533, "percentage": 70 } diff --git a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.html b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.html index e1393595ac..11c45ba7c9 100644 --- a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.html +++ b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.html @@ -1,12 +1,11 @@ - - + + diff --git a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts index 011ec99f1c..f02f7a1024 100644 --- a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts +++ b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts @@ -8,12 +8,14 @@ import { DataService, DeletionResult, GetAssetList, + LogicalOperator, ModalService, NotificationService, + TagFragment, } from '@vendure/admin-ui/core'; import { SortOrder } from '@vendure/common/lib/generated-shop-types'; import { PaginationInstance } from 'ngx-pagination'; -import { combineLatest, EMPTY, Observable } from 'rxjs'; +import { BehaviorSubject, combineLatest, EMPTY, Observable } from 'rxjs'; import { debounceTime, finalize, map, switchMap, takeUntil } from 'rxjs/operators'; @Component({ @@ -22,10 +24,12 @@ import { debounceTime, finalize, map, switchMap, takeUntil } from 'rxjs/operator styleUrls: ['./asset-list.component.scss'], }) export class AssetListComponent - extends BaseListComponent + extends BaseListComponent implements OnInit { - searchTerm = new FormControl(''); + searchTerm$ = new BehaviorSubject(undefined); + filterByTags$ = new BehaviorSubject(undefined); uploading = false; + allTags$: Observable; paginationConfig$: Observable; constructor( @@ -39,20 +43,29 @@ export class AssetListComponent super.setQueryFn( (...args: any[]) => this.dataService.product.getAssetList(...args), data => data.assets, - (skip, take) => ({ - options: { - skip, - take, - filter: { - name: { - contains: this.searchTerm.value, + (skip, take) => { + const searchTerm = this.searchTerm$.value; + const tags = this.filterByTags$.value?.map(t => t.value); + return { + options: { + skip, + take, + ...(searchTerm + ? { + filter: { + name: { contains: searchTerm }, + }, + } + : {}), + sort: { + createdAt: SortOrder.DESC, }, + tags, + tagsOperator: LogicalOperator.AND, }, - sort: { - createdAt: SortOrder.DESC, - }, - }, - }), + }; + }, + { take: 25, skip: 0 }, ); } @@ -61,9 +74,10 @@ export class AssetListComponent this.paginationConfig$ = combineLatest(this.itemsPerPage$, this.currentPage$, this.totalItems$).pipe( map(([itemsPerPage, currentPage, totalItems]) => ({ itemsPerPage, currentPage, totalItems })), ); - this.searchTerm.valueChanges - .pipe(debounceTime(250), takeUntil(this.destroy$)) - .subscribe(() => this.refresh()); + this.searchTerm$.pipe(debounceTime(250), takeUntil(this.destroy$)).subscribe(() => this.refresh()); + + this.filterByTags$.pipe(takeUntil(this.destroy$)).subscribe(() => this.refresh()); + this.allTags$ = this.dataService.product.getTagList().mapStream(data => data.tags.items); } filesSelected(files: File[]) { diff --git a/packages/admin-ui/src/lib/catalog/src/components/product-search-input/product-search-input.component.html b/packages/admin-ui/src/lib/catalog/src/components/product-search-input/product-search-input.component.html index 0bccd96fa9..7cf7345c21 100644 --- a/packages/admin-ui/src/lib/catalog/src/components/product-search-input/product-search-input.component.html +++ b/packages/admin-ui/src/lib/catalog/src/components/product-search-input/product-search-input.component.html @@ -20,7 +20,7 @@ - + { - if (this.isFacetValueItem(item)) { - return item.facetValue.facet.name; - } else { - return ''; - } - }; - onSelectChange(selectedItems: Array) { if (!Array.isArray(selectedItems)) { selectedItems = [selectedItems]; diff --git a/packages/admin-ui/src/lib/core/src/common/base-list.component.ts b/packages/admin-ui/src/lib/core/src/common/base-list.component.ts index e83e4f8963..716ebab11c 100644 --- a/packages/admin-ui/src/lib/core/src/common/base-list.component.ts +++ b/packages/admin-ui/src/lib/core/src/common/base-list.component.ts @@ -28,6 +28,7 @@ export class BaseListComponent impleme private onPageChangeFn: OnPageChangeFn = (skip, take) => ({ options: { skip, take } } as any); private refresh$ = new BehaviorSubject(undefined); + private defaults: { take: number; skip: number } = { take: 10, skip: 0 }; constructor(protected router: Router, protected route: ActivatedRoute) {} @@ -38,12 +39,16 @@ export class BaseListComponent impleme listQueryFn: ListQueryFn, mappingFn: MappingFn, onPageChangeFn?: OnPageChangeFn, + defaults?: { take: number; skip: number }, ) { this.listQueryFn = listQueryFn; this.mappingFn = mappingFn; if (onPageChangeFn) { this.onPageChangeFn = onPageChangeFn; } + if (defaults) { + this.defaults = defaults; + } } ngOnInit() { @@ -52,7 +57,7 @@ export class BaseListComponent impleme `No listQueryFn has been defined. Please call super.setQueryFn() in the constructor.`, ); } - this.listQuery = this.listQueryFn(10, 0); + this.listQuery = this.listQueryFn(this.defaults.take, this.defaults.skip); const fetchPage = ([currentPage, itemsPerPage, _]: [number, number, undefined]) => { const take = itemsPerPage; @@ -70,7 +75,7 @@ export class BaseListComponent impleme ); this.itemsPerPage$ = this.route.queryParamMap.pipe( map(qpm => qpm.get('perPage')), - map(perPage => (!perPage ? 10 : +perPage)), + map(perPage => (!perPage ? this.defaults.take : +perPage)), distinctUntilChanged(), ); diff --git a/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts b/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts index e66597576c..a28edfdce9 100644 --- a/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts +++ b/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts @@ -398,8 +398,10 @@ export const CREATE_ASSETS = gql` mutation CreateAssets($input: [CreateAssetInput!]!) { createAssets(input: $input) { ...Asset - tags { - ...Tag + ... on Asset { + tags { + ...Tag + } } ... on ErrorResult { message diff --git a/packages/admin-ui/src/lib/core/src/public_api.ts b/packages/admin-ui/src/lib/core/src/public_api.ts index 503ac3900b..d8f1ef17a2 100644 --- a/packages/admin-ui/src/lib/core/src/public_api.ts +++ b/packages/admin-ui/src/lib/core/src/public_api.ts @@ -95,6 +95,7 @@ export * from './shared/components/asset-gallery/asset-gallery.component'; export * from './shared/components/asset-picker-dialog/asset-picker-dialog.component'; export * from './shared/components/asset-preview/asset-preview.component'; export * from './shared/components/asset-preview-dialog/asset-preview-dialog.component'; +export * from './shared/components/asset-search-input/asset-search-input.component'; export * from './shared/components/channel-assignment-control/channel-assignment-control.component'; export * from './shared/components/channel-badge/channel-badge.component'; export * from './shared/components/chip/chip.component'; @@ -131,6 +132,7 @@ export * from './shared/components/history-entry-detail/history-entry-detail.com export * from './shared/components/items-per-page-controls/items-per-page-controls.component'; export * from './shared/components/labeled-data/labeled-data.component'; export * from './shared/components/language-selector/language-selector.component'; +export * from './shared/components/manage-tags-dialog/manage-tags-dialog.component'; export * from './shared/components/modal-dialog/dialog-buttons.directive'; export * from './shared/components/modal-dialog/dialog-component-outlet.component'; export * from './shared/components/modal-dialog/dialog-title.directive'; @@ -155,6 +157,7 @@ export * from './shared/components/rich-text-editor/rich-text-editor.component'; export * from './shared/components/select-toggle/select-toggle.component'; export * from './shared/components/simple-dialog/simple-dialog.component'; export * from './shared/components/table-row-action/table-row-action.component'; +export * from './shared/components/tag-selector/tag-selector.component'; export * from './shared/components/timeline-entry/timeline-entry.component'; export * from './shared/components/title-input/title-input.component'; export * from './shared/directives/disabled.directive'; diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts index bab18c9703..73d4123d05 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.ts @@ -64,6 +64,8 @@ export class AssetGalleryComponent implements OnChanges { this.selection.splice(index, 1); } } + // Make the selection mutable + this.selection = this.selection.map(x => ({ ...x })); this.selectionChange.emit(this.selection); } diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html b/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html index abc383a0c6..fb5f136d08 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-picker-dialog/asset-picker-dialog.component.html @@ -1,6 +1,7 @@
- {{ 'asset.select-assets' | translate }} + {{ 'asset.select-assets' | translate }} +
- + { assets$: Observable; + allTags$: Observable; paginationConfig: PaginationInstance = { currentPage: 1, itemsPerPage: 25, @@ -30,7 +36,8 @@ export class AssetPickerDialogComponent implements OnInit, OnDestroy, Dialog void; selection: Asset[] = []; - searchTerm = new FormControl(''); + searchTerm$ = new BehaviorSubject(undefined); + filterByTags$ = new BehaviorSubject(undefined); uploading = false; private listQuery: QueryResult; private destroy$ = new Subject(); @@ -39,19 +46,17 @@ export class AssetPickerDialogComponent implements OnInit, OnDestroy, Dialog data.tags.items); this.assets$ = this.listQuery.stream$.pipe( - tap((result) => (this.paginationConfig.totalItems = result.assets.totalItems)), - map((result) => result.assets.items), + tap(result => (this.paginationConfig.totalItems = result.assets.totalItems)), + map(result => result.assets.items), ); - this.searchTerm.valueChanges - .pipe(debounceTime(250), takeUntil(this.destroy$)) - .subscribe((searchTerm) => { - this.fetchPage( - this.paginationConfig.currentPage, - this.paginationConfig.itemsPerPage, - searchTerm, - ); - }); + this.searchTerm$.pipe(debounceTime(250), takeUntil(this.destroy$)).subscribe(() => { + this.fetchPage(this.paginationConfig.currentPage, this.paginationConfig.itemsPerPage); + }); + this.filterByTags$.pipe(takeUntil(this.destroy$)).subscribe(() => { + this.fetchPage(this.paginationConfig.currentPage, this.paginationConfig.itemsPerPage); + }); } ngOnDestroy(): void { @@ -61,20 +66,12 @@ export class AssetPickerDialogComponent implements OnInit, OnDestroy, Dialog (this.uploading = false))) - .subscribe((res) => { - this.fetchPage( - this.paginationConfig.currentPage, - this.paginationConfig.itemsPerPage, - this.searchTerm.value, - ); + .subscribe(res => { + this.fetchPage(this.paginationConfig.currentPage, this.paginationConfig.itemsPerPage); this.notificationService.success(_('asset.notify-create-assets-success'), { count: files.length, }); @@ -104,9 +97,11 @@ export class AssetPickerDialogComponent implements OnInit, OnDestroy, Dialog t.value); this.listQuery.ref.refetch({ options: { skip, @@ -119,6 +114,8 @@ export class AssetPickerDialogComponent implements OnInit, OnDestroy, Dialog + +
+ {{ 'catalog.search-for-term' | translate }}: {{ selectComponent.searchTerm }} +
+ + + + {{ item.value }} + + + "{{ item.label }}" + + + + + {{ item.value }} + + + diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.scss b/packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.scss new file mode 100644 index 0000000000..9671eb8ac0 --- /dev/null +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.scss @@ -0,0 +1,26 @@ +@import "mixins"; + +:host { + display: block; + width: 100%; + + ::ng-deep { + @include ng-select-facet-values; + } +} + +ng-select { + width: 100%; + min-width: 300px; + margin-right: 12px; +} + +.search-header { + padding: 8px 10px; + border-bottom: 1px solid var(--color-component-border-100); + cursor: pointer; + + &.selected, &:hover { + background-color: var(--color-component-bg-200); + } +} diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.ts new file mode 100644 index 0000000000..107be2cb2c --- /dev/null +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-search-input/asset-search-input.component.ts @@ -0,0 +1,92 @@ +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { NgSelectComponent } from '@ng-select/ng-select'; +import { notNullOrUndefined } from '@vendure/common/lib/shared-utils'; + +import { SearchProducts, TagFragment } from '../../../common/generated-types'; + +@Component({ + selector: 'vdr-asset-search-input', + templateUrl: './asset-search-input.component.html', + styleUrls: ['./asset-search-input.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class AssetSearchInputComponent { + @Input() tags: TagFragment[]; + @Output() searchTermChange = new EventEmitter(); + @Output() tagsChange = new EventEmitter(); + @ViewChild('selectComponent', { static: true }) private selectComponent: NgSelectComponent; + private lastTerm = ''; + private lastTagIds: string[] = []; + + setSearchTerm(term: string | null) { + if (term) { + this.selectComponent.select({ label: term, value: { label: term } }); + } else { + const currentTerm = this.selectComponent.selectedItems.find(i => !this.isTag(i.value)); + if (currentTerm) { + this.selectComponent.unselect(currentTerm); + } + } + } + + setTags(tags: TagFragment[]) { + const items = this.selectComponent.items; + + this.selectComponent.selectedItems.forEach(item => { + if (this.isTag(item.value) && !tags.map(t => t.id).includes(item.id)) { + this.selectComponent.unselect(item); + } + }); + + tags.map(tag => { + return items.find(item => this.isTag(item) && item.id === tag.id); + }) + .filter(notNullOrUndefined) + .forEach(item => { + const isSelected = this.selectComponent.selectedItems.find(i => { + const val = i.value; + if (this.isTag(val)) { + return val.id === item.id; + } + return false; + }); + if (!isSelected) { + this.selectComponent.select({ label: '', value: item }); + } + }); + } + + filterTagResults = (term: string, item: SearchProducts.FacetValues | { label: string }) => { + if (!this.isTag(item)) { + return false; + } + return item.value.toLowerCase().startsWith(term.toLowerCase()); + }; + + onSelectChange(selectedItems: Array) { + if (!Array.isArray(selectedItems)) { + selectedItems = [selectedItems]; + } + const searchTermItem = selectedItems.find(item => !this.isTag(item)) as { label: string } | undefined; + const searchTerm = searchTermItem ? searchTermItem.label : ''; + + const tags = selectedItems.filter(this.isTag); + + if (searchTerm !== this.lastTerm) { + this.searchTermChange.emit(searchTerm); + this.lastTerm = searchTerm; + } + if (this.lastTagIds.join(',') !== tags.map(t => t.id).join(',')) { + this.tagsChange.emit(tags); + this.lastTagIds = tags.map(t => t.id); + } + } + + isSearchHeaderSelected(): boolean { + return this.selectComponent.itemsList.markedIndex === -1; + } + + private isTag = (input: unknown): input is TagFragment => { + return typeof input === 'object' && !!input && input.hasOwnProperty('value'); + }; +} diff --git a/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.html b/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.html index 07a431f822..9a0d0bcf56 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.html +++ b/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.html @@ -5,11 +5,11 @@ [clearable]="true" [searchable]="true" [disabled]="disabled" + [placeholder]="placeholder" (change)="valueChanged($event)" > - - {{ tag }} + {{ tag }} {{ tag }} diff --git a/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.scss b/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.scss index 2e96ff31a9..cceda1df05 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.scss +++ b/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.scss @@ -1,5 +1,11 @@ +@import "mixins"; + :host { display: block; margin-top: 12px; position: relative; + + ::ng-deep { + @include ng-select-facet-values; + } } diff --git a/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.ts index 710fd408f7..100ec1cf2d 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.ts +++ b/packages/admin-ui/src/lib/core/src/shared/components/tag-selector/tag-selector.component.ts @@ -1,8 +1,9 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { DataService, TagFragment } from '@vendure/admin-ui/core'; import { Observable } from 'rxjs'; +import { DataService } from '../../../data/providers/data.service'; + @Component({ selector: 'vdr-tag-selector', templateUrl: './tag-selector.component.html', @@ -17,6 +18,7 @@ import { Observable } from 'rxjs'; ], }) export class TagSelectorComponent implements OnInit, ControlValueAccessor { + @Input() placeholder: string | undefined; allTags$: Observable; onChange: (val: any) => void; onTouch: () => void; diff --git a/packages/admin-ui/src/lib/core/src/shared/shared.module.ts b/packages/admin-ui/src/lib/core/src/shared/shared.module.ts index bd80b135c3..8a80bdb199 100644 --- a/packages/admin-ui/src/lib/core/src/shared/shared.module.ts +++ b/packages/admin-ui/src/lib/core/src/shared/shared.module.ts @@ -28,6 +28,7 @@ import { AssetGalleryComponent } from './components/asset-gallery/asset-gallery. import { AssetPickerDialogComponent } from './components/asset-picker-dialog/asset-picker-dialog.component'; import { AssetPreviewDialogComponent } from './components/asset-preview-dialog/asset-preview-dialog.component'; import { AssetPreviewComponent } from './components/asset-preview/asset-preview.component'; +import { AssetSearchInputComponent } from './components/asset-search-input/asset-search-input.component'; import { ChannelAssignmentControlComponent } from './components/channel-assignment-control/channel-assignment-control.component'; import { ChannelBadgeComponent } from './components/channel-badge/channel-badge.component'; import { ChipComponent } from './components/chip/chip.component'; @@ -125,6 +126,7 @@ const DECLARATIONS = [ ActionBarRightComponent, AssetPreviewComponent, AssetPreviewDialogComponent, + AssetSearchInputComponent, ConfigurableInputComponent, AffixedInputComponent, ChipComponent, diff --git a/packages/admin-ui/src/lib/static/i18n-messages/cs.json b/packages/admin-ui/src/lib/static/i18n-messages/cs.json index 4e081d356d..08ca13a7a6 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/cs.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/cs.json @@ -129,6 +129,7 @@ "remove-option": "Odebrat volbu", "remove-product-from-channel": "Odebrat produkt z kanálu", "remove-product-variant-from-channel": "Odebrat variantu z kanálu", + "search-asset-name-or-tag": "", "search-for-term": "Hledat výraz", "search-product-name-or-code": "Hledat produkt dle jména, nebo kódu", "sku": "SKU", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/de.json b/packages/admin-ui/src/lib/static/i18n-messages/de.json index f6a0b1badb..d2f0d8d249 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/de.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/de.json @@ -129,6 +129,7 @@ "remove-option": "Option entfernen", "remove-product-from-channel": "Produkt aus dem Kanal entfernen", "remove-product-variant-from-channel": "", + "search-asset-name-or-tag": "", "search-for-term": "Suche nach Begriff", "search-product-name-or-code": "Suche nach Produktname oder -code", "sku": "Artikelnummer", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/en.json b/packages/admin-ui/src/lib/static/i18n-messages/en.json index 360a047fb1..44258affc9 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/en.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/en.json @@ -129,6 +129,7 @@ "remove-option": "Remove option", "remove-product-from-channel": "Remove product from channel", "remove-product-variant-from-channel": "Remove product variant from channel", + "search-asset-name-or-tag": "Search by asset name or tags", "search-for-term": "Search for term", "search-product-name-or-code": "Search by product name or code", "sku": "SKU", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/es.json b/packages/admin-ui/src/lib/static/i18n-messages/es.json index a39b5967c0..572876af1b 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/es.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/es.json @@ -129,6 +129,7 @@ "remove-option": "Eliminar opción", "remove-product-from-channel": "Eliminar product de canal de ventas", "remove-product-variant-from-channel": "", + "search-asset-name-or-tag": "", "search-for-term": "", "search-product-name-or-code": "Buscar por nombre o código de producto", "sku": "SKU", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/fr.json b/packages/admin-ui/src/lib/static/i18n-messages/fr.json index 97f089aad3..dc2939084b 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/fr.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/fr.json @@ -129,6 +129,7 @@ "remove-option": "Retirer l'option", "remove-product-from-channel": "Retirer le produit du canal", "remove-product-variant-from-channel": "", + "search-asset-name-or-tag": "", "search-for-term": "Chercher le terme", "search-product-name-or-code": "Chercher par nom de produit ou code", "sku": "UGS", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pl.json b/packages/admin-ui/src/lib/static/i18n-messages/pl.json index 3526225da3..14573d3bfb 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/pl.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/pl.json @@ -129,6 +129,7 @@ "remove-option": "Usuń opcje", "remove-product-from-channel": "Usuń produkt z kanału", "remove-product-variant-from-channel": "", + "search-asset-name-or-tag": "", "search-for-term": "Szukaj frazy", "search-product-name-or-code": "Szukaj produktu po nazwie lub kodzie", "sku": "SKU", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json index 749920d522..304a6600db 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json @@ -129,6 +129,7 @@ "remove-option": "Excluir opção", "remove-product-from-channel": "Excluir produto do canal", "remove-product-variant-from-channel": "", + "search-asset-name-or-tag": "", "search-for-term": "Pesquisar termo", "search-product-name-or-code": "Pesquisar por nome ou código do produto", "sku": "SKU", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json index d49156c202..2014850501 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json @@ -129,6 +129,7 @@ "remove-option": "移除选项", "remove-product-from-channel": "从销售渠道移除商品", "remove-product-variant-from-channel": "", + "search-asset-name-or-tag": "", "search-for-term": "输入搜索条目", "search-product-name-or-code": "输入要搜索的商品名称或商品编码", "sku": "商品库存编码", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json index 62fc8825bc..f16804eb44 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json @@ -129,6 +129,7 @@ "remove-option": "移除選項", "remove-product-from-channel": "從渠道移除商品", "remove-product-variant-from-channel": "", + "search-asset-name-or-tag": "", "search-for-term": "輸入搜索條目", "search-product-name-or-code": "輸入要搜索的商品名稱或商品編碼", "sku": "商品庫存編碼",