Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUG] User List Limited to 100 Users - Filtering Doesn't Reveal Hidden Users #740

Merged
merged 2 commits into from
Aug 15, 2024
Merged

[BUG] User List Limited to 100 Users - Filtering Doesn't Reveal Hidden Users #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73ee89f
Create draft PR for #739
github-actions[bot] Aug 14, 2024
9b717b8
****TcOpen.Inxton.Local.Security****
peterbarancek Aug 15, 2024
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
10 changes: 7 additions & 3 deletions src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class BaseUserViewModel : BindableBase
private static ObservableCollection<UserData> _allUsers;

public IRepository<UserData> UserRepository { get => _userRepositary; set => _userRepositary = value; }
public ObservableCollection<UserData> AllUsers { get => _allUsers; private set => _allUsers = value; }
public ObservableCollection<UserData> AllUsers { get => _allUsers;private set => _allUsers = value; }
public List<Role> AllRoles { get; private set; } = new List<Role>();
public List<string> AllGroups { get; private set; }
public static event EventHandler OnNewUserAdded;
Expand All @@ -27,13 +27,17 @@ public BaseUserViewModel()
UserRepository = SecurityManager.Manager.UserRepository;
AllRoles = SecurityManager.Manager.AvailableRoles.ToList();
AllGroups = SecurityManager.Manager.AvailableGroups().ToList();
AllUsers = new ObservableCollection<UserData>(UserRepository.GetRecords());
AllUsers = new ObservableCollection<UserData>(UserRepository.Queryable.Where(p=> true));
}





protected void UsersChanged()
{
AllUsers.Clear();
UserRepository.GetRecords().ToList().ForEach(AllUsers.Add);
UserRepository.Queryable.Where(p => true).ToList().ForEach(AllUsers.Add);
OnNewUserAdded?.Invoke(this, EventArgs.Empty);
}
}
Expand Down
13 changes: 6 additions & 7 deletions ...on/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@
<controls:PermissionBox Permissions="Administrator">
<TabControl>
<TabItem Header="{x:Static p:strings.CurrentUsers}">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid Margin="12" Style="{DynamicResource Card}">
<controls:AllUsersGroupManagementView/>
</Grid>
</ScrollViewer>
<Grid Margin="12" Style="{DynamicResource Card}">
<controls:AllUsersGroupManagementView/>
</Grid>

</TabItem>
<TabItem Header="{x:Static p:strings.NewUser}">
<ScrollViewer VerticalScrollBarVisibility="Auto">
Expand All @@ -46,11 +45,11 @@
</ScrollViewer>
</TabItem>
<TabItem Header="Group management">
<ScrollViewer VerticalScrollBarVisibility="Auto">

<Grid Margin="12" Style="{DynamicResource Card}">
<controls:AllGroupsGroupManagementView />
</Grid>
</ScrollViewer>

</TabItem>
</TabControl>
</controls:PermissionBox>
Expand Down
2 changes: 1 addition & 1 deletion src/TcOpen.Inxton/src/Security/RoleGroupManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public string GetRolesFromGroupString(string group)
public List<GroupData> GetAllGroup()
{
List<GroupData> data = null;
data = groupRepo.GetRecords().ToList();
data = groupRepo.Queryable.Where(p => true).ToList();
return data;
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...lements.Wpf/Carousel/TcoCarouselView.xaml → ...nts.Wpf/Carousel/TcoCarouselSpotView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<UserControl
x:Class="TcoElements.TcoCarouselView"
x:Class="TcoElements.TcoCarouselSpotView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand Down Expand Up @@ -44,7 +44,7 @@
Foreground="{DynamicResource OnWarning}"
HorizontalAlignment="Center"
MaxWidth="300"
Visibility="{Binding _status.InPosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter}, ConverterParameter=false}"
Visibility="{Binding _status.InPosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter}, ConverterParameter=true}"
Content="{x:Static p:Resources.CarouselNotInPos}" />
<Button Style="{StaticResource MaterialDesignOutlinedButton}"
VerticalAlignment="Top"
Expand All @@ -53,7 +53,7 @@
Foreground="{StaticResource OnError}"
HorizontalAlignment="Center"
MaxWidth="300"
Visibility="{Binding _status.InPrecisePosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter }, ConverterParameter=false}"
Visibility="{Binding _status.InPrecisePosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter }, ConverterParameter=true}"
Content="{x:Static p:Resources.CarouselNotInPrecisePos}" />

</StackPanel>
Expand All @@ -72,7 +72,7 @@
Foreground="{StaticResource OnError}"
MaxWidth="350"
Margin="5,200,5,5"
Visibility="{Binding _status.TurnSafetyCondition.Cyclic, Converter={vortex:BooleanToVisibilityConverter}, ConverterParameter=false}"
Visibility="{Binding _status.TurnSafetyCondition.Cyclic, Converter={vortex:BooleanToVisibilityConverter}, ConverterParameter=true}"
Content="{x:Static p:Resources.CarouselNotSafeTurnCondition}" >
</Button>

Expand Down
4 changes: 2 additions & 2 deletions ...ents.Wpf/Carousel/TcoCarouselView.xaml.cs → ....Wpf/Carousel/TcoCarouselSpotView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ namespace TcoElements
/// <summary>
/// Interaction logic for TcoCarouselServiceView.xaml
/// </summary>
public partial class TcoCarouselView
public partial class TcoCarouselSpotView
: UserControl
{
public TcoCarouselView()
public TcoCarouselSpotView()
{
if (DesignerProperties.GetIsInDesignMode(this))
{
Expand Down
2 changes: 1 addition & 1 deletion src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<Page Update="Carousel\Service\TcoCarouselServiceView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
<Page Update="Carousel\TcoCarouselView.xaml">
<Page Update="Carousel\TcoCarouselSpotView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
Expand Down
Loading