Tsumanu/actix-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use lazy_static to initialize viewmodel fields

Browse Source
This commit is contained in:
Manuel Gugger 2022-10-24 18:22:38 +02:00
parent 6729d0c8c6
commit e48acd015c
4 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
actix_admin_macros/src/lib.rs
View File

@ -37,6 +37,7 @@ pub fn derive_actix_admin(_input: proc_macro::TokenStream) -> proc_macro::TokenS
use sea_orm::EntityTrait;
use itertools::izip;
use actix_session::{Session};
use lazy_static::lazy_static;
};
proc_macro::TokenStream::from(expanded)
}
@ -155,6 +156,55 @@ pub fn derive_actix_admin_model(input: proc_macro::TokenStream) -> proc_macro::T
let fields_textarea = get_actix_admin_fields_textarea(&fields);
let expanded = quote! {
lazy_static! {
pub static ref ACTIX_ADMIN_VIEWMODEL_FIELDS: Vec<ActixAdminViewModelField> = {
let mut vec = Vec::new();
let field_names = stringify!(
#(#field_names),*
).split(",")
.collect::<Vec<_>>();
let html_input_types = stringify!(
#(#field_html_input_type),*
).split(",")
.collect::<Vec<_>>();
let field_select_lists = stringify!(
#(#field_select_list),*
).split(",")
.collect::<Vec<_>>();
let is_option_lists = [
#(#is_option_list),*
];
let fields_type_paths = [
#(#fields_type_path),*
];
let fields_textareas = [
#(#fields_textarea),*
];
for (field_name, html_input_type, select_list, is_option_list, fields_type_path, is_textarea) in izip!(&field_names, &html_input_types, &field_select_lists, is_option_lists, fields_type_paths, fields_textareas) {
let select_list = select_list.replace('"', "").replace(' ', "").to_string();
let field_name = field_name.replace('"', "").replace(' ', "").to_string();
let html_input_type = html_input_type.replace('"', "").replace(' ', "").to_string();
vec.push(ActixAdminViewModelField {
field_name: field_name,
html_input_type: html_input_type,
select_list: select_list.clone(),
is_option: is_option_list,
field_type: ActixAdminViewModelFieldType::get_field_type(fields_type_path, select_list, is_textarea)
});
}
vec
};
}
impl From<Model> for ActixAdminModel {
fn from(model: Model) -> Self {
ActixAdminModel {
@ -211,51 +261,8 @@ pub fn derive_actix_admin_model(input: proc_macro::TokenStream) -> proc_macro::T
model.errors = errors;
}
fn get_fields() -> Vec<ActixAdminViewModelField> {
let mut vec = Vec::new();
let field_names = stringify!(
#(#field_names),*
).split(",")
.collect::<Vec<_>>();
let html_input_types = stringify!(
#(#field_html_input_type),*
).split(",")
.collect::<Vec<_>>();
let field_select_lists = stringify!(
#(#field_select_list),*
).split(",")
.collect::<Vec<_>>();
let is_option_lists = [
#(#is_option_list),*
];
let fields_type_paths = [
#(#fields_type_path),*
];
let fields_textareas = [
#(#fields_textarea),*
];
for (field_name, html_input_type, select_list, is_option_list, fields_type_path, is_textarea) in izip!(&field_names, &html_input_types, &field_select_lists, is_option_lists, fields_type_paths, fields_textareas) {
let select_list = select_list.replace('"', "").replace(' ', "").to_string();
let field_name = field_name.replace('"', "").replace(' ', "").to_string();
let html_input_type = html_input_type.replace('"', "").replace(' ', "").to_string();
vec.push(ActixAdminViewModelField {
field_name: field_name,
html_input_type: html_input_type,
select_list: select_list.clone(),
is_option: is_option_list,
field_type: ActixAdminViewModelFieldType::get_field_type(fields_type_path, select_list, is_textarea)
});
}
vec
fn get_fields() -> &'static[ActixAdminViewModelField] {
ACTIX_ADMIN_VIEWMODEL_FIELDS.as_slice()
}
}
};

2
example/Cargo.toml
View File

@ -15,6 +15,6 @@ dotenv = "0.15"
serde = "1.0.136"
serde_derive = "1.0.136"
sea-orm = { version = "^0.9.1", features = [ "sqlx-sqlite", "runtime-actix-native-tls", "macros" ], default-features = true }
lazy_static = "1.4.0"
actix-admin = { path = "../" }
azure_auth = { path = "./azure_auth" }

2
src/model.rs
View File

@ -15,7 +15,7 @@ pub trait ActixAdminModelTrait {
posts_per_page: usize,
search: &String
) -> Result<(usize, Vec<ActixAdminModel>), ActixAdminError>;
fn get_fields() -> Vec<ActixAdminViewModelField>;
fn get_fields() -> &'static[ActixAdminViewModelField];
fn validate_model(model: &mut ActixAdminModel);
}

4
src/view_model.rs
View File

@ -35,7 +35,7 @@ pub trait ActixAdminViewModelTrait {
pub struct ActixAdminViewModel {
pub entity_name: String,
pub primary_key: String,
pub fields: Vec<ActixAdminViewModelField>,
pub fields: &'static[ActixAdminViewModelField],
pub show_search: bool,
pub user_can_access: Option<fn(&Session) -> bool>
}
@ -44,7 +44,7 @@ pub struct ActixAdminViewModel {
pub struct ActixAdminViewModelSerializable {
pub entity_name: String,
pub primary_key: String,
pub fields: Vec<ActixAdminViewModelField>,
pub fields: &'static [ActixAdminViewModelField],
pub show_search: bool
}