Scheduling infrastructure for absolutely everyone.
fix(CAL-5435): Conditionally render selection bar buttons based on user role (#20604)
devin-ai-integration[bot]76a820f3ca15
diff --git a/packages/features/ee/organizations/pages/members.tsx b/packages/features/ee/organizations/pages/members.tsxindex bc1889dca2d..7662a6687c7 100644--- a/packages/features/ee/organizations/pages/members.tsx+++ b/packages/features/ee/organizations/pages/members.tsx@@ -19,7 +19,7 @@ const MembersView = () => {<LicenseRequired><div>{!isPending && canLoggedInUserSeeMembers && <UserListTable />}</div>{!canLoggedInUserSeeMembers && (- <div className="border-subtle rounded-xl border p-6" data-testId="members-privacy-warning">+ <div className="border-subtle rounded-xl border p-6" data-testid="members-privacy-warning"><h2 className="text-default">{t("only_admin_can_see_members_of_org")}</h2></div>)}diff --git a/packages/features/users/components/UserTable/UserListTable.tsx b/packages/features/users/components/UserTable/UserListTable.tsxindex 12c01c3e2d8..921acc7ef6c 100644--- a/packages/features/users/components/UserTable/UserListTable.tsx+++ b/packages/features/users/components/UserTable/UserListTable.tsx@@ -7,6 +7,7 @@ import { useQueryState, parseAsBoolean } from "nuqs";import { useMemo, useReducer, useState } from "react";import { createPortal } from "react-dom";+import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";import {DataTableProvider,DataTableWrapper,@@ -156,7 +157,7 @@ function UserListTableContent() {// TODO (SEAN): Make Column filters a trpc query param so we can fetch serverside even if the data is not loadedconst totalRowCount = data?.meta?.totalRowCount ?? 0;- const adminOrOwner = org?.user.role === "ADMIN" || org?.user.role === "OWNER";+ const adminOrOwner = checkAdminOrOwner(org?.user?.role);//we must flatten the array of arrays from the useInfiniteQuery hookconst flatData = useMemo<UserTableUser[]>(() => data?.rows ?? [], [data]);@@ -554,7 +555,7 @@ function UserListTableContent() {</p>{!isPlatformUser ? (<>- <TeamListBulkAction table={table} />+ {adminOrOwner && <TeamListBulkAction table={table} />}{numberOfSelectedRows >= 2 && (<DataTableSelectionBar.Buttoncolor="secondary"@@ -563,14 +564,16 @@ function UserListTableContent() {{t("group_meeting")}</DataTableSelectionBar.Button>)}- <MassAssignAttributesBulkAction table={table} filters={columnFilters} />- <EventTypesList table={table} orgTeams={teams} />+ {adminOrOwner && <MassAssignAttributesBulkAction table={table} filters={columnFilters} />}+ {adminOrOwner && <EventTypesList table={table} orgTeams={teams} />}</>) : null}- <DeleteBulkUsers- users={table.getSelectedRowModel().flatRows.map((row) => row.original)}- onRemove={() => table.toggleAllPageRowsSelected(false)}- />+ {adminOrOwner && (+ <DeleteBulkUsers+ users={table.getSelectedRowModel().flatRows.map((row) => row.original)}+ onRemove={() => table.toggleAllPageRowsSelected(false)}+ />+ )}</DataTableSelectionBar.Root>)}</DataTableWrapper>