From 1480a4478c0194620e972907cdfbda281bc36c90 Mon Sep 17 00:00:00 2001 From: Vladimir Romashchenko Date: Tue, 11 Aug 2020 04:03:39 -0400 Subject: [PATCH 1/4] Added fix in changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b23aec6e6..f3e977d50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ All notable, unreleased changes to this project will be documented in this file. - create Apps - #599 by @AlicjaSzu - Refactor authorization - #624 by @dominik-zeglen - Fix minor bugs - #628 by @dominik-zeglen +- Removed confirm button in MembersErrorDialog - #498 by @eaglesemanation ## 2.10.1 From d0422323ba4c542c7821fac21dc5525828bce73d Mon Sep 17 00:00:00 2001 From: Vladimir Romashchenko Date: Tue, 11 Aug 2020 04:04:16 -0400 Subject: [PATCH 2/4] Added "info" variant for Action Dialog Info messages should not require any kind of confirmation, so I added option to disable ConfirmButton by providing "info" as a variant --- src/components/ActionDialog/ActionDialog.tsx | 32 +++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/ActionDialog/ActionDialog.tsx b/src/components/ActionDialog/ActionDialog.tsx index e11e6da01..c4b41cfb2 100644 --- a/src/components/ActionDialog/ActionDialog.tsx +++ b/src/components/ActionDialog/ActionDialog.tsx @@ -33,7 +33,7 @@ interface ActionDialogProps extends DialogProps { confirmButtonState: ConfirmButtonTransitionState; maxWidth?: "xs" | "sm" | "md" | "lg" | "xl" | false; title: string; - variant?: "default" | "delete"; + variant?: "default" | "delete" | "info"; onConfirm(); } @@ -61,20 +61,22 @@ const ActionDialog: React.FC = props => { - - {confirmButtonLabel || - (variant === "delete" - ? intl.formatMessage(buttonMessages.delete) - : intl.formatMessage(buttonMessages.confirm))} - + {variant !== "info" && ( + + {confirmButtonLabel || + (variant === "delete" + ? intl.formatMessage(buttonMessages.delete) + : intl.formatMessage(buttonMessages.confirm))} + + )} ); From 3451d58879af84299e177f79078a5dde3155086e Mon Sep 17 00:00:00 2001 From: Vladimir Romashchenko Date: Tue, 11 Aug 2020 04:10:32 -0400 Subject: [PATCH 3/4] Changed MemberErrorDialog variant to "info" --- .../components/MembersErrorDialog/MembersErrorDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx b/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx index d92b9bd9c..496f637ae 100644 --- a/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx +++ b/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx @@ -29,7 +29,7 @@ const MembersErrorDialog: React.FC = ({ defaultMessage: "Unassign users", description: "dialog title" })} - variant="default" + variant="info" > Date: Tue, 11 Aug 2020 20:08:06 -0400 Subject: [PATCH 4/4] Reverted changes to changelog.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3e977d50..6b68a94ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ All notable, unreleased changes to this project will be documented in this file. - create Apps - #599 by @AlicjaSzu - Refactor authorization - #624 by @dominik-zeglen - Fix minor bugs - #628 by @dominik-zeglen -- Removed confirm button in MembersErrorDialog - #498 by @eaglesemanation +- Add navigator button - #635 by @dominik-zeglen ## 2.10.1