From 6df86882a369cbe553b320b046f9f978d7221486 Mon Sep 17 00:00:00 2001
From: breadddevv <tiagu.1789@gmail.com>
Date: Tue, 14 Jul 2026 20:37:38 +0100
Subject: [PATCH] Added cancel permission

---
 components/sessioncard.tsx                | 4 +++-
 components/settings/permissions/roles.tsx | 1 +
 components/topbar.tsx                     | 3 ++-
 pages/workspace/[id]/sessions.tsx         | 3 ++-
 utils/sessionPermissions.ts               | 6 +++++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/components/sessioncard.tsx b/components/sessioncard.tsx
index 51f7d5f8..3b1b56ae 100644
--- a/components/sessioncard.tsx
+++ b/components/sessioncard.tsx
@@ -141,6 +141,7 @@ interface SessionModalProps {
   onUpdate?: () => void;
   workspaceMembers: any[];
   canManage: boolean;
+  canCancel: boolean;
   canAddNotes?: boolean;
   sessionColors?: SessionColors;
   colorsReady?: boolean | undefined;
@@ -155,6 +156,7 @@ const SessionModal: React.FC<SessionModalProps> = ({
   onUpdate,
   workspaceMembers,
   canManage,
+  canCancel,
   canAddNotes,
   sessionColors,
   colorsReady,
@@ -726,7 +728,7 @@ const SessionModal: React.FC<SessionModalProps> = ({
             </SessionInset>
           )}
 
-          {canManage && !session.cancelled && (
+          {(canManage || canCancel)  && !session.cancelled && (
             <SessionInset>
               {!isCancelExpanded ? (
                 <button
diff --git a/components/settings/permissions/roles.tsx b/components/settings/permissions/roles.tsx
index a8fac6ad..9ea1b7f1 100644
--- a/components/settings/permissions/roles.tsx
+++ b/components/settings/permissions/roles.tsx
@@ -49,6 +49,7 @@ const RolesManager: FC<Props> = ({ roles, setRoles, grouproles }) => {
       [`Create Scheduled ${typeCapitalized}`]: `sessions_${type}_scheduled`,
       [`Manage ${typeCapitalized} Sessions`]: `sessions_${type}_manage`,
       [`Add Notes to ${typeCapitalized} Sessions`]: `sessions_${type}_notes`,
+      [`Cancel ${typeCapitalized} Sessions`]: `sessions_${type}_cancel`,
     };
   });
 
diff --git a/components/topbar.tsx b/components/topbar.tsx
index 1a4266de..fdee8bea 100644
--- a/components/topbar.tsx
+++ b/components/topbar.tsx
@@ -75,6 +75,7 @@ const Topbar: NextPage = () => {
     try {
       const res = await axios.get("/api/user/sessions");
       setSessions(res.data.sessions || []);
+      toast.success("Sessions refreshed")
     } catch {
       toast.error("Failed to load sessions");
     } finally {
@@ -307,7 +308,7 @@ const Topbar: NextPage = () => {
                         Active sessions
                       </p>
                       <button
-                        onClick={() => { fetchSessions(); toast.success("Sessions refreshed"); }}
+                        onClick={fetchSessions}
                         className="rounded-lg p-1 text-zinc-400 transition-colors hover:bg-zinc-100 dark:hover:bg-zinc-800"
                       >
                         <IconRefresh className="h-4 w-4" />
diff --git a/pages/workspace/[id]/sessions.tsx b/pages/workspace/[id]/sessions.tsx
index 72c063cf..ab30dd2a 100644
--- a/pages/workspace/[id]/sessions.tsx
+++ b/pages/workspace/[id]/sessions.tsx
@@ -24,7 +24,7 @@ import { withPermissionCheckSsr } from "@/utils/permissionsManager";
 import toast from "react-hot-toast";
 import SessionTemplate from "@/components/sessioncard";
 import PatternEditDialog from "@/components/sessionpatterns";
-import { canCreateAnySession, canAddNotes, canManageSession } from "@/utils/sessionPermissions";
+import { canCreateAnySession, canAddNotes, canManageSession, canCancelSession } from "@/utils/sessionPermissions";
 import { AuthenticatedRequest } from "@/lib/withAuth";
 import clsx from "clsx";
 import {
@@ -1187,6 +1187,7 @@ const Home: pageWithLayout<pageProps> = (props) => {
             }}
             workspaceMembers={workspaceMembers}
             canManage={canManageSession(workspace.yourPermission || [], selectedSession?.type)}
+            canCancel={canCancelSession(workspace.yourPermission || [], selectedSession?.type)}
             canAddNotes={canAddNotes(workspace.yourPermission || [], selectedSession?.type)}
             sessionColors={sessionColors}
             colorsReady={!colorsLoading}
diff --git a/utils/sessionPermissions.ts b/utils/sessionPermissions.ts
index fc9c48ab..eb5f655c 100644
--- a/utils/sessionPermissions.ts
+++ b/utils/sessionPermissions.ts
@@ -3,7 +3,7 @@ export type SessionType = 'shift' | 'training' | 'event' | 'other';
 export function hasSessionPermission(
   permissions: string[],
   sessionType: string | null | undefined,
-  action: 'see' | 'assign' | 'claim' | 'host' | 'unscheduled' | 'scheduled' | 'manage' | 'notes'
+  action: 'see' | 'assign' | 'claim' | 'host' | 'unscheduled' | 'scheduled' | 'manage' | 'notes' | 'cancel'
 ): boolean {
   if (permissions.includes('admin')) return true;
   
@@ -41,6 +41,10 @@ export function canManageSession(permissions: string[], sessionType: string | nu
   return hasSessionPermission(permissions, sessionType, 'manage');
 }
 
+export function canCancelSession(permissions: string[], sessionType: string | null | undefined): boolean {
+  return hasSessionPermission(permissions, sessionType, 'cancel');
+}
+
 export function canAddNotes(permissions: string[], sessionType: string | null | undefined): boolean {
   return hasSessionPermission(permissions, sessionType, 'notes');
 }