diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-03 03:48:25 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-03 03:48:25 +0200 |
| commit | 3f2397750a3f5bbdf5ef78049c237ebeaff78319 (patch) | |
| tree | 3a8b325c1f04fa90c114893d84c65020fce7920d /Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels | |
| parent | c873eb1c0324eb50428fc26cdb5f1c3d05c7d3ea (diff) | |
| download | Tango-3f2397750a3f5bbdf5ef78049c237ebeaff78319.tar.gz Tango-3f2397750a3f5bbdf5ef78049c237ebeaff78319.zip | |
DataStore fixes.
Diffstat (limited to 'Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs index 46f388461..16fe59f61 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/DataStoreViewVM.cs @@ -251,6 +251,7 @@ namespace Tango.FSE.MachineConfiguration.ViewModels if (SelectedCollection != null) { _selectedCollectionView = CollectionViewSource.GetDefaultView(SelectedCollection.Items); + _selectedCollectionView.SortDescriptions.Add(new SortDescription(nameof(DataStoreItemModel.Key), ListSortDirection.Ascending)); _selectedCollectionView.Filter = (x) => FilterItems(x as DataStoreItemModel); _selectedCollectionView.Refresh(); } @@ -292,7 +293,20 @@ namespace Tango.FSE.MachineConfiguration.ViewModels return; } + var selectedCollection = SelectedCollection; + var selectedItem = SelectedItem; + await LoadDataStore(); + + if (selectedCollection != null) + { + SelectedCollection = DataStore.Collections.FirstOrDefault(x => x.Name == selectedCollection.Name); + } + + if (SelectedCollection != null && selectedItem != null) + { + SelectedItem = SelectedCollection.Items.FirstOrDefault(x => x.Key == selectedItem.Key); + } } private async Task LoadDataStore() |