From 3aca10d35ee2a8c048e21f75b245d889c688e19f Mon Sep 17 00:00:00 2001 From: Alaister Young Date: Fri, 2 Dec 2022 14:38:49 +0000 Subject: [PATCH 01/53] hotfix: key for functions usage --- studio/components/interfaces/Billing/Billing.constants.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/studio/components/interfaces/Billing/Billing.constants.tsx b/studio/components/interfaces/Billing/Billing.constants.tsx index f2ce7ffc943..97efdae0381 100644 --- a/studio/components/interfaces/Billing/Billing.constants.tsx +++ b/studio/components/interfaces/Billing/Billing.constants.tsx @@ -76,7 +76,7 @@ export const USAGE_BASED_PRODUCTS = [ icon: , features: [ { - key: 'total_func_count', + key: 'func_count', attribute: 'total_func_count', title: 'Function Count', units: 'absolute', @@ -84,7 +84,7 @@ export const USAGE_BASED_PRODUCTS = [ }, { - key: 'total_func_invocations', + key: 'func_invocations', attribute: 'total_func_invocations', title: 'Function Invocations', units: 'absolute', From 624afc1f9a7d945533bdca267de3f523d5e22e9e Mon Sep 17 00:00:00 2001 From: Jonathan Summers-Muir Date: Sat, 28 Jan 2023 04:57:55 +0800 Subject: [PATCH 02/53] Update ExitSurvey.tsx --- .../Billing/ExitSurvey/ExitSurvey.tsx | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx b/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx index 9cda2b5aa30..e8caaf6111f 100644 --- a/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx +++ b/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx @@ -37,6 +37,8 @@ const ExitSurvey: FC = ({ freeTier, subscription, onSelectBack }) => { // Tracking submitting state separately outside of form component cause of // the additional dynamic confirmation modal that we're doing const [isSubmitting, setIsSubmitting] = useState(false) + const [isSubmittingDowngradeModal, setIsSubmittingDowngradeModal] = useState(false) + const [isSuccessful, setIsSuccessful] = useState(false) const [showConfirmModal, setShowConfirmModal] = useState(false) const [subscriptionPreview, setSubscriptionPreview] = useState() @@ -123,6 +125,7 @@ const ExitSurvey: FC = ({ freeTier, subscription, onSelectBack }) => { try { setIsSubmitting(true) + setIsSubmittingDowngradeModal(true) // Trigger subscription downgrade const tier = freeTier.prices[0].id @@ -175,6 +178,7 @@ const ExitSurvey: FC = ({ freeTier, subscription, onSelectBack }) => { }) } finally { setIsSubmitting(false) + setIsSubmittingDowngradeModal(false) } } @@ -293,7 +297,10 @@ const ExitSurvey: FC = ({ freeTier, subscription, onSelectBack }) => { visible={showConfirmModal} size="large" header="Downgrading project to free" - onCancel={() => setShowConfirmModal(false)} + onCancel={() => { + setShowConfirmModal(false) + setIsSubmitting(false) + }} >
@@ -314,14 +321,21 @@ const ExitSurvey: FC = ({ freeTier, subscription, onSelectBack }) => {
-