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.

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

Add option to filter sessions by Host ID #40

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions lib/clients/session_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class SessionClient extends ChangeNotifier {
_filterSettings = SessionFilterSettings(
name: "",
hostName: "",
hostId: "",
includeEnded: settingsClient.currentSettings.sessionViewLastIncludeEnded.valueOrDefault,
includeIncompatible: settingsClient.currentSettings.sessionViewLastIncludeIncompatible.valueOrDefault,
minActiveUsers: settingsClient.currentSettings.sessionViewLastMinimumUsers.valueOrDefault,
Expand Down
6 changes: 6 additions & 0 deletions lib/models/session.dart
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ class SessionFilterSettings {
final bool includeEnded;
final bool includeIncompatible;
final String hostName;
final String hostId;
final int minActiveUsers;
final bool includeEmptyHeadless;

Expand All @@ -199,6 +200,7 @@ class SessionFilterSettings {
required this.includeEnded,
required this.includeIncompatible,
required this.hostName,
required this.hostId,
required this.minActiveUsers,
required this.includeEmptyHeadless,
});
Expand All @@ -208,6 +210,7 @@ class SessionFilterSettings {
includeEnded: false,
includeIncompatible: false,
hostName: "",
hostId: "",
minActiveUsers: 0,
includeEmptyHeadless: true,
);
Expand All @@ -216,13 +219,15 @@ class SessionFilterSettings {
"${"&includeEnded=$includeEnded"}"
"${name.isNotEmpty ? "&name=$name" : ""}"
"${hostName.isNotEmpty ? "&hostName=$hostName" : ""}"
"${hostId.isNotEmpty ? "&hostId=$hostId" : ""}"
"${minActiveUsers > 0 ? "&minActiveUsers=$minActiveUsers" : ""}";

SessionFilterSettings copyWith({
String? name,
bool? includeEnded,
bool? includeIncompatible,
String? hostName,
String? hostId,
int? minActiveUsers,
bool? includeEmptyHeadless,
}) {
Expand All @@ -231,6 +236,7 @@ class SessionFilterSettings {
includeEnded: includeEnded ?? this.includeEnded,
includeIncompatible: includeIncompatible ?? this.includeIncompatible,
hostName: hostName ?? this.hostName,
hostId: hostId ?? this.hostId,
minActiveUsers: minActiveUsers ?? this.minActiveUsers,
includeEmptyHeadless: includeEmptyHeadless ?? this.includeEmptyHeadless,
);
Expand Down
20 changes: 20 additions & 0 deletions lib/widgets/sessions/session_filter_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class SessionFilterDialog extends StatefulWidget {
class _SessionFilterDialogState extends State<SessionFilterDialog> {
final TextEditingController _sessionNameController = TextEditingController();
final TextEditingController _hostNameController = TextEditingController();
final TextEditingController _hostIdController = TextEditingController();
late SessionFilterSettings _currentFilter;

@override
Expand All @@ -27,6 +28,7 @@ class _SessionFilterDialogState extends State<SessionFilterDialog> {
if (oldWidget.lastFilter != widget.lastFilter) {
_sessionNameController.text = widget.lastFilter.name;
_hostNameController.text = widget.lastFilter.hostName;
_hostIdController.text = widget.lastFilter.hostId;
}
}

Expand All @@ -36,12 +38,14 @@ class _SessionFilterDialogState extends State<SessionFilterDialog> {
_currentFilter = widget.lastFilter;
_sessionNameController.text = widget.lastFilter.name;
_hostNameController.text = widget.lastFilter.hostName;
_hostIdController.text = widget.lastFilter.hostId;
}

@override
void dispose() {
_sessionNameController.dispose();
_hostNameController.dispose();
_hostIdController.dispose();
super.dispose();
}

Expand Down Expand Up @@ -100,6 +104,22 @@ class _SessionFilterDialogState extends State<SessionFilterDialog> {
),
),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: TextField(
controller: _hostIdController,
onChanged: (value) {
_currentFilter = _currentFilter.copyWith(hostId: value);
},
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 20),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32),
),
labelText: 'Host Id',
),
),
),
Row(
mainAxisSize: MainAxisSize.max,
children: [
Expand Down