Merge pull request #580 from trycompai/main

claudfuen · web-flow · commit f79a401dafb3 · 2025-05-11T20:54:57.000-04:00
[comp] Production Deploy
diff --git a/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/FrameworkRequirementsClientPage.tsx b/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/FrameworkRequirementsClientPage.tsx
@@ -57,7 +57,7 @@ export function FrameworkRequirementsClientPage({
       setIsEditRequirementDialogOpen(true);
     };
 
-    const handleRequirementUpdated = (updatedRequirement: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description'>) => {
+    const handleRequirementUpdated = (updatedRequirement: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description' | 'identifier'>) => {
       setRequirementsList(prevList => 
         prevList.map(req => 
           req.id === updatedRequirement.id ? { ...req, ...updatedRequirement } : req
diff --git a/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/actions/add-requirement-action.ts b/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/actions/add-requirement-action.ts
@@ -9,6 +9,7 @@ import type { FrameworkEditorRequirement } from '@prisma/client';
 const AddRequirementSchema = z.object({
   name: z.string().min(3, { message: 'Requirement name must be at least 3 characters long' }),
   description: z.string().optional(), // Description can be optional
+  identifier: z.string().optional(), // Identifier can be optional
   frameworkId: z.string().min(1, { message: 'Framework ID is required' }),
 });
 
@@ -27,6 +28,7 @@ export async function addRequirementAction(
   const rawInput = {
     name: formData.get('name'),
     description: formData.get('description'),
+    identifier: formData.get('identifier'),
     frameworkId: formData.get('frameworkId'),
   };
 
@@ -40,13 +42,14 @@ export async function addRequirementAction(
     };
   }
 
-  const { name, description, frameworkId } = validationResult.data;
+  const { name, description, identifier, frameworkId } = validationResult.data;
 
   try {
     const newRequirement = await db.frameworkEditorRequirement.create({
       data: {
         name,
         description: description || '', // Ensure description is at least an empty string if optional and not provided
+        identifier: identifier || '', // Ensure identifier is at least an empty string if optional and not provided
         framework: {
           connect: { id: frameworkId },
         },
diff --git a/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/AddRequirementDialog.tsx b/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/AddRequirementDialog.tsx
@@ -40,6 +40,7 @@ export function AddRequirementDialog({ isOpen, onOpenChange, frameworkId, onRequ
   const [formState, formAction, isPending] = useActionState(addRequirementAction, initialFormState);
   const [name, setName] = useState('');
   const [description, setDescription] = useState('');
+  const [identifier, setIdentifier] = useState('');
 
   useEffect(() => {
     if (formState.success && formState.data) {
@@ -50,6 +51,7 @@ export function AddRequirementDialog({ isOpen, onOpenChange, frameworkId, onRequ
       onRequirementAdded(); // Close dialog and refresh list
       setName(''); // Reset local state
       setDescription('');
+      setIdentifier('');
       // The form itself will reset due to the key change on next open if desired, or if onOpenChange triggers a reset
     } else if (!formState.success && (formState.error || formState.issues)) {
       const issueMessages = formState.issues?.map(i => `${i.path.join('.')} : ${i.message}`).join('; ') || '';
@@ -66,6 +68,7 @@ export function AddRequirementDialog({ isOpen, onOpenChange, frameworkId, onRequ
       // Reset form fields and formState when dialog is opened
       setName('');
       setDescription('');
+      setIdentifier('');
       setFormKey(Date.now()); // Reset form state by changing key, ensuring useFormState re-initializes
     } else {
         // If dialog is closed ensure parent knows
@@ -111,6 +114,25 @@ export function AddRequirementDialog({ isOpen, onOpenChange, frameworkId, onRequ
                 </p>
               )}
             </div>
+            <div className="grid grid-cols-4 items-center gap-4">
+              <Label htmlFor={`identifier-${frameworkId}`} className="text-right">
+                Identifier
+              </Label>
+              <Input 
+                id={`identifier-${frameworkId}`} 
+                name="identifier" 
+                value={identifier}
+                onChange={(e) => setIdentifier(e.target.value)}
+                className="col-span-3" 
+                placeholder="e.g., cc1-1"
+                disabled={isPending}
+              />
+              {formState.issues?.find(issue => issue.path.includes('identifier')) && (
+                <p className="col-span-4 text-sm text-destructive text-right">
+                  {formState.issues.find(issue => issue.path.includes('identifier'))?.message}
+                </p>
+              )}
+            </div>
             <div className="grid grid-cols-4 items-center gap-4">
               <Label htmlFor={`description-${frameworkId}`} className="text-right">
                 Description
diff --git a/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/EditRequirementDialog.tsx b/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/EditRequirementDialog.tsx
@@ -21,8 +21,8 @@ import { RequirementBaseSchema } from '../../schemas'
 interface EditRequirementDialogProps {
   isOpen: boolean
   onOpenChange: (isOpen: boolean) => void
-  requirement: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description'> & { frameworkId: string } 
-  onRequirementUpdated?: (updatedData: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description'>) => void
+  requirement: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description' | 'identifier'> & { frameworkId: string } 
+  onRequirementUpdated?: (updatedData: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description' | 'identifier'>) => void
 }
 
 const requirementFormSchema = RequirementBaseSchema;
@@ -40,6 +40,7 @@ export function EditRequirementDialog({
     defaultValues: {
       name: requirement.name,
       description: requirement.description ?? '',
+      identifier: requirement.identifier ?? '',
     },
     mode: 'onChange',
   })
@@ -48,6 +49,7 @@ export function EditRequirementDialog({
     form.reset({
       name: requirement.name,
       description: requirement.description ?? '',
+      identifier: requirement.identifier ?? '',
     })
   }, [requirement, form])
 
@@ -59,6 +61,9 @@ export function EditRequirementDialog({
     if (values.description) {
       formData.append('description', values.description);
     }
+    if (values.identifier) {
+      formData.append('identifier', values.identifier);
+    }
     
     const result = await updateRequirementAction(null, formData);
 
@@ -91,6 +96,7 @@ export function EditRequirementDialog({
         form.reset({
             name: requirement.name,
             description: requirement.description ?? '',
+            identifier: requirement.identifier ?? '',
         });
       }
       onOpenChange(open);
@@ -119,6 +125,21 @@ export function EditRequirementDialog({
                 </FormItem>
               )}
             />
+            <FormField
+              control={form.control}
+              name="identifier"
+              render={({ field }) => (
+                <FormItem className="grid grid-cols-4 items-center gap-2">
+                  <FormLabel className="text-right">Identifier</FormLabel>
+                  <FormControl className="col-span-3">
+                    <Input placeholder="e.g., cc1-1" {...field} />
+                  </FormControl>
+                  <div className="col-start-2 col-span-3">
+                    <FormMessage />
+                  </div>
+                </FormItem>
+              )}
+            />
             <FormField
               control={form.control}
               name="description"
diff --git a/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/columns.tsx b/apps/framework-editor/app/(pages)/frameworks/[frameworkId]/components/columns.tsx
@@ -21,9 +21,18 @@ export function getColumns(
   onDelete: (requirement: FrameworkEditorRequirement) => void
 ): ColumnDef<FrameworkEditorRequirement>[] {
   return [
+    {
+      accessorKey: "identifier",
+      header: "Identifier",
+      size: 150,
+      cell: ({ row }) => {
+        const identifier = row.getValue("identifier") as string;
+        return identifier || "-";
+      },
+    },
     {
       accessorKey: "name",
-      header: "Requirement ID / Name",
+      header: "Name",
       size: 250,
       cell: ({ row }) => row.getValue("name"),
     },
diff --git a/apps/framework-editor/app/(pages)/frameworks/actions/update-requirement-action.ts b/apps/framework-editor/app/(pages)/frameworks/actions/update-requirement-action.ts
@@ -13,7 +13,7 @@ const UpdateRequirementSchema = RequirementBaseSchema.extend({
 
 export interface UpdateRequirementActionState {
   success: boolean
-  data?: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description'>
+  data?: Pick<FrameworkEditorRequirement, 'id' | 'name' | 'description' | 'identifier'>
   error?: string
   issues?: z.ZodIssue[]
 }
@@ -26,6 +26,7 @@ export async function updateRequirementAction(
     id: formData.get('id'),
     name: formData.get('name'),
     description: formData.get('description'),
+    identifier: formData.get('identifier'),
     frameworkId: formData.get('frameworkId')
   }
 
@@ -39,7 +40,7 @@ export async function updateRequirementAction(
     }
   }
 
-  const { id, name, description, frameworkId } = validationResult.data
+  const { id, name, description, identifier, frameworkId } = validationResult.data
 
   try {
     const existingRequirement = await db.frameworkEditorRequirement.findUnique({
@@ -55,11 +56,13 @@ export async function updateRequirementAction(
       data: {
         name,
         description: description,
+        identifier: identifier || '',
       },
       select: {
         id: true,
         name: true,
         description: true,
+        identifier: true,
       }
     });
 
diff --git a/apps/framework-editor/app/(pages)/frameworks/schemas.ts b/apps/framework-editor/app/(pages)/frameworks/schemas.ts
@@ -9,4 +9,5 @@ export const FrameworkBaseSchema = z.object({
 export const RequirementBaseSchema = z.object({
   name: z.string().min(1, { message: "Requirement name is required." }),
   description: z.string().optional(), // Assuming description can be optional
+  identifier: z.string().optional(), // Identifier is optional
 }); 
diff --git a/packages/db/prisma/migrations/20250512004633_added_identifier/migration.sql b/packages/db/prisma/migrations/20250512004633_added_identifier/migration.sql
@@ -0,0 +1,5 @@
+-- DropIndex
+DROP INDEX "FrameworkEditorRequirement_frameworkId_name_key";
+
+-- AlterTable
+ALTER TABLE "FrameworkEditorRequirement" ADD COLUMN     "identifier" TEXT NOT NULL DEFAULT '';
diff --git a/packages/db/prisma/schema/framework-editor.prisma b/packages/db/prisma/schema/framework-editor.prisma
@@ -21,12 +21,11 @@ model FrameworkEditorRequirement {
     frameworkId String
     framework   FrameworkEditorFramework @relation(fields: [frameworkId], references: [id])
 
-    name        String // Original requirement ID within that framework, e.g., "CC1.1"
+    name        String // Original requirement ID within that framework, e.g., "Privacy"
+    identifier  String @default("") // Unique identifier for the requirement, e.g., "cc1-1"
     description String
 
     controlTemplates FrameworkEditorControlTemplate[]
-
-    @@unique([frameworkId, name])
 }
 
 model FrameworkEditorPolicyTemplate {
