Merge branch 'main' into chas/add-comments-to-findings

Author: tofikwest

apps/app/src/app/(app)/[orgId]/overview/components/CreateFindingSheet.tsx

@@ -29,7 +29,6 @@ import {
   DrawerContent,
   DrawerHeader,
   DrawerTitle,
-  Input,
   Select,
   SelectContent,
   SelectGroup,
@@ -56,7 +55,6 @@ type TargetKind =
   | 'member'
   | 'device'
   | 'evidenceFormType'
-  | 'evidenceSubmission'
   | 'area';
 
 const TARGET_OPTIONS: { value: TargetKind; label: string }[] = [
@@ -67,7 +65,6 @@ const TARGET_OPTIONS: { value: TargetKind; label: string }[] = [
   { value: 'member', label: 'Person' },
   { value: 'device', label: 'Device' },
   { value: 'evidenceFormType', label: 'Document type' },
-  { value: 'evidenceSubmission', label: 'Evidence submission' },
   { value: 'area', label: 'Area' },
 ];
 
@@ -232,8 +229,6 @@ export function CreateFindingSheet({
         else if (values.targetKind === 'risk' && targetId) payload.riskId = targetId;
         else if (values.targetKind === 'member' && targetId) payload.memberId = targetId;
         else if (values.targetKind === 'device' && targetId) payload.deviceId = targetId;
-        else if (values.targetKind === 'evidenceSubmission' && targetId)
-          payload.evidenceSubmissionId = targetId;
 
         const hasTarget =
           payload.taskId ||
@@ -242,7 +237,6 @@ export function CreateFindingSheet({
           payload.riskId ||
           payload.memberId ||
           payload.deviceId ||
-          payload.evidenceSubmissionId ||
           payload.evidenceFormType ||
           payload.area;
 
@@ -522,7 +516,6 @@ function EntityPicker({
   endpointOverrides?: Partial<Record<TargetKind, string | null>>;
 }) {
   const endpoint = useMemo(() => {
-    if (kind === 'evidenceSubmission') return null;
     // An explicit override (including `null`) wins over the default. `null`
     // means "no admin endpoint exists for this kind", so skip fetching.
     if (endpointOverrides && kind in endpointOverrides) {
@@ -536,19 +529,6 @@ function EntityPicker({
     [kind, data],
   );
 
-  if (kind === 'evidenceSubmission') {
-    return (
-      <div className="w-full">
-        <label className="text-sm font-medium">Evidence submission ID</label>
-        <Input
-          value={value}
-          onChange={(e) => onChange(e.target.value)}
-          placeholder="evs_..."
-        />
-      </div>
-    );
-  }
-
   return (
     <div className="w-full">
       <label className="text-sm font-medium">Select {labelForKind(kind)}</label>
@@ -571,7 +551,7 @@ function EntityPicker({
   );
 }
 
-function endpointForKind(kind: Exclude<TargetKind, 'area' | 'evidenceSubmission'>): string | null {
+function endpointForKind(kind: Exclude<TargetKind, 'area'>): string | null {
   switch (kind) {
     case 'task':
       return '/v1/tasks';
@@ -646,7 +626,7 @@ function extractOptions(
     .filter((x): x is Option => x !== null);
 }
 
-function labelForKind(kind: Exclude<TargetKind, 'area' | 'evidenceSubmission'>): string {
+function labelForKind(kind: Exclude<TargetKind, 'area'>): string {
   switch (kind) {
     case 'task':
       return 'task';

apps/app/src/app/(app)/[orgId]/people/devices/components/DeviceAgentDevicesList.test.tsx

@@ -6,6 +6,10 @@ vi.mock('next/navigation', () => ({
   useParams: () => ({ orgId: 'org_1' }),
 }));
 
+vi.mock('@/hooks/use-permissions', () => ({
+  usePermissions: () => ({ hasPermission: () => true }),
+}));
+
 vi.mock('../lib/devices-csv', async (importOriginal) => {
   const mod = await importOriginal<typeof import('../lib/devices-csv')>();
   return {

apps/app/src/app/(app)/[orgId]/people/devices/components/DeviceAgentDevicesList.tsx

@@ -37,6 +37,7 @@ import { useMemo, useState } from 'react';
 import { toast } from 'sonner';
 import { useSWRConfig } from 'swr';
 import { usePeopleActions } from '@/hooks/use-people-api';
+import { usePermissions } from '@/hooks/use-permissions';
 import type { DeviceWithChecks } from '../types';
 import {
   buildDevicesCsv,
@@ -48,7 +49,6 @@ import { RemoveDeviceAlert } from '../../all/components/RemoveDeviceAlert';
 
 export interface DeviceAgentDevicesListProps {
   devices: DeviceWithChecks[];
-  isCurrentUserOwner: boolean;
 }
 
 const CHECK_FIELDS = [
@@ -176,10 +176,11 @@ function CheckBadges({ device }: { device: DeviceWithChecks }) {
 
 export const DeviceAgentDevicesList = ({
   devices,
-  isCurrentUserOwner,
 }: DeviceAgentDevicesListProps) => {
   const { orgId } = useParams<{ orgId: string }>();
   const { removeDeviceAgent } = usePeopleActions();
+  const { hasPermission } = usePermissions();
+  const canRemoveDevice = hasPermission('member', 'delete');
   const { mutate } = useSWRConfig();
   const [selectedDevice, setSelectedDevice] = useState<DeviceWithChecks | null>(null);
   const [actionDevice, setActionDevice] = useState<DeviceWithChecks | null>(null);
@@ -356,7 +357,7 @@ export const DeviceAgentDevicesList = ({
                       </DropdownMenuTrigger>
                       <DropdownMenuContent align="end" style={{ width: 'auto' }}>
                         <DropdownMenuItem
-                          disabled={!isCurrentUserOwner}
+                          disabled={!canRemoveDevice}
                           onClick={(e) => {
                             e.stopPropagation();
                             setActionDevice(device);

apps/app/src/app/(app)/[orgId]/people/devices/components/DevicesTabContent.tsx

@@ -66,10 +66,7 @@ export function DevicesTabContent({ isCurrentUserOwner }: DevicesTabContentProps
       />
 
       {agentDevices.length > 0 && (
-        <DeviceAgentDevicesList
-          devices={agentDevices}
-          isCurrentUserOwner={isCurrentUserOwner}
-        />
+        <DeviceAgentDevicesList devices={agentDevices} />
       )}
 
       {isFleetLoading ? (