[HIMA-328] applyed fixes for the remission list scrolling

2025-12-28 22:42:11 +01:00 · 2019-11-25 12:09:56 +01:00
parent c5b85ff2bb
commit 1300c38ae0
11 changed files with 126 additions and 354 deletions
--- a/apps/sales/src/app/modules/remission/components/remission-filter-item/remission-filter-item.component.html
+++ b/apps/sales/src/app/modules/remission/components/remission-filter-item/remission-filter-item.component.html
@@ -4,7 +4,7 @@
    <lib-icon class="icon" [rotateBackwards]="expanded" transition="all 0.2s linear" width="17px" name="Arrow_Down_2_branch"></lib-icon>
  </div>
 </div>
-<div class="options" [style.top]="optionsTopPosition" *ngIf="expanded" [@fadeIn]="expanded">
+<div id="options" class="options" [style.top]="optionsTopPosition" *ngIf="expanded" [@fadeIn]="expanded">
  <ng-container *ngFor="let option of filter.options">
    <div class="option" [ngClass]="{ selected: isFirstLevelItemSelected(hasGrouping ? option.name : option.id) }">
      <span class="check-icon" (click)="toggleFirstLevelItem(hasGrouping ? option.name : option)">
--- a/apps/sales/src/app/modules/remission/components/remission-filter-item/remission-filter-item.component.ts
+++ b/apps/sales/src/app/modules/remission/components/remission-filter-item/remission-filter-item.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, Output, EventEmitter, OnDestroy } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { Filter, FilterOption } from '@isa/remission';
 import { fadeInAnimation } from '../../animations/fadeIn.animation';
 import { growShrinkAnimation } from '../../animations/grow-shrink.animation';
@@ -38,7 +38,7 @@ export class RemissionFilterItemComponent implements OnInit, OnDestroy {
    return value + 'px';
  }

-  constructor(private store: Store, private remissionHelper: RemissionHelperService) {}
+  constructor(private store: Store, private remissionHelper: RemissionHelperService, private cdrf: ChangeDetectorRef) {}

  ngOnInit() {
    this.areFilterOptionsGoups(this.filter);
@@ -105,6 +105,7 @@ export class RemissionFilterItemComponent implements OnInit, OnDestroy {
    this.expanded = false;
    this.store.dispatch(new SetRemissionFilters([...this.selectedGroups], [...this.selectedOptions], this.remissionResourceType));
    this.remissionHelper.updateFilters({ filterId: this.filter.id, options: this.selectedOptions });
+    this.remissionHelper.setFilterHeight(0);
  }

  uncheckGroupOfOption(option: FilterOption) {
@@ -281,6 +282,25 @@ export class RemissionFilterItemComponent implements OnInit, OnDestroy {
    if (this.expanded) {
      this.closeOtherFilters.emit(this.filter.id);
    }
+    this.setFilterHeight(this.expanded);
+  }
+
+  setFilterHeight(expanded: boolean) {
+    this.cdrf.detectChanges();
+    setTimeout(() => {
+      if (expanded) {
+        const options = document.getElementById('options');
+        if (options) {
+          const height = options.getBoundingClientRect().height;
+          console.log('SetFilterHeight: ' + height);
+          this.remissionHelper.setFilterHeight(height);
+        } else {
+          this.remissionHelper.setFilterHeight(0);
+        }
+      } else {
+        this.remissionHelper.setFilterHeight(0);
+      }
+    });
  }

  public closeNotCurrentFilters(id: string) {
--- a/apps/sales/src/app/modules/remission/components/remission-list/remission-list.component.html
+++ b/apps/sales/src/app/modules/remission/components/remission-list/remission-list.component.html
@@ -1,6 +1,7 @@
 <div
  id="result-container"
  class="result-container"
+  [style.height.px]="containerHeight"
  [ngClass]="{
    empty: ds && ds.allHits === 0 && started,
    'one-item': ds && ds.allHits === 1 && started,
--- a/apps/sales/src/app/modules/remission/components/remission-list/remission-list.component.scss
+++ b/apps/sales/src/app/modules/remission/components/remission-list/remission-list.component.scss
@@ -1,5 +1,4 @@
 .result-container {
-  height: 810px;
  &.empty {
    height: 5px;
  }
--- a/apps/sales/src/app/modules/remission/components/remission-list/remission-list.component.ts
+++ b/apps/sales/src/app/modules/remission/components/remission-list/remission-list.component.ts
@@ -30,6 +30,7 @@ export class RemissionListComponent implements OnInit, OnDestroy {
  prevRangeEnd: number;
  showScrollOverlay = false;
  stopListScrolling = true;
+  containerHeight = 810;
  prevListTop = 0;

  constructor(
@@ -40,6 +41,7 @@ export class RemissionListComponent implements OnInit, OnDestroy {
  ) {}

  ngOnInit() {
+    this.subscribeToFilterHeightChanges();
    this.subscribeToListSrollEvents();
  }

@@ -88,6 +90,7 @@ export class RemissionListComponent implements OnInit, OnDestroy {
  }

  public subscribeToProducts() {
+    console.log('subscribed to products');
    this.remissionHelper.loadRemissionListProducts$
      .pipe(
        filter(data => !isNullOrUndefined(data)),
@@ -101,6 +104,7 @@ export class RemissionListComponent implements OnInit, OnDestroy {
  }

  public unsubscribeToProducts() {
+    console.log('subscribed to products');
    this.destroy$.next();
    this.subscribedToProducts = false;
    this.ds = null;
@@ -111,4 +115,21 @@ export class RemissionListComponent implements OnInit, OnDestroy {
      this.ds = new RemissionListDataSource(this.remisssionService, this.remissionHelper, this.store, this.remissionProcesessId);
    }
  }
+
+  subscribeToFilterHeightChanges() {
+    console.log('subscribed to filter heights changes');
+    this.remissionHelper.filterHeight$
+      .pipe(
+        filter(data => !isNullOrUndefined(data)),
+        takeUntil(this.destroy$)
+      )
+      .subscribe(height => {
+        console.log('Height', height);
+        if (height === 0 || height < 810) {
+          this.containerHeight = 810;
+        } else {
+          this.containerHeight = height;
+        }
+      });
+  }
 }
--- a/apps/sales/src/app/modules/remission/components/remission-list/remission-list.datasource.ts
+++ b/apps/sales/src/app/modules/remission/components/remission-list/remission-list.datasource.ts
@@ -157,6 +157,7 @@ export class RemissionListDataSource extends DataSource<RemissionProduct | undef
    remissionSearch$
      .pipe(take(1))
      .subscribe((result: { skip?: number; take?: number; hits?: number; items: RemissionProduct[]; completed: boolean }) => {
+        console.log(result);
        this.loading = false;
        this.results = true;
        const products = [...result.items];
--- a/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts
+++ b/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts
@@ -253,7 +253,6 @@ export class RemissionListCreateComponent implements OnInit, OnDestroy, AfterVie
    }
    this.store.dispatch(new SetRemissionProcess(remissionProcess));
    this.remissionHelper.loadRemissionListProducts(remissionProcess.id);
-    console.log('subscribed to products');
    const isSubscribetToProducts = this.remissionList.subscribedToProducts;
    if (!isSubscribetToProducts) {
      this.remissionProductsSubscription();
--- a/apps/sales/src/app/modules/remission/pages/remission-list-started/remission-list-started.component.ts
+++ b/apps/sales/src/app/modules/remission/pages/remission-list-started/remission-list-started.component.ts
@@ -252,7 +252,10 @@ export class RemissionListStartedComponent implements OnInit, OnDestroy {
    this.selectedSupplier = remissionProcess.filter.target.name === this.suppliers.leftSupplier.name ? Side.LEFT : Side.RIGHT;
    this.store.dispatch(new SetRemissionProcess(remissionProcess));
    this.remissionHelper.loadRemissionListProducts(remissionProcess.id);
-    this.remissionProductsSubscription();
+    const isSubscribetToProducts = this.remissionList.subscribedToProducts;
+    if (!isSubscribetToProducts) {
+      this.remissionProductsSubscription();
+    }
    // TODO: remove console logging
    console.log('remission subscribed', remissionProcess);
  };
@@ -297,13 +300,22 @@ export class RemissionListStartedComponent implements OnInit, OnDestroy {
    const noOptionsForOverflowSelected =
      this.selectedRemissionResourceType === RemissionResourceType.Overflow && options && options.length < 1;
    if (isProcessUpdated && !noOptionsForOverflowSelected) {
-      this.remissionListHits = null;
-      this.listLoaded = false;
-      this.cdrf.detectChanges();
+      setTimeout(() => {
+        this.remissionListHits = null;
+        this.listLoaded = false;
+        this.cdrf.detectChanges();
+      });
      this.remissionList.subscribeToProducts();
      setTimeout(() => {
        this.listLoaded = true;
      });
+    } else if (noOptionsForOverflowSelected) {
+      setTimeout(() => {
+        this.remissionListHits = null;
+        this.listLoaded = false;
+        this.cdrf.detectChanges();
+      });
+      this.remissionList.unsubscribeToProducts();
    }
  }

--- a/apps/sales/src/app/modules/remission/services/remission-helper.service.ts
+++ b/apps/sales/src/app/modules/remission/services/remission-helper.service.ts
@@ -18,6 +18,7 @@ export class RemissionHelperService {
  deleteRemissionListItem$ = new Subject<RemissionProduct>();
  addRemissionListItem$ = new Subject<RemissionProduct>();
  updateRemissionListItem$ = new Subject<{ quantity: number; product: RemissionProduct }>();
+  filterHeight$ = new BehaviorSubject<number>(null);
  constructor() {}

  public deleteFilterOption = (option: FilterOption) => this.filteOptionsDeleteEvents$.next(option);
@@ -31,4 +32,5 @@ export class RemissionHelperService {
  public addRemissionListItem = (remissionProduct: RemissionProduct) => this.addRemissionListItem$.next(remissionProduct);
  public updateRemissionListItem = (quantity: number, product: RemissionProduct) =>
    this.updateRemissionListItem$.next({ quantity: quantity, product: product });
+  public setFilterHeight = (height: number) => this.filterHeight$.next(height);
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1039,161 +1039,67 @@
      }
    },
    "@cmf/catalog-api": {
-      "version": "0.1.4",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.4.tgz",
-      "integrity": "sha1-Zx/SX/5hVeKqQBWAxxfUFh8+9gk=",
+      "version": "0.1.8",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.8.tgz",
+      "integrity": "sha1-U0sNLVzptjXl1PFY3HuzEGR/66g=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@cmf/core": {
-      "version": "0.1.4",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.4.tgz",
-      "integrity": "sha1-RE5rWb2Yz0aWKk+NmftqMXnAVPY=",
+      "version": "0.1.8",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.8.tgz",
+      "integrity": "sha1-VUspqHh0s0ZD83MNkEJ0Wth58bk=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@cmf/inventory-api": {
-      "version": "0.1.4",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.4.tgz",
-      "integrity": "sha1-7+svFOk3KYGD8lAWRosr40pBvQc=",
+      "version": "0.1.8",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.8.tgz",
+      "integrity": "sha1-zQ3Kr7NfZEq/MsHjyx7rJEeVkTM=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@cmf/trade-api": {
-      "version": "0.1.4",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.4.tgz",
-      "integrity": "sha1-gNagHmzSwR+AwVGtoh2Y6uuICmM=",
+      "version": "0.1.8",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.8.tgz",
+      "integrity": "sha1-T2JjckMZL3t62i32oqOWm2YbF9I=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@isa/catsearch-api": {
-      "version": "0.0.16",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/catsearch-api/-/catsearch-api-0.0.16.tgz",
-      "integrity": "sha1-5I5RmWChfTmvGeY89KKQdEHc/rc=",
+      "version": "0.0.25",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/catsearch-api/-/catsearch-api-0.0.25.tgz",
+      "integrity": "sha1-qZf5/X0FAxA+TH6RseqVvxakoXM=",
      "requires": {
-        "@cmf/catalog-api": "0.1.4",
-        "@cmf/core": "0.1.4",
-        "@cmf/trade-api": "0.1.4",
        "tslib": "^1.9.0"
      }
    },
    "@isa/print-api": {
-      "version": "0.0.16",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/print-api/-/print-api-0.0.16.tgz",
-      "integrity": "sha1-ZhS9OFbpbzCGWvD0rjp8XrvMQW4=",
+      "version": "0.0.25",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/print-api/-/print-api-0.0.25.tgz",
+      "integrity": "sha1-Nd1xpxsVHfL6f+Xs5ZebMKkwHwM=",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@isa/remi-api": {
-      "version": "0.0.16",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remi-api/-/remi-api-0.0.16.tgz",
-      "integrity": "sha1-zU+3oCUFOSU4WOm+gc1VH1DcgXM=",
+      "version": "0.0.25",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remi-api/-/remi-api-0.0.25.tgz",
+      "integrity": "sha1-FJoIcE83XbTF1bmlDTJfDZ8N8M8=",
      "requires": {
-        "@cmf/core": "0.1.4",
-        "@cmf/inventory-api": "0.1.4",
-        "@cmf/trade-api": "0.1.4",
        "tslib": "^1.9.0"
      }
    },
    "@isa/remission": {
-      "version": "0.1.6",
-      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.1.6.tgz",
-      "integrity": "sha1-X3Z/z9FKcOdGpLcXxB55W//vxJI=",
+      "version": "0.1.7",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.1.7.tgz",
+      "integrity": "sha1-QTIxvC4zmYJtSsXJ5GDo+e5yOfI=",
      "requires": {
-        "@isa/catsearch-api": "0.0.21",
-        "@isa/print-api": "0.0.21",
-        "@isa/remi-api": "0.0.21",
-        "deep-equal": "^1.1.0",
-        "tslib": "^1.9.0",
-        "uuid": "^3.3.3"
-      },
-      "dependencies": {
-        "@cmf/catalog-api": {
-          "version": "0.1.8",
-          "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.8.tgz",
-          "integrity": "sha1-U0sNLVzptjXl1PFY3HuzEGR/66g=",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "@cmf/core": {
-          "version": "0.1.8",
-          "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.8.tgz",
-          "integrity": "sha1-VUspqHh0s0ZD83MNkEJ0Wth58bk=",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "@cmf/inventory-api": {
-          "version": "0.1.8",
-          "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.8.tgz",
-          "integrity": "sha1-zQ3Kr7NfZEq/MsHjyx7rJEeVkTM=",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "@cmf/trade-api": {
-          "version": "0.1.8",
-          "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.8.tgz",
-          "integrity": "sha1-T2JjckMZL3t62i32oqOWm2YbF9I=",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "@isa/catsearch-api": {
-          "version": "0.0.21",
-          "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/catsearch-api/-/catsearch-api-0.0.21.tgz",
-          "integrity": "sha1-gXx9f4fQI28BoPx71k/t1KPEvSk=",
-          "requires": {
-            "@cmf/catalog-api": "0.1.8",
-            "@cmf/core": "0.1.8",
-            "@cmf/trade-api": "0.1.8",
-            "tslib": "^1.9.0"
-          }
-        },
-        "@isa/print-api": {
-          "version": "0.0.21",
-          "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/print-api/-/print-api-0.0.21.tgz",
-          "integrity": "sha1-8+5VXRjPtKSWoABzxpx+2uuZ0eU=",
-          "requires": {
-            "@cmf/core": "0.1.8",
-            "tslib": "^1.9.0"
-          }
-        },
-        "@isa/remi-api": {
-          "version": "0.0.21",
-          "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remi-api/-/remi-api-0.0.21.tgz",
-          "integrity": "sha1-s5fJ0VccP1plbKo/XJcf/aFgt/A=",
-          "requires": {
-            "@cmf/core": "0.1.8",
-            "@cmf/inventory-api": "0.1.8",
-            "@cmf/trade-api": "0.1.8",
-            "tslib": "^1.9.0"
-          }
-        },
-        "deep-equal": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-          "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-          "requires": {
-            "is-arguments": "^1.0.4",
-            "is-date-object": "^1.0.1",
-            "is-regex": "^1.0.4",
-            "object-is": "^1.0.1",
-            "object-keys": "^1.1.1",
-            "regexp.prototype.flags": "^1.2.0"
-          }
-        },
-        "uuid": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-          "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
-        }
+        "tslib": "^1.9.0"
      }
    },
    "@ngtools/json-schema": {
@@ -2128,27 +2034,11 @@
        "babel-runtime": "^6.22.0"
      }
    },
-    "babel-polyfill": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
-      "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.10.0"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.10.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
-        }
-      }
-    },
    "babel-runtime": {
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
      "requires": {
        "core-js": "^2.4.0",
        "regenerator-runtime": "^0.11.0"
@@ -2883,6 +2773,7 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
      "requires": {
        "restore-cursor": "^2.0.0"
      }
@@ -2890,7 +2781,8 @@
    "cli-width": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
    },
    "cliui": {
      "version": "3.2.0",
@@ -3484,14 +3376,6 @@
        }
      }
    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
    "define-property": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -3837,6 +3721,7 @@
      "version": "0.1.12",
      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "dev": true,
      "requires": {
        "iconv-lite": "~0.4.13"
      }
@@ -4316,6 +4201,7 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
      "requires": {
        "escape-string-regexp": "^1.0.5"
      }
@@ -5046,11 +4932,6 @@
        "rimraf": "2"
      }
    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
    "gauge": {
      "version": "2.7.4",
      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -5261,14 +5142,6 @@
        "har-schema": "^2.0.0"
      }
    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
    "has-ansi": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -5526,6 +5399,7 @@
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
      "requires": {
        "safer-buffer": ">= 2.1.2 < 3"
      }
@@ -5847,11 +5721,6 @@
        }
      }
    },
-    "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
-    },
    "is-arrayish": {
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -5905,11 +5774,6 @@
        }
      }
    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-    },
    "is-descriptor": {
      "version": "0.1.6",
      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -6048,7 +5912,8 @@
    "is-promise": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
    },
    "is-redirect": {
      "version": "1.0.0",
@@ -6056,14 +5921,6 @@
      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
      "dev": true
    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
    "is-retry-allowed": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
@@ -6073,7 +5930,8 @@
    "is-stream": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
    },
    "is-typedarray": {
      "version": "1.0.0",
@@ -7308,7 +7166,8 @@
    "mimic-fn": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
    },
    "mini-css-extract-plugin": {
      "version": "0.5.0",
@@ -7472,7 +7331,8 @@
    "mute-stream": {
      "version": "0.0.7",
      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
    },
    "nan": {
      "version": "2.12.1",
@@ -7665,11 +7525,11 @@
      }
    },
    "ngx-infinite-scroll": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-7.0.1.tgz",
-      "integrity": "sha512-be9DAAuabV7VGI06/JUnS6pXC6mcBOzA4+SBCwOcP9WwJ2r5GjdZyOa34ls9hi1MnCOj3zrXLvPKQ/UDp6csIw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-7.2.0.tgz",
+      "integrity": "sha512-EcqjKpU1ukRV3YXOW8cTVtbzPpa9UPaRtYBCg0ZQH3ceCDm+xzLbd4pXy6oKAIN4zN1r/pyGuf5XOJkA8vr6yg==",
      "requires": {
-        "opencollective": "^1.0.3"
+        "opencollective-postinstall": "^2.0.2"
      }
    },
    "ngx-toggle-switch": {
@@ -7683,15 +7543,6 @@
      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
      "dev": true
    },
-    "node-fetch": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz",
-      "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=",
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
    "node-fetch-npm": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
@@ -8036,16 +7887,6 @@
        }
      }
    },
-    "object-is": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
    "object-visit": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -8100,6 +7941,7 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
      "requires": {
        "mimic-fn": "^1.0.0"
      }
@@ -8122,131 +7964,10 @@
        "is-wsl": "^1.1.0"
      }
    },
-    "opencollective": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz",
-      "integrity": "sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=",
-      "requires": {
-        "babel-polyfill": "6.23.0",
-        "chalk": "1.1.3",
-        "inquirer": "3.0.6",
-        "minimist": "1.2.0",
-        "node-fetch": "1.6.3",
-        "opn": "4.0.2"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "chardet": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-          "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
-        },
-        "external-editor": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-          "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
-          "requires": {
-            "chardet": "^0.4.0",
-            "iconv-lite": "^0.4.17",
-            "tmp": "^0.0.33"
-          }
-        },
-        "inquirer": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
-          "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
-          "requires": {
-            "ansi-escapes": "^1.1.0",
-            "chalk": "^1.0.0",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^2.0.1",
-            "figures": "^2.0.0",
-            "lodash": "^4.3.0",
-            "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rx": "^4.1.0",
-            "string-width": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "through": "^2.3.6"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        },
-        "opn": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
-          "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
-          "requires": {
-            "object-assign": "^4.0.1",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
-      }
-    },
    "opencollective-postinstall": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
-      "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==",
-      "dev": true
+      "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw=="
    },
    "opn": {
      "version": "5.5.0",
@@ -9332,7 +9053,8 @@
    "regenerator-runtime": {
      "version": "0.11.1",
      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
    },
    "regex-not": {
      "version": "1.0.2",
@@ -9343,14 +9065,6 @@
        "safe-regex": "^1.1.0"
      }
    },
-    "regexp.prototype.flags": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
-      "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
-      "requires": {
-        "define-properties": "^1.1.2"
-      }
-    },
    "regexpu-core": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
@@ -9506,6 +9220,7 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
      "requires": {
        "onetime": "^2.0.0",
        "signal-exit": "^3.0.2"
@@ -9649,6 +9364,7 @@
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
      "requires": {
        "is-promise": "^2.1.0"
      }
@@ -9662,11 +9378,6 @@
        "aproba": "^1.1.1"
      }
    },
-    "rx": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I="
-    },
    "rxjs": {
      "version": "6.4.0",
      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -11062,7 +10773,8 @@
    "through": {
      "version": "2.3.8",
      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
    },
    "through2": {
      "version": "2.0.5",
@@ -11099,6 +10811,7 @@
      "version": "0.0.33",
      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
      "requires": {
        "os-tmpdir": "~1.0.2"
      }
--- a/package.json
+++ b/package.json
@@ -31,10 +31,14 @@
    "@angular/pwa": "^0.13.4",
    "@angular/router": "~7.2.12",
    "@angular/service-worker": "~7.2.12",
-    "@isa/catsearch-api": "0.0.16",
-    "@isa/print-api": "0.0.16",
-    "@isa/remi-api": "0.0.16",
-    "@isa/remission": "^0.1.6",
+    "@cmf/catalog-api": "^0.1.8",
+    "@cmf/core": "^0.1.8",
+    "@cmf/inventory-api": "^0.1.8",
+    "@cmf/trade-api": "^0.1.8",
+    "@isa/catsearch-api": "^0.0.25",
+    "@isa/print-api": "^0.0.25",
+    "@isa/remi-api": "^0.0.25",
+    "@isa/remission": "^0.1.7",
    "@ngxs/store": "^3.4.1",
    "@types/faker": "^4.1.5",
    "@zxing/ngx-scanner": "^1.3.0",
@@ -46,7 +50,7 @@
    "hammerjs": "^2.0.8",
    "ng-circle-progress": "^1.4.0",
    "ng-connection-service": "^1.0.4",
-    "ngx-infinite-scroll": "^7.0.1",
+    "ngx-infinite-scroll": "^7.2.0",
    "ngx-toggle-switch": "^2.0.5",
    "node-sass": "^4.12.0",
    "rxjs": "~6.4.0",