Update ngx-ui-scroll for ivy distribution

paulscherrerinstitute · Feb 23, 2024 · a2419d5 · a2419d5
1 parent a0127a9
commit a2419d5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 28 deletions.
diff --git a/scilog/package-lock.json b/scilog/package-lock.json
diff --git a/scilog/package.json b/scilog/package.json
@@ -34,12 +34,13 @@
     "ng2-charts": "^4.1.1",
     "ngx-cookie-service": "^14.0.1",
     "ngx-jdenticon": "^1.0.4",
-    "ngx-ui-scroll": "^1.11.0-rc.1",
+    "ngx-ui-scroll": "^3.2.0-beta.2",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "prismjs": "^1.28.0",
     "prismjs-components-importer": "^0.2.0",
     "rxjs": "^7.8.0",
     "stream-browserify": "^3.0.0",
+    "vscroll": "^1.6.0-beta.4",
     "webpack": "^5.70.0",
     "zone.js": "~0.11.4"
   },

diff --git a/scilog/src/app/logbook/core/scroll-base.service.ts b/scilog/src/app/logbook/core/scroll-base.service.ts
@@ -70,7 +70,7 @@ export class ScrollBaseService {
   }
 
   remove(id: string) {
-    this.datasource.adapter.remove({ predicate: ({ data }) => data.id === id });
+    this.datasource.adapter.remove({ predicate: ({ data }) => (data as {id: string}).id === id });
   }
 
   reset() {

diff --git a/scilog/src/app/overview/logbook-icon-scroll-service.service.spec.ts b/scilog/src/app/overview/logbook-icon-scroll-service.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { LogbookDataService } from '@shared/remote-data.service';
 
 import { LogbookIconScrollService } from './logbook-icon-scroll-service.service';
-import { AdapterMethodResult, IDatasource } from 'ngx-ui-scroll/src/component/interfaces';
+import { IDatasource } from 'ngx-ui-scroll';
 
 describe('LogbookIconScrollServiceService', () => {
   let service: LogbookIconScrollService;
@@ -24,7 +24,7 @@ describe('LogbookIconScrollServiceService', () => {
   });
 
   it('should test getData', async () => {
-    service['datasource'] = {adapter: {relax: async () => ({} as AdapterMethodResult)}} as IDatasource;
+    service['datasource'] = {adapter: {relax: async () => ({})}} as IDatasource;
     expect(await service.getData(0, 10, {})).toEqual([[1, 2, 3], [4, 5, 6], [7]]);
   });