Merge pull request #1303 from trycompai/main

Marfuen · web-flow · commit 59cc65083a3e · 2025-08-07T10:51:31.000-04:00
[comp] Production Deploy
diff --git a/apps/app/package.json b/apps/app/package.json
@@ -46,7 +46,7 @@
     "@tiptap/extension-table-row": "^2.22.3",
     "@trigger.dev/react-hooks": "3.3.17",
     "@trigger.dev/sdk": "3.3.17",
-    "@trycompai/db": "^1.3.2",
+    "@trycompai/db": "^1.3.3",
     "@types/canvas-confetti": "^1.9.0",
     "@types/three": "^0.177.0",
     "@uploadthing/react": "^7.3.0",
diff --git a/apps/app/src/actions/policies/submit-policy-for-approval-action.ts b/apps/app/src/actions/policies/submit-policy-for-approval-action.ts
@@ -16,15 +16,7 @@ export const submitPolicyForApprovalAction = authActionClient
     },
   })
   .action(async ({ parsedInput, ctx }) => {
-    const {
-      id,
-      assigneeId,
-      department,
-      review_frequency,
-      review_date,
-      isRequiredToSign,
-      approverId,
-    } = parsedInput;
+    const { id, assigneeId, department, review_frequency, review_date, approverId } = parsedInput;
     const { user, session } = ctx;
 
     if (!user.id || !session.activeOrganizationId) {
@@ -49,7 +41,6 @@ export const submitPolicyForApprovalAction = authActionClient
           department,
           frequency: review_frequency,
           reviewDate: newReviewDate,
-          isRequiredToSign: isRequiredToSign === 'required',
           approverId,
         },
       });
diff --git a/apps/app/src/actions/policies/update-policy-form-action.ts b/apps/app/src/actions/policies/update-policy-form-action.ts
@@ -40,8 +40,7 @@ export const updatePolicyFormAction = authActionClient
     },
   })
   .action(async ({ parsedInput, ctx }) => {
-    const { id, status, assigneeId, department, review_frequency, review_date, isRequiredToSign } =
-      parsedInput;
+    const { id, status, assigneeId, department, review_frequency, review_date } = parsedInput;
     const { user, session } = ctx;
 
     if (!user.id || !session.activeOrganizationId) {
@@ -81,7 +80,6 @@ export const updatePolicyFormAction = authActionClient
           department,
           frequency: review_frequency,
           reviewDate,
-          isRequiredToSign: isRequiredToSign === 'required',
           ...(lastPublishedAt && { lastPublishedAt }),
         },
       });
diff --git a/apps/app/src/actions/policies/update-policy-overview-action.ts b/apps/app/src/actions/policies/update-policy-overview-action.ts
@@ -18,7 +18,7 @@ export const updatePolicyOverviewAction = authActionClient
     },
   })
   .action(async ({ parsedInput, ctx }) => {
-    const { id, title, description, isRequiredToSign } = parsedInput;
+    const { id, title, description } = parsedInput;
     const { user, session } = ctx;
 
     if (!user) {
@@ -52,13 +52,6 @@ export const updatePolicyOverviewAction = authActionClient
         data: {
           name: title,
           description,
-          // Use type assertion to handle the new field
-          // that might not be in the generated types yet
-          ...(isRequiredToSign !== undefined
-            ? ({
-                isRequiredToSign: isRequiredToSign === 'required',
-              } as any)
-            : {}),
         },
       });
 
diff --git a/apps/app/src/actions/schema.ts b/apps/app/src/actions/schema.ts
@@ -291,7 +291,6 @@ export const updatePolicyOverviewSchema = z.object({
   id: z.string(),
   title: z.string(),
   description: z.string(),
-  isRequiredToSign: z.enum(['required', 'not_required']).optional(),
   entityId: z.string(),
 });
 
@@ -302,7 +301,6 @@ export const updatePolicyFormSchema = z.object({
   department: z.nativeEnum(Departments),
   review_frequency: z.nativeEnum(Frequency),
   review_date: z.date(),
-  isRequiredToSign: z.enum(['required', 'not_required']),
   approverId: z.string().optional().nullable(), // Added for selecting an approver
   entityId: z.string(),
 });
diff --git a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx
@@ -100,7 +100,6 @@ const getPoliciesTasks = async (employeeId: string) => {
   const policies = await db.policy.findMany({
     where: {
       organizationId: organizationId,
-      isRequiredToSign: true,
     },
     orderBy: {
       name: 'asc',
diff --git a/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx b/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx
@@ -52,13 +52,10 @@ export async function EmployeesOverview() {
       return roles.includes('employee');
     });
 
-    console.log(employees);
-
     // Fetch required policies
     policies = await db.policy.findMany({
       where: {
         organizationId: organizationId,
-        isRequiredToSign: true,
       },
     });
 
diff --git a/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/UpdatePolicyOverview.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/UpdatePolicyOverview.tsx
@@ -9,7 +9,6 @@ import { Calendar } from '@comp/ui/calendar';
 import { cn } from '@comp/ui/cn';
 import { Popover, PopoverContent, PopoverTrigger } from '@comp/ui/popover';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@comp/ui/select';
-import { Switch } from '@comp/ui/switch';
 import { Departments, Frequency, Member, type Policy, PolicyStatus, User } from '@db';
 import { format } from 'date-fns';
 import { CalendarIcon, Loader2 } from 'lucide-react';
@@ -105,8 +104,6 @@ export function UpdatePolicyOverview({
     const assigneeId = selectedAssigneeId; // Use state instead of form data
     const department = formData.get('department') as Departments;
     const reviewFrequency = formData.get('review_frequency') as Frequency;
-    const isRequiredToSign =
-      formData.get('isRequiredToSign') === 'on' ? 'required' : 'not_required';
 
     // Get review date from the form or use the existing one
     const reviewDate = tempDate || (policy.reviewDate ? new Date(policy.reviewDate) : new Date());
@@ -118,7 +115,6 @@ export function UpdatePolicyOverview({
         assigneeId !== policy.assigneeId ||
         department !== policy.department ||
         reviewFrequency !== policy.frequency ||
-        (policy.isRequiredToSign ? 'required' : 'not_required') !== isRequiredToSign ||
         (policy.reviewDate ? new Date(policy.reviewDate).toDateString() : '') !==
           reviewDate.toDateString());
 
@@ -134,7 +130,6 @@ export function UpdatePolicyOverview({
         department,
         review_frequency: reviewFrequency,
         review_date: reviewDate,
-        isRequiredToSign,
         approverId: null,
         entityId: policy.id,
       });
@@ -153,8 +148,6 @@ export function UpdatePolicyOverview({
     const assigneeId = selectedAssigneeId; // Use state instead of form data
     const department = formData.get('department') as Departments;
     const reviewFrequency = formData.get('review_frequency') as Frequency;
-    const isRequiredToSign =
-      formData.get('isRequiredToSign') === 'on' ? 'required' : 'not_required';
 
     // Get review date from the form or use the existing one
     const reviewDate = tempDate || (policy.reviewDate ? new Date(policy.reviewDate) : new Date());
@@ -167,7 +160,6 @@ export function UpdatePolicyOverview({
       department,
       review_frequency: reviewFrequency,
       review_date: reviewDate,
-      isRequiredToSign,
       approverId: selectedApproverId,
       entityId: policy.id,
     });
@@ -372,25 +364,6 @@ export function UpdatePolicyOverview({
               }
             />
           </div>
-
-          {/* Required to Sign Field */}
-          <div className="mt-2 flex flex-col gap-2">
-            <label htmlFor="isRequiredToSign" className="text-sm font-medium">
-              Employee Signature Requirement
-            </label>
-            <div className="mt-4 flex items-center space-x-2">
-              <Switch
-                id="isRequiredToSign"
-                name="isRequiredToSign"
-                disabled={fieldsDisabled}
-                defaultChecked={policy.isRequiredToSign}
-                onCheckedChange={handleFormChange}
-              />
-              <span className="text-sm text-gray-500">
-                {policy.isRequiredToSign ? 'Required' : 'Not Required'}
-              </span>
-            </div>
-          </div>
         </div>
 
         <div className="col-span-1 flex justify-end gap-2 md:col-span-2">
diff --git a/apps/app/src/components/forms/policies/policy-overview.tsx b/apps/app/src/components/forms/policies/policy-overview.tsx
@@ -10,7 +10,6 @@ import { cn } from '@comp/ui/cn';
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@comp/ui/form';
 import { Popover, PopoverContent, PopoverTrigger } from '@comp/ui/popover';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@comp/ui/select';
-import { Switch } from '@comp/ui/switch';
 import { Departments, Frequency, type Policy, type PolicyStatus } from '@db';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { format } from 'date-fns';
@@ -52,7 +51,6 @@ export function UpdatePolicyOverview({ policy }: { policy: Policy }) {
       department: policy.department ?? Departments.admin,
       review_frequency: policy.frequency ?? Frequency.monthly,
       review_date: reviewDate,
-      isRequiredToSign: policy.isRequiredToSign ? 'required' : 'not_required',
     },
   });
 
@@ -64,7 +62,6 @@ export function UpdatePolicyOverview({ policy }: { policy: Policy }) {
       department: data.department,
       review_frequency: data.review_frequency,
       review_date: data.review_date,
-      isRequiredToSign: data.isRequiredToSign,
       entityId: data.id,
     });
   };
@@ -194,24 +191,6 @@ export function UpdatePolicyOverview({ policy }: { policy: Policy }) {
               </FormItem>
             )}
           />
-          <FormField
-            control={form.control}
-            name="isRequiredToSign"
-            render={({ field }) => (
-              <FormItem className="flex flex-col gap-3">
-                <FormLabel>{'Signature Requirement'}</FormLabel>
-                <FormControl>
-                  <Switch
-                    checked={field.value === 'required'}
-                    onCheckedChange={(checked) => {
-                      field.onChange(checked ? 'required' : 'not_required');
-                    }}
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
         </div>
         <div className="mt-4 flex justify-end">
           <Button
diff --git a/apps/app/src/components/forms/policies/update-policy-form.tsx b/apps/app/src/components/forms/policies/update-policy-form.tsx
@@ -6,7 +6,6 @@ import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@c
 import { Button } from '@comp/ui/button';
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@comp/ui/form';
 import { Input } from '@comp/ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@comp/ui/select';
 import { Textarea } from '@comp/ui/textarea';
 import { Policy } from '@db';
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -36,7 +35,6 @@ export function UpdatePolicyForm({ policy }: { policy: Policy }) {
       id: policy.id,
       title: policy.name,
       description: policy.description ?? '',
-      isRequiredToSign: policy.isRequiredToSign ? 'required' : 'not_required',
       entityId: policy.id,
     },
   });
@@ -47,7 +45,6 @@ export function UpdatePolicyForm({ policy }: { policy: Policy }) {
       id: data.id,
       title: data.title,
       description: data.description,
-      isRequiredToSign: data.isRequiredToSign,
       entityId: data.id,
     });
   };
@@ -97,28 +94,6 @@ export function UpdatePolicyForm({ policy }: { policy: Policy }) {
                       </FormItem>
                     )}
                   />
-                  <FormField
-                    control={form.control}
-                    name="isRequiredToSign"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>{'Signature Requirement'}</FormLabel>
-                        <FormControl>
-                          <div className="mt-3">
-                            <Select value={field.value} onValueChange={field.onChange}>
-                              <SelectTrigger>
-                                <SelectValue placeholder={'Select signature requirement'} />
-                              </SelectTrigger>
-                              <SelectContent>
-                                <SelectItem value="required">{'Required'}</SelectItem>
-                                <SelectItem value="not_required">{'Not Required'}</SelectItem>
-                              </SelectContent>
-                            </Select>
-                          </div>
-                        </FormControl>
-                      </FormItem>
-                    )}
-                  />
                 </div>
                 <div className="mt-8 flex justify-end">
                   <Button
diff --git a/apps/portal/package.json b/apps/portal/package.json
@@ -9,7 +9,7 @@
     "@react-email/render": "^1.1.2",
     "@t3-oss/env-nextjs": "^0.13.8",
     "@trycompai/analytics": "workspace:*",
-    "@trycompai/db": "^1.3.0",
+    "@trycompai/db": "^1.3.3",
     "@trycompai/email": "workspace:*",
     "@trycompai/kv": "workspace:*",
     "@trycompai/ui": "workspace:*",
diff --git a/bun.lock b/bun.lock
@@ -149,7 +149,7 @@
         "@tiptap/extension-table-row": "^2.22.3",
         "@trigger.dev/react-hooks": "3.3.17",
         "@trigger.dev/sdk": "3.3.17",
-        "@trycompai/db": "^1.3.2",
+        "@trycompai/db": "^1.3.3",
         "@types/canvas-confetti": "^1.9.0",
         "@types/three": "^0.177.0",
         "@uploadthing/react": "^7.3.0",
@@ -236,7 +236,7 @@
         "@react-email/render": "^1.1.2",
         "@t3-oss/env-nextjs": "^0.13.8",
         "@trycompai/analytics": "workspace:*",
-        "@trycompai/db": "^1.3.0",
+        "@trycompai/db": "^1.3.3",
         "@trycompai/email": "workspace:*",
         "@trycompai/kv": "workspace:*",
         "@trycompai/ui": "workspace:*",
@@ -1786,7 +1786,7 @@
 
     "@trycompai/analytics": ["@trycompai/analytics@workspace:packages/analytics"],
 
-    "@trycompai/db": ["@trycompai/db@1.3.2", "", { "dependencies": { "@prisma/client": "^6.13.0", "dotenv": "^16.4.5" } }, "sha512-iM7K6qISSe4hdHpTBGNkAHx8O636Vmt6A1akgU32pu+K10kNYHRkR1yc6YmXwy5wxCNKYeTDyVghoe5PcgCVhw=="],
+    "@trycompai/db": ["@trycompai/db@1.3.3", "", { "dependencies": { "@prisma/client": "^6.13.0", "dotenv": "^16.4.5" } }, "sha512-7xaOFJ4UyjBkZTAbdDuvXmcuWMDtD1D1j2EUUjO/tbuhsGblyJ3i3o9saUce3IHCKNLVj5tU+BUEmlXdECQtew=="],
 
     "@trycompai/email": ["@trycompai/email@workspace:packages/email"],
 
@@ -5202,6 +5202,8 @@
 
     "@trigger.dev/sdk/uuid": ["uuid@9.0.1", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="],
 
+    "@trycompai/db/dotenv": ["dotenv@16.6.1", "", {}, "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow=="],
+
     "@trycompai/integrations/@types/node": ["@types/node@24.2.0", "", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw=="],
 
     "@types/body-parser/@types/node": ["@types/node@24.2.0", "", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw=="],
diff --git a/packages/db/package.json b/packages/db/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@trycompai/db",
   "description": "Database package with Prisma client and schema for Comp AI",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "dependencies": {
     "@prisma/client": "^6.13.0",
     "dotenv": "^16.4.5"
diff --git a/packages/db/prisma/migrations/20250807142557_all_policies_signed/migration.sql b/packages/db/prisma/migrations/20250807142557_all_policies_signed/migration.sql
@@ -0,0 +1,5 @@
+-- Update the default value for the isRequiredToSign field to true
+ALTER TABLE "Policy" ALTER COLUMN "isRequiredToSign" SET DEFAULT true;
+
+-- Set all existing policies to be required to sign
+UPDATE "Policy" SET "isRequiredToSign" = true WHERE "isRequiredToSign" IS FALSE OR "isRequiredToSign" IS NULL;
diff --git a/packages/db/prisma/schema/policy.prisma b/packages/db/prisma/schema/policy.prisma
@@ -6,7 +6,7 @@ model Policy {
   content          Json[]
   frequency        Frequency?
   department       Departments?
-  isRequiredToSign Boolean      @default(false)
+  isRequiredToSign Boolean      @default(true)
   signedBy         String[]     @default([])
   reviewDate       DateTime?
   isArchived       Boolean      @default(false)
