Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useAppSelector } from 'app/store/storeHooks';
import { selectCurrentUser } from 'features/auth/store/authSlice';
import { useCurrentQueueItemId } from 'features/queue/hooks/useCurrentQueueItemId';
import { useCallback, useMemo } from 'react';
import { useGetSetupStatusQuery } from 'services/api/endpoints/auth';
import { useGetCurrentQueueItemQuery } from 'services/api/endpoints/queue';

import { useCancelQueueItem } from './useCancelQueueItem';
Expand All @@ -10,10 +11,16 @@ export const useCancelCurrentQueueItem = () => {
const currentQueueItemId = useCurrentQueueItemId();
const { data: currentQueueItem } = useGetCurrentQueueItemQuery();
const currentUser = useAppSelector(selectCurrentUser);
const { data: setupStatus } = useGetSetupStatusQuery();
const cancelQueueItem = useCancelQueueItem();

// Check if current user can cancel the current item
const canCancelCurrentItem = useMemo(() => {
// In single-user mode, allow canceling current item without auth checks.
if (setupStatus && !setupStatus.multiuser_enabled) {
return true;
}

if (!currentUser || !currentQueueItem) {
return false;
}
Expand All @@ -23,7 +30,7 @@ export const useCancelCurrentQueueItem = () => {
}
// Non-admin users can only cancel their own items
return currentQueueItem.user_id === currentUser.user_id;
}, [currentUser, currentQueueItem]);
}, [setupStatus, currentUser, currentQueueItem]);

const trigger = useCallback(
(options?: { withToast?: boolean }) => {
Expand Down