[dev] [carhartlewis] lewis/comp-framework-fixes

apps/framework-editor/app/(pages)/frameworks/[frameworkId]/policies/page.tsx

@@ -1,18 +1,9 @@
 import { serverApi } from '@/app/lib/api-server';
 import { isAuthorized } from '@/app/lib/utils';
+import type { FrameworkEditorPolicyTemplate } from '@/db';
 import { redirect } from 'next/navigation';
 import { PoliciesClientPage } from '../../../policies/PoliciesClientPage';
 
-interface PolicyTemplateItem {
-  id: string;
-  name: string;
-  description: string;
-  frequency: string;
-  department: string;
-  createdAt: string | Date;
-  updatedAt: string | Date;
-}
-
 export default async function Page({
   params,
 }: {
@@ -24,7 +15,7 @@ export default async function Page({
   const { frameworkId } = await params;
 
   const policies =
-    await serverApi<PolicyTemplateItem[]>(`/policy-template?frameworkId=${frameworkId}`);
+    await serverApi<FrameworkEditorPolicyTemplate[]>(`/policy-template?frameworkId=${frameworkId}`);
 
   return <PoliciesClientPage initialPolicies={policies} frameworkId={frameworkId} />;
 }

apps/framework-editor/app/(pages)/policies/PoliciesClientPage.tsx

@@ -2,6 +2,7 @@
 
 import { apiClient } from '@/app/lib/api-client';
 import { DataTable } from '@/app/components/DataTable';
+import type { FrameworkEditorPolicyTemplate } from '@/db';
 import { Button } from '@trycompai/ui';
 import { Link } from 'lucide-react';
 import { useRouter } from 'next/navigation';
@@ -13,18 +14,8 @@ import {
 import { columns } from './components/columns';
 import { CreatePolicyDialog } from './components/CreatePolicyDialog';
 
-interface PolicyItem {
-  id: string;
-  name: string;
-  description: string;
-  frequency: string;
-  department: string;
-  createdAt: string | Date;
-  updatedAt: string | Date;
-}
-
 interface PoliciesClientPageProps {
-  initialPolicies: PolicyItem[];
+  initialPolicies: FrameworkEditorPolicyTemplate[];
   emptyMessage?: string;
   frameworkId?: string;
 }
@@ -44,7 +35,7 @@ export function PoliciesClientPage({ initialPolicies, emptyMessage, frameworkId
     [],
   );
 
-  const handleRowClick = (policy: PolicyItem) => {
+  const handleRowClick = (policy: FrameworkEditorPolicyTemplate) => {
     router.push(`/policies/${policy.id}`);
   };
 

apps/framework-editor/app/(pages)/policies/[policyId]/PolicyDetailsClientPage.tsx

@@ -1,22 +1,15 @@
 'use client';
 
+import type { FrameworkEditorPolicyTemplate } from '@/db';
 import { Button, Card, CardContent, CardDescription, CardHeader, CardTitle } from '@trycompai/ui';
 import { PencilIcon, Trash2 } from 'lucide-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { DeletePolicyDialog } from './components/DeletePolicyDialog';
 import { EditPolicyDialog } from './components/EditPolicyDialog';
 
-interface PolicyItem {
-  id: string;
-  name: string;
-  description: string;
-  frequency: string;
-  department: string;
-}
-
 interface PolicyDetailsClientPageProps {
-  policy: PolicyItem;
+  policy: FrameworkEditorPolicyTemplate;
 }
 
 export function PolicyDetailsClientPage({ policy }: PolicyDetailsClientPageProps) {

apps/framework-editor/app/(pages)/policies/[policyId]/page.tsx

@@ -1,22 +1,13 @@
 import PageLayout from '@/app/components/PageLayout';
 import { serverApi } from '@/app/lib/api-server';
 import { isAuthorized } from '@/app/lib/utils';
+import type { FrameworkEditorPolicyTemplate } from '@/db';
 import '@/styles/editor.css';
+import type { JSONContent } from '@tiptap/react';
 import { notFound, redirect } from 'next/navigation';
 import { PolicyDetailsClientPage } from './PolicyDetailsClientPage';
 import { PolicyEditorClient } from './PolicyEditorClient';
 
-interface PolicyTemplate {
-  id: string;
-  name: string;
-  description: string;
-  frequency: string;
-  department: string;
-  content: unknown;
-  createdAt: string;
-  updatedAt: string;
-}
-
 export default async function PolicyDetailPage({
   params,
 }: {
@@ -27,9 +18,9 @@ export default async function PolicyDetailPage({
 
   const { policyId } = await params;
 
-  let policy: PolicyTemplate;
+  let policy: FrameworkEditorPolicyTemplate;
   try {
-    policy = await serverApi<PolicyTemplate>(`/policy-template/${policyId}`);
+    policy = await serverApi<FrameworkEditorPolicyTemplate>(`/policy-template/${policyId}`);
   } catch {
     notFound();
   }
@@ -45,7 +36,7 @@ export default async function PolicyDetailPage({
       <PolicyEditorClient
         policyId={policy.id}
         policyName={policy.name}
-        initialContent={policy.content}
+        initialContent={policy.content as JSONContent | JSONContent[] | null}
       />
     </PageLayout>
   );