From 9d01025a1fba0a33043096bf395c11fbab075f3f Mon Sep 17 00:00:00 2001
From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:55:20 +0530
Subject: [PATCH] revert: team availability view (#17222)
---
apps/web/modules/availability/availability-view.tsx | 4 ++--
.../timezone-buddy/components/AvailabilitySliderTable.tsx | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/apps/web/modules/availability/availability-view.tsx b/apps/web/modules/availability/availability-view.tsx
index 88e32261e9..361c062b83 100644
--- a/apps/web/modules/availability/availability-view.tsx
+++ b/apps/web/modules/availability/availability-view.tsx
@@ -201,7 +201,7 @@ export default function AvailabilityPage({ currentOrg }: PageProps) {
(data && (data.user.role === MembershipRole.OWNER || data.user.role === MembershipRole.ADMIN)) ?? false;
const isOrgAndPrivate = data?.isOrganization && data.isPrivate;
- const canViewTeamAvailability = isOrg && (isOrgAdminOrOwner || !isOrgAndPrivate);
+ const canViewTeamAvailability = isOrgAdminOrOwner || !isOrgAndPrivate;
const toggleGroupOptions = [{ value: "mine", label: t("my_availability") }];
@@ -233,7 +233,7 @@ export default function AvailabilityPage({ currentOrg }: PageProps) {
}>
{searchParams?.get("type") === "team" && canViewTeamAvailability ? (
-
+
) : (
)}
diff --git a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
index 923c695600..096d57bf36 100644
--- a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
+++ b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
@@ -58,7 +58,7 @@ function UpgradeTeamTip() {
);
}
-export function AvailabilitySliderTable(props: { userTimeFormat: number | null }) {
+export function AvailabilitySliderTable(props: { userTimeFormat: number | null; isOrg: boolean }) {
const tableContainerRef = useRef(null);
const [browsingDate, setBrowsingDate] = useState(dayjs());
const [editSheetOpen, setEditSheetOpen] = useState(false);
@@ -210,8 +210,10 @@ export function AvailabilitySliderTable(props: { userTimeFormat: number | null }
table={table}
tableContainerRef={tableContainerRef}
onRowMouseclick={(row) => {
- setEditSheetOpen(true);
- setSelectedUser(row.original);
+ if (props.isOrg) {
+ setEditSheetOpen(true);
+ setSelectedUser(row.original);
+ }
}}
isPending={isPending}
onScroll={(e) => fetchMoreOnBottomReached(e.target as HTMLDivElement)}>