@@ -273,17 +279,27 @@ impl Component for AddFilterComponent {
}
}
-
#[derive(Deserialize, Clone, PartialEq, Eq)]
pub struct Filter {
enabled: bool,
- title: String,
+ pub title: String,
group: FilterGroup,
file_name: String,
}
+impl Filter {
+ pub fn new(title: String, group: FilterGroup, file_name: String) -> Self {
+ Self {
+ enabled: true,
+ title,
+ group,
+ file_name,
+ }
+ }
+}
+
impl std::fmt::Display for Filter {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(
f,
"Filter(Enabled={}, Title={}, Group={:?}, File_name={})",
@@ -299,8 +315,7 @@ pub struct FilterStatusChangeRequest {
file_name: String,
}
-#[derive(Deserialize, Clone, PartialEq, Eq)]
-pub struct FilterConfiguration(Vec
);
+pub type FilterConfiguration = Vec;
pub enum Message {
Load,
@@ -320,6 +335,17 @@ impl Filters {
fn configuration_has_changed(&self) -> bool {
self.filter_configuration != self.filter_configuration_before_changes
}
+ pub fn get_filters(&self) -> Vec {
+ self.filter_configuration.as_ref().unwrap().clone()
+ }
+
+ pub fn has_filter(&self, filter: &Filter) -> bool {
+ self.filter_configuration
+ .as_ref()
+ .unwrap()
+ .into_iter()
+ .any(|f| f.file_name == filter.file_name)
+ }
}
impl Component for Filters {
@@ -378,7 +404,6 @@ impl Component for Filters {
.filter_configuration
.as_ref()
.unwrap()
- .0
.iter()
.map(|filter| FilterStatusChangeRequest {
enabled: filter.enabled,
@@ -413,7 +438,6 @@ impl Component for Filters {
self.filter_configuration
.as_mut()
.unwrap()
- .0
.iter_mut()
.find(|filter| filter.file_name == filter_name)
.and_then(|filter| {
@@ -473,7 +497,6 @@ impl Component for Filters {
let category_name = format!("{:?}", category);
log::debug!("Category filter: {category_name}");
let filters = filters
- .0
.iter()
.filter(|filter| filter.group == category)
.collect::>();
@@ -519,23 +542,25 @@ impl Component for Filters {
};
match &self.filter_configuration {
- Some(filter_configuration) => html! {
- <>
- { title }
- {success_banner}
-
- { render_category(FilterGroup::Default, filter_configuration) }
- { render_category(FilterGroup::Ads, filter_configuration) }
- { render_category(FilterGroup::Privacy, filter_configuration) }
- { render_category(FilterGroup::Malware, filter_configuration) }
- { render_category(FilterGroup::Social, filter_configuration) }
- { render_category(FilterGroup::Regional, filter_configuration) }
-
- },
+ Some(filter_configuration) => {
+ html! {
+ <>
+ { title }
+ {success_banner}
+
+ { render_category(FilterGroup::Default, filter_configuration) }
+ { render_category(FilterGroup::Ads, filter_configuration) }
+ { render_category(FilterGroup::Privacy, filter_configuration) }
+ { render_category(FilterGroup::Malware, filter_configuration) }
+ { render_category(FilterGroup::Social, filter_configuration) }
+ { render_category(FilterGroup::Regional, filter_configuration) }
+
+ }
+ }
// This realistically loads way too fast for a loader to be useful. Adding one would just add
// unwanted flickering.
None => html! {{ title }},
diff --git a/web_frontend/src/main.rs b/web_frontend/src/main.rs
index 3b204cb..3377306 100644
--- a/web_frontend/src/main.rs
+++ b/web_frontend/src/main.rs
@@ -4,8 +4,8 @@ use yew_router::prelude::*;
mod blocking_enabled;
mod dashboard;
-mod filters;
mod filterlists;
+mod filters;
mod requests;
mod save_button;
mod settings;
diff --git a/web_frontend/src/save_button.rs b/web_frontend/src/save_button.rs
index 9e26634..81fde99 100644
--- a/web_frontend/src/save_button.rs
+++ b/web_frontend/src/save_button.rs
@@ -1,7 +1,7 @@
use web_sys::MouseEvent;
use yew::{classes, html, Callback, Component, Context, Html, Properties};
-pub const BASE_BUTTON_CSS: [&'static str; 20]= [
+pub const BASE_BUTTON_CSS: [&'static str; 20] = [
"inline-flex",
"items-center",
"justify-center",
-
-
-
+
+
+
