mirror of
https://github.com/nitnelave/lldap.git
synced 2023-04-12 14:25:13 +00:00
app: Extract the AddUserToGroup component
This commit is contained in:
parent
7aab9e8cf5
commit
37c6e8ef30
@ -24,6 +24,8 @@ features = [
|
|||||||
"HtmlDocument",
|
"HtmlDocument",
|
||||||
"HtmlInputElement",
|
"HtmlInputElement",
|
||||||
"HtmlOptionElement",
|
"HtmlOptionElement",
|
||||||
|
"HtmlOptionsCollection",
|
||||||
|
"HtmlSelectElement",
|
||||||
"console",
|
"console",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
271
app/src/components/add_user_to_group.rs
Normal file
271
app/src/components/add_user_to_group.rs
Normal file
@ -0,0 +1,271 @@
|
|||||||
|
use crate::{
|
||||||
|
components::user_details::{Group, User},
|
||||||
|
infra::api::HostService,
|
||||||
|
};
|
||||||
|
use anyhow::{Error, Result};
|
||||||
|
use graphql_client::GraphQLQuery;
|
||||||
|
use std::collections::HashSet;
|
||||||
|
use yew::{
|
||||||
|
html::ChangeData,
|
||||||
|
prelude::*,
|
||||||
|
services::{fetch::FetchTask, ConsoleService},
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(GraphQLQuery)]
|
||||||
|
#[graphql(
|
||||||
|
schema_path = "../schema.graphql",
|
||||||
|
query_path = "queries/add_user_to_group.graphql",
|
||||||
|
response_derives = "Debug",
|
||||||
|
variables_derives = "Clone",
|
||||||
|
custom_scalars_module = "crate::infra::graphql"
|
||||||
|
)]
|
||||||
|
pub struct AddUserToGroup;
|
||||||
|
|
||||||
|
#[derive(GraphQLQuery)]
|
||||||
|
#[graphql(
|
||||||
|
schema_path = "../schema.graphql",
|
||||||
|
query_path = "queries/get_group_list.graphql",
|
||||||
|
response_derives = "Debug",
|
||||||
|
variables_derives = "Clone",
|
||||||
|
custom_scalars_module = "crate::infra::graphql"
|
||||||
|
)]
|
||||||
|
pub struct GetGroupList;
|
||||||
|
type GroupListGroup = get_group_list::GetGroupListGroups;
|
||||||
|
|
||||||
|
impl From<GroupListGroup> for Group {
|
||||||
|
fn from(group: GroupListGroup) -> Self {
|
||||||
|
Self {
|
||||||
|
id: group.id,
|
||||||
|
display_name: group.display_name,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct AddUserToGroupComponent {
|
||||||
|
link: ComponentLink<Self>,
|
||||||
|
user: User,
|
||||||
|
/// The list of existing groups, initially not loaded.
|
||||||
|
group_list: Option<Vec<Group>>,
|
||||||
|
/// Whether the "+" button has been clicked.
|
||||||
|
add_group: bool,
|
||||||
|
on_error: Callback<Error>,
|
||||||
|
on_user_added_to_group: Callback<Group>,
|
||||||
|
selected_group: Option<Group>,
|
||||||
|
// Used to keep the request alive long enough.
|
||||||
|
_task: Option<FetchTask>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub enum Msg {
|
||||||
|
AddGroupButtonClicked,
|
||||||
|
GroupListResponse(Result<get_group_list::ResponseData>),
|
||||||
|
SubmitAddGroup,
|
||||||
|
AddGroupResponse(Result<add_user_to_group::ResponseData>),
|
||||||
|
SelectionChanged(ChangeData),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(yew::Properties, Clone, PartialEq)]
|
||||||
|
pub struct Props {
|
||||||
|
pub user: User,
|
||||||
|
pub on_user_added_to_group: Callback<Group>,
|
||||||
|
pub on_error: Callback<Error>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AddUserToGroupComponent {
|
||||||
|
fn get_group_list(&mut self) {
|
||||||
|
self._task = HostService::graphql_query::<GetGroupList>(
|
||||||
|
get_group_list::Variables,
|
||||||
|
self.link.callback(Msg::GroupListResponse),
|
||||||
|
"Error trying to fetch group list",
|
||||||
|
)
|
||||||
|
.map_err(|e| {
|
||||||
|
ConsoleService::log(&e.to_string());
|
||||||
|
e
|
||||||
|
})
|
||||||
|
.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn submit_add_group(&mut self) -> Result<bool> {
|
||||||
|
let group_id = match &self.selected_group {
|
||||||
|
None => return Ok(false),
|
||||||
|
Some(group) => group.id,
|
||||||
|
};
|
||||||
|
self._task = HostService::graphql_query::<AddUserToGroup>(
|
||||||
|
add_user_to_group::Variables {
|
||||||
|
user: self.user.id.clone(),
|
||||||
|
group: group_id,
|
||||||
|
},
|
||||||
|
self.link.callback(Msg::AddGroupResponse),
|
||||||
|
"Error trying to initiate adding the user to a group",
|
||||||
|
)
|
||||||
|
.map_err(|e| {
|
||||||
|
ConsoleService::log(&e.to_string());
|
||||||
|
e
|
||||||
|
})
|
||||||
|
.ok();
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle_msg(&mut self, msg: <Self as Component>::Message) -> Result<bool> {
|
||||||
|
match msg {
|
||||||
|
Msg::AddGroupButtonClicked => {
|
||||||
|
if self.group_list.is_none() {
|
||||||
|
self.get_group_list();
|
||||||
|
} else {
|
||||||
|
self.set_default_selection();
|
||||||
|
}
|
||||||
|
self.add_group = true;
|
||||||
|
}
|
||||||
|
Msg::GroupListResponse(response) => {
|
||||||
|
self.group_list = Some(response?.groups.into_iter().map(Into::into).collect());
|
||||||
|
self.set_default_selection();
|
||||||
|
}
|
||||||
|
Msg::SubmitAddGroup => return self.submit_add_group(),
|
||||||
|
Msg::AddGroupResponse(response) => {
|
||||||
|
response?;
|
||||||
|
// Adding the user to the group succeeded, we're not in the process of adding a
|
||||||
|
// group anymore.
|
||||||
|
self.add_group = false;
|
||||||
|
let group = self
|
||||||
|
.selected_group
|
||||||
|
.as_ref()
|
||||||
|
.expect("Could not get selected group")
|
||||||
|
.clone();
|
||||||
|
// Remove the group from the dropdown.
|
||||||
|
self.on_user_added_to_group.emit(group);
|
||||||
|
}
|
||||||
|
Msg::SelectionChanged(data) => match data {
|
||||||
|
ChangeData::Select(e) => {
|
||||||
|
self.update_selection(e);
|
||||||
|
}
|
||||||
|
_ => unreachable!(),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update_selection(&mut self, e: web_sys::HtmlSelectElement) {
|
||||||
|
if e.selected_index() == -1 {
|
||||||
|
self.selected_group = None;
|
||||||
|
} else {
|
||||||
|
use wasm_bindgen::JsCast;
|
||||||
|
let option = e
|
||||||
|
.options()
|
||||||
|
.get_with_index(e.selected_index() as u32)
|
||||||
|
.unwrap()
|
||||||
|
.dyn_into::<web_sys::HtmlOptionElement>()
|
||||||
|
.unwrap();
|
||||||
|
self.selected_group = Some(Group {
|
||||||
|
id: option.value().parse::<i64>().unwrap(),
|
||||||
|
display_name: option.text(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_selectable_group_list(&self, group_list: &Vec<Group>) -> Vec<Group> {
|
||||||
|
let user_groups = self.user.groups.iter().collect::<HashSet<_>>();
|
||||||
|
group_list
|
||||||
|
.iter()
|
||||||
|
.filter(|g| !user_groups.contains(g))
|
||||||
|
.map(Clone::clone)
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_default_selection(&mut self) {
|
||||||
|
self.selected_group = (|| {
|
||||||
|
let groups = self.get_selectable_group_list(self.group_list.as_ref()?);
|
||||||
|
groups.into_iter().next()
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Component for AddUserToGroupComponent {
|
||||||
|
type Message = Msg;
|
||||||
|
type Properties = Props;
|
||||||
|
fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
|
||||||
|
Self {
|
||||||
|
link,
|
||||||
|
user: props.user,
|
||||||
|
group_list: None,
|
||||||
|
add_group: false,
|
||||||
|
on_error: props.on_error,
|
||||||
|
on_user_added_to_group: props.on_user_added_to_group,
|
||||||
|
selected_group: None,
|
||||||
|
_task: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn update(&mut self, msg: Self::Message) -> ShouldRender {
|
||||||
|
match self.handle_msg(msg) {
|
||||||
|
Err(e) => {
|
||||||
|
ConsoleService::error(&e.to_string());
|
||||||
|
self.on_error.emit(e);
|
||||||
|
true
|
||||||
|
}
|
||||||
|
Ok(b) => b,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn change(&mut self, props: Self::Properties) -> ShouldRender {
|
||||||
|
if props.user.groups != self.user.groups {
|
||||||
|
self.user = props.user;
|
||||||
|
if self.selected_group.is_none() {
|
||||||
|
self.set_default_selection();
|
||||||
|
}
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn view(&self) -> Html {
|
||||||
|
if !self.add_group {
|
||||||
|
return html! {
|
||||||
|
<>
|
||||||
|
<td></td>
|
||||||
|
<td>
|
||||||
|
<button onclick=self.link.callback(
|
||||||
|
|_| Msg::AddGroupButtonClicked)>
|
||||||
|
{"+"}
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</>
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(group_list) = &self.group_list {
|
||||||
|
let to_add_group_list = self.get_selectable_group_list(&group_list);
|
||||||
|
let make_select_option = |group: Group| {
|
||||||
|
html! {
|
||||||
|
<option value={group.id.to_string()}>{group.display_name}</option>
|
||||||
|
}
|
||||||
|
};
|
||||||
|
html! {
|
||||||
|
<>
|
||||||
|
<td>
|
||||||
|
<select name="groupToAdd" id="groupToAdd"
|
||||||
|
onchange=self.link.callback(|e| Msg::SelectionChanged(e))>
|
||||||
|
{
|
||||||
|
to_add_group_list
|
||||||
|
.into_iter()
|
||||||
|
.map(make_select_option)
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<button onclick=self.link.callback(
|
||||||
|
|_| Msg::SubmitAddGroup)>
|
||||||
|
{"Add"}
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
html! {
|
||||||
|
<>
|
||||||
|
<td>{"Loading groups"}</td>
|
||||||
|
<td></td>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,3 +1,4 @@
|
|||||||
|
pub mod add_user_to_group;
|
||||||
pub mod app;
|
pub mod app;
|
||||||
pub mod change_password;
|
pub mod change_password;
|
||||||
pub mod create_user;
|
pub mod create_user;
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
components::router::{AppRoute, NavButton},
|
components::{
|
||||||
|
add_user_to_group::AddUserToGroupComponent,
|
||||||
|
router::{AppRoute, NavButton},
|
||||||
|
},
|
||||||
infra::api::HostService,
|
infra::api::HostService,
|
||||||
};
|
};
|
||||||
use anyhow::{anyhow, bail, Error, Result};
|
use anyhow::{anyhow, bail, Error, Result};
|
||||||
use graphql_client::GraphQLQuery;
|
use graphql_client::GraphQLQuery;
|
||||||
use std::collections::HashSet;
|
|
||||||
use yew::{
|
use yew::{
|
||||||
prelude::*,
|
prelude::*,
|
||||||
services::{fetch::FetchTask, ConsoleService},
|
services::{fetch::FetchTask, ConsoleService},
|
||||||
@ -14,23 +16,13 @@ use yew::{
|
|||||||
#[graphql(
|
#[graphql(
|
||||||
schema_path = "../schema.graphql",
|
schema_path = "../schema.graphql",
|
||||||
query_path = "queries/get_user_details.graphql",
|
query_path = "queries/get_user_details.graphql",
|
||||||
response_derives = "Debug, Hash, PartialEq, Eq",
|
response_derives = "Debug, Hash, PartialEq, Eq, Clone",
|
||||||
custom_scalars_module = "crate::infra::graphql"
|
custom_scalars_module = "crate::infra::graphql"
|
||||||
)]
|
)]
|
||||||
pub struct GetUserDetails;
|
pub struct GetUserDetails;
|
||||||
|
|
||||||
type User = get_user_details::GetUserDetailsUser;
|
pub type User = get_user_details::GetUserDetailsUser;
|
||||||
type Group = get_user_details::GetUserDetailsUserGroups;
|
pub type Group = get_user_details::GetUserDetailsUserGroups;
|
||||||
type GroupListGroup = get_group_list::GetGroupListGroups;
|
|
||||||
|
|
||||||
impl From<GroupListGroup> for Group {
|
|
||||||
fn from(group: GroupListGroup) -> Self {
|
|
||||||
Self {
|
|
||||||
id: group.id,
|
|
||||||
display_name: group.display_name,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(GraphQLQuery)]
|
#[derive(GraphQLQuery)]
|
||||||
#[graphql(
|
#[graphql(
|
||||||
@ -42,16 +34,6 @@ impl From<GroupListGroup> for Group {
|
|||||||
)]
|
)]
|
||||||
pub struct UpdateUser;
|
pub struct UpdateUser;
|
||||||
|
|
||||||
#[derive(GraphQLQuery)]
|
|
||||||
#[graphql(
|
|
||||||
schema_path = "../schema.graphql",
|
|
||||||
query_path = "queries/add_user_to_group.graphql",
|
|
||||||
response_derives = "Debug",
|
|
||||||
variables_derives = "Clone",
|
|
||||||
custom_scalars_module = "crate::infra::graphql"
|
|
||||||
)]
|
|
||||||
pub struct AddUserToGroup;
|
|
||||||
|
|
||||||
#[derive(GraphQLQuery)]
|
#[derive(GraphQLQuery)]
|
||||||
#[graphql(
|
#[graphql(
|
||||||
schema_path = "../schema.graphql",
|
schema_path = "../schema.graphql",
|
||||||
@ -62,16 +44,6 @@ pub struct AddUserToGroup;
|
|||||||
)]
|
)]
|
||||||
pub struct RemoveUserFromGroup;
|
pub struct RemoveUserFromGroup;
|
||||||
|
|
||||||
#[derive(GraphQLQuery)]
|
|
||||||
#[graphql(
|
|
||||||
schema_path = "../schema.graphql",
|
|
||||||
query_path = "queries/get_group_list.graphql",
|
|
||||||
response_derives = "Debug",
|
|
||||||
variables_derives = "Clone",
|
|
||||||
custom_scalars_module = "crate::infra::graphql"
|
|
||||||
)]
|
|
||||||
pub struct GetGroupList;
|
|
||||||
|
|
||||||
pub struct UserDetails {
|
pub struct UserDetails {
|
||||||
link: ComponentLink<Self>,
|
link: ComponentLink<Self>,
|
||||||
/// Which user this is about.
|
/// Which user this is about.
|
||||||
@ -87,11 +59,7 @@ pub struct UserDetails {
|
|||||||
update_request: Option<update_user::UpdateUserInput>,
|
update_request: Option<update_user::UpdateUserInput>,
|
||||||
/// True iff we just finished updating the user, to display a successful message.
|
/// True iff we just finished updating the user, to display a successful message.
|
||||||
update_successful: bool,
|
update_successful: bool,
|
||||||
/// Whether the "+" button has been clicked.
|
|
||||||
add_group: bool,
|
|
||||||
is_admin: bool,
|
is_admin: bool,
|
||||||
/// The list of existing groups, initially not loaded.
|
|
||||||
group_list: Option<Vec<Group>>,
|
|
||||||
/// The group that we're requesting to remove, if any.
|
/// The group that we're requesting to remove, if any.
|
||||||
group_to_remove: Option<Group>,
|
group_to_remove: Option<Group>,
|
||||||
// Used to keep the request alive long enough.
|
// Used to keep the request alive long enough.
|
||||||
@ -107,12 +75,10 @@ pub enum Msg {
|
|||||||
SubmitUserUpdateForm,
|
SubmitUserUpdateForm,
|
||||||
/// Response after updating the user's details.
|
/// Response after updating the user's details.
|
||||||
UpdateFinished(Result<update_user::ResponseData>),
|
UpdateFinished(Result<update_user::ResponseData>),
|
||||||
AddGroupButtonClicked,
|
|
||||||
GroupListResponse(Result<get_group_list::ResponseData>),
|
|
||||||
SubmitAddGroup,
|
|
||||||
AddGroupResponse(Result<add_user_to_group::ResponseData>),
|
|
||||||
SubmitRemoveGroup(Group),
|
SubmitRemoveGroup(Group),
|
||||||
RemoveGroupResponse(Result<remove_user_from_group::ResponseData>),
|
RemoveGroupResponse(Result<remove_user_from_group::ResponseData>),
|
||||||
|
OnError(Error),
|
||||||
|
OnUserAddedToGroup(Group),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(yew::Properties, Clone, PartialEq)]
|
#[derive(yew::Properties, Clone, PartialEq)]
|
||||||
@ -214,42 +180,6 @@ impl UserDetails {
|
|||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_group_list(&mut self) {
|
|
||||||
self._task = HostService::graphql_query::<GetGroupList>(
|
|
||||||
get_group_list::Variables,
|
|
||||||
self.link.callback(Msg::GroupListResponse),
|
|
||||||
"Error trying to fetch group list",
|
|
||||||
)
|
|
||||||
.map_err(|e| {
|
|
||||||
ConsoleService::log(&e.to_string());
|
|
||||||
e
|
|
||||||
})
|
|
||||||
.ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn submit_add_group(&mut self) -> Result<bool> {
|
|
||||||
if self.group_list.is_none() {
|
|
||||||
return Ok(false);
|
|
||||||
}
|
|
||||||
let group_id = get_selected_group()
|
|
||||||
.expect("could not get selected group")
|
|
||||||
.id;
|
|
||||||
self._task = HostService::graphql_query::<AddUserToGroup>(
|
|
||||||
add_user_to_group::Variables {
|
|
||||||
user: self.username.clone(),
|
|
||||||
group: group_id,
|
|
||||||
},
|
|
||||||
self.link.callback(Msg::AddGroupResponse),
|
|
||||||
"Error trying to initiate adding the user to a group",
|
|
||||||
)
|
|
||||||
.map_err(|e| {
|
|
||||||
ConsoleService::log(&e.to_string());
|
|
||||||
e
|
|
||||||
})
|
|
||||||
.ok();
|
|
||||||
Ok(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn submit_remove_group(&mut self, group: Group) -> Result<bool> {
|
fn submit_remove_group(&mut self, group: Group) -> Result<bool> {
|
||||||
self._task = HostService::graphql_query::<RemoveUserFromGroup>(
|
self._task = HostService::graphql_query::<RemoveUserFromGroup>(
|
||||||
remove_user_from_group::Variables {
|
remove_user_from_group::Variables {
|
||||||
@ -280,49 +210,16 @@ impl UserDetails {
|
|||||||
},
|
},
|
||||||
Msg::SubmitUserUpdateForm => return self.submit_user_update_form(),
|
Msg::SubmitUserUpdateForm => return self.submit_user_update_form(),
|
||||||
Msg::UpdateFinished(r) => return self.user_update_finished(r),
|
Msg::UpdateFinished(r) => return self.user_update_finished(r),
|
||||||
Msg::AddGroupButtonClicked => {
|
|
||||||
if self.group_list.is_none() {
|
|
||||||
self.get_group_list();
|
|
||||||
}
|
|
||||||
self.add_group = true;
|
|
||||||
}
|
|
||||||
Msg::GroupListResponse(response) => {
|
|
||||||
let user_groups = self
|
|
||||||
.user
|
|
||||||
.as_ref()
|
|
||||||
.unwrap()
|
|
||||||
.groups
|
|
||||||
.iter()
|
|
||||||
.collect::<HashSet<_>>();
|
|
||||||
self.group_list = Some(
|
|
||||||
response?
|
|
||||||
.groups
|
|
||||||
.into_iter()
|
|
||||||
.map(Into::into)
|
|
||||||
.filter(|g| !user_groups.contains(g))
|
|
||||||
.collect(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Msg::SubmitAddGroup => return self.submit_add_group(),
|
|
||||||
Msg::AddGroupResponse(response) => {
|
|
||||||
response?;
|
|
||||||
// Adding the user to the group succeeded, we're not in the process of adding a
|
|
||||||
// group anymore.
|
|
||||||
self.add_group = false;
|
|
||||||
let group = get_selected_group().expect("Could not get selected group");
|
|
||||||
// Remove the group from the dropdown.
|
|
||||||
self.group_list.as_mut().unwrap().retain(|g| g != &group);
|
|
||||||
self.user.as_mut().unwrap().groups.push(group);
|
|
||||||
}
|
|
||||||
Msg::SubmitRemoveGroup(group) => return self.submit_remove_group(group),
|
Msg::SubmitRemoveGroup(group) => return self.submit_remove_group(group),
|
||||||
Msg::RemoveGroupResponse(response) => {
|
Msg::RemoveGroupResponse(response) => {
|
||||||
response?;
|
response?;
|
||||||
let group = self.group_to_remove.take().unwrap();
|
let group = self.group_to_remove.take().unwrap();
|
||||||
// Remove the group from the user and add it to the dropdown.
|
// Remove the group from the user and add it to the dropdown.
|
||||||
self.user.as_mut().unwrap().groups.retain(|g| g != &group);
|
self.user.as_mut().unwrap().groups.retain(|g| g != &group);
|
||||||
if let Some(groups) = self.group_list.as_mut() {
|
}
|
||||||
groups.push(group);
|
Msg::OnError(e) => return Err(e),
|
||||||
}
|
Msg::OnUserAddedToGroup(group) => {
|
||||||
|
self.user.as_mut().unwrap().groups.push(group);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(true)
|
Ok(true)
|
||||||
@ -382,7 +279,7 @@ impl UserDetails {
|
|||||||
let id = group.id;
|
let id = group.id;
|
||||||
let display_name = group.display_name.clone();
|
let display_name = group.display_name.clone();
|
||||||
html! {
|
html! {
|
||||||
<tr>
|
<tr key="groupRow_".to_string() + &display_name.clone()>
|
||||||
<td>{&group.display_name}</td>
|
<td>{&group.display_name}</td>
|
||||||
{ if self.is_admin { html! {
|
{ if self.is_admin { html! {
|
||||||
<td><button onclick=self.link.callback(move |_| Msg::SubmitRemoveGroup(Group{id, display_name: display_name.clone()}))>{"-"}</button></td>
|
<td><button onclick=self.link.callback(move |_| Msg::SubmitRemoveGroup(Group{id, display_name: display_name.clone()}))>{"-"}</button></td>
|
||||||
@ -395,88 +292,43 @@ impl UserDetails {
|
|||||||
<div>
|
<div>
|
||||||
<span>{"Group memberships"}</span>
|
<span>{"Group memberships"}</span>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr key="headerRow">
|
||||||
<th>{"Group"}</th>
|
<th>{"Group"}</th>
|
||||||
{ if self.is_admin { html!{ <th></th> }} else { html!{} }}
|
{ if self.is_admin { html!{ <th></th> }} else { html!{} }}
|
||||||
</tr>
|
</tr>
|
||||||
{u.groups.iter().map(make_group_row).collect::<Vec<_>>()}
|
{u.groups.iter().map(make_group_row).collect::<Vec<_>>()}
|
||||||
{self.view_add_group_button()}
|
<tr key="groupToAddRow">
|
||||||
|
{self.view_add_group_button(u)}
|
||||||
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn view_add_group_button(&self) -> Html {
|
fn view_add_group_button(&self, u: &User) -> Html {
|
||||||
let make_select_option = |group: &Group| {
|
if self.is_admin {
|
||||||
html! {
|
html! {
|
||||||
<option value={group.id.to_string()}>{&group.display_name}</option>
|
<AddUserToGroupComponent
|
||||||
}
|
user=u.clone()
|
||||||
};
|
on_error=self.link.callback(Msg::OnError)
|
||||||
if self.add_group {
|
on_user_added_to_group=self.link.callback(Msg::OnUserAddedToGroup)/>
|
||||||
html! {
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
{ if let Some(groups) = self.group_list.as_ref() {
|
|
||||||
html! {
|
|
||||||
<select name="groupToAdd" id="groupToAdd">
|
|
||||||
{groups.iter().map(make_select_option).collect::<Vec<_>>()}
|
|
||||||
</select>
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
html! { <span>{"Loading groups"} </span> } }
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
{ if self.is_admin { html!{
|
|
||||||
<td>
|
|
||||||
<button onclick=self.link.callback(
|
|
||||||
|_| Msg::SubmitAddGroup)>
|
|
||||||
{"Add"}
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
}} else { html! {} }
|
|
||||||
}
|
|
||||||
</tr>
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
html! {
|
html! {}
|
||||||
<tr>
|
|
||||||
<td></td>
|
|
||||||
<td>
|
|
||||||
<button onclick=self.link.callback(
|
|
||||||
|_| Msg::AddGroupButtonClicked)>
|
|
||||||
{"+"}
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_html_element<T: wasm_bindgen::JsCast>(name: &str) -> Option<T> {
|
|
||||||
use wasm_bindgen::JsCast;
|
|
||||||
web_sys::window()?
|
|
||||||
.document()?
|
|
||||||
.get_element_by_id(name)?
|
|
||||||
.dyn_into::<T>()
|
|
||||||
.ok()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_element(name: &str) -> Option<String> {
|
fn get_element(name: &str) -> Option<String> {
|
||||||
Some(get_html_element::<web_sys::HtmlInputElement>(name)?.value())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_selected_group() -> Option<Group> {
|
|
||||||
use wasm_bindgen::JsCast;
|
use wasm_bindgen::JsCast;
|
||||||
let select = get_html_element::<web_sys::HtmlSelectElement>("groupToAdd")?;
|
Some(
|
||||||
let id = select.value().parse::<i64>().expect("invalid group id");
|
web_sys::window()?
|
||||||
let display_name = select
|
.document()?
|
||||||
.get(select.selected_index() as u32)
|
.get_element_by_id(name)?
|
||||||
.unwrap()
|
.dyn_into::<web_sys::HtmlInputElement>()
|
||||||
.dyn_into::<web_sys::HtmlOptionElement>()
|
.ok()?
|
||||||
.unwrap()
|
.value(),
|
||||||
.text();
|
)
|
||||||
Some(Group { id, display_name })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_element_or_empty(name: &str) -> String {
|
fn get_element_or_empty(name: &str) -> String {
|
||||||
@ -485,7 +337,6 @@ fn get_element_or_empty(name: &str) -> String {
|
|||||||
|
|
||||||
impl Component for UserDetails {
|
impl Component for UserDetails {
|
||||||
type Message = Msg;
|
type Message = Msg;
|
||||||
// The username.
|
|
||||||
type Properties = Props;
|
type Properties = Props;
|
||||||
|
|
||||||
fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
|
fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
|
||||||
@ -495,11 +346,9 @@ impl Component for UserDetails {
|
|||||||
node_ref: NodeRef::default(),
|
node_ref: NodeRef::default(),
|
||||||
_task: None,
|
_task: None,
|
||||||
user: None,
|
user: None,
|
||||||
group_list: None,
|
|
||||||
error: None,
|
error: None,
|
||||||
update_request: None,
|
update_request: None,
|
||||||
update_successful: false,
|
update_successful: false,
|
||||||
add_group: false,
|
|
||||||
is_admin: props.is_admin,
|
is_admin: props.is_admin,
|
||||||
group_to_remove: None,
|
group_to_remove: None,
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user