@@ -113,13 +109,13 @@ impl Component for CreateGroupForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("groupname")}
@@ -129,8 +125,8 @@ impl Component for CreateGroupForm {
diff --git a/app/src/components/create_user.rs b/app/src/components/create_user.rs
index b7ece1c..34de174 100644
--- a/app/src/components/create_user.rs
+++ b/app/src/components/create_user.rs
@@ -5,17 +5,14 @@ use crate::{
common_component::{CommonComponent, CommonComponentParts},
},
};
-use anyhow::{bail, Context, Result};
+use anyhow::{bail, Result};
+use gloo_console::log;
use graphql_client::GraphQLQuery;
use lldap_auth::{opaque, registration};
use validator_derive::Validate;
use yew::prelude::*;
-use yew::services::ConsoleService;
use yew_form_derive::Model;
-use yew_router::{
- agent::{RouteAgentDispatcher, RouteRequest},
- route::Route,
-};
+use yew_router::{prelude::History, scope_ext::RouterScopeExt};
#[derive(GraphQLQuery)]
#[graphql(
@@ -28,7 +25,6 @@ pub struct CreateUser;
pub struct CreateUserForm {
common: CommonComponentParts
,
- route_dispatcher: RouteAgentDispatcher,
form: yew_form::Form,
}
@@ -73,7 +69,11 @@ pub enum Msg {
}
impl CommonComponent for CreateUserForm {
- fn handle_msg(&mut self, msg: ::Message) -> Result {
+ fn handle_msg(
+ &mut self,
+ ctx: &Context,
+ msg: ::Message,
+ ) -> Result {
match msg {
Msg::Update => Ok(true),
Msg::SubmitForm => {
@@ -93,6 +93,7 @@ impl CommonComponent for CreateUserForm {
},
};
self.common.call_graphql::(
+ ctx,
req,
Msg::CreateUserResponse,
"Error trying to create user",
@@ -102,7 +103,7 @@ impl CommonComponent for CreateUserForm {
Msg::CreateUserResponse(r) => {
match r {
Err(e) => return Err(e),
- Ok(r) => ConsoleService::log(&format!(
+ Ok(r) => log!(&format!(
"Created user '{}' at '{}'",
&r.create_user.id, &r.create_user.creation_date
)),
@@ -122,12 +123,11 @@ impl CommonComponent for CreateUserForm {
registration_start_request: message,
};
self.common
- .call_backend(HostService::register_start, req, move |r| {
+ .call_backend(ctx, HostService::register_start(req), move |r| {
Msg::RegistrationStartResponse((state, r))
- })
- .context("Error trying to create user")?;
+ });
} else {
- self.update(Msg::SuccessfulCreation);
+ self.update(ctx, Msg::SuccessfulCreation);
}
Ok(false)
}
@@ -143,22 +143,19 @@ impl CommonComponent for CreateUserForm {
server_data: response.server_data,
registration_upload: registration_upload.message,
};
- self.common
- .call_backend(
- HostService::register_finish,
- req,
- Msg::RegistrationFinishResponse,
- )
- .context("Error trying to register user")?;
+ self.common.call_backend(
+ ctx,
+ HostService::register_finish(req),
+ Msg::RegistrationFinishResponse,
+ );
Ok(false)
}
Msg::RegistrationFinishResponse(response) => {
response?;
- self.handle_msg(Msg::SuccessfulCreation)
+ self.handle_msg(ctx, Msg::SuccessfulCreation)
}
Msg::SuccessfulCreation => {
- self.route_dispatcher
- .send(RouteRequest::ChangeRoute(Route::from(AppRoute::ListUsers)));
+ ctx.link().history().unwrap().push(AppRoute::ListUsers);
Ok(true)
}
}
@@ -173,23 +170,19 @@ impl Component for CreateUserForm {
type Message = Msg;
type Properties = ();
- fn create(props: Self::Properties, link: ComponentLink) -> Self {
+ fn create(_: &Context) -> Self {
Self {
- common: CommonComponentParts::::create(props, link),
- route_dispatcher: RouteAgentDispatcher::new(),
+ common: CommonComponentParts::::create(),
form: yew_form::Form::::new(CreateUserModel::default()),
}
}
- fn update(&mut self, msg: Self::Message) -> ShouldRender {
- CommonComponentParts::::update(self, msg)
+ fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool {
+ CommonComponentParts::::update(self, ctx, msg)
}
- fn change(&mut self, props: Self::Properties) -> ShouldRender {
- self.common.change(props)
- }
-
- fn view(&self) -> Html {
+ fn view(&self, ctx: &Context) -> Html {
+ let link = &ctx.link();
type Field = yew_form::Field;
html! {
@@ -206,13 +199,13 @@ impl Component for CreateUserForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("username")}
@@ -227,14 +220,14 @@ impl Component for CreateUserForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("email")}
@@ -247,13 +240,13 @@ impl Component for CreateUserForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("display_name")}
@@ -266,13 +259,13 @@ impl Component for CreateUserForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("first_name")}
@@ -285,13 +278,13 @@ impl Component for CreateUserForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("last_name")}
@@ -304,14 +297,14 @@ impl Component for CreateUserForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("password")}
@@ -324,14 +317,14 @@ impl Component for CreateUserForm {
+ oninput={link.callback(|_| Msg::Update)} />
{&self.form.field_message("confirm_password")}
@@ -340,9 +333,9 @@ impl Component for CreateUserForm {
diff --git a/app/src/components/delete_group.rs b/app/src/components/delete_group.rs
index 881f55f..1fe3ce9 100644
--- a/app/src/components/delete_group.rs
+++ b/app/src/components/delete_group.rs
@@ -39,16 +39,21 @@ pub enum Msg {
}
impl CommonComponent
for DeleteGroup {
- fn handle_msg(&mut self, msg: ::Message) -> Result {
+ fn handle_msg(
+ &mut self,
+ ctx: &Context,
+ msg: ::Message,
+ ) -> Result {
match msg {
Msg::ClickedDeleteGroup => {
self.modal.as_ref().expect("modal not initialized").show();
}
Msg::ConfirmDeleteGroup => {
- self.update(Msg::DismissModal);
+ self.update(ctx, Msg::DismissModal);
self.common.call_graphql::(
+ ctx,
delete_group_query::Variables {
- group_id: self.common.group.id,
+ group_id: ctx.props().group.id,
},
Msg::DeleteGroupResponse,
"Error trying to delete group",
@@ -58,12 +63,8 @@ impl CommonComponent for DeleteGroup {
self.modal.as_ref().expect("modal not initialized").hide();
}
Msg::DeleteGroupResponse(response) => {
- self.common.cancel_task();
response?;
- self.common
- .props
- .on_group_deleted
- .emit(self.common.group.id);
+ ctx.props().on_group_deleted.emit(ctx.props().group.id);
}
}
Ok(true)
@@ -78,15 +79,15 @@ impl Component for DeleteGroup {
type Message = Msg;
type Properties = DeleteGroupProps;
- fn create(props: Self::Properties, link: ComponentLink) -> Self {
+ fn create(_: &Context) -> Self {
Self {
- common: CommonComponentParts::::create(props, link),
+ common: CommonComponentParts::::create(),
node_ref: NodeRef::default(),
modal: None,
}
}
- fn rendered(&mut self, first_render: bool) {
+ fn rendered(&mut self, _: &Context, first_render: bool) {
if first_render {
self.modal = Some(Modal::new(
self.node_ref
@@ -96,43 +97,42 @@ impl Component for DeleteGroup {
}
}
- fn update(&mut self, msg: Self::Message) -> ShouldRender {
+ fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool {
CommonComponentParts::::update_and_report_error(
self,
+ ctx,
msg,
- self.common.on_error.clone(),
+ ctx.props().on_error.clone(),
)
}
- fn change(&mut self, props: Self::Properties) -> ShouldRender {
- self.common.change(props)
- }
-
- fn view(&self) -> Html {
+ fn view(&self, ctx: &Context) -> Html {
+ let link = &ctx.link();
html! {
<>
- {self.show_modal()}
+ {self.show_modal(ctx)}
}
}
}
impl DeleteGroup {
- fn show_modal(&self) -> Html {
+ fn show_modal(&self, ctx: &Context) -> Html {
+ let link = &ctx.link();
html! {
+ ref={self.node_ref.clone()}>
{"Are you sure you want to delete group "}
- {&self.common.group.display_name}{"?"}
+ {&ctx.props().group.display_name}{"?"}