filegrc 0.16.23 → 0.16.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filegrc",
-  "version": "0.16.23",
+  "version": "0.16.24",
   "description": "Zero-dependency Git-native GRC engine",
   "license": "MIT",
   "repository": {

package/src/collection-review.js

@@ -3,6 +3,7 @@ import { modelSupports } from "../model/index.js";
 import {
   collectionRevision,
   collectionReviewDecisionMatches,
+  controlReviewerConflictIds,
   reviewedControlConflictIds
 } from "./collection-revision.js";
 import { collectionRecordProposals, retentionScheduleReviewScope, scopedCollectionRecords } from "./collection-scope.js";
@@ -450,19 +451,7 @@ async function requireRetentionScheduleReady(loaded, resourceType, program, rete
 }
 
 function assessControlReviewers(loaded, controls) {
-  const byId = new Map(loaded.resources.map((record) => [record.id, record]));
-  const controlIds = new Set(controls.map(({ id }) => id));
-  const conflictIds = new Set();
-  for (const control of controls) {
-    for (const id of currentPartyPeople(control.ownerIds || [], byId)) conflictIds.add(id);
-  }
-  for (const obligation of loaded.resources.filter((record) => (
-    record.type === "obligation"
-    && record.status === "active"
-    && (record.controlIds || []).some((id) => controlIds.has(id))
-  ))) {
-    for (const id of currentPartyPeople(obligation.ownerIds || [], byId)) conflictIds.add(id);
-  }
+  const conflictIds = new Set(controlReviewerConflictIds(loaded, controls));
   const people = loaded.resources.filter(({ type, status }) => type === "person" && status === "active");
   return {
     eligibleReviewerIds: people.map(({ id }) => id).filter((id) => !conflictIds.has(id)),

package/src/collection-revision.js

@@ -128,14 +128,21 @@ export function reviewedControlConflictIds(loaded, review) {
   const controls = scopedCollectionRecords(source, "control", program);
   const controlIds = new Set(controls.map(({ id }) => id));
   const byId = new Map(source.resources.map((record) => [record.id, record]));
+  return controlReviewerConflictIds(source, controls, byId, controlIds);
+}
+
+export function controlReviewerConflictIds(loaded, controls, byId = new Map(loaded.resources.map((record) => [record.id, record])), controlIds = new Set(controls.map(({ id }) => id))) {
   const conflicts = new Set();
-  for (const record of [
-    ...controls,
-    ...source.resources.filter((record) => record.type === "obligation"
-      && record.status === "active"
-      && (record.controlIds || []).some((id) => controlIds.has(id)))
-  ]) {
-    for (const id of currentPartyPeople(record.ownerIds || [], byId)) conflicts.add(id);
+  for (const control of controls) {
+    for (const id of currentPartyPeople(control.ownerIds || [], byId)) conflicts.add(id);
+  }
+  for (const obligation of loaded.resources.filter((record) => record.type === "obligation"
+    && record.status === "active"
+    && (record.controlIds || []).some((id) => controlIds.has(id)))) {
+    // A team owns the work queue, but membership alone does not mean each member
+    // performed its work. Named people and appointment holders remain conflicts.
+    const namedOwners = (obligation.ownerIds || []).filter((id) => byId.get(id)?.type !== "team");
+    for (const id of currentPartyPeople(namedOwners, byId)) conflicts.add(id);
   }
   return [...conflicts].sort();
 }

package/src/web.js

@@ -650,6 +650,9 @@ function renderStageOverview(main, stageId, params = new URLSearchParams()) {
   });
   main.querySelector("[data-review-policy-activation]")?.addEventListener("click", openPolicyActivationDialog);
   main.querySelector("[data-review-document-activation]")?.addEventListener("click", () => openDocumentActivationDialog());
+  if (stage.id === "controls") {
+    main.querySelector("[data-review-collection]")?.addEventListener("click", () => openCollectionReviewDialog("control"));
+  }
   main.querySelector("[data-review-audit-document-activation]")?.addEventListener("click", (event) => {
     openDocumentActivationDialog(event.currentTarget.dataset.reviewAuditDocumentActivation);
   });