luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-29 01:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reset search logs

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-02-18 14:52:10 +01:00
parent e2f243b4d4
commit 611f57c5ac
6 changed files with 43 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/models/applied_filters.dart
View file

@ -1,11 +1,11 @@
class AppliedFiters {
String selectedResultStatus = 'all';
String? domainText;
String? searchText;
List<String>? clients;
AppliedFiters({
required this.selectedResultStatus,
required this.domainText,
required this.searchText,
required this.clients
});
}

14
lib/providers/logs_provider.dart
View file

@ -12,7 +12,7 @@ class LogsProvider with ChangeNotifier {
DateTime? _logsOlderThan;
String _selectedResultStatus = 'all';
String? _domainText;
String? _searchText;
List<String>? _selectedClients;
int _logsQuantity = 100;
@ -20,7 +20,7 @@ class LogsProvider with ChangeNotifier {
AppliedFiters _appliedFilters = AppliedFiters(
selectedResultStatus: 'all',
domainText: null,
searchText: null,
clients: null
);
@ -44,8 +44,8 @@ class LogsProvider with ChangeNotifier {
return _selectedResultStatus;
}
String? get domainText {
return _domainText;
String? get searchText {
return _searchText;
}
int get logsQuantity {
@ -98,7 +98,7 @@ class LogsProvider with ChangeNotifier {
_logsOlderThan = null;
_offset = 0;
_selectedResultStatus = 'all';
_domainText = null;
_searchText = null;
notifyListeners();
}
@ -116,8 +116,8 @@ class LogsProvider with ChangeNotifier {
notifyListeners();
}
void setDomainText(String? value) {
_domainText = value;
void setSearchText(String? value) {
_searchText = value;
notifyListeners();
}

8
lib/screens/home/top_items.dart
View file

@ -140,24 +140,24 @@ class TopItems extends StatelessWidget {
child: InkWell(
onTap: () {
if (type == 'topQueriedDomains' || type == 'topBlockedDomains') {
logsProvider.setDomainText(item.keys.toList()[0]);
logsProvider.setSearchText(item.keys.toList()[0]);
logsProvider.setSelectedClients(null);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
domainText: item.keys.toList()[0],
searchText: item.keys.toList()[0],
clients: null
)
);
appConfigProvider.setSelectedScreen(2);
}
else if (type == 'topClients') {
logsProvider.setDomainText(null);
logsProvider.setSearchText(null);
logsProvider.setSelectedClients([item.keys.toList()[0]]);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
domainText: null,
searchText: null,
clients: [item.keys.toList()[0]]
)
);

26
lib/screens/logs/logs.dart
View file

@ -31,7 +31,7 @@ class Logs extends StatelessWidget {
appConfigProvider: appConfigProvider,
logsProvider: logsProvider,
selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus,
domainText: logsProvider.appliedFilters.domainText,
searchText: logsProvider.appliedFilters.searchText,
);
}
}
@ -41,7 +41,7 @@ class LogsWidget extends StatefulWidget {
final AppConfigProvider appConfigProvider;
final LogsProvider logsProvider;
final String selectedResultStatus;
final String? domainText;
final String? searchText;
const LogsWidget({
Key? key,
@ -49,7 +49,7 @@ class LogsWidget extends StatefulWidget {
required this.appConfigProvider,
required this.logsProvider,
required this.selectedResultStatus,
required this.domainText,
required this.searchText,
}) : super(key: key);
@override
@ -67,12 +67,12 @@ class _LogsWidgetState extends State<LogsWidget> {
int? inOffset,
bool? loadingMore,
String? responseStatus,
String? domainText,
String? searchText,
}) async {
int offst = inOffset ?? widget.logsProvider.offset;
String resStatus = responseStatus ?? widget.selectedResultStatus;
String? search = domainText ?? widget.domainText;
String? search = searchText ?? widget.searchText;
if (loadingMore != null && loadingMore == true) {
setState(() => isLoadingMore = true);
@ -402,7 +402,7 @@ class _LogsWidgetState extends State<LogsWidget> {
),
const SizedBox(width: 5),
],
bottom: logsProvider.appliedFilters.domainText != null || logsProvider.appliedFilters.selectedResultStatus != 'all' || logsProvider.appliedFilters.clients != null
bottom: logsProvider.appliedFilters.searchText != null || logsProvider.appliedFilters.selectedResultStatus != 'all' || logsProvider.appliedFilters.clients != null
? PreferredSize(
preferredSize: const Size(double.maxFinite, 50),
child: Container(
@ -421,7 +421,7 @@ class _LogsWidgetState extends State<LogsWidget> {
child: ListView(
scrollDirection: Axis.horizontal,
children: [
if (logsProvider.appliedFilters.domainText != null) ...[
if (logsProvider.appliedFilters.searchText != null) ...[
const SizedBox(width: 15),
Chip(
avatar: const Icon(
@ -430,7 +430,7 @@ class _LogsWidgetState extends State<LogsWidget> {
label: Row(
children: [
Text(
logsProvider.appliedFilters.domainText!,
logsProvider.appliedFilters.searchText!,
),
],
),
@ -442,14 +442,14 @@ class _LogsWidgetState extends State<LogsWidget> {
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus,
domainText: null,
searchText: null,
clients: logsProvider.appliedFilters.clients
)
);
logsProvider.setDomainText(null);
logsProvider.setSearchText(null);
fetchLogs(
inOffset: 0,
domainText: ''
searchText: ''
);
},
),
@ -475,7 +475,7 @@ class _LogsWidgetState extends State<LogsWidget> {
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
domainText: logsProvider.appliedFilters.domainText,
searchText: logsProvider.appliedFilters.searchText,
clients: logsProvider.appliedFilters.clients
)
);
@ -510,7 +510,7 @@ class _LogsWidgetState extends State<LogsWidget> {
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: logsProvider.appliedFilters.selectedResultStatus,
domainText: logsProvider.appliedFilters.domainText,
searchText: logsProvider.appliedFilters.searchText,
clients: null
)
);

44
lib/screens/logs/logs_filters_modal.dart
View file

@ -41,13 +41,11 @@ class LogsFiltersModalWidget extends StatefulWidget {
}
class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
TextEditingController domainController = TextEditingController();
String? domainError;
TextEditingController searchController = TextEditingController();
@override
void initState() {
domainController.text = widget.logsProvider.domainText ?? '';
domainError = null;
searchController.text = widget.logsProvider.searchText ?? '';
super.initState();
}
@ -70,7 +68,7 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
void resetFilters() async {
setState(() {
domainController.text = '';
searchController.text = '';
});
logsProvider.setLoadStatus(0);
@ -85,7 +83,7 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
domainText: null,
searchText: null,
clients: null
)
);
@ -134,13 +132,13 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
count: logsProvider.logsQuantity,
olderThan: logsProvider.logsOlderThan,
responseStatus: logsProvider.selectedResultStatus,
search: logsProvider.domainText,
search: logsProvider.searchText,
);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: logsProvider.selectedResultStatus,
domainText: logsProvider.domainText,
searchText: logsProvider.searchText,
clients: logsProvider.selectedClients
)
);
@ -208,39 +206,25 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
children: [
Expanded(
child: TextFormField(
controller: domainController,
onChanged: (value) {
logsProvider.setDomainText(value);
RegExp domain = RegExp(r'^([a-z0-9|-]+\.)*[a-z0-9|-]+\.[a-z]+$');
if (value == '' || domain.hasMatch(value) == true) {
setState(() {
domainError = null;
});
}
else {
setState(() {
domainError = AppLocalizations.of(context)!.invalidDomain;
});
}
},
controller: searchController,
onChanged: logsProvider.setSearchText,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.link_rounded),
prefixIcon: const Icon(Icons.search_rounded),
border: const OutlineInputBorder(
borderRadius: BorderRadius.all(
Radius.circular(10)
)
),
labelText: AppLocalizations.of(context)!.domain,
labelText: AppLocalizations.of(context)!.search,
suffixIcon: IconButton(
onPressed: () {
setState(() {
domainController.text = '';
searchController.text = '';
});
logsProvider.setDomainText(null);
logsProvider.setSearchText(null);
},
icon: const Icon(Icons.clear)
),
errorText: domainError
),
),
)
@ -294,9 +278,7 @@ class _LogsFiltersModalWidgetState extends State<LogsFiltersModalWidget> {
child: Text(AppLocalizations.of(context)!.resetFilters)
),
TextButton(
onPressed: domainError == null
? () => filterLogs()
: null,
onPressed: () => filterLogs(),
child: Text(AppLocalizations.of(context)!.apply)
),
],

8
lib/screens/top_items/top_items.dart
View file

@ -200,12 +200,12 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
return CustomListTile(
onTap: () {
if (widget.type == 'topQueriedDomains' || widget.type == 'topBlockedDomains') {
logsProvider.setDomainText(screenData[index].keys.toList()[0]);
logsProvider.setSearchText(screenData[index].keys.toList()[0]);
logsProvider.setSelectedClients(null);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
domainText: screenData[index].keys.toList()[0],
searchText: screenData[index].keys.toList()[0],
clients: null
)
);
@ -213,12 +213,12 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
Navigator.pop(context);
}
else if (widget.type == 'topClients') {
logsProvider.setDomainText(null);
logsProvider.setSearchText(null);
logsProvider.setSelectedClients([screenData[index].keys.toList()[0]]);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
domainText: null,
searchText: null,
clients: [screenData[index].keys.toList()[0]]
)
);