Merge pull request #123 from TheAxelander/121_122_fix_import

Merge changes for version 1.6.2
TheAxelander · Jan 11, 2023 · 16e8bb6 · 16e8bb6
2 parents 183d863 + 177e4b5
commit 16e8bb6
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.6.2 (2023-01-11)
+
+* [Fixed] Due to implemented fix for [#114](https://github.com/TheAxelander/OpenBudgeteer/issues/114) Column mapping on Import Page was not working properly [#121](https://github.com/TheAxelander/OpenBudgeteer/issues/121) [#122](https://github.com/TheAxelander/OpenBudgeteer/issues/122)
+
 ### 1.6.1 (2022-12-31)
 
 * [Changed] Slight visual changes for Mapping Rule modification

diff --git a/OpenBudgeteer.Blazor/Pages/Import.razor b/OpenBudgeteer.Blazor/Pages/Import.razor
@@ -63,7 +63,7 @@
 				        <label class="form-label">Import Profile:</label>
                         <ObjectSelect
                             GetSelectedItemIdHandler="@(e => e.ImportProfileId.ToString())"
-                            SetSelectedItemHandler="@(e => _dataContext.AvailableImportProfiles.First(i => i.ImportProfileId == Convert.ToInt32(e)))"
+                            SetSelectedItemHandler="@(e => _dataContext.AvailableImportProfiles.FirstOrDefault(i => i.ImportProfileId == Convert.ToInt32(e), dummyImportProfile))"
                             @bind-SelectedItem="@_dataContext.SelectedImportProfile"
                             AvailableItems="@_dataContext.AvailableImportProfiles"
                             OnSelectedItemChanged="@ImportProfile_SelectionChanged"
@@ -81,7 +81,7 @@
                         <label class="form-label">Target Account:</label>
                         <ObjectSelect
                             GetSelectedItemIdHandler="@(e => e.AccountId.ToString())"
-                            SetSelectedItemHandler="@(e => _dataContext.AvailableAccounts.First(i => i.AccountId == Convert.ToInt32(e)))"
+                            SetSelectedItemHandler="@(e => _dataContext.AvailableAccounts.FirstOrDefault(i => i.AccountId == Convert.ToInt32(e), dummyAccount))"
                             @bind-SelectedItem="@_dataContext.SelectedAccount"
                             AvailableItems="@_dataContext.AvailableAccounts"
                             OnSelectedItemChanged="@TargetAccount_SelectionChanged"
@@ -516,8 +516,8 @@
         HandleResult(_dataContext.LoadData());
         _dataContext.AvailableImportProfiles.Insert(0, dummyImportProfile);
         _dataContext.AvailableAccounts.Insert(0, dummyAccount);
-        _dataContext.IdentifiedColumns.Insert(0, dummyColumn);
         _dataContext.SelectedImportProfile = dummyImportProfile;
+        _dataContext.IdentifiedColumns.Insert(0, dummyColumn);
         _dataContext.SelectedAccount = dummyAccount;
     }
 
@@ -527,6 +527,7 @@
         _step3Enabled = false;
         _step4Enabled = false;
         _dataContext.SelectedImportProfile = dummyImportProfile;
+        _dataContext.IdentifiedColumns.Insert(0, dummyColumn);
         _dataContext.SelectedAccount = dummyAccount;
 
         var file = (await FileReaderService.CreateReference(_inputElement).EnumerateFilesAsync()).FirstOrDefault();
@@ -537,11 +538,6 @@
 
     async Task LoadProfile()
     {
-        //// Workaround for setting the SelectedImportProfile as the first item is always selected but doesn't trigger OnChange
-        //if (_dataContext.SelectedImportProfile == null && _dataContext.AvailableImportProfiles.Count > 0)
-        //{
-        //    _dataContext.SelectedImportProfile = _dataContext.AvailableImportProfiles.First();
-        //}
         var result = await _dataContext.LoadProfileAsync();
         if (result.IsSuccessful)
         {

diff --git a/OpenBudgeteer.Blazor/Shared/NavMenu.razor b/OpenBudgeteer.Blazor/Shared/NavMenu.razor
@@ -61,7 +61,7 @@
         <div class="col-md-auto">
             <div class="navbar-text">
                 <span>
-                    Version: 1.6.1 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)
+                    Version: 1.6.2 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)
                 </span>
             </div>
         </div>

diff --git a/OpenBudgeteer.Blazor/Shared/Selector/BucketSelect.razor b/OpenBudgeteer.Blazor/Shared/Selector/BucketSelect.razor
@@ -55,7 +55,6 @@
                 SelectedItemId = value.BucketId;
                 return;
             }
-            var oldValue = _selectedItem;
             _selectedItem = value;
             SelectedItemChanged.InvokeAsync(value);
             OnSelectedItemChanged.InvokeAsync(new ChangeEventArgs() { Value = value });

diff --git a/OpenBudgeteer.Blazor/Shared/Selector/IntegerSelect.razor b/OpenBudgeteer.Blazor/Shared/Selector/IntegerSelect.razor
@@ -29,7 +29,6 @@
             // Check if there is no real change
             if (_selectedItem == value) return;
 
-            var oldValue = _selectedItem;
             _selectedItem = value;
             SelectedItemChanged.InvokeAsync(value);
             OnSelectedItemChanged.InvokeAsync(new ChangeEventArgs() { Value = value });

diff --git a/OpenBudgeteer.Blazor/Shared/Selector/ObjectSelect.razor b/OpenBudgeteer.Blazor/Shared/Selector/ObjectSelect.razor
@@ -59,7 +59,6 @@
                 SelectedItemId = GetSelectedItemIdHandler(value);
                 return;
             }
-            var oldValue = _selectedItem;
             _selectedItem = value;
             SelectedItemChanged.InvokeAsync(value);
             OnSelectedItemChanged.InvokeAsync(new ChangeEventArgs() { Value = value });

diff --git a/OpenBudgeteer.Blazor/Shared/Selector/StringSelect.razor b/OpenBudgeteer.Blazor/Shared/Selector/StringSelect.razor
@@ -29,7 +29,6 @@
             // Check if there is no real change
             if (_selectedItem == value) return;
 
-            var oldValue = _selectedItem;
             _selectedItem = value;
             SelectedItemChanged.InvokeAsync(value);
             OnSelectedItemChanged.InvokeAsync(new ChangeEventArgs() { Value = value });

diff --git a/OpenBudgeteer.Core/ViewModels/ImportDataViewModel.cs b/OpenBudgeteer.Core/ViewModels/ImportDataViewModel.cs
@@ -174,7 +174,13 @@ public Account SelectedAccount
     public ImportProfile SelectedImportProfile
     {
         get => _selectedImportProfile;
-        set => Set(ref _selectedImportProfile, value);
+        set
+        {
+            // Load Headers already to prevent hiccups with other SelectedItem properties from Column Mappings
+            // as they depend on SelectedImportProfile   
+            if (value != null) LoadHeaders(value);
+            Set(ref _selectedImportProfile, value);    
+        }
     }
 
     private int _totalRecords;
@@ -398,8 +404,8 @@ public async Task<ViewModelOperationResult> LoadProfileAsync()
                 SelectedAccount = AvailableAccounts.First(i => i.AccountId == SelectedImportProfile.AccountId);
             }
 
-            var result = LoadHeaders();
-            if (!result.IsSuccessful) throw new Exception(result.Message);
+            // var result = LoadHeaders();
+            // if (!result.IsSuccessful) throw new Exception(result.Message);
 
             //await ValidateDataAsync();
             _isProfileValid = true;
@@ -416,19 +422,50 @@ public async Task<ViewModelOperationResult> LoadProfileAsync()
     /// <summary>
     /// Reads column headers from the loaded file
     /// </summary>
+    /// <remarks>
+    /// Uses settings from current <see cref="SelectedImportProfile"/>
+    /// </remarks>
     /// <returns>Object which contains information and results of this method</returns>
     public ViewModelOperationResult LoadHeaders()
+    {
+        var result = LoadHeaders(SelectedImportProfile);
+
+        // If possible and necessary make initial selections after loading headers
+        if (IdentifiedColumns.Count == 0) return result;
+        var firstSelection = IdentifiedColumns.First();
+        if (string.IsNullOrEmpty(SelectedImportProfile.TransactionDateColumnName))
+            SelectedImportProfile.TransactionDateColumnName = firstSelection;
+        if (string.IsNullOrEmpty(SelectedImportProfile.PayeeColumnName))
+            SelectedImportProfile.PayeeColumnName = firstSelection;
+        if (string.IsNullOrEmpty(SelectedImportProfile.MemoColumnName))
+            SelectedImportProfile.MemoColumnName = firstSelection;
+        if (string.IsNullOrEmpty(SelectedImportProfile.AmountColumnName))
+            SelectedImportProfile.AmountColumnName = firstSelection;
+        if (string.IsNullOrEmpty(SelectedImportProfile.CreditColumnName))
+            SelectedImportProfile.CreditColumnName = firstSelection;
+        if (string.IsNullOrEmpty(SelectedImportProfile.CreditColumnIdentifierColumnName))
+            SelectedImportProfile.CreditColumnIdentifierColumnName = firstSelection;
+
+        return result;
+    }
+
+    /// <summary>
+    /// Reads column headers from the loaded file
+    /// </summary>
+    /// <param name="importProfile"><see cref="ImportProfile"/> containing the settings how to parse the headers</param>
+    /// <returns>Object which contains information and results of this method</returns>
+    public ViewModelOperationResult LoadHeaders(ImportProfile importProfile)
     {
         try
         {
             // Set ComboBox selection for Column Mapping
             IdentifiedColumns.Clear();
-            var headerLine = _fileLines[SelectedImportProfile.HeaderRow - 1];
-            var columns = headerLine.Split(SelectedImportProfile.Delimiter);
+            var headerLine = _fileLines[importProfile.HeaderRow - 1];
+            var columns = headerLine.Split(importProfile.Delimiter);
             foreach (var column in columns)
             {
                 if (column != string.Empty)
-                    IdentifiedColumns.Add(column.Trim(SelectedImportProfile.TextQualifier)); // Exclude TextQualifier
+                    IdentifiedColumns.Add(column.Trim(importProfile.TextQualifier)); // Exclude TextQualifier
             }
 
             return new ViewModelOperationResult(true);