@colijnit/catalog 12.1.59 → 12.1.61

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.
@@ -49,8 +49,8 @@ class Version {
49
49
  constructor() {
50
50
  this.name = "@colijnit/catalog";
51
51
  this.description = "iOne Catalog module based on Angular 12";
52
- this.symVer = "12.1.59";
53
- this.publishDate = "19-1-2024 18:12:29";
52
+ this.symVer = "12.1.61";
53
+ this.publishDate = "2-2-2024 09:52:57";
54
54
  }
55
55
  }
56
56
 
@@ -1261,7 +1261,7 @@ class CatalogConnectorService {
1261
1261
  }
1262
1262
  getBrandFilter(params) {
1263
1263
  return __awaiter(this, void 0, void 0, function* () {
1264
- return this._adapterService.getTurnoverGroupFilter(params);
1264
+ return this._adapterService.getBrandFilter(params);
1265
1265
  });
1266
1266
  }
1267
1267
  getArtStockStatus(goodId) {
@@ -1565,6 +1565,8 @@ class CatalogFilterViewmodel extends FilterViewmodel {
1565
1565
  }
1566
1566
 
1567
1567
  class CatalogFilterService {
1568
+ //TODO reinitialize once screenconfig is implemented
1569
+ //['Catalog', 'rangeCatalog'],
1568
1570
  constructor(_iOneController) {
1569
1571
  this._iOneController = _iOneController;
1570
1572
  this.priceMinFilter = 0;
@@ -1579,7 +1581,6 @@ class CatalogFilterService {
1579
1581
  this.depthMaxFilter = 100000;
1580
1582
  this.filters = [];
1581
1583
  this.filterItemMap = new Map([
1582
- ['Catalog', 'rangeCatalog'],
1583
1584
  ['Product group', 'rangeArticleGroup'],
1584
1585
  ['Atmosphere', 'rangeSphereCode'],
1585
1586
  ['Colour', 'colourCodes'],
@@ -1593,53 +1594,58 @@ class CatalogFilterService {
1593
1594
  }
1594
1595
  getFilters(filters) {
1595
1596
  this._iOneController.getPriceFilter(filters).then((filter) => {
1596
- this.priceMinFilter = filter.priceMin;
1597
- this.priceMaxFilter = filter.priceMax;
1597
+ if (filter) {
1598
+ this.priceMinFilter = filter.priceMin;
1599
+ this.priceMaxFilter = filter.priceMax;
1600
+ }
1598
1601
  });
1599
1602
  const newFilters = [];
1600
1603
  const filterProms = [];
1601
- filterProms.push(this._iOneController.getCatalogFilter(filters).then((filter) => {
1602
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1604
+ filterProms.push(
1605
+ //TODO reinitialize once screenconfig is implemented-->
1606
+ /*this._iOneController.getCatalogFilter(filters).then((filter: ArticleSearchFilterSelections) => {
1607
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1603
1608
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Catalog'));
1604
1609
  }
1605
- }), this._iOneController.getArticleGroupsFilter(filters).then((filter) => {
1606
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1610
+ }),*/
1611
+ this._iOneController.getArticleGroupsFilter(filters).then((filter) => {
1612
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1607
1613
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Product group'));
1608
1614
  }
1609
1615
  }), this._iOneController.getAtmosphereFilter(filters).then((filter) => {
1610
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1616
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1611
1617
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Atmosphere'));
1612
1618
  }
1613
1619
  }), this._iOneController.getColorFilter(filters).then((filter) => {
1614
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1620
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1615
1621
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Colour'));
1616
1622
  }
1617
1623
  }), this._iOneController.getConceptFilter(filters).then((filter) => {
1618
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1624
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1619
1625
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Concept'));
1620
1626
  }
1621
1627
  }), this._iOneController.getDesignFilter(filters).then((filter) => {
1622
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1628
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1623
1629
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Design'));
1624
1630
  }
1625
1631
  }), this._iOneController.getMainArticleFilter(filters).then((filter) => {
1626
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1632
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1627
1633
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Main article'));
1628
1634
  }
1629
1635
  }), this._iOneController.getMaterialFilter(filters).then((filter) => {
1630
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1636
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1631
1637
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Material'));
1632
1638
  }
1633
1639
  }), this._iOneController.getTagsFilter(filters).then((filter) => {
1634
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1640
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1635
1641
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Tag'));
1636
1642
  }
1637
1643
  }), this._iOneController.getTurnoverGroupFilter(filters).then((filter) => {
1638
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1644
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1639
1645
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Turnover group'));
1640
1646
  }
1641
1647
  }), this._iOneController.getBrandFilter(filters).then((filter) => {
1642
- if (filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1648
+ if (filter && filter.selectionDTOS && filter.selectionDTOS.length > 0) {
1643
1649
  newFilters.push(this.createNewFiltersAndCopySelections(filter, 'Brands'));
1644
1650
  }
1645
1651
  }));
@@ -2109,6 +2115,8 @@ var IconEnum;
2109
2115
  IconEnum["Refresh"] = "refresh";
2110
2116
  IconEnum["Search"] = "search";
2111
2117
  IconEnum["SyncAlt"] = "sync_alt";
2118
+ IconEnum["ThickLines"] = "thick_lines";
2119
+ IconEnum["ThinLines"] = "thin_lines";
2112
2120
  IconEnum["ThreeD"] = "three_d";
2113
2121
  IconEnum["TileView"] = "tile_view";
2114
2122
  IconEnum["Truck"] = "truck";
@@ -2131,11 +2139,13 @@ const IconSvg = {
2131
2139
  "filter_circle_large": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M22.81,37A1.28,1.28,0,0,1,22,35.79V29.31L15.14,17.54a1.28,1.28,0,0,1,1.14-1.87H33.72a1.28,1.28,0,0,1,1.14,1.87L28,29.31v6.47A1.29,1.29,0,0,1,27.17,37Z\" fill=\"#484f60\"/><path d=\"M25,6.33A18.67,18.67,0,1,1,6.33,25,18.7,18.7,0,0,1,25,6.33M25,5A20,20,0,1,0,45,25,20,20,0,0,0,25,5Z\" fill=\"#484f60\"/></svg>",
2132
2140
  "grid_view": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><g><rect x=\"0\" y=\"26.41\" width=\"30\" height=\"2.52\" fill=\"#484f60\"/><rect x=\"0\" y=\"21.29\" width=\"30\" height=\"2.52\" fill=\"#484f60\"/><rect x=\"0\" y=\"16.26\" width=\"30\" height=\"2.52\" fill=\"#484f60\"/><rect x=\"0\" y=\"11.22\" width=\"30\" height=\"2.52\" fill=\"#484f60\"/><rect x=\"0\" y=\"6.11\" width=\"30\" height=\"2.52\" fill=\"#484f60\"/><rect x=\"0\" y=\"1.08\" width=\"30\" height=\"2.52\" fill=\"#484f60\"/></g></g></svg>",
2133
2141
  "hamburger": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><title>hamburger</title><rect x=\"14\" y=\"15.17\" width=\"22\" height=\"4\"/><rect x=\"14\" y=\"23.17\" width=\"22\" height=\"4\"/><rect x=\"14\" y=\"31.17\" width=\"22\" height=\"4\"/></svg>",
2134
- "list_view": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><g><rect x=\"8\" y=\"5.17\" width=\"22\" height=\"4\" fill=\"#484f60\"/><rect x=\"8\" y=\"13.17\" width=\"22\" height=\"4\" fill=\"#484f60\"/><rect x=\"8\" y=\"21.17\" width=\"22\" height=\"4\" fill=\"#484f60\"/><rect y=\"12.17\" width=\"6\" height=\"6\" fill=\"#484f60\"/><rect y=\"4.17\" width=\"6\" height=\"6\" fill=\"#484f60\"/><rect y=\"20.17\" width=\"6\" height=\"6\" fill=\"#484f60\"/></g></g></svg>",
2142
+ "list_view": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 51 51\"><rect x=\"26.5\" y=\"13\" width=\"14\" height=\"7\" fill=\"#4d5050\"/><rect x=\"10.5\" y=\"13\" width=\"14\" height=\"7\" fill=\"#4d5050\"/><rect x=\"10.5\" y=\"22\" width=\"14\" height=\"7\" fill=\"#4d5050\"/><rect x=\"26.5\" y=\"22\" width=\"14\" height=\"7\" fill=\"#4d5050\"/><rect x=\"10.5\" y=\"31\" width=\"14\" height=\"7\" fill=\"#4d5050\"/><rect x=\"26.5\" y=\"31\" width=\"14\" height=\"7\" fill=\"#4d5050\"/></svg>",
2135
2143
  "magic_wand": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><g style=\"isolation:isolate\"><path d=\"M20.45,10.71a.28.28,0,0,1,.49-.19l1.4,1.25a.93.93,0,0,0,.83.23L25,11.62a.29.29,0,0,1,.34.41l-.76,1.71a.93.93,0,0,0,0,.86l.93,1.62c.12.26,0,.45-.29.45l-1.86-.2a1,1,0,0,0-.81.32l-1.26,1.38a.28.28,0,0,1-.5-.14l-.39-1.83a1,1,0,0,0-.55-.67l-1.71-.77a.28.28,0,0,1,0-.52l1.62-.94a1,1,0,0,0,.48-.73Z\" fill=\"#484f60\"/><g style=\"mix-blend-mode:lighten\"><path d=\"M23.3,16.21a1,1,0,0,0-.8.31l-1,1.13a.29.29,0,0,1-.51-.14L20.66,16a1,1,0,0,0-.55-.68l-1.39-.62a.28.28,0,0,1,0-.52L20,13.45a1,1,0,0,0,.48-.73l.16-1.5a.29.29,0,0,1,.49-.2l1.13,1a.93.93,0,0,0,.83.23L24.58,12a.29.29,0,0,1,.34.41l-.62,1.38a.91.91,0,0,0,.05.86l.75,1.32a.29.29,0,0,1-.29.44Z\" fill=\"#484f60\"/></g><path d=\"M33.57,36.76a.53.53,0,0,1,0,.72l-2.37,2.18a.48.48,0,0,1-.7,0L18,25.34a.51.51,0,0,1,0-.71l2.36-2.19a.49.49,0,0,1,.7,0Z\" fill=\"#484f60\"/><path d=\"M18.6,19.94a.51.51,0,0,1,0,.71L16.2,22.84a.48.48,0,0,1-.7,0l-2.76-3.13a.51.51,0,0,1,0-.71l2.37-2.19a.48.48,0,0,1,.7,0Z\" fill=\"#484f60\"/><path d=\"M30.67,10.55a.29.29,0,0,1,.47.24v1.12a1,1,0,0,0,.4.77l.9.66a.29.29,0,0,1-.08.52l-1.07.35a1,1,0,0,0-.61.61l-.35,1.06a.28.28,0,0,1-.51.09l-.67-.91a1,1,0,0,0-.77-.4H27.27a.29.29,0,0,1-.25-.47l.66-.9a.93.93,0,0,0,.14-.85l-.35-1.07a.29.29,0,0,1,.38-.38l1.07.35a1,1,0,0,0,.85-.13Z\" fill=\"#484f60\"/><g style=\"mix-blend-mode:lighten\"><path d=\"M29.25,14.88a1,1,0,0,0-.77-.4h-.86a.29.29,0,0,1-.24-.47l.5-.69a.93.93,0,0,0,.14-.85l-.26-.82c-.07-.27.1-.44.37-.37l.82.26a1,1,0,0,0,.85-.13l.69-.51a.29.29,0,0,1,.47.25V12a.94.94,0,0,0,.39.76l.7.51a.29.29,0,0,1-.09.52l-.81.26a1,1,0,0,0-.62.61l-.26.82a.29.29,0,0,1-.52.08Z\" fill=\"#484f60\"/></g><path d=\"M37,15.81a.29.29,0,0,1,.32.43l-.13.26a.91.91,0,0,0,0,.85l.15.26A.29.29,0,0,1,37,18l-.29,0a.93.93,0,0,0-.81.27l-.2.21a.28.28,0,0,1-.5-.16l0-.29a1,1,0,0,0-.52-.69l-.27-.13a.28.28,0,0,1,0-.52l.26-.13a.93.93,0,0,0,.5-.71l0-.29a.29.29,0,0,1,.5-.17l.21.21a.92.92,0,0,0,.82.26Z\" fill=\"#484f60\"/><g style=\"mix-blend-mode:lighten\"><path d=\"M35.25,18a1,1,0,0,0-.52-.7l-.12-.05a.28.28,0,0,1,0-.52l.12-.06a1,1,0,0,0,.51-.7V15.8a.29.29,0,0,1,.5-.18l.09.1a.92.92,0,0,0,.82.26l.13,0a.29.29,0,0,1,.32.42L37,16.5a.91.91,0,0,0,0,.85l.07.12a.29.29,0,0,1-.31.43l-.13,0a1,1,0,0,0-.82.28l-.09.1a.28.28,0,0,1-.5-.16Z\" fill=\"#484f60\"/></g></g></svg>",
2136
2144
  "refresh": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><polygon points=\"14.58 22.71 14.58 10 27.29 22.71 14.58 22.71\" fill=\"#484f60\"/><polygon points=\"35.42 27.29 35.42 40 22.71 27.29 35.42 27.29\" fill=\"#484f60\"/><path d=\"M19.9,15.32c4.09-4.09,10.2-8.13,18.33,0h0C31.73,8.82,26.65,13.9,22.56,18Z\" fill=\"#484f60\"/><path d=\"M30.1,34.68c-4.09,4.08-10.2,8.13-18.33,0h0c6.51,6.5,11.58,1.43,15.67-2.66Z\" fill=\"#484f60\"/></svg>",
2137
2145
  "search": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M28,14.75A9.39,9.39,0,1,0,28,28,9.39,9.39,0,0,0,28,14.75ZM26.48,26.48a7.2,7.2,0,1,1,0-10.18A7.2,7.2,0,0,1,26.48,26.48Z\" fill=\"#484f60\"/><path d=\"M37.36,33.49,32.67,28.8a2.19,2.19,0,0,0-3.09,0l-.78.78a2.19,2.19,0,0,0,0,3.09l4.69,4.69a2.2,2.2,0,0,0,3.1,0l.77-.78A2.19,2.19,0,0,0,37.36,33.49Z\" fill=\"#484f60\"/></svg>",
2138
2146
  "sync_alt": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M370.72 133.28C339.458 104.008 298.888 87.962 255.848 88c-77.458.068-144.328 53.178-162.791 126.85-1.344 5.363-6.122 9.15-11.651 9.15H24.103c-7.498 0-13.194-6.807-11.807-14.176C33.933 94.924 134.813 8 256 8c66.448 0 126.791 26.136 171.315 68.685L463.03 40.97C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.749zM32 296h134.059c21.382 0 32.09 25.851 16.971 40.971l-41.75 41.75c31.262 29.273 71.835 45.319 114.876 45.28 77.418-.07 144.315-53.144 162.787-126.849 1.344-5.363 6.122-9.15 11.651-9.15h57.304c7.498 0 13.194 6.807 11.807 14.176C478.067 417.076 377.187 504 256 504c-66.448 0-126.791-26.136-171.315-68.685L48.97 471.03C33.851 486.149 8 475.441 8 454.059V320c0-13.255 10.745-24 24-24z\"/></svg>",
2147
+ "thick_lines": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><rect x=\"10\" y=\"12.67\" width=\"30\" height=\"7\" fill=\"#484f60\"/><rect x=\"10\" y=\"21.67\" width=\"30\" height=\"7\" fill=\"#484f60\"/><rect x=\"10\" y=\"30.67\" width=\"30\" height=\"7\" fill=\"#484f60\"/></svg>",
2148
+ "thin_lines": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><rect x=\"10\" y=\"14.17\" width=\"30\" height=\"4\" fill=\"#484f60\"/><rect x=\"10\" y=\"20.17\" width=\"30\" height=\"4\" fill=\"#484f60\"/><rect x=\"10\" y=\"26.17\" width=\"30\" height=\"4\" fill=\"#484f60\"/><rect x=\"10\" y=\"32.17\" width=\"30\" height=\"4\" fill=\"#484f60\"/></svg>",
2139
2149
  "three_d": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M16.08,30.77a4.85,4.85,0,0,1-3-.8,4,4,0,0,0-2.49-.15,6.21,6.21,0,0,0,2.53,1.09,12.84,12.84,0,0,0,2.93-.14\" fill=\"#484f60\" opacity=\"0.5\"/><path d=\"M14.27,19.68A4.71,4.71,0,0,0,11,20.78l2,.14c.31,0,1.2-.69,1.55-.81a3.88,3.88,0,0,1,1.65-.24l-1.94-.19\" fill=\"#484f60\" opacity=\"0.5\"/><path d=\"M21.64,28.79a4.13,4.13,0,0,0-3.1-4c.89-.7,1.77-1.09,2.26-2.21a5.12,5.12,0,0,0,.35-1.9c-.13-3.24-2.64-3.73-5.29-4.15a4,4,0,0,1,3.44,3.7,4.61,4.61,0,0,1-.83,3.12,9.7,9.7,0,0,1-1.82,1.43,4.3,4.3,0,0,1,3.17,4.34,4.9,4.9,0,0,1-4.21,5c2.09-.34,4.37-.64,5.46-2.69a5,5,0,0,0,.57-2.58\" fill=\"#484f60\" opacity=\"0.5\"/><path d=\"M28.44,18.88l.38-.07.48-.06.57,0h.75l.36,0,.35.05c-.2,0-.42-.08-1.57-.25l-.36-.05-.37,0h-.77l-.59,0-.49.07a3.08,3.08,0,0,0-.39.07l-.3.07V31.38H27l.13,0h1.63l.21,0h.2l.2,0h.05l1.55-.24h0l-.34.05-.33,0H29.12l-.36,0-.33,0a1.15,1.15,0,0,1-.28-.06V19Z\" fill=\"#484f60\" opacity=\"0.5\"/><path d=\"M40,24.34a9,9,0,0,0-3-7.1,11.06,11.06,0,0,0-4.47-1.86c4.38,1.13,6.23,5.31,6.13,9.54-.12,4.5-2.27,8.55-6.86,9.66,2.59-.63,5-1.41,6.52-3.78A12,12,0,0,0,40,24.34\" fill=\"#484f60\" opacity=\"0.5\"/><path d=\"M35.38,16.71A7.32,7.32,0,0,1,36.74,18a7.82,7.82,0,0,1,1,1.73,10.32,10.32,0,0,1,.68,2.16,13.86,13.86,0,0,1,.23,2.59,15,15,0,0,1-.25,2.78,11.39,11.39,0,0,1-.68,2.31,9.34,9.34,0,0,1-1,1.85,8.23,8.23,0,0,1-1.28,1.4,7.76,7.76,0,0,1-1.7,1.07,9.07,9.07,0,0,1-2,.69,13.36,13.36,0,0,1-2.26.33,18.25,18.25,0,0,1-2.45,0c-.5,0-1-.08-1.39-.12l-1.17-.14c-.36,0-.68-.11-1-.16l-.77-.15V15.86c.34-.09.71-.18,1.09-.26s.81-.15,1.24-.21.88-.12,1.34-.17.95-.1,1.44-.13a20.57,20.57,0,0,1,2.33,0,12,12,0,0,1,2,.24,8.24,8.24,0,0,1,1.72.55A7.1,7.1,0,0,1,35.38,16.71ZM27.92,31.53a6.53,6.53,0,0,0,2.46-.32A4.81,4.81,0,0,0,32.32,30a5.82,5.82,0,0,0,1.27-2.18A10.11,10.11,0,0,0,34,24.67a8.65,8.65,0,0,0-.42-2.85,4.94,4.94,0,0,0-1.18-2,4.45,4.45,0,0,0-1.83-1.11,6.55,6.55,0,0,0-2.35-.28l-.59,0-.49.07a3.08,3.08,0,0,0-.39.07l-.3.07V31.38a2.11,2.11,0,0,0,.29.06l.34,0,.37,0,.36,0h.07\" fill=\"#484f60\"/><path d=\"M14.57,16.47a5.49,5.49,0,0,1,2,.22,3.89,3.89,0,0,1,1.49.84A3.66,3.66,0,0,1,19,18.89a4.29,4.29,0,0,1,.33,1.7,5.29,5.29,0,0,1-.17,1.34,4.29,4.29,0,0,1-.5,1.16,4.17,4.17,0,0,1-.84.94,4.88,4.88,0,0,1-1.16.69v.05a3.7,3.7,0,0,1,1.22.5,4,4,0,0,1,1,.92,4.61,4.61,0,0,1,.69,1.3,5.24,5.24,0,0,1,.25,1.62,5.36,5.36,0,0,1-.42,2.15,4.44,4.44,0,0,1-1.2,1.64,4.84,4.84,0,0,1-1.86,1,6.78,6.78,0,0,1-2.39.23,7.69,7.69,0,0,1-2.36-.52,6.89,6.89,0,0,1-.9-.42,4.36,4.36,0,0,1-.69-.47l.62-2.9a4.12,4.12,0,0,0,.53.34,6.21,6.21,0,0,0,.73.36,5.69,5.69,0,0,0,.88.31,5.19,5.19,0,0,0,1,.15,3.11,3.11,0,0,0,1.1-.13,2,2,0,0,0,.8-.45,1.93,1.93,0,0,0,.49-.71,2.35,2.35,0,0,0,.17-.89A2.48,2.48,0,0,0,16,27.67a2.23,2.23,0,0,0-.63-.79,2.9,2.9,0,0,0-.89-.46,3.5,3.5,0,0,0-1-.15H12.2V23.44l1.23,0a3.44,3.44,0,0,0,.83-.11,2.83,2.83,0,0,0,.79-.36,2,2,0,0,0,.6-.62,2,2,0,0,0,.23-.94,1.8,1.8,0,0,0-.13-.71,1.36,1.36,0,0,0-.38-.56,1.58,1.58,0,0,0-.64-.35,2.79,2.79,0,0,0-.9-.1,4.07,4.07,0,0,0-.84.13c-.27.08-.53.18-.78.28a6.56,6.56,0,0,0-1.17.7L10.42,18a5,5,0,0,1,.72-.51,7.82,7.82,0,0,1,2.12-.82A8,8,0,0,1,14.57,16.47Z\" fill=\"#484f60\"/></svg>",
2140
2150
  "tile_view": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><g><rect x=\"16\" y=\"2.67\" width=\"14\" height=\"7\" fill=\"#484f60\"/><rect y=\"2.67\" width=\"14\" height=\"7\" fill=\"#484f60\"/><rect y=\"11.67\" width=\"14\" height=\"7\" fill=\"#484f60\"/><rect x=\"16\" y=\"11.67\" width=\"14\" height=\"7\" fill=\"#484f60\"/><rect y=\"20.67\" width=\"14\" height=\"7\" fill=\"#484f60\"/><rect x=\"16\" y=\"20.67\" width=\"14\" height=\"7\" fill=\"#484f60\"/></g></g></svg>",
2141
2151
  "truck": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\" version=\"1.1\" sodipodi:docname=\"truck.svg\" inkscape:version=\"0.92.4 (5da689c313, 2019-01-14)\"><metadata ><rdf:RDF><cc:Work rdf:about=\"\"><dc:format>image/svg+xml</dc:format><dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs /><sodipodi:namedview pagecolor=\"#ffffff\" bordercolor=\"#666666\" borderopacity=\"1\" objecttolerance=\"10\" gridtolerance=\"10\" guidetolerance=\"10\" inkscape:pageopacity=\"0\" inkscape:pageshadow=\"2\" inkscape:window-width=\"1920\" inkscape:window-height=\"1017\" showgr inkscape:zoom=\"9.44\" inkscape:cx=\"31.555563\" inkscape:cy=\"21.585628\" inkscape:window-x=\"-8\" inkscape:window-y=\"-8\" inkscape:window-maximized=\"1\" inkscape:current-layer=\"svg8\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06827145,0,0,0.06827064,7.670918,5.1378096)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><path inkscape:connector-curvature=\"0\" d=\"m 119.467,337.067 c -28.237,0 -51.2,22.963 -51.2,51.2 0,28.237 22.963,51.2 51.2,51.2 28.237,0 51.2,-22.963 51.2,-51.2 0,-28.237 -22.964,-51.2 -51.2,-51.2 z m 0,85.333 c -18.825,0 -34.133,-15.309 -34.133,-34.133 0,-18.825 15.309,-34.133 34.133,-34.133 18.824,0 34.133,15.309 34.133,34.133 0,18.824 -15.309,34.133 -34.133,34.133 z\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><path inkscape:connector-curvature=\"0\" d=\"m 409.6,337.067 c -28.237,0 -51.2,22.963 -51.2,51.2 0,28.237 22.963,51.2 51.2,51.2 28.237,0 51.2,-22.963 51.2,-51.2 0,-28.237 -22.963,-51.2 -51.2,-51.2 z m 0,85.333 c -18.825,0 -34.133,-15.309 -34.133,-34.133 0,-18.825 15.309,-34.133 34.133,-34.133 18.825,0 34.133,15.309 34.133,34.133 0,18.824 -15.308,34.133 -34.133,34.133 z\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><path inkscape:connector-curvature=\"0\" d=\"m 510.643,289.784 -76.8,-119.467 c -1.57,-2.441 -4.275,-3.917 -7.177,-3.917 H 332.8 c -4.719,0 -8.533,3.823 -8.533,8.533 v 213.333 c 0,4.719 3.814,8.533 8.533,8.533 h 34.133 v -17.067 h -25.6 V 183.467 h 80.674 l 72.926,113.442 v 82.825 H 452.266 V 396.8 h 51.2 c 4.719,0 8.533,-3.814 8.533,-8.533 V 294.4 c 10e-4,-1.63 -0.468,-3.243 -1.356,-4.616 z\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><path inkscape:connector-curvature=\"0\" d=\"M 375.467,277.333 V 217.6 h 68.267 v -17.067 h -76.8 c -4.719,0 -8.533,3.823 -8.533,8.533 v 76.8 c 0,4.719 3.814,8.533 8.533,8.533 h 128 V 277.332 H 375.467 Z\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><path inkscape:connector-curvature=\"0\" d=\"M 332.8,106.667 H 8.533 C 3.823,106.667 0,110.49 0,115.2 v 273.067 c 0,4.719 3.823,8.533 8.533,8.533 H 76.8 V 379.733 H 17.067 v -256 h 307.2 v 256 H 162.133 V 396.8 H 332.8 c 4.719,0 8.533,-3.814 8.533,-8.533 V 115.2 c 0,-4.71 -3.814,-8.533 -8.533,-8.533 z\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><rect x=\"8.533\" y=\"345.60001\" width=\"51.200001\" height=\"17.066999\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><rect x=\"179.2\" y=\"345.60001\" width=\"145.067\" height=\"17.066999\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><rect x=\"469.33301\" y=\"345.60001\" width=\"34.132999\" height=\"17.066999\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><rect x=\"34.132999\" y=\"140.8\" width=\"298.66699\" height=\"17.066999\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><rect x=\"110.933\" y=\"379.733\" width=\"17.066999\" height=\"17.066999\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\"><g style=\"fill:#484f60;fill-opacity:1\"><rect x=\"401.06699\" y=\"379.733\" width=\"17.066999\" height=\"17.066999\" style=\"fill:#484f60;fill-opacity:1\" /></g></g><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /><g transform=\"matrix(0.06813214,0,0,0.06813214,7.6,6.2856989)\" style=\"fill:#484f60;fill-opacity:1\" /></svg>",
@@ -2538,6 +2548,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2538
2548
  <co-catalog-filter-item [placeholder]="'ARTICLENR'"
2539
2549
  [mode]="modes.TextField"
2540
2550
  [(model)]="catalogSearchService.searchRequest.articleNumber"
2551
+ [expanded]="false"
2541
2552
  >
2542
2553
  </co-catalog-filter-item>
2543
2554
  </div>
@@ -2545,6 +2556,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2545
2556
  <co-catalog-filter-item [placeholder]="'BARCODE'"
2546
2557
  [mode]="modes.TextField"
2547
2558
  [(model)]="catalogSearchService.searchRequest.barcode"
2559
+ [expanded]="false"
2548
2560
  >
2549
2561
  </co-catalog-filter-item>
2550
2562
  </div>
@@ -2554,6 +2566,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2554
2566
  [sliderDefaultMin]=0
2555
2567
  [sliderDefaultMax]=100000
2556
2568
  [(model)]="catalogSearchService.searchRequest.rangePrice"
2569
+ [expanded]="false"
2557
2570
  >
2558
2571
  </co-catalog-filter-item>
2559
2572
  </div>
@@ -2563,6 +2576,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2563
2576
  [sliderDefaultMin]=0
2564
2577
  [sliderDefaultMax]=5000
2565
2578
  [(model)]="catalogSearchService.searchRequest.length"
2579
+ [expanded]="false"
2566
2580
  >
2567
2581
  </co-catalog-filter-item>
2568
2582
  </div>
@@ -2572,6 +2586,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2572
2586
  [sliderDefaultMin]=0
2573
2587
  [sliderDefaultMax]=5000
2574
2588
  [(model)]="catalogSearchService.searchRequest.width"
2589
+ [expanded]="false"
2575
2590
  >
2576
2591
  </co-catalog-filter-item>
2577
2592
  </div>
@@ -2581,6 +2596,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2581
2596
  [sliderDefaultMin]=0
2582
2597
  [sliderDefaultMax]=5000
2583
2598
  [(model)]="catalogSearchService.searchRequest.height"
2599
+ [expanded]="false"
2584
2600
  >
2585
2601
  </co-catalog-filter-item>
2586
2602
  </div>
@@ -2590,6 +2606,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2590
2606
  [sliderDefaultMin]=0
2591
2607
  [sliderDefaultMax]=5000
2592
2608
  [(model)]="catalogSearchService.searchRequest.depth"
2609
+ [expanded]="false"
2593
2610
  >
2594
2611
  </co-catalog-filter-item>
2595
2612
  </div>
@@ -2598,10 +2615,21 @@ CatalogFilterContentGeneralComponent.decorators = [
2598
2615
  [(model)]="catalogSearchService.searchRequest.colourCodes"
2599
2616
  [mode]="modes.SelectListWithStringCollectionOutput"
2600
2617
  [collection]="colorCollection"
2618
+ [expanded]="false"
2619
+ >
2620
+ </co-catalog-filter-item>
2621
+ </div>
2622
+ <div class="filter-item-wrapper">
2623
+ <co-catalog-filter-item [placeholder]="'LATEST_DELIVERY_DATE'"
2624
+ [(model)]="catalogSearchService.searchRequest.latestDeliveryDate"
2625
+ [mode]="modes.DateField"
2626
+ [expanded]="false"
2601
2627
  >
2602
2628
  </co-catalog-filter-item>
2603
2629
  </div>
2604
- <div class="filter-item-wrapper">
2630
+
2631
+ <!--TODO reinitialize once screenconfig is implemented-->
2632
+ <!--<div class="filter-item-wrapper">
2605
2633
  <co-catalog-filter-item
2606
2634
  [placeholder]="'ARTICLE_TYPE'"
2607
2635
  [customContent]="true">
@@ -2635,7 +2663,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2635
2663
  [(model)]="catalogSearchService.searchRequest.doSync"
2636
2664
  >
2637
2665
  </co-catalog-filter-item>
2638
- </div>
2666
+ </div> -->
2639
2667
  <div class="filter-item-wrapper">
2640
2668
  <co-catalog-filter-item [placeholder]="'RETAIL_FORMULA'"
2641
2669
  [collection]="storeGroupCollection"
@@ -2652,19 +2680,21 @@ CatalogFilterContentGeneralComponent.decorators = [
2652
2680
  >
2653
2681
  </co-catalog-filter-item>
2654
2682
  </div>
2655
- <div class="filter-item-wrapper">
2683
+ <!--TODO reinitialize once screenconfig is implemented-->
2684
+ <!--<div class="filter-item-wrapper">
2656
2685
  <co-catalog-filter-item [placeholder]="'ARTICLE_TYPE'"
2657
2686
  [collection]="articleTypeCollection"
2658
2687
  [mode]="modes.SelectListWithStringCollectionOutput"
2659
2688
  [(model)]="catalogSearchService.searchRequest.articleKindList"
2660
2689
  >
2661
2690
  </co-catalog-filter-item>
2662
- </div>
2691
+ </div>-->
2663
2692
  <div class="filter-item-wrapper">
2664
2693
  <co-catalog-filter-item [placeholder]="'PUBLISH_VIA'"
2665
2694
  [collection]="artPublicationCollection"
2666
2695
  [(model)]="catalogSearchService.searchRequest.publicationCode"
2667
2696
  [mode]="modes.SelectListWithNumberOutput"
2697
+ [expanded]="false"
2668
2698
  >
2669
2699
  </co-catalog-filter-item>
2670
2700
  </div>
@@ -2673,17 +2703,19 @@ CatalogFilterContentGeneralComponent.decorators = [
2673
2703
  [collection]="artPublicationSalesCollection"
2674
2704
  [(model)]="catalogSearchService.searchRequest.publicationWebshopSales"
2675
2705
  [mode]="modes.SelectListWithNumberOutput"
2706
+ [expanded]="false"
2676
2707
  >
2677
2708
  </co-catalog-filter-item>
2678
2709
  </div>
2679
- <div class="filter-item-wrapper">
2710
+ <!--TODO reinitialize once screenconfig is implemented-->
2711
+ <!--<div class="filter-item-wrapper">
2680
2712
  <co-catalog-filter-item [placeholder]="'PRICELIST_SALES'"
2681
2713
  [(model)]="catalogSearchService.searchRequest.pricelistRetail"
2682
2714
  [mode]="modes.SingleSelectList"
2683
2715
  [collection]="priceListsSalesCollection"
2684
2716
  >
2685
2717
  </co-catalog-filter-item>
2686
- </div>
2718
+ </div>-->
2687
2719
  <div class="filter-item-wrapper">
2688
2720
  <co-catalog-filter-item [placeholder]="'CATEGORY'"
2689
2721
  [(model)]="catalogSearchService.searchRequest.category"
@@ -2725,6 +2757,7 @@ class CatalogFilterItemComponent {
2725
2757
  this.placeholder = '';
2726
2758
  this.customContent = false;
2727
2759
  this.singleSelect = false;
2760
+ this.expanded = true;
2728
2761
  this.initialLimit = 10;
2729
2762
  this.sliderDefaultMin = 0;
2730
2763
  this.sliderDefaultMax = 10000;
@@ -2750,7 +2783,7 @@ CatalogFilterItemComponent.decorators = [
2750
2783
  selector: "co-catalog-filter-item",
2751
2784
  template: `
2752
2785
  <co-filter-item [placeholder]="placeholder | localize"
2753
- [expanded]="true"
2786
+ [expanded]="expanded"
2754
2787
  [customContent]="customContent"
2755
2788
  [collection]="collection"
2756
2789
  [minSearchCharsToLoadCollection]="minSearchCharsToLoadCollection"
@@ -2785,6 +2818,7 @@ CatalogFilterItemComponent.propDecorators = {
2785
2818
  placeholder: [{ type: Input }],
2786
2819
  customContent: [{ type: Input }],
2787
2820
  singleSelect: [{ type: Input }],
2821
+ expanded: [{ type: Input }],
2788
2822
  minSearchCharsToLoadCollection: [{ type: Input }],
2789
2823
  initialLimit: [{ type: Input }],
2790
2824
  sliderDefaultMin: [{ type: Input }],
@@ -3554,7 +3588,7 @@ class CatalogSearchComponent {
3554
3588
  this.showNavigation = false;
3555
3589
  this.showLandingPage = false;
3556
3590
  this.showFilter = false;
3557
- this.showViewModes = false;
3591
+ this.showViewModes = true;
3558
3592
  this.settingsChange = new EventEmitter();
3559
3593
  this.onLookAtArticleButtonClick = new EventEmitter();
3560
3594
  this.onArButtonClick = new EventEmitter();
@@ -3651,11 +3685,18 @@ CatalogSearchComponent.decorators = [
3651
3685
  <co-catalog-search-header [placeholder]="searchPlaceholder"
3652
3686
  (filterIconClick)="showFilter = !showFilter"></co-catalog-search-header>
3653
3687
  </div>
3654
- <ng-container *ngIf="showViewModes">
3655
- <button (click)="mode = 'tile'">tile</button>
3656
- <button (click)="mode = 'list'">list</button>
3657
- <button (click)="mode = 'grid'">grid</button>
3658
- </ng-container>
3688
+ <div class="view-modes-wrapper">
3689
+ <co-button
3690
+ (click)="mode = 'tile'"
3691
+ [class.selected]="mode === 'tile'"
3692
+ [iconData]="iconCacheService.getIcon(icons.ListView)">
3693
+ </co-button>
3694
+ <co-button
3695
+ (click)="mode = 'list'"
3696
+ [class.selected]="mode === 'list'"
3697
+ [iconData]="iconCacheService.getIcon(icons.ThinLines)">
3698
+ </co-button>
3699
+ </div>
3659
3700
  <co-catalog-navigation *ngIf="showNavigation"
3660
3701
  [view]="contentView"
3661
3702
  (homeClick)="handleHomeClick($event)"
@@ -4524,7 +4565,8 @@ CatalogSearchModule.decorators = [
4524
4565
  CatalogCategoriesModule,
4525
4566
  CatalogExternalSourcesModule,
4526
4567
  CatalogNavigationModule,
4527
- IconModule
4568
+ IconModule,
4569
+ ButtonModule
4528
4570
  ],
4529
4571
  declarations: [
4530
4572
  CatalogSearchComponent