fix: gitops catalog filter and handle subscription error (#512)

* fix: workload creation * fix: gitops catalog filter
konstructio · Sep 3, 2024 · f5e5b98 · f5e5b98
1 parent 59365c2
commit f5e5b98
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/app/settings/subscription/[slug]/page.tsx b/app/settings/subscription/[slug]/page.tsx
@@ -1,17 +1,8 @@
 import React from 'react';
-import axios from 'axios';
-import sortBy from 'lodash/sortBy';
 
-import Subscription from '@/containers/Subscription/Subscription';
-import { Plan } from '@/types/plan';
-
-async function getProductPlans() {
-  const { SAAS_API_URL = '' } = process.env;
-
-  const { data } = await axios.get<Array<Plan>>(`${SAAS_API_URL}/api/v1/payment/plans`);
+import { getProductPlans } from '../page';
 
-  return sortBy(data, (product) => product && product.metadata && product.metadata['order']);
-}
+import Subscription from '@/containers/Subscription/Subscription';
 
 export default async function Page({ params }: { params: { slug: string } }) {
   const plans = await getProductPlans();

diff --git a/app/settings/subscription/page.tsx b/app/settings/subscription/page.tsx
@@ -5,12 +5,18 @@ import sortBy from 'lodash/sortBy';
 import Subscription from '@/containers/Subscription/Subscription';
 import { Plan } from '@/types/plan';
 
-async function getProductPlans() {
+export async function getProductPlans() {
   const { SAAS_API_URL = '' } = process.env;
 
-  const { data } = await axios.get<Array<Plan>>(`${SAAS_API_URL}/api/v1/payment/plans`);
+  try {
+    const { data } = await axios.get<Array<Plan>>(`${SAAS_API_URL}/api/v1/payment/plans`);
 
-  return sortBy(data, (product) => product && product.metadata && product.metadata['order']);
+    return sortBy(data, (product) => product && product.metadata && product.metadata['order']);
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log('error getting product plans', error);
+    return [];
+  }
 }
 
 export default async function Page() {

diff --git a/hooks/usePaywall.ts b/hooks/usePaywall.ts
@@ -4,7 +4,7 @@ import { useAppSelector } from '@/redux/store';
 import { SaasFeatures, SaasPlans } from '@/types/subscription';
 
 export const CLUSTERS_LIMIT_FALLBACK: { [key: string]: number } = {
-  [SaasPlans.Community]: 3,
+  [SaasPlans.Community]: 4,
   [SaasPlans.Pro]: 10,
   [SaasPlans.Enterprise]: Infinity,
 };
@@ -30,9 +30,12 @@ export default function usePaywall() {
     }
 
     if (!license?.licenseKey) {
+      // Gets and checks number of clusters to allow workload creation
       return (
-        Object.keys(clusterMap).filter((clusterKey) => clusterKey != 'draft').length <
-        CLUSTERS_LIMIT_FALLBACK[SaasPlans.Community]
+        Object.keys(clusterMap).filter((clusterKey) => {
+          const { status } = clusterMap[clusterKey];
+          return clusterKey != 'draft' && status != 'deleted';
+        }).length < CLUSTERS_LIMIT_FALLBACK[SaasPlans.Community]
       );
     }
 

diff --git a/redux/slices/applications.slice.ts b/redux/slices/applications.slice.ts
@@ -100,8 +100,14 @@ const applicationsSlice = createSlice({
         state.installedClusterAppNames = [];
       })
       .addCase(getClusterApplications.fulfilled, (state, { payload }) => {
-        state.clusterApplications = payload;
-        state.installedClusterAppNames = payload.map((app) => app.name);
+        if (payload) {
+          state.clusterApplications = payload;
+
+          state.installedClusterAppNames = payload.map((app) => app.name);
+        } else {
+          state.installedClusterAppNames = [];
+          state.clusterApplications = [];
+        }
       })
       .addCase(getClusterApplications.rejected, (state) => {
         state.clusterApplications = [];