@visns-studio/visns-components 5.15.1 → 5.15.2

package/package.json

@@ -90,7 +90,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.15.1",
+    "version": "5.15.2",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/generic/GenericQuote.jsx

@@ -592,14 +592,9 @@ function GenericQuote({ logo, setting, urlParam, proposalConfig = null }) {
                         console.log('Saved template ID not found in available templates:', data.proposal_template_id);
                     }
                 } else {
-                    // Set default template if no saved template and available
-                    const defaultTemplate = templates.find(
-                        t => t.label?.includes('Standard') || t.label?.includes('Default')
-                    );
-                    if (defaultTemplate) {
-                        console.log('Setting default template:', defaultTemplate);
-                        setSelectedTemplate(defaultTemplate.id);
-                    }
+                    // Leave template unselected if no saved template
+                    console.log('No saved template found, leaving unselected');
+                    setSelectedTemplate(null);
                 }
                 
                 console.log('Templates successfully loaded:', templates.length, 'templates');
@@ -833,13 +828,22 @@ function GenericQuote({ logo, setting, urlParam, proposalConfig = null }) {
     };
 
     const generateProposalPDF = async () => {
+        console.log('generateProposalPDF - Starting', {
+            selectedTemplate,
+            hasSelectedTemplate: !!selectedTemplate,
+            dataId: data.id,
+            proposalTemplateId: data.proposal_template_id,
+        });
+
         if (!selectedTemplate) {
+            console.error('generateProposalPDF - No template selected');
             toast.error('Please select a template first');
             return;
         }
 
         setIsGeneratingProposal(true);
         const toastId = toast.loading('Generating proposal PDF...');
+        console.log('generateProposalPDF - Toast created', { toastId });
 
         try {
             const proposalData = {
@@ -889,45 +893,79 @@ function GenericQuote({ logo, setting, urlParam, proposalConfig = null }) {
                 orientation: 'portrait'
             };
 
-            // Create a form for file download
-            const form = document.createElement('form');
-            form.method = 'POST';
-            form.action = `/ajax/quotes/${data.id}/generate-proposal`;
-            form.style.display = 'none';
+            console.log('generateProposalPDF - Proposal data prepared', {
+                proposalDataKeys: Object.keys(proposalData.proposal_data),
+                templateId: proposalData.template_id,
+                filename: proposalData.filename,
+                dataLength: JSON.stringify(proposalData.proposal_data).length,
+            });
 
-            // Add CSRF token
+            // Use fetch + file-saver for clean PDF download
             const csrfToken = document.querySelector('meta[name="csrf-token"]')?.getAttribute('content');
-            if (csrfToken) {
-                const csrfInput = document.createElement('input');
-                csrfInput.type = 'hidden';
-                csrfInput.name = '_token';
-                csrfInput.value = csrfToken;
-                form.appendChild(csrfInput);
+            console.log('generateProposalPDF - CSRF token', { 
+                hasToken: !!csrfToken,
+                tokenLength: csrfToken?.length || 0 
+            });
+
+            if (!csrfToken) {
+                console.error('generateProposalPDF - No CSRF token found!');
+                throw new Error('CSRF token not found');
             }
 
-            // Add proposal data as hidden input
-            const dataInput = document.createElement('input');
-            dataInput.type = 'hidden';
-            dataInput.name = 'proposal_data';
-            dataInput.value = JSON.stringify(proposalData.proposal_data);
-            form.appendChild(dataInput);
-
-            const templateInput = document.createElement('input');
-            templateInput.type = 'hidden';
-            templateInput.name = 'template_id';
-            templateInput.value = selectedTemplate;
-            form.appendChild(templateInput);
-
-            const filenameInput = document.createElement('input');
-            filenameInput.type = 'hidden';
-            filenameInput.name = 'filename';
-            filenameInput.value = proposalData.filename;
-            form.appendChild(filenameInput);
-
-            // Submit form to trigger download
-            document.body.appendChild(form);
-            form.submit();
-            document.body.removeChild(form);
+            console.log('generateProposalPDF - Making fetch request with FormData...');
+
+            // Create FormData for the request
+            const formData = new FormData();
+            formData.append('_token', csrfToken);
+            formData.append('proposal_data', JSON.stringify(proposalData.proposal_data));
+            formData.append('template_id', selectedTemplate);
+            formData.append('filename', proposalData.filename);
+            formData.append('download', 'false'); // Use stream instead of download for AJAX
+
+            console.log('generateProposalPDF - FormData prepared');
+
+            const response = await fetch(`/ajax/quotes/${data.id}/generate-proposal`, {
+                method: 'POST',
+                headers: {
+                    'X-Requested-With': 'XMLHttpRequest',
+                    // Don't set Content-Type for FormData - browser sets it automatically
+                },
+                body: formData,
+            });
+
+            console.log('generateProposalPDF - Fetch response received', {
+                status: response.status,
+                statusText: response.statusText,
+                contentType: response.headers.get('content-type'),
+                ok: response.ok,
+            });
+
+            if (!response.ok) {
+                let errorText = 'Unknown error';
+                try {
+                    errorText = await response.text();
+                } catch (e) {
+                    console.error('Failed to read error response', e);
+                }
+                console.error('generateProposalPDF - Server error response', {
+                    status: response.status,
+                    statusText: response.statusText,
+                    errorText,
+                });
+                throw new Error(`Server error: ${response.status} - ${errorText}`);
+            }
+
+            console.log('generateProposalPDF - Converting response to blob...');
+            const blob = await response.blob();
+            
+            console.log('generateProposalPDF - Blob created', {
+                size: blob.size,
+                type: blob.type,
+            });
+
+            // Use file-saver to download the PDF
+            saveAs(blob, proposalData.filename);
+            console.log('generateProposalPDF - File saved using saveAs');
 
             toast.update(toastId, {
                 render: 'Proposal PDF download started',
@@ -937,7 +975,13 @@ function GenericQuote({ logo, setting, urlParam, proposalConfig = null }) {
                 closeButton: true,
             });
         } catch (error) {
-            console.error('Error generating proposal PDF:', error);
+            console.error('generateProposalPDF - Exception caught', {
+                error: error,
+                errorMessage: error.message,
+                errorStack: error.stack,
+                selectedTemplate,
+                dataId: data.id,
+            });
             toast.update(toastId, {
                 render: 'Failed to generate proposal PDF: ' + error.message,
                 type: 'error',
@@ -946,6 +990,7 @@ function GenericQuote({ logo, setting, urlParam, proposalConfig = null }) {
                 closeButton: true,
             });
         } finally {
+            console.log('generateProposalPDF - Finally block, setting isGeneratingProposal to false');
             setIsGeneratingProposal(false);
         }
     };