From ce6205f61df0a615eea05c6c9ac7a12c86bb4bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wo=C5=BAniak?= Date: Sat, 16 Jan 2021 19:31:45 +0100 Subject: [PATCH] Close delete epic modal when have related issues --- jirs-client/js/css/styledModal.scss | 16 ++++++++++++++++ jirs-client/src/components/styled_checkbox.rs | 14 ++++++++------ jirs-client/src/components/styled_field.rs | 8 ++++---- jirs-client/src/components/styled_icon.rs | 14 ++++++-------- .../src/components/styled_image_input.rs | 10 +++++----- jirs-client/src/components/styled_link.rs | 8 ++++---- jirs-client/src/components/styled_select.rs | 2 -- jirs-client/src/components/styled_textarea.rs | 8 ++++---- jirs-client/src/components/styled_tooltip.rs | 8 ++++---- jirs-client/src/modals/epic_delete/view.rs | 17 +++++++++++++++-- 10 files changed, 66 insertions(+), 39 deletions(-) diff --git a/jirs-client/js/css/styledModal.scss b/jirs-client/js/css/styledModal.scss index 500ab2c1..dc2b60d1 100644 --- a/jirs-client/js/css/styledModal.scss +++ b/jirs-client/js/css/styledModal.scss @@ -162,6 +162,22 @@ } } } + + > .actions { + display: flex; + justify-content: flex-end; + margin: { + bottom: 10px; + top: 10px; + } + + padding: { + right: 40px; + left: 40px; + }; + > .styledButton { + } + } } } } diff --git a/jirs-client/src/components/styled_checkbox.rs b/jirs-client/src/components/styled_checkbox.rs index 92ec3935..41dd6e34 100644 --- a/jirs-client/src/components/styled_checkbox.rs +++ b/jirs-client/src/components/styled_checkbox.rs @@ -1,9 +1,11 @@ -use seed::{prelude::*, *}; - -use jirs_data::TimeTracking; - -use crate::shared::{ToChild, ToNode}; -use crate::{FieldId, Msg}; +use { + crate::{ + shared::{ToChild, ToNode}, + FieldId, Msg, + }, + jirs_data::TimeTracking, + seed::{prelude::*, *}, +}; #[derive(Debug)] pub struct StyledCheckboxState { diff --git a/jirs-client/src/components/styled_field.rs b/jirs-client/src/components/styled_field.rs index 946592fc..71c74136 100644 --- a/jirs-client/src/components/styled_field.rs +++ b/jirs-client/src/components/styled_field.rs @@ -1,7 +1,7 @@ -use seed::{prelude::*, *}; - -use crate::shared::ToNode; -use crate::Msg; +use { + crate::{shared::ToNode, Msg}, + seed::{prelude::*, *}, +}; #[derive(Debug)] pub struct StyledField<'l> { diff --git a/jirs-client/src/components/styled_icon.rs b/jirs-client/src/components/styled_icon.rs index 5ed7f574..c9ffa29a 100644 --- a/jirs-client/src/components/styled_icon.rs +++ b/jirs-client/src/components/styled_icon.rs @@ -1,11 +1,9 @@ -use std::borrow::Cow; - -use seed::{prelude::*, *}; - -use jirs_data::{IssuePriority, IssueType}; - -use crate::shared::ToNode; -use crate::Msg; +use { + crate::{shared::ToNode, Msg}, + jirs_data::{IssuePriority, IssueType}, + seed::{prelude::*, *}, + std::borrow::Cow, +}; #[allow(dead_code)] #[derive(Copy, Clone, Debug)] diff --git a/jirs-client/src/components/styled_image_input.rs b/jirs-client/src/components/styled_image_input.rs index 0e34d3f5..877f7baa 100644 --- a/jirs-client/src/components/styled_image_input.rs +++ b/jirs-client/src/components/styled_image_input.rs @@ -1,8 +1,8 @@ -use seed::{prelude::*, *}; -use web_sys::File; - -use crate::shared::ToNode; -use crate::{FieldId, Msg}; +use { + crate::{shared::ToNode, FieldId, Msg}, + seed::{prelude::*, *}, + web_sys::File, +}; #[derive(Debug, Clone)] pub struct StyledImageInputState { diff --git a/jirs-client/src/components/styled_link.rs b/jirs-client/src/components/styled_link.rs index a44d8dd1..f55e471e 100644 --- a/jirs-client/src/components/styled_link.rs +++ b/jirs-client/src/components/styled_link.rs @@ -1,7 +1,7 @@ -use seed::{prelude::*, *}; - -use crate::shared::ToNode; -use crate::Msg; +use { + crate::{shared::ToNode, Msg}, + seed::{prelude::*, *}, +}; pub struct StyledLink<'l> { children: Vec>, diff --git a/jirs-client/src/components/styled_select.rs b/jirs-client/src/components/styled_select.rs index f6ab7a8b..72f4fa16 100644 --- a/jirs-client/src/components/styled_select.rs +++ b/jirs-client/src/components/styled_select.rs @@ -10,8 +10,6 @@ use { seed::{prelude::*, *}, }; -// pub trait ChildIter<'l> = Iterator>; - #[derive(Clone, Debug, PartialEq)] pub enum StyledSelectChanged { Text(String), diff --git a/jirs-client/src/components/styled_textarea.rs b/jirs-client/src/components/styled_textarea.rs index 63801ea7..31dcebb4 100644 --- a/jirs-client/src/components/styled_textarea.rs +++ b/jirs-client/src/components/styled_textarea.rs @@ -1,7 +1,7 @@ -use seed::{prelude::*, *}; - -use crate::shared::ToNode; -use crate::{FieldId, Msg}; +use { + crate::{shared::ToNode, FieldId, Msg}, + seed::{prelude::*, *}, +}; #[derive(Debug)] pub struct StyledTextarea<'l> { diff --git a/jirs-client/src/components/styled_tooltip.rs b/jirs-client/src/components/styled_tooltip.rs index 583401f7..914c57cc 100644 --- a/jirs-client/src/components/styled_tooltip.rs +++ b/jirs-client/src/components/styled_tooltip.rs @@ -1,7 +1,7 @@ -use seed::{prelude::*, *}; - -use crate::shared::ToNode; -use crate::Msg; +use { + crate::{shared::ToNode, Msg}, + seed::{prelude::*, *}, +}; #[derive(Debug, Copy, Clone)] pub enum Variant { diff --git a/jirs-client/src/modals/epic_delete/view.rs b/jirs-client/src/modals/epic_delete/view.rs index dcb41a35..c1c3f258 100644 --- a/jirs-client/src/modals/epic_delete/view.rs +++ b/jirs-client/src/modals/epic_delete/view.rs @@ -1,6 +1,6 @@ use { crate::{ - components::{styled_confirm_modal::*, styled_icon::*, styled_modal::*}, + components::{styled_button::*, styled_confirm_modal::*, styled_icon::*, styled_modal::*}, modals::epic_delete::Model, model, shared::ToNode, @@ -45,12 +45,25 @@ fn warning(model: &model::Model, modal: &Model) -> Node { ]] }) .collect(); + + let close = StyledButton::build() + .text("Close") + .on_click(mouse_ev("click", move |ev| { + ev.stop_propagation(); + ev.prevent_default(); + Msg::ModalDropped + })) + .secondary() + .build() + .into_node(); + section![ h3![C!["header"], "Cannot delete epic"], div![ C!["warning"], "This epic have related issues. Please move or delete them first." ], - ol![C!["relatedList"], issues] + ol![C!["relatedList"], issues], + div![C!["actions"], close] ] }