diff --git a/apps/app/package.json b/apps/app/package.json index c87ecf70d..c9c32f4bb 100644 --- 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 index 214046415..ad25e71ca 100644 --- 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 index cc6dc6e9c..3edac74d0 100644 --- 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 index 59f363768..9445d40c1 100644 --- 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 index 246717025..8a95aa782 100644 --- 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 index 587b8abfc..61e870d0d 100644 --- 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 index b5faa8fb7..0cfa16347 100644 --- 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 index 3781bdbb4..b56ac17db 100644 --- 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({ } /> - - {/* Required to Sign Field */} -
- -
- - - {policy.isRequiredToSign ? 'Required' : 'Not Required'} - -
-
diff --git a/apps/app/src/components/forms/policies/policy-overview.tsx b/apps/app/src/components/forms/policies/policy-overview.tsx index eea096c54..948295441 100644 --- 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 }) { )} /> - ( - - {'Signature Requirement'} - - { - field.onChange(checked ? 'required' : 'not_required'); - }} - /> - - - - )} - />