From 3c05a4cebd088672d92d3d5713f16f14e27447cb Mon Sep 17 00:00:00 2001 From: Neeraj138 Date: Sun, 29 Jan 2023 14:01:40 +0530 Subject: [PATCH] Add check for subscriptions call before setting the current plan --- frontend/src/components/basic/table/EnvironmentsTable.tsx | 4 +++- frontend/src/pages/settings/billing/[id].tsx | 5 +++-- frontend/src/pages/settings/org/[id].tsx | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/basic/table/EnvironmentsTable.tsx b/frontend/src/components/basic/table/EnvironmentsTable.tsx index 8ff7d9f0a..df0d06ef5 100644 --- a/frontend/src/components/basic/table/EnvironmentsTable.tsx +++ b/frontend/src/components/basic/table/EnvironmentsTable.tsx @@ -34,7 +34,9 @@ const EnvironmentTable = ({ data = [], onCreateEnv, onDeleteEnv, onUpdateEnv }: const subscriptions = await getOrganizationSubscriptions({ orgId }); - setPlan(subscriptions.data[0].plan.product); + if (subscriptions) { + setPlan(subscriptions.data[0].plan.product) + } })(); // eslint-disable-next-line react-hooks/exhaustive-deps }, []); diff --git a/frontend/src/pages/settings/billing/[id].tsx b/frontend/src/pages/settings/billing/[id].tsx index 1f90afcd4..626dbf69d 100644 --- a/frontend/src/pages/settings/billing/[id].tsx +++ b/frontend/src/pages/settings/billing/[id].tsx @@ -66,8 +66,9 @@ export default function SettingsBilling() { const subscriptions = await getOrganizationSubscriptions({ orgId }); - - setCurrentPlan(subscriptions.data[0].plan.product); + if (subscriptions) { + setCurrentPlan(subscriptions.data[0].plan.product); + } const orgUsers = await getOrganizationUsers({ orgId }); diff --git a/frontend/src/pages/settings/org/[id].tsx b/frontend/src/pages/settings/org/[id].tsx index bb25d0a5c..1fd67c52c 100644 --- a/frontend/src/pages/settings/org/[id].tsx +++ b/frontend/src/pages/settings/org/[id].tsx @@ -87,7 +87,9 @@ export default function SettingsOrg() { const subscriptions = await getOrganizationSubscriptions({ orgId }); - setCurrentPlan(subscriptions.data[0].plan.product); + if (subscriptions) { + setCurrentPlan(subscriptions.data[0].plan.product); + } })(); }, []);