michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Show only my locks (#515)

Browse source 
* Added a checkbox in the LFSLocks window to only show the ones locked by "Mat"
* Waits for the locks list to finish loading before making the checkbox clickable
* Now uses correct username for lock filtering.
   WIP: needs an error popup if user is misconfigured
* Added an error popup if username is empty on lfs locks
* Replaced an IEnumerable with a AvaloniaList for consistency
This commit is contained in:
Mat 2024-09-26 09:00:31 +02:00 committed by GitHub
parent 4a08caddad
commit 21498f7009
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 48 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/ViewModels/LFSLocks.cs
View file

@ -1,4 +1,5 @@
using System.Threading.Tasks; using System.Linq;
using System.Threading.Tasks;
using Avalonia.Collections; using Avalonia.Collections;
using Avalonia.Threading; using Avalonia.Threading;
@ -20,11 +21,39 @@ namespace SourceGit.ViewModels
get => _isEmpty; get => _isEmpty;
private set => SetProperty(ref _isEmpty, value); private set => SetProperty(ref _isEmpty, value);
} }
public bool ShowOnlyMyLocks
{
get => _showOnlyMyLocks;
set
{
if (!SetProperty(ref _showOnlyMyLocks, value))
return;
public AvaloniaList<Models.LFSLock> Locks OnPropertyChanged(nameof(FilteredLocks));
IsEmpty = !FilteredLocks.Any();
}
}
private AvaloniaList<Models.LFSLock> Locks
{ {
get; get;
private set; }
public AvaloniaList<Models.LFSLock> FilteredLocks
{
get
{
if (string.IsNullOrEmpty(_userName))
{
App.RaiseException(_repo, "Username is empty");
return Locks;
}
return _showOnlyMyLocks ?
new AvaloniaList<Models.LFSLock>(Locks.Where(@lock => @lock.User == _userName)) :
Locks;
}
} }
public LFSLocks(string repo, string remote) public LFSLocks(string repo, string remote)
@ -32,6 +61,7 @@ namespace SourceGit.ViewModels
_repo = repo; _repo = repo;
_remote = remote; _remote = remote;
Locks = new AvaloniaList<Models.LFSLock>(); Locks = new AvaloniaList<Models.LFSLock>();
new Commands.Config(repo).ListAll().TryGetValue("user.name", out _userName);
Task.Run(() => Task.Run(() =>
{ {
@ -71,5 +101,7 @@ namespace SourceGit.ViewModels
private string _remote; private string _remote;
private bool _isLoading = true; private bool _isLoading = true;
private bool _isEmpty = false; private bool _isEmpty = false;
private bool _showOnlyMyLocks = false;
private string _userName;
} }
} }

17
src/Views/LFSLocks.axaml
View file

@ -13,7 +13,7 @@
Title="{DynamicResource Text.GitLFS.Locks.Title}" Title="{DynamicResource Text.GitLFS.Locks.Title}"
Width="600" Height="400" Width="600" Height="400"
WindowStartupLocation="CenterOwner"> WindowStartupLocation="CenterOwner">
<Grid RowDefinitions="Auto,*"> <Grid RowDefinitions="Auto,Auto,*">
<!-- TitleBar --> <!-- TitleBar -->
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}"> <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
<Border Grid.Column="0" Grid.ColumnSpan="3" <Border Grid.Column="0" Grid.ColumnSpan="3"
@ -43,11 +43,20 @@
IsVisible="{OnPlatform True, macOS=False}"/> IsVisible="{OnPlatform True, macOS=False}"/>
</Grid> </Grid>
<!-- Filter and Unlock All -->
<Grid Grid.Row="1" ColumnDefinitions="Auto,*,Auto" Margin="8,0,0,0">
<CheckBox Grid.Column="0"
Content="Show only my locks"
IsChecked="{Binding ShowOnlyMyLocks}"
IsEnabled="{Binding !IsLoading}"
VerticalAlignment="Center" />
</Grid>
<!-- Locked Files --> <!-- Locked Files -->
<Grid Grid.Row="1"> <Grid Grid.Row="2">
<ListBox Margin="8" <ListBox Margin="8,0,8,8"
Background="{DynamicResource Brush.Contents}" Background="{DynamicResource Brush.Contents}"
ItemsSource="{Binding Locks}" ItemsSource="{Binding FilteredLocks}"
SelectionMode="Single" SelectionMode="Single"
BorderThickness="1" BorderThickness="1"
BorderBrush="{DynamicResource Brush.Border2}" BorderBrush="{DynamicResource Brush.Border2}"