fix(tasks): include 'not_relevant' status in task completion checks (#1770)

Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>

Author: github-actions[bot]

apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableColumns.tsx

@@ -43,7 +43,7 @@ export const ControlRequirementsTableColumns: ColumnDef<RequirementTableData>[]
       const isCompleted = requirement.policy
         ? requirement.policy?.status === 'published'
         : requirement.task
-          ? requirement.task?.status === 'done'
+          ? requirement.task?.status === 'done' || requirement.task?.status === 'not_relevant'
           : false;
 
       return (

apps/app/src/app/(app)/[orgId]/controls/[controlId]/data/getOrganizationControlProgress.ts

@@ -96,7 +96,7 @@ export const getOrganizationControlProgress = async (controlId: string) => {
 
     progress.byType[taskTypeKey].total++;
 
-    const isCompleted = task.status === 'done';
+    const isCompleted = task.status === 'done' || task.status === 'not_relevant';
 
     if (isCompleted) {
       progress.completed++;

apps/app/src/app/(app)/[orgId]/controls/lib/utils.ts

@@ -6,7 +6,7 @@ export function getControlStatus(control: ControlWithRelations): StatusType {
   const tasks = control.tasks || [];
 
   const allPoliciesArePublished = policies.every((policy) => policy.status === 'published');
-  const allTasksAreCompleted = tasks.every((task) => task.status === 'done');
+  const allTasksAreCompleted = tasks.every((task) => task.status === 'done' || task.status === 'not_relevant');
 
   if (!allPoliciesArePublished && !allTasksAreCompleted) {
     return 'not_started';

apps/app/src/app/(app)/[orgId]/frameworks/lib/compute.ts

@@ -34,7 +34,7 @@ export function computeFrameworkStats(
   for (const t of frameworkTasks) uniqueTaskMap.set(t.id, t);
   const uniqueTasks = Array.from(uniqueTaskMap.values());
   const totalTasks = uniqueTasks.length;
-  const doneTasks = uniqueTasks.filter((t) => t.status === 'done').length;
+  const doneTasks = uniqueTasks.filter((t) => t.status === 'done' || t.status === 'not_relevant').length;
   const taskRatio = totalTasks > 0 ? doneTasks / totalTasks : 1;
 
   const complianceScore = Math.round(((policyRatio + taskRatio) / 2) * 100);

apps/app/src/app/(app)/[orgId]/frameworks/lib/getTasks.ts

@@ -8,9 +8,9 @@ export const getDoneTasks = cache(async (organizationId: string) => {
     },
   });
 
-  const doneTasks = tasks.filter((t) => t.status === 'done');
+  const doneTasks = tasks.filter((t) => t.status === 'done' || t.status === 'not_relevant');
   const incompleteTasks = tasks.filter(
-    (t) => t.status === 'todo' || t.status === 'in_progress' || t.status === 'not_relevant',
+    (t) => t.status === 'todo' || t.status === 'in_progress',
   );
 
   return {

apps/app/src/app/(app)/[orgId]/frameworks/lib/utils.ts

@@ -34,7 +34,7 @@ export function getControlStatus(
       (policy) => policy.status === 'published', // Simplified from artifact.policy.status
     );
   const allTasksDone =
-    controlTasks.length > 0 && controlTasks.every((task) => task.status === 'done');
+    controlTasks.length > 0 && controlTasks.every((task) => task.status === 'done' || task.status === 'not_relevant');
 
   if (allPoliciesPublished && (controlTasks.length === 0 || allTasksDone)) return 'completed';
   if (allPoliciesDraft && allTasksTodo) return 'not_started';

apps/app/src/app/(app)/[orgId]/tasks/components/ModernTaskList.tsx

@@ -113,12 +113,24 @@ export function ModernTaskList({ tasks, members, statusFilter }: ModernTaskListP
             <div className="divide-y divide-slate-100 overflow-hidden rounded-lg border border-slate-200/60 bg-white">
               {statusTasks.map((task, index) => {
                 const member = assignedMember(task);
+                const isNotRelevant = task.status === 'not_relevant';
                 return (
                   <div
                     key={task.id}
-                    className="group flex items-center gap-4 p-4 transition-colors hover:bg-slate-50/50 cursor-pointer"
+                    className={`group relative flex items-center gap-4 p-4 transition-colors cursor-pointer ${
+                      isNotRelevant
+                        ? 'opacity-50 bg-slate-100/50 backdrop-blur-md hover:bg-slate-100/60'
+                        : 'hover:bg-slate-50/50'
+                    }`}
                     onClick={() => handleTaskClick(task.id)}
                   >
+                    {isNotRelevant && (
+                      <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
+                        <span className="text-sm font-bold uppercase tracking-[0.15em] text-slate-600">
+                          NOT RELEVANT
+                        </span>
+                      </div>
+                    )}
                     <div
                       className="flex shrink-0 items-center"
                       onClick={(e) => e.stopPropagation()}
@@ -128,14 +140,16 @@ export function ModernTaskList({ tasks, members, statusFilter }: ModernTaskListP
                     <div className="flex min-w-0 flex-1 items-center gap-4">
                       <div className="min-w-0 flex-1">
                         <div className="flex items-center gap-2">
-                          <div className="text-sm font-semibold text-slate-900">{task.title}</div>
+                          <div className={`text-sm font-semibold ${isNotRelevant ? 'text-slate-500' : 'text-slate-900'}`}>
+                            {task.title}
+                          </div>
                           <AutomationIndicator
                             automations={task.evidenceAutomations}
                             variant="inline"
                           />
                         </div>
                         {task.description && (
-                          <div className="text-slate-500 mt-0.5 line-clamp-1 text-xs">
+                          <div className={`mt-0.5 line-clamp-1 text-xs ${isNotRelevant ? 'text-slate-400' : 'text-slate-500'}`}>
                             {task.description}
                           </div>
                         )}

apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx

@@ -88,7 +88,7 @@ export function TaskList({
   // Calculate overall stats from all tasks (not filtered)
   const overallStats = useMemo(() => {
     const total = initialTasks.length;
-    const done = initialTasks.filter((t) => t.status === 'done').length;
+    const done = initialTasks.filter((t) => t.status === 'done' || t.status === 'not_relevant').length;
     const inProgress = initialTasks.filter((t) => t.status === 'in_progress').length;
     const todo = initialTasks.filter((t) => t.status === 'todo').length;
     const completionRate = total > 0 ? Math.round((done / total) * 100) : 0;

apps/app/src/app/(app)/[orgId]/tasks/components/TasksByCategory.tsx

@@ -112,7 +112,7 @@ export function TasksByCategory({ tasks, members, statusFilter }: TasksByCategor
   // Calculate stats for a category
   const getCategoryStats = (categoryTasks: Task[]) => {
     const total = categoryTasks.length;
-    const done = categoryTasks.filter((t) => t.status === 'done').length;
+    const done = categoryTasks.filter((t) => t.status === 'done' || t.status === 'not_relevant').length;
     const inProgress = categoryTasks.filter((t) => t.status === 'in_progress').length;
     const completionRate = total > 0 ? Math.round((done / total) * 100) : 0;
     return { total, done, inProgress, completionRate };
@@ -262,20 +262,34 @@ export function TasksByCategory({ tasks, members, statusFilter }: TasksByCategor
                   const member = assignedMember(task);
                   const statusStyle =
                     statusPalette[task.status as keyof typeof statusPalette] ?? statusPalette.todo;
+                  const isNotRelevant = task.status === 'not_relevant';
                   return (
                     <div
                       key={task.id}
-                      className="group relative flex cursor-pointer flex-col gap-3 rounded-sm border border-border/60 bg-card/50 p-4 transition-colors hover:bg-muted/20"
+                      className={`group relative flex cursor-pointer flex-col gap-3 rounded-sm border border-border/60 p-4 transition-colors ${
+                        isNotRelevant
+                          ? 'opacity-50 bg-slate-100/50 backdrop-blur-md hover:bg-slate-100/60'
+                          : 'bg-card/50 hover:bg-muted/20'
+                      }`}
                       onClick={() => handleTaskClick(task.id)}
                     >
                       <span
                         className={`absolute left-0 top-0 h-full w-[2px] ${statusStyle.indicator}`}
                       />
+                      {isNotRelevant && (
+                        <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
+                          <span className="text-sm font-bold uppercase tracking-[0.15em] text-slate-600">
+                            NOT RELEVANT
+                          </span>
+                        </div>
+                      )}
 
                       <div className="flex items-start justify-between gap-3">
                         <div className="min-w-0 flex-1 space-y-2">
                           <div className="flex items-start gap-2">
-                            <h4 className="flex-1 text-sm font-semibold text-foreground line-clamp-2">
+                            <h4 className={`flex-1 text-sm font-semibold line-clamp-2 ${
+                              isNotRelevant ? 'text-slate-500' : 'text-foreground'
+                            }`}>
                               {task.title}
                             </h4>
                             <AutomationIndicator
@@ -284,7 +298,9 @@ export function TasksByCategory({ tasks, members, statusFilter }: TasksByCategor
                             />
                           </div>
                           {task.description && (
-                            <p className="text-xs text-muted-foreground/80 line-clamp-2 leading-relaxed">
+                            <p className={`text-xs line-clamp-2 leading-relaxed ${
+                              isNotRelevant ? 'text-slate-400' : 'text-muted-foreground/80'
+                            }`}>
                               {task.description}
                             </p>
                           )}