From ecb7f45f140035646c35cc4d6f5cc97dac880a47 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Thu, 11 Jun 2026 13:12:40 +0200
Subject: [PATCH] Refactor report creation and property initialization

Replaced nullable fields with non-nullable properties for `Report`
and `BasePdfBytes` to improve initialization and encapsulation.
Updated `OnInitializedAsync` to use `BasePdfBytes` and added
error handling for missing PDF bytes.

Refactored report creation logic by removing `BuildFreshBaseReport`
and `CreateReportInstance`, consolidating functionality into a
new `CreateReport` method. Enhanced `CreateReport` to support
both predefined and dynamically generated reports, simplifying
the code structure and improving maintainability.
---
 .../EnvelopeReceiverPage_DxReportViewer.razor | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_DxReportViewer.razor b/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_DxReportViewer.razor
index cea135a2..4c00c09d 100644
--- a/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_DxReportViewer.razor
+++ b/EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_DxReportViewer.razor
@@ -19,34 +19,37 @@
 @code {
     [Parameter] public string EnvelopeKey { get; set; } = string.Empty;
 
-    XtraReport? Report;
-    byte[]? _basePdfBytes;
+    XtraReport Report { get; set; } = null!;
+
+    byte[] BasePdfBytes { get; set; } = null!;
 
     protected override async Task OnInitializedAsync() {
         if (!AppOptions.Value.UsePredefinedReports) {
             var (pdfBytes, _) = await DocumentService.GetDocumentAsync(EnvelopeKey);
             if (pdfBytes is { Length: > 0 })
-                _basePdfBytes = pdfBytes;
+                BasePdfBytes = pdfBytes;
+            else
+                throw new InvalidOperationException($"No PDF bytes found for EnvelopeKey: {EnvelopeKey}");
         }
 
-        Report = BuildFreshBaseReport();
+        Report = CreateReport();
     }
 
-    XtraReport BuildFreshBaseReport() {
-        if (_basePdfBytes is { Length: > 0 }) {
+    XtraReport CreateReport()
+    {
+        if (AppOptions.Value.UsePredefinedReports)
+        {
+            return ReportStorage.TryGetReport("LargeDatasetReport", out var savedReport)
+                ? savedReport
+                : PredefinedReports.ReportsFactory.GetReport("LargeDatasetReport");
+        }
+        else
+        {
             var report = new XtraReport();
             var detail = new DevExpress.XtraReports.UI.DetailBand();
             report.Bands.Add(detail);
-            detail.Controls.Add(new DevExpress.XtraReports.UI.XRPdfContent { Source = _basePdfBytes, GenerateOwnPages = true });
+            detail.Controls.Add(new DevExpress.XtraReports.UI.XRPdfContent { Source = BasePdfBytes, GenerateOwnPages = true });
             return report;
         }
-        return CreateReportInstance();
     }
-
-    XtraReport CreateReportInstance() {
-        return ReportStorage.TryGetReport("LargeDatasetReport", out var savedReport)
-            ? savedReport
-            : PredefinedReports.ReportsFactory.GetReport("LargeDatasetReport");
-    }
-}
-
+}
\ No newline at end of file