ngx-render-material-forms 1.3.0 → 1.3.2

package/fesm2020/ngx-render-material-forms.js

@@ -81,7 +81,7 @@ import RadioComponent from 'formiojs/components/radio/Radio.js';
 import SelectBoxesComponent from 'formiojs/components/selectboxes/SelectBoxes.js';
 import SelectComponent from 'formiojs/components/select/Select.js';
 import { Subject } from 'rxjs';
-import { debounceTime, tap, distinctUntilChanged, takeUntil } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
 import * as CryptoJS from 'crypto-js';
 import { isNullOrUndefined } from 'util';
 import * as i9 from 'ngx-mat-select-search';
@@ -2539,8 +2539,10 @@ class MaterialSelectComponent extends MaterialComponent {
         this.grail = '';
         this.productsloadingFlag = false;
         this.searching = false;
+        this.productList = [];
         // Variable to hold the reference to the current panel element
         this.currentPanelElement = null;
+        this.openCounter = 1;
         this.holy = CryptoJS.enc.Base64.parse('8F/2+T2NXqUBQERR12R4sw==');
         this.grail = CryptoJS.enc.Base64.parse('yE0CgQbYzK5wqeoKTVzhOQ==');
     }
@@ -2584,14 +2586,23 @@ class MaterialSelectComponent extends MaterialComponent {
         if (this.instance.component.key.toLowerCase() === 'vendorproductid') {
             const scrollElement = event.target;
             const trackHeight = scrollElement.scrollHeight - scrollElement.offsetHeight;
+            if (this.openCounter < 2) {
+                const retrievedObject = JSON.parse(localStorage.getItem('storageObject'));
+                this.totalPages = Number(retrievedObject?.totalPages);
+                this.productsloadingFlag = true;
+                this.productList = retrievedObject?.dataSource;
+            }
             if (this.productsloadingFlag && Math.floor(scrollElement.scrollTop / trackHeight * 100) > 50) {
                 this.productsloadingFlag = false;
+                this.openCounter = this.openCounter + 1;
                 if (this.pageNumber < this.totalPages) {
                     this.pageNumber = this.pageNumber + 1;
+                    this.searching = true;
                     this.loadData(this.pageNumber, this.pageSize, this.searchQuery);
                 }
                 else {
                     this.productsloadingFlag = true;
+                    this.searching = false;
                 }
             }
         }
@@ -2610,11 +2621,17 @@ class MaterialSelectComponent extends MaterialComponent {
         const vendorId = this.getValueByKey(paramsData, 'vendorId');
         const onlyActive = this.getValueByKey(paramsData, 'onlyActive');
         var currentUser = JSON.parse(localStorage.getItem('currentUser'));
-        var accessToken = currentUser.Tokens.AccessToken;
-        const headers = new HttpHeaders({
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer ' + accessToken
-        });
+        let headers;
+        if (currentUser && currentUser.Tokens && currentUser.Tokens.AccessToken) {
+            var accessToken = currentUser.Tokens.AccessToken;
+            headers = new HttpHeaders({
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer ' + accessToken
+            });
+        }
+        else {
+            console.error('User not authenticated or tokens missing.');
+        }
         const envendorId = this.scrumble(vendorId);
         const enpageNumber = this.scrumble(pageNumber);
         const enpageSize = this.scrumble(pageSize);
@@ -2644,25 +2661,26 @@ class MaterialSelectComponent extends MaterialComponent {
                 if (this.instance.component.key.toLowerCase() === 'vendorproductid') {
                     this.totalPages = response?.data?.totalPages;
                     const data = response.data.dataSource;
-                    const transformedData = this.transformResponseData(data);
-                    this.filteredOptionsLength = transformedData.length;
+                    this.filteredOptionsLength = data.length;
+                    if (this.productList.length > 0) {
+                        data.map(item => {
+                            return item;
+                        }).forEach(i => this.productList.push(i));
+                    }
+                    else {
+                        this.productList = data;
+                    }
                     // Update filteredOptions with transformedData
-                    this.filteredOptions = Promise.resolve(transformedData.map(item => ({
-                        label: item.label,
-                        value: item.value,
-                        date: item.date
-                    })));
+                    var allProductList = this.transformResponseData(this.productList);
+                    this.filteredOptions = Promise.resolve(allProductList);
                     this.searching = false;
-                    // Update filteredOptions with transformedData
-                    // this.filteredOptions = this.filteredOptions.then(existingOptions => {
-                    //   const newOptions = transformedData.map(item => ({
-                    //     label: item.label,
-                    //     value: item.value,
-                    //     date: item.date
-                    //   }));
-                    //   return existingOptions.concat(newOptions);
-                    // });
                     this.productsloadingFlag = true;
+                    setTimeout(() => {
+                        const ele = this.selectElem.panel.nativeElement;
+                        const trackHeight = ele.scrollHeight - ele.offsetHeight;
+                        const middlePosition = trackHeight / 2 - 50;
+                        ele.scrollTo({ top: middlePosition, behavior: 'auto' });
+                    }, 250);
                 }
             }
         });
@@ -2708,6 +2726,8 @@ class MaterialSelectComponent extends MaterialComponent {
             this.pageNumber = 1;
             this.pageSize = 20;
             this.searchQuery = '';
+            this.searching = false;
+            this.productList = [];
             this.loadData(this.pageNumber, this.pageSize, this.searchQuery);
         }
     }
@@ -2715,16 +2735,16 @@ class MaterialSelectComponent extends MaterialComponent {
         if (this.instance.component.key.toLowerCase() === 'vendorproductid') {
             this.selectElem.openedChange.subscribe((isOpen) => {
                 if (isOpen) {
-                    this.pageNumber = 1;
+                    this.pageNumber = 2;
                     this.pageSize = 20;
                     this.searchQuery = '';
-                    this.searching = true;
-                    this.loadData(this.pageNumber, this.pageSize, this.searchQuery);
+                    this.searching = false;
+                    //this.loadData(this.pageNumber, this.pageSize, this.searchQuery);
                     this.registerPanelScrollEvent(this.selectElem);
                 }
                 else {
                     this.removePanelScrollEvent();
-                    console.log('closed');
+                    this.searching = false;
                 }
             });
         }
@@ -2741,11 +2761,14 @@ class MaterialSelectComponent extends MaterialComponent {
         if (this.instance.component.key.toLowerCase() === 'vendorproductid') {
             this.websiteMultiFilterCtrl.valueChanges
                 .pipe(debounceTime(1000), // Time in milliseconds between key events
-            tap(() => this.searching = true), distinctUntilChanged(), takeUntil(this._onDestroy))
+            //  tap(() => this.searching = true),
+            distinctUntilChanged(), takeUntil(this._onDestroy))
                 .subscribe((searchQuery) => {
                 if (searchQuery != '') {
                     this.pageNumber = 1;
                     this.pageSize = 20;
+                    this.productList = [];
+                    this.searching = true;
                     this.loadData(this.pageNumber, this.pageSize, searchQuery);
                 }
             });