Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Filee.App/ViewModels/GroupEditorViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Filee.App.Services;
using Filee.Core.Formats;
using Filee.Core.Localization;
using Filee.Core.Presets;
using Filee.Core.Settings;
Expand Down Expand Up @@ -48,7 +49,10 @@ public GroupEditorViewModel(Preset group, UserDataStore store, ILocalizer loc, b
/// <summary>The presets the group fans out, in order.</summary>
public ObservableCollection<GroupMember> Members { get; } = [];

/// <summary>Actions that can still be added (not groups, not already in it).</summary>
/// <summary>
/// Actions that can still be added (not groups, not already in it), without the ones whose target belongs only to
/// turned-off fields, like the toolbar editor's palette. Members already in the group stay.
/// </summary>
public ObservableCollection<Choice<string>> Available { get; } = [];

[ObservableProperty]
Expand Down Expand Up @@ -139,8 +143,9 @@ public void Delete()
private void Refresh()
{
var taken = Members.Select(m => m.PresetId).ToHashSet();
var off = _store.Settings.TurnedOffFieldSet();
Available.Clear();
foreach (var preset in _store.Presets.Where(p => !p.IsGroup && !taken.Contains(p.Id)))
foreach (var preset in _store.Presets.Where(p => !p.IsGroup && !taken.Contains(p.Id) && FormatFields.IsShown(p.TargetFormat, off)))
Available.Add(new Choice<string>(preset.Id, _loc.DisplayName(preset), CaptionOf(preset)));
OnPropertyChanged(nameof(IsFull));
OnPropertyChanged(nameof(IsEmpty));
Expand Down
27 changes: 27 additions & 0 deletions tests/Filee.App.Tests/GroupEditorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,33 @@ private static void Add(GroupEditorViewModel vm, string presetId)
vm.AddCommand.Execute(null);
}

[AvaloniaFact]
public void Presets_of_turned_off_fields_are_not_offered_but_members_stay()
{
TestServices.EnsureInitialized("en");
var settings = AppHost.Get<UserDataStore>().Settings;
var off = settings.TurnedOffFields;
settings.TurnedOffFields = ["font"];
try
{
var vm = Edit(new Preset { Name = "Fonts", Kind = PresetKind.Group, SubPresetIds = ["to-ttf"] });
Assert.Equal("to-ttf", Assert.Single(vm.Members).PresetId); // saved members aren't dropped (rule 7)
Assert.DoesNotContain(vm.Available, c => c.Value == "to-otf");
Assert.Contains(vm.Available, c => c.Value == "to-eot"); // also in Old formats, which is on
Assert.Contains(vm.Available, c => c.Value == "to-png");

vm.RemoveCommand.Execute(vm.Members[0]);
Assert.DoesNotContain(vm.Available, c => c.Value == "to-ttf");

settings.TurnedOffFields = [];
Assert.Contains(Edit(new Preset { Name = "Fonts", Kind = PresetKind.Group }).Available, c => c.Value == "to-otf");
}
finally
{
settings.TurnedOffFields = off;
}
}

[AvaloniaFact]
public void Presets_are_added_in_order_moved_and_removed_then_saved_into_the_group()
{
Expand Down
Loading