@colijnit/catalog 12.1.27 → 12.1.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/bundles/colijnit-catalog.umd.js +22 -248
  2. package/bundles/colijnit-catalog.umd.js.map +1 -1
  3. package/colijnit-catalog.d.ts +14 -17
  4. package/colijnit-catalog.metadata.json +1 -1
  5. package/esm2015/colijnit-catalog.js +15 -18
  6. package/esm2015/lib/cache/cache-field.js +2 -2
  7. package/esm2015/lib/cache/parameter-cache-field.js +3 -3
  8. package/esm2015/lib/cache/service/select-multiple-cache.service.js +4 -4
  9. package/esm2015/lib/cache/service/select-multiple-parameterized-cache.service.js +4 -4
  10. package/esm2015/lib/cache/service/select-single-cache.service.js +3 -3
  11. package/esm2015/lib/catalog-version.js +3 -3
  12. package/esm2015/lib/component/catalog-article-tile/catalog-article-tile.component.js +3 -2
  13. package/esm2015/lib/component/catalog-navigation/catalog-navigation.component.js +2 -2
  14. package/esm2015/lib/component/catalog-navigation/catalog-navigation.module.js +2 -2
  15. package/esm2015/lib/component/catalog-search/catalog-search.component.js +3 -3
  16. package/esm2015/lib/pipe/localize.pipe.js +1 -1
  17. package/esm2015/lib/service/catalog-connector.service.js +1 -1
  18. package/esm2015/lib/service/catalog-options.service.js +1 -1
  19. package/esm2015/lib/service/catalog.service.js +2 -126
  20. package/esm2015/lib/service/dictionary.service.js +4 -4
  21. package/esm2015/lib/service/icon-cache.service.js +4 -4
  22. package/fesm2015/colijnit-catalog.js +11 -239
  23. package/fesm2015/colijnit-catalog.js.map +1 -1
  24. package/lib/cache/cache-field.d.ts +1 -1
  25. package/lib/cache/service/select-multiple-cache.service.d.ts +3 -3
  26. package/lib/cache/service/select-multiple-parameterized-cache.service.d.ts +5 -5
  27. package/lib/cache/service/select-single-cache.service.d.ts +4 -4
  28. package/lib/component/catalog-article-tile/style/_layout.scss +13 -8
  29. package/lib/component/catalog-article-tile/style/_material-definition.scss +1 -0
  30. package/lib/component/catalog-article-tile/style/_theme.scss +1 -0
  31. package/lib/service/catalog-options.service.d.ts +1 -1
  32. package/lib/service/catalog.service.d.ts +0 -11
  33. package/lib/service/dictionary.service.d.ts +1 -1
  34. package/lib/service/icon-cache.service.d.ts +2 -2
  35. package/package.json +1 -1
  36. package/esm2015/lib/directive/overlay/overlay-parent.directive.js +0 -19
  37. package/esm2015/lib/directive/overlay/overlay.directive.js +0 -73
  38. package/esm2015/lib/directive/overlay/overlay.module.js +0 -18
  39. package/esm2015/lib/interface/order-by.interface.js +0 -2
  40. package/lib/directive/overlay/overlay-parent.directive.d.ts +0 -6
  41. package/lib/directive/overlay/overlay.directive.d.ts +0 -15
  42. package/lib/directive/overlay/overlay.module.d.ts +0 -2
  43. package/lib/interface/order-by.interface.d.ts +0 -4
@@ -1,5 +1,5 @@
1
1
  import * as i0 from '@angular/core';
2
- import { Injectable, EventEmitter, Component, ViewEncapsulation, Input, Output, HostBinding, ChangeDetectorRef, ViewChild, Pipe, NgModule, Directive, ElementRef, HostListener, Renderer2 } from '@angular/core';
2
+ import { Injectable, EventEmitter, Component, ViewEncapsulation, Input, Output, HostBinding, ChangeDetectorRef, ViewChild, Pipe, NgModule, Directive, HostListener, ElementRef, Renderer2 } from '@angular/core';
3
3
  import { CommonModule } from '@angular/common';
4
4
  import { __awaiter } from 'tslib';
5
5
  import { Subject, BehaviorSubject } from 'rxjs';
@@ -18,7 +18,7 @@ import { ObjectUtils } from '@colijnit/ioneconnector/build/utils/object-utils';
18
18
  import { FileUtils } from '@colijnit/ioneconnector/build/utils/file-utils';
19
19
  import { ArticleExtendedRequest } from '@colijnit/articleapi/build/model/article-extended-request';
20
20
  import { PagingParameters } from '@colijnit/ioneconnector/build/model/paging-parameters';
21
- import { InputTextModule, FilterItemModule, InputDatePickerModule, IconCollapseHandleModule, ImageModule, IconModule as IconModule$1, InputSearchModule, PaginationBarModule } from '@colijnit/corecomponents_v12';
21
+ import { InputTextModule, FilterItemModule, InputDatePickerModule, IconCollapseHandleModule, ImageModule, IconModule as IconModule$1, OverlayModule, InputSearchModule, PaginationBarModule } from '@colijnit/corecomponents_v12';
22
22
  import { trigger, state, style, transition, animate } from '@angular/animations';
23
23
  import { SliderComponent, IconModule, PriceDisplayPipeModule, ButtonModule, ImageModule as ImageModule$1 } from '@colijnit/corecomponents';
24
24
  import * as i1 from '@angular/platform-browser';
@@ -29,8 +29,8 @@ class Version {
29
29
  constructor() {
30
30
  this.name = "@colijnit/catalog";
31
31
  this.description = "iOne Catalog module based on Angular 12";
32
- this.symVer = "12.1.27";
33
- this.publishDate = "13-4-2023 18:09:01";
32
+ this.symVer = "12.1.28";
33
+ this.publishDate = "21-4-2023 16:40:30";
34
34
  }
35
35
  }
36
36
 
@@ -1630,24 +1630,14 @@ class CatalogService {
1630
1630
  // this.ensureDataListsLoaded();
1631
1631
  this.articlesPerPage = this._settingsService.settings.options.maxItemsPerPage;
1632
1632
  if (this._settingsService.settings.options.searchOnStart) {
1633
- this.searchArticles();
1633
+ this._catalogSearchService.searchArticles();
1634
1634
  }
1635
1635
  }
1636
1636
  })), this.optionsService.parametersSet.subscribe((set) => {
1637
1637
  if (set) {
1638
1638
  this.defaultOptions = this.optionsService.parameters;
1639
- // this._createDefaultRequest();
1640
- // if (this.optionsService.parameters.general && this._settingsService.settings.options.searchOnStart) {
1641
- // this._setRequestParametersAndProps(null, null, this.optionsService.parameters.general.split(' '));
1642
- // this.searchArticles();
1643
- // }
1644
1639
  }
1645
1640
  }));
1646
- /*
1647
- this.doArticleSearchThrottledFunc = this.utils.getAsThrottledFunction(() => {
1648
- return this.doSearchArticles();
1649
- }, this.minMillisBetweenArticleSearches, this);
1650
- */
1651
1641
  }
1652
1642
  // public set filterText(value: string[]) {
1653
1643
  // this._setRequestParametersAndProps(null, null, value);
@@ -1706,10 +1696,6 @@ class CatalogService {
1706
1696
  get currentPage() {
1707
1697
  return this._currentPage;
1708
1698
  }
1709
- set currentPage(value) {
1710
- this._currentPage = value;
1711
- this.doSearchArticles(false);
1712
- }
1713
1699
  ngOnDestroy() {
1714
1700
  this._subs.forEach(s => s.unsubscribe());
1715
1701
  }
@@ -1746,120 +1732,10 @@ class CatalogService {
1746
1732
  return this._imageService.getTurnoverGroupImage(group);
1747
1733
  });
1748
1734
  }
1749
- // public filterOnCollection(collection: FilterItemViewmodel[]): void {
1750
- // if (!collection || collection.length === 0) {
1751
- // return;
1752
- // }
1753
- // let cleared: boolean = false;
1754
- // let filterRange: string[] = [];
1755
- // const searchFilterProp: string = this._filterService.getFilterItemMap(collection[0].filter.filterName);
1756
- // if (searchFilterProp) {
1757
- // collection.forEach((viewModel: FilterItemViewmodel) => {
1758
- // if (!cleared) {
1759
- // this.articleSearchFilters[searchFilterProp] = '';
1760
- // cleared = true;
1761
- // }
1762
- // if (viewModel.checked) {
1763
- // filterRange.push(`?='${viewModel.code}'`);
1764
- // }
1765
- // });
1766
- // this.articleSearchFilters[searchFilterProp] = filterRange.join(',');
1767
- // this.searchArticles();
1768
- // }
1769
- // }
1770
- changeOrderBy(orderBy) {
1771
- this._currentOrderBy = orderBy.id;
1772
- this._sortArticleList();
1773
- }
1774
- searchArticles() {
1775
- return __awaiter(this, void 0, void 0, function* () {
1776
- if (!this._controllerInitialized) {
1777
- return;
1778
- }
1779
- clearTimeout(this._searchTimer);
1780
- this._searchTimer = setTimeout(() => {
1781
- this.searchTextChanged.next(this._filterText);
1782
- this.doArticleSearchThrottledFunc.call(this);
1783
- }, 400);
1784
- });
1785
- }
1786
- resetFilters() {
1787
- // this._createDefaultRequest();
1788
- // this.category = null;
1789
- // this.turnoverGroup = null;
1790
- // if (this.filterText !== null) {
1791
- // this.filterText = this.filterText.slice();
1792
- // }
1793
- // this.onResetFilters.next();
1794
- }
1795
1735
  reset() {
1796
1736
  this.showCatOrTurnoverGroupArticles = false;
1797
1737
  this.showExternalSource = false;
1798
1738
  }
1799
- ensureDataListsLoaded() {
1800
- return __awaiter(this, void 0, void 0, function* () {
1801
- // this.externalSourceViewModels.length = 0;
1802
- // this.iOne.getCatalogDefinitions().then(async (defs: CatalogDefinition[]) => {
1803
- // for (let i = 0; i < defs.length; i++) {
1804
- // this._imageService.getExternalSourceImage(defs[i]);
1805
- // const viewModel: ExternalSourceViewmodel = new ExternalSourceViewmodel(
1806
- // defs[i],
1807
- // defs[i].externalSourceId ? await this.iOne.getExternalSource(defs[i].externalSourceId, false) : new ExternalSource()
1808
- // )
1809
- // this.externalSourceViewModels.push(viewModel);
1810
- // }
1811
- // });
1812
- });
1813
- }
1814
- // POST: this.articlesOnShowcase contains all articles for given search parameters.
1815
- doSearchArticles(getFilters = true) {
1816
- return __awaiter(this, void 0, void 0, function* () {
1817
- // const lowerBound: number = ((this.currentPage - 1) * this.articlesPerPage) + 1;
1818
- // this.articleSearchFilters.paging = new PagingParameters(lowerBound, lowerBound + this.articlesPerPage - 1, this.articlesPerPage);
1819
- // this.iOne.getArticlesForCatalog(this.articleSearchFilters, false).then((result: ArticlesSearchResult) => {
1820
- // this.resultCount = result.count;
1821
- // this.articlesOnShowcase = result.articles;
1822
- // this.filteredArticlesOnShowcase = this.articlesOnShowcase.slice(0);
1823
- // this._sortArticleList();
1824
- // this.showExternalSource = false;
1825
- // this.showIoneSource = false;
1826
- // this.showCatOrTurnoverGroupArticles = true;
1827
- // this.showPageChanged.next(this.currentPage);
1828
- // })
1829
- // if (getFilters) {
1830
- // this._filterService.getFilters(this.articleSearchFilters);
1831
- // }
1832
- // // todo: get total count of result based on same request to build paging
1833
- });
1834
- }
1835
- // public sortTurnoverGroups(categories: ArticleCategory[]): void {
1836
- // }
1837
- //
1838
- _sortArticleList() {
1839
- switch (this._currentOrderBy) {
1840
- case 1:
1841
- this._sortArticleListByArticleNr();
1842
- break;
1843
- case 2:
1844
- this._sortArticleListByArticleName();
1845
- break;
1846
- }
1847
- }
1848
- _sortArticleListByArticleNr() {
1849
- const newList = this.filteredArticlesOnShowcase.sort((a, b) => a.articleNumber > b.articleNumber ? 1 : -1);
1850
- this.filteredArticlesOnShowcase = newList.slice();
1851
- }
1852
- _sortArticleListByArticleName() {
1853
- const newList = this.filteredArticlesOnShowcase.sort((a, b) => {
1854
- const first = a.name ? a.name : a.description;
1855
- const second = b.name ? b.name : b.description;
1856
- return first > second ? 1 : -1;
1857
- });
1858
- this.filteredArticlesOnShowcase = newList.slice();
1859
- }
1860
- _createDefaultRequest() {
1861
- this.articleSearchFilters = Object.assign({}, this.defaultOptions);
1862
- }
1863
1739
  }
1864
1740
  CatalogService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CatalogService_Factory() { return new CatalogService(i0.ɵɵinject(CatalogConnectorService), i0.ɵɵinject(CatalogConnectorAdapterService), i0.ɵɵinject(CatalogSettingsService), i0.ɵɵinject(CatalogOptionsService), i0.ɵɵinject(CatalogImageService), i0.ɵɵinject(CatalogSettingsService), i0.ɵɵinject(CatalogFilterService), i0.ɵɵinject(CatalogSearchService)); }, token: CatalogService, providedIn: "root" });
1865
1741
  CatalogService.decorators = [
@@ -2509,7 +2385,7 @@ CatalogNavigationComponent.decorators = [
2509
2385
  <div class="navigation-category-column-wrapper" *ngFor="let category of categories">
2510
2386
  <div class="navigation-category" [textContent]="category.category" (click)="handleCategoryClick($event, category.category)"></div>
2511
2387
  <div class="navigation-turnovergroup-wrapper">
2512
- <div class="navigation-turnovergroup" *ngFor="let turnoverGroup of category.turnoverGroups" [textContent]="turnoverGroup.description" (click)="handleTurnoverGroupClick($event, turnoverGroup.description)"></div>
2388
+ <div class="navigation-turnovergroup" *ngFor="let turnoverGroup of category.turnoverGroups" [textContent]="turnoverGroup.description" (click)="handleTurnoverGroupClick($event, turnoverGroup.turnovergroupNr)"></div>
2513
2389
  </div>
2514
2390
  </div>
2515
2391
  </div>
@@ -2626,111 +2502,6 @@ CatalogExternalSourcesModule.decorators = [
2626
2502
  },] }
2627
2503
  ];
2628
2504
 
2629
- class OverlayDirective {
2630
- constructor(elementRef) {
2631
- this.keepInView = false;
2632
- this._elementRef = elementRef;
2633
- }
2634
- set parent(value) {
2635
- if (value && value.elementRef) {
2636
- this._parent = value.elementRef;
2637
- }
2638
- else {
2639
- if (this._parent) {
2640
- this._observer.disconnect();
2641
- }
2642
- }
2643
- }
2644
- handleScroll(event) {
2645
- this._checkAndPlaceElement();
2646
- }
2647
- ngOnDestroy() {
2648
- // document.removeEventListener("scroll", (event) => this._handleScroll(event), false);
2649
- this._observer.disconnect();
2650
- this._elementRef = undefined;
2651
- this._parent = undefined;
2652
- }
2653
- ngOnInit() {
2654
- // document.addEventListener("scroll", (event) => this._handleScroll(event), false);
2655
- this._checkAndPlaceElement();
2656
- this._observer = new ResizeObserver((entries) => {
2657
- this._checkAndPlaceElement();
2658
- });
2659
- this._observer.observe(document.body);
2660
- }
2661
- _checkAndPlaceElement() {
2662
- const elementRect = this._elementRef.nativeElement.getBoundingClientRect();
2663
- const parentRect = this._parent.nativeElement.getBoundingClientRect();
2664
- this._placeElement(window.innerHeight, window.innerWidth, parentRect, elementRect);
2665
- }
2666
- _placeElement(bottom, right, parentRect, elementRect) {
2667
- if (bottom < parentRect.bottom + elementRect.height) { // make sure it fits at the bottom
2668
- this._elementRef.nativeElement.style.top = (parentRect.top - elementRect.height) + "px";
2669
- }
2670
- else {
2671
- this._elementRef.nativeElement.style.top = parentRect.bottom + "px";
2672
- }
2673
- if (this.keepInView) {
2674
- if (elementRect.right > window.innerWidth) {
2675
- //see if we can move it to the left
2676
- if ((window.innerWidth - elementRect.width) > 0) {
2677
- this._elementRef.nativeElement.style.left = (window.innerWidth - elementRect.width) + "px";
2678
- }
2679
- else { //resize so it fits into view
2680
- this._elementRef.nativeElement.style.width = window.innerWidth + "px";
2681
- this._elementRef.nativeElement.style.left = 0;
2682
- }
2683
- }
2684
- }
2685
- }
2686
- }
2687
- OverlayDirective.decorators = [
2688
- { type: Directive, args: [{
2689
- selector: "[overlay]"
2690
- },] }
2691
- ];
2692
- OverlayDirective.ctorParameters = () => [
2693
- { type: ElementRef }
2694
- ];
2695
- OverlayDirective.propDecorators = {
2696
- parent: [{ type: Input, args: ["overlay",] }],
2697
- keepInView: [{ type: Input }],
2698
- handleScroll: [{ type: HostListener, args: ["document:scroll", ["$event"],] }]
2699
- };
2700
-
2701
- class OverlayParentDirective {
2702
- constructor(elementRef) {
2703
- this.elementRef = elementRef;
2704
- }
2705
- ngOnDestroy() {
2706
- this.elementRef = undefined;
2707
- }
2708
- }
2709
- OverlayParentDirective.decorators = [
2710
- { type: Directive, args: [{
2711
- selector: '[overlayParent]',
2712
- exportAs: 'overlayParent'
2713
- },] }
2714
- ];
2715
- OverlayParentDirective.ctorParameters = () => [
2716
- { type: ElementRef }
2717
- ];
2718
-
2719
- class OverlayModule {
2720
- }
2721
- OverlayModule.decorators = [
2722
- { type: NgModule, args: [{
2723
- declarations: [
2724
- OverlayDirective,
2725
- OverlayParentDirective
2726
- ],
2727
- exports: [
2728
- OverlayDirective,
2729
- OverlayParentDirective
2730
- ]
2731
- },] }
2732
- ];
2733
-
2734
2505
  class CatalogNavigationModule {
2735
2506
  }
2736
2507
  CatalogNavigationModule.decorators = [
@@ -2757,7 +2528,7 @@ class CatalogSearchComponent {
2757
2528
  this._catalogEventService = _catalogEventService;
2758
2529
  this.showNavigation = false;
2759
2530
  this.showFilter = false;
2760
- this.showViewModes = false;
2531
+ this.showViewModes = true;
2761
2532
  this.onLookAtArticleButtonClick = new EventEmitter();
2762
2533
  this.onArButtonClick = new EventEmitter();
2763
2534
  this.onAddArticleButtonClick = new EventEmitter();
@@ -2815,7 +2586,7 @@ CatalogSearchComponent.decorators = [
2815
2586
  <button (click)="mode = 'list'">list</button>
2816
2587
  <button (click)="mode = 'grid'">grid</button>
2817
2588
  </ng-container>
2818
- <co-catalog-navigation *ngIf="showNavigation"></co-catalog-navigation>
2589
+ <co-catalog-navigation *ngIf="showNavigation" (categoryClick)="handleCategoryClick($event)" (turnoverGroupClick)="handleTurnoverGroupClick($event)"></co-catalog-navigation>
2819
2590
  <co-catalog-categories (categoryClick)="handleCategoryClick($event)" (turnoverGroupClick)="handleTurnoverGroupClick($event)"></co-catalog-categories>
2820
2591
  <div class="search-content">
2821
2592
  <ng-container *ngIf="mode === 'tile'">
@@ -3154,7 +2925,8 @@ CatalogArticleTileComponent.decorators = [
3154
2925
  -->
3155
2926
  <div class="main-top">
3156
2927
  <div *ngIf="!!turnover" class="turnover" [innerText]="removeHtmlTags(turnover)"></div>
3157
- <div *ngIf="!!name" class="description" [innerText]="removeHtmlTags(name)"></div>
2928
+ <div class="name" [innerText]="removeHtmlTags(article.name)"></div>
2929
+ <div class="description" [innerText]="removeHtmlTags(article.description)"></div>
3158
2930
  </div>
3159
2931
  <div class="main-bottom">
3160
2932
  <div class="main-bottom-left">
@@ -3619,5 +3391,5 @@ CatalogExternalSourceModule.decorators = [
3619
3391
  * Generated bundle index. Do not edit.
3620
3392
  */
3621
3393
 
3622
- export { CatalogArticleListModule, CatalogArticleTileModule, CatalogCategoriesModule, CatalogExternalSourceModule, CatalogExternalSourcesModule, CatalogFilterModule, CatalogNavigationModule, CatalogSearchHeaderModule, CatalogSearchModule, CatalogSearchResultListModule, CatalogSearchResultTileModule, CatalogSearchService, CatalogService, Version, CatalogFilterComponent as ɵa, CatalogFilterService as ɵb, CatalogArticleTileComponent as ɵba, ArticleBaseComponent as ɵbb, VisibilityObserverModule as ɵbc, VisibilityObserverMasterDirective as ɵbd, VisibilityObserverDirective as ɵbe, CatalogSearchResultTileComponent as ɵbf, CatalogSearchBaseComponent as ɵbg, CatalogArticleListComponent as ɵbh, CatalogSearchResultListComponent as ɵbi, CatalogSearchComponent as ɵbj, CatalogExternalSourceComponent as ɵbk, CatalogConnectorService as ɵc, CatalogConnectorAdapterService as ɵd, SelectSingleCacheService as ɵe, BusinessObjectCacheManagerService as ɵf, SelectMultipleCacheService as ɵg, CacheField as ɵh, SelectMultipleParameterizedCacheService as ɵi, SelectSingleParameterizedCacheService as ɵj, CatalogSettingsService as ɵk, DictionaryService as ɵl, CatalogOptionsService as ɵm, IconCacheService as ɵn, LocalizePipe as ɵo, ResponsiveTextModule as ɵp, ResponsiveTextComponent as ɵq, CatalogCategoriesComponent as ɵr, CatalogImageService as ɵs, CatalogExternalSourcesComponent as ɵt, OverlayModule as ɵu, OverlayDirective as ɵv, OverlayParentDirective as ɵw, CatalogNavigationComponent as ɵx, CatalogEventService as ɵy, CatalogSearchHeaderComponent as ɵz };
3394
+ export { CatalogArticleListModule, CatalogArticleTileModule, CatalogCategoriesModule, CatalogExternalSourceModule, CatalogExternalSourcesModule, CatalogFilterModule, CatalogNavigationModule, CatalogSearchHeaderModule, CatalogSearchModule, CatalogSearchResultListModule, CatalogSearchResultTileModule, CatalogSearchService, CatalogService, Version, CatalogFilterComponent as ɵa, CatalogFilterService as ɵb, VisibilityObserverMasterDirective as ɵba, VisibilityObserverDirective as ɵbb, CatalogSearchResultTileComponent as ɵbc, CatalogSearchBaseComponent as ɵbd, CatalogArticleListComponent as ɵbe, CatalogSearchResultListComponent as ɵbf, CatalogSearchComponent as ɵbg, CatalogExternalSourceComponent as ɵbh, CatalogConnectorService as ɵc, CatalogConnectorAdapterService as ɵd, SelectSingleCacheService as ɵe, BusinessObjectCacheManagerService as ɵf, SelectMultipleCacheService as ɵg, CacheField as ɵh, SelectMultipleParameterizedCacheService as ɵi, SelectSingleParameterizedCacheService as ɵj, CatalogSettingsService as ɵk, DictionaryService as ɵl, CatalogOptionsService as ɵm, IconCacheService as ɵn, LocalizePipe as ɵo, ResponsiveTextModule as ɵp, ResponsiveTextComponent as ɵq, CatalogCategoriesComponent as ɵr, CatalogImageService as ɵs, CatalogExternalSourcesComponent as ɵt, CatalogNavigationComponent as ɵu, CatalogEventService as ɵv, CatalogSearchHeaderComponent as ɵw, CatalogArticleTileComponent as ɵx, ArticleBaseComponent as ɵy, VisibilityObserverModule as ɵz };
3623
3395
  //# sourceMappingURL=colijnit-catalog.js.map