From 02600880d1042ac69d59fc1856549478219f3c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Mon, 19 Jun 2023 13:48:26 +0200 Subject: [PATCH] fix: specific actions for enterprise trial messages (#4001) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Nuno Góis --- .../common/InstanceStatus/InstanceStatus.tsx | 20 ++++++++++++++++++- .../InstanceStatus/InstanceStatusBar.tsx | 14 ++++++++----- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/frontend/src/component/common/InstanceStatus/InstanceStatus.tsx b/frontend/src/component/common/InstanceStatus/InstanceStatus.tsx index 62f1213dc3..e474004158 100644 --- a/frontend/src/component/common/InstanceStatus/InstanceStatus.tsx +++ b/frontend/src/component/common/InstanceStatus/InstanceStatus.tsx @@ -5,7 +5,7 @@ import { ConditionallyRender } from 'component/common/ConditionallyRender/Condit import { Dialogue } from 'component/common/Dialogue/Dialogue'; import { Typography } from '@mui/material'; import { useNavigate } from 'react-router-dom'; -import { IInstanceStatus } from 'interfaces/instance'; +import { IInstanceStatus, InstancePlan } from 'interfaces/instance'; import { ADMIN } from 'component/providers/AccessProvider/permissions'; import AccessContext from 'contexts/AccessContext'; import useInstanceStatusApi from 'hooks/api/actions/useInstanceStatusApi/useInstanceStatusApi'; @@ -44,6 +44,24 @@ const TrialDialog: VFC = ({ return () => clearInterval(interval); }, [expired]); + if (instanceStatus.plan === InstancePlan.ENTERPRISE) { + return ( + { + setDialogOpen(false); + }} + title={`Your free ${instanceStatus.plan} trial has expired!`} + > + + Please contact your Unleash sales representative to avoid{' '} + deletion of your Unleash account. + + + ); + } + if (hasAccess(ADMIN)) { return ( { has expired. Upgrade trial otherwise your{' '} account will be deleted. - + ); }; @@ -105,7 +105,7 @@ const StatusBarExpiresSoon = ({ instanceStatus }: IInstanceStatusBarProps) => { {timeRemaining} left of your free{' '} {instanceStatus.plan} trial. - + ); }; @@ -118,12 +118,12 @@ const StatusBarExpiresLater = ({ instanceStatus }: IInstanceStatusBarProps) => { Heads up! You're currently on a free{' '} {instanceStatus.plan} trial account. - + ); }; -const BillingLink = () => { +const BillingLink = ({ instanceStatus }: IInstanceStatusBarProps) => { const { hasAccess } = useContext(AccessContext); const navigate = useNavigate(); @@ -131,6 +131,10 @@ const BillingLink = () => { return null; } + if (instanceStatus.plan === InstancePlan.ENTERPRISE) { + return null; + } + return ( navigate('/admin/billing')}