Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-12 13:29:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

[WEB-2022] Fix/members billing status (#701)

Browse Source 
* fix: hide the billing status for non pro workspaces

* fix: handled null state
This commit is contained in:
Akshita Goyal
2024-07-25 16:39:22 +05:30
committed by GitHub
parent 90e91f56a2
commit cec71f28f1
2 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web/ee/components/projects/settings/useProjectColumns.tsx
View File

@@ -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";

14
web/ee/components/workspace/settings/useMemberColumns.tsx
View File

@@ -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,
}
: {};
};