From 44103b961319763ef94c0353ad257125ceb7667b Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Fri, 21 Nov 2025 07:20:26 +0100
Subject: [PATCH] improvements

---
 .../Components/Grids/MgGridBase.cs                 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/AyCode.Blazor.Components/Components/Grids/MgGridBase.cs b/AyCode.Blazor.Components/Components/Grids/MgGridBase.cs
index 8844764..1214fc4 100644
--- a/AyCode.Blazor.Components/Components/Grids/MgGridBase.cs
+++ b/AyCode.Blazor.Components/Components/Grids/MgGridBase.cs
@@ -30,8 +30,8 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
     protected bool IsFirstInitializeParameters;
     protected bool IsFirstInitializeParameterCore;
 
-    private TSignalRDataSource _dataSource = null!;
-    private List<TDataItem> _dataSourceParam = [];
+    private TSignalRDataSource? _dataSource = null!;
+    private List<TDataItem>? _dataSourceParam = [];
     private string _gridLogName;
 
     public MgGridBase() : base()
@@ -61,7 +61,7 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
         {
             _filterText = value;
 
-            if (_dataSource != null! && _dataSource.FilterText != value)
+            if (_dataSource != null && _dataSource.FilterText != value)
             {
                 _dataSource.FilterText = value;
                 ReloadDataSourceAsync().Forget();
@@ -117,7 +117,7 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
         {
             _dataSourceParam = value as List<TDataItem>;
 
-            if (_dataSource != null!) // && _dataSourceParam is List<TDataItem> workingReferenceList)
+            if (_dataSource != null) // && _dataSourceParam is List<TDataItem> workingReferenceList)
                 _dataSource.SetWorkingReferenceList(_dataSourceParam);
         }
     }
@@ -166,7 +166,7 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
 
     private Task OnDataSourceLoaded()
     {
-        Logger.Debug($"{_gridLogName} OnDataSourceLoaded; Count: {_dataSource.Count}");
+        Logger.Debug($"{_gridLogName} OnDataSourceLoaded; Count: {_dataSource?.Count}");
 
         Reload();
         //_dataSource.LoadItem(_dataSource.First().Id).Forget();
@@ -177,7 +177,9 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
     {
         if (firstRender)
         {
-            if (_dataSourceParam != null!) await _dataSource.LoadDataSource(_dataSourceParam, true, true);
+            if (_dataSource == null) return;
+
+            if (_dataSourceParam != null) await _dataSource.LoadDataSource(_dataSourceParam, true, true);
             else _dataSource.LoadDataSourceAsync(true).Forget();
         }