From cec71f28f17e05cf227119bc3ea646e9f588afc8 Mon Sep 17 00:00:00 2001
From: Akshita Goyal <36129505+gakshita@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:39:22 +0530
Subject: [PATCH] [WEB-2022] Fix/members billing status (#701)

* fix: hide the billing status for non pro workspaces

* fix: handled null state
---
 .../projects/settings/useProjectColumns.tsx   | 23 +------------------
 .../workspace/settings/useMemberColumns.tsx   | 14 ++++++++---
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/web/ee/components/projects/settings/useProjectColumns.tsx b/web/ee/components/projects/settings/useProjectColumns.tsx
index 2b0f0071fe..2fa5417585 100644
--- a/web/ee/components/projects/settings/useProjectColumns.tsx
+++ b/web/ee/components/projects/settings/useProjectColumns.tsx
@@ -1,22 +1 @@
-import { EUserWorkspaceRoles } from "@/constants/workspace";
-import { RowData, useProjectColumns as useCeProjectColumns } from "ce/components/projects/settings/useProjectColumns";
-
-export const useProjectColumns = () => {
-  const { columns, workspaceSlug, projectId, removeMemberModal, setRemoveMemberModal } = useCeProjectColumns();
-  const [fullName, displayName, accountType, joiningDate] = columns;
-
-  const eeColumns = [
-    fullName,
-    displayName,
-    accountType,
-    {
-      key: "Billing Status",
-      content: "Billing Status",
-      tdRender: (rowData: RowData) => (
-        <div className="w-36">{rowData.role < EUserWorkspaceRoles.MEMBER ? "Inactive" : "Active"}</div>
-      ),
-    },
-    joiningDate,
-  ];
-  return { columns: eeColumns, workspaceSlug, projectId, removeMemberModal, setRemoveMemberModal };
-};
+export * from "ce/components/projects/settings/useProjectColumns";
diff --git a/web/ee/components/workspace/settings/useMemberColumns.tsx b/web/ee/components/workspace/settings/useMemberColumns.tsx
index 71d1171bad..fdf892f435 100644
--- a/web/ee/components/workspace/settings/useMemberColumns.tsx
+++ b/web/ee/components/workspace/settings/useMemberColumns.tsx
@@ -1,11 +1,12 @@
+import { useMemberColumns as useCeMemberColumns } from "ce/components/workspace/settings/useMemberColumns";
 import { RowData } from "@/components/workspace/settings/member-columns";
 import { EUserWorkspaceRoles } from "@/constants/workspace";
-import { useMemberColumns as useCeMemberColumns } from "ce/components/workspace/settings/useMemberColumns";
+import { useWorkspaceSubscription } from "@/plane-web/hooks/store";
 
 export const useMemberColumns = () => {
   const { columns, workspaceSlug, removeMemberModal, setRemoveMemberModal } = useCeMemberColumns();
   const [fullName, display_name, accountType, joiningDate] = columns;
-
+  const { currentWorkspaceSubscribedPlanDetail } = useWorkspaceSubscription();
   const eeColumns = [
     fullName,
     display_name,
@@ -20,5 +21,12 @@ export const useMemberColumns = () => {
     joiningDate,
   ];
 
-  return { columns: eeColumns, workspaceSlug, removeMemberModal, setRemoveMemberModal };
+  return currentWorkspaceSubscribedPlanDetail
+    ? {
+        columns: currentWorkspaceSubscribedPlanDetail.product === "PRO" ? eeColumns : columns,
+        workspaceSlug,
+        removeMemberModal,
+        setRemoveMemberModal,
+      }
+    : {};
 };