From 02e98462824dfc6e6283b990ab15e66e731bd93a Mon Sep 17 00:00:00 2001 From: Anoop P <44577841+anoopw3bdev@users.noreply.github.com> Date: Wed, 21 Feb 2024 23:09:37 +0530 Subject: [PATCH] Add confirmation modal when deleting/ regenerating api keys, deleting webhook (#4035) * fix: confirmation modal style * add confirmation modal when delete/ regenerating an api key * add confirmation modal when deleting webhook * fix: remove line break * Update packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx * Update packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx * Update packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx * Update packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx * Update packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx * Update packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx --------- Co-authored-by: Charles Bochet --- .../modal/components/ConfirmationModal.tsx | 20 +++++---- .../SettingsDevelopersApiKeyDetail.tsx | 42 +++++++++++++++++-- .../SettingsDevelopersWebhookDetail.tsx | 21 +++++++++- 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx index 27c52e33f..9c7cb4125 100644 --- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx +++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx @@ -42,6 +42,10 @@ const StyledCenteredTitle = styled.div` text-align: center; `; +const StyledSection = styled(Section)` + margin-bottom: ${({ theme }) => theme.spacing(6)}; +`; + export const StyledConfirmationButton = styled(StyledCenteredButton)` border-color: ${({ theme }) => theme.border.color.danger}; box-shadow: none; @@ -94,12 +98,12 @@ export const ConfirmationModal = ({ -
{subtitle} -
+ {confirmationValue && (
)} + setIsOpen(false)} + variant="secondary" + title="Cancel" + fullWidth + /> - setIsOpen(false)} - variant="secondary" - title="Cancel" - fullWidth - /> diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx index b8a07b857..a94a27b37 100644 --- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx +++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx @@ -1,4 +1,4 @@ -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import styled from '@emotion/styled'; import { DateTime } from 'luxon'; @@ -20,6 +20,7 @@ import { IconRepeat, IconSettings, IconTrash } from '@/ui/display/icon'; import { H2Title } from '@/ui/display/typography/components/H2Title'; import { Button } from '@/ui/input/button/components/Button'; import { TextInput } from '@/ui/input/components/TextInput'; +import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'; import { Section } from '@/ui/layout/section/components/Section'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; @@ -40,6 +41,10 @@ const StyledInputContainer = styled.div` `; export const SettingsDevelopersApiKeyDetail = () => { + const [isRegenerateKeyModalOpen, setIsRegenerateKeyModalOpen] = + useState(false); + const [isDeleteApiKeyModalOpen, setIsDeleteApiKeyModalOpen] = useState(false); + const navigate = useNavigate(); const { apiKeyId = '' } = useParams(); @@ -154,7 +159,7 @@ export const SettingsDevelopersApiKeyDetail = () => {