ngx-render-material-forms 2.2.9 → 2.3.0

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

@@ -2680,7 +2680,11 @@ class CommonService {
         const baseApiUrl = this.getBaseApiUrl();
         const vendorId = this.getValueByKey(this.paramsData, 'vendorId');
         const programId = this.getValueByKey(this.paramsData, 'programId');
-        return this.http.get(`${baseApiUrl}/api/VendorFormBuilder/GetVendorProductsV2?vendorId=${vendorId}&pageNumber=${pageNumber}&pageSize=${pazeSize}&search=${search}&onlyActive=${onlyActive}&includeDescription=${description}&levelOne=${levelOneId}&levelTwo=${levelTwoId}&levelThree=${levelThreeId}&levelFour=${levelFourId}&programId=${programId}`);
+        let apiUrl = `${baseApiUrl}/api/VendorFormBuilder/GetVendorProductsV2?vendorId=${vendorId}&pageNumber=${pageNumber}&pageSize=${pazeSize}&search=${search}&onlyActive=${onlyActive}&includeDescription=${description}&levelOne=${levelOneId}&levelTwo=${levelTwoId}&levelThree=${levelThreeId}&levelFour=${levelFourId}`;
+        if (programId) {
+            apiUrl += `&programId=${programId}`;
+        }
+        return this.http.get(apiUrl);
     }
     listSubCategory(category) {
         const vendorId = this.getValueByKey(this.paramsData, 'vendorId');
@@ -2925,7 +2929,10 @@ class MaterialSelectComponent extends MaterialComponent {
         // Get the current hostname
         const hostname = window.location.hostname;
         const baseApiUrl = baseUrlMapping[btoa(hostname)] || null;
-        let url = `${baseApiUrl}/api/VendorFormBuilder/GetVendorProducts?vendorId=${envendorId}&pageNumber=${enpageNumber}&pageSize=${enpageSize}&search=${ensearchQuery}&onlyActive=${enactive}&includeDescription=${endescription}&programId=${enprogramId}`;
+        let url = `${baseApiUrl}/api/VendorFormBuilder/GetVendorProducts?vendorId=${envendorId}&pageNumber=${enpageNumber}&pageSize=${enpageSize}&search=${ensearchQuery}&onlyActive=${enactive}&includeDescription=${endescription}`;
+        if (enprogramId && programId) {
+            url += `&programId=${enprogramId}`;
+        }
         // Only add includeCountryId if it has a valid value
         if (encodeIncludeCountry !== null && encodeIncludeCountry !== undefined && this.isFilterProductBasedOnCustomerCountryValid(this.instance.component.data)) {
             url += `&filterProductBasedOnCustomerCountry=${encodeIncludeCountry}`;
@@ -4069,6 +4076,8 @@ class AddOnProductsComponent {
     }
     updateActiveFiltersCount() {
         this.activeFiltersCount = 0;
+        if (this.searchQuery !== '')
+            this.activeFiltersCount++;
         if (this.form.get('dropdownLevel1').value)
             this.activeFiltersCount++;
         if (this.form.get('dropdownLevel2').value)
@@ -4107,14 +4116,17 @@ class AddOnProductsComponent {
         this.levelFourId = 0;
         this.pageNumber = 1;
         this.pageSize = 20;
+        this.form.controls['searchProductName'].setValue('');
+        this.searchQuery = '';
+        this.dataSource.data = [];
+        this.spinnerFlag = false;
         this.updateActiveFiltersCount();
-        if (this.searchQuery === '') {
-            this.dataSource.data = [];
-            this.spinnerFlag = false;
-        }
-        else {
-            this.getProducts(false);
-        }
+        // if (this.searchQuery === '') {
+        //   this.dataSource.data = [];
+        //   this.spinnerFlag = false;
+        // } else {
+        //   this.getProducts(false);
+        // }
     }
     shouldResetTable(search, levelOneId, levelTwoId, levelThreeId, levelFourId) {
         return search === '' && levelOneId === 0 && levelTwoId === 0 && levelThreeId === 0 && levelFourId === 0;