ngx-render-material-forms 1.7.7 → 1.7.9

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

@@ -2867,7 +2867,12 @@ class MaterialSelectComponent extends MaterialComponent {
         // Get the current hostname
         const hostname = window.location.hostname;
         const baseApiUrl = baseUrlMapping[hostname] || null;
-        this.http.get(`${baseApiUrl}/api/VendorFormBuilder/GetVendorProducts?vendorId=${envendorId}&pageNumber=${enpageNumber}&pageSize=${enpageSize}&search=${ensearchQuery}&onlyActive=${enactive}&includeDescription=${endescription}&includeCurrencyId=${encodeIncludeCurrencyId}`, { headers }).subscribe(response => {
+        let url = `${baseApiUrl}/api/VendorFormBuilder/GetVendorProducts?vendorId=${envendorId}&pageNumber=${enpageNumber}&pageSize=${enpageSize}&search=${ensearchQuery}&onlyActive=${enactive}&includeDescription=${endescription}`;
+        // Only add includeCurrencyId if it has a valid value
+        if (encodeIncludeCurrencyId !== null && encodeIncludeCurrencyId !== undefined) {
+            url += `&includeCurrencyId=${encodeIncludeCurrencyId}`;
+        }
+        this.http.get(url, { headers }).subscribe(response => {
             if (response && response.code === 200) {
                 if (this.instance.component.key.toLowerCase() === 'vendorproductid') {
                     this.totalPages = response?.data?.totalPages;
@@ -3821,8 +3826,8 @@ class MaterialDataGridComponent extends MaterialNestedComponent {
         else {
             this.dataSource.data = instance.dataValue;
         }
-        if (this.checkSubmissionStatus && !this.hasValueAndEditMode && !this.showNewProductPicker) {
-            //this.showDataGrid = false;
+        if (this.checkSubmissionStatus && !this.hasValueAndEditMode) {
+            this.showDataGrid = false;
             this.dataSource.data = [];
         }
         else {
@@ -3869,6 +3874,7 @@ class MaterialDataGridComponent extends MaterialNestedComponent {
         this.dataSource.data = [...this.dataSource.data];
     }
     addAnother() {
+        this.showDataGrid = true;
         if (this.showNewProductPicker) {
             const diologeRef = this.dialog.open(AddOnProductsComponent, {
                 disableClose: true,
@@ -3893,6 +3899,7 @@ class MaterialDataGridComponent extends MaterialNestedComponent {
                     }
                     localStorage.setItem(`selectedProducts-${this.dealId}`, JSON.stringify(response.data.items.selectedProducts));
                     this.dataSourceNew = response.data.items.selectedProducts;
+                    this.showDataGrid = true;
                     this.instance.component.defaultValue = response.data.items.selectedProducts;
                 }
             });
@@ -3927,7 +3934,7 @@ class MaterialDataGridComponent extends MaterialNestedComponent {
         dialogRef.afterClosed().subscribe(result => {
             if (result) {
                 if (this.dataSource?.data?.length === 1 && this.checkSubmissionStatus) {
-                    //this.showDataGrid = false;
+                    this.showDataGrid = false;
                 }
                 // User confirmed, proceed with deletion
                 this.instance.removeRow(index);