[dev] [tofikwest] tofik/trust-portal-fix-subprocessor (#2109)

* refactor(trust-portal): remove isSubProcessor references from vendor logic

* refactor(trust-portal): improve code readability and handle button loading state

---------

Co-authored-by: Tofik Hasanov <annexcies@gmail.com>

Author: github-actions[bot]

apps/api/src/trust-portal/trust-access.service.ts

@@ -2463,7 +2463,6 @@ export class TrustAccessService {
     const vendors = await db.vendor.findMany({
       where: {
         organizationId: trust.organizationId,
-        isSubProcessor: true,
         showOnTrustPortal: true,
       },
       orderBy: [{ trustPortalOrder: 'asc' }, { name: 'asc' }],

apps/app/src/app/(app)/[orgId]/trust/page.tsx

@@ -1,16 +1,16 @@
+import { APP_AWS_ORG_ASSETS_BUCKET, s3Client } from '@/app/s3';
 import { env } from '@/env.mjs';
 import { auth } from '@/utils/auth';
+import { GetObjectCommand } from '@aws-sdk/client-s3';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { db } from '@db';
+import { Prisma } from '@prisma/client';
 import { Button, PageHeader, PageLayout } from '@trycompai/design-system';
 import { Launch } from '@trycompai/design-system/icons';
-import { Prisma } from '@prisma/client';
 import type { Metadata } from 'next';
 import { headers } from 'next/headers';
 import Link from 'next/link';
 import { TrustPortalSwitch } from './portal-settings/components/TrustPortalSwitch';
-import { APP_AWS_ORG_ASSETS_BUCKET, s3Client } from '@/app/s3';
-import { GetObjectCommand } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
 /**
  * Valid compliance badge types for trust portal
@@ -51,7 +51,11 @@ function mapCertificationToBadgeType(certType: string): ComplianceBadgeType | nu
   if (normalized.includes('hipaa')) {
     return 'hipaa';
   }
-  if (normalized.includes('pcidss') || normalized.includes('pci dss') || normalized.includes('pci_dss')) {
+  if (
+    normalized.includes('pcidss') ||
+    normalized.includes('pci dss') ||
+    normalized.includes('pci_dss')
+  ) {
     return 'pci_dss';
   }
   if (normalized.includes('nen7510') || normalized.includes('nen 7510')) {
@@ -118,14 +122,12 @@ function generateLogoUrl(website: string | null): string | null {
  * Sync vendor trust portal data from GlobalVendors risk assessment
  * Updates compliance badges and logo URL if they can be derived from existing data
  */
-async function syncVendorTrustData(
-  vendor: {
-    id: string;
-    website: string | null;
-    complianceBadges: Prisma.JsonValue | null;
-    logoUrl: string | null;
-  }
-): Promise<{ complianceBadges: ComplianceBadge[] | null; logoUrl: string | null } | null> {
+async function syncVendorTrustData(vendor: {
+  id: string;
+  website: string | null;
+  complianceBadges: Prisma.JsonValue | null;
+  logoUrl: string | null;
+}): Promise<{ complianceBadges: ComplianceBadge[] | null; logoUrl: string | null } | null> {
   const updates: Prisma.VendorUpdateInput = {};
   let hasUpdates = false;
 
@@ -141,12 +143,12 @@ async function syncVendorTrustData(
       if (extractedBadges && extractedBadges.length > 0) {
         // Only update if current badges are empty or different
         const currentBadges = vendor.complianceBadges as ComplianceBadge[] | null;
-        const currentTypes = new Set(currentBadges?.map(b => b.type) ?? []);
-        const extractedTypes = new Set(extractedBadges.map(b => b.type));
-        
-        const isDifferent = 
+        const currentTypes = new Set(currentBadges?.map((b) => b.type) ?? []);
+        const extractedTypes = new Set(extractedBadges.map((b) => b.type));
+
+        const isDifferent =
           currentTypes.size !== extractedTypes.size ||
-          [...extractedTypes].some(t => !currentTypes.has(t));
+          [...extractedTypes].some((t) => !currentTypes.has(t));
 
         if (isDifferent) {
           updates.complianceBadges = extractedBadges as unknown as Prisma.InputJsonValue;
@@ -218,9 +220,9 @@ export default async function TrustPage({ params }: { params: Promise<{ orgId: s
     orderBy: { order: 'asc' },
   });
 
-  // Fetch vendors/subprocessors with risk assessment data for syncing
+  // Fetch vendors with risk assessment data for syncing
   const vendorsRaw = await db.vendor.findMany({
-    where: { organizationId: orgId, isSubProcessor: true },
+    where: { organizationId: orgId },
     orderBy: [{ trustPortalOrder: 'asc' }, { name: 'asc' }],
   });
 

apps/app/src/app/(app)/[orgId]/trust/portal-settings/components/TrustPortalCustomLinks.tsx

@@ -199,6 +199,10 @@ export function TrustPortalCustomLinks({
   };
 
   const handleSave = () => {
+    if (createLink.status === 'executing' || updateLink.status === 'executing') {
+      return;
+    }
+
     if (!title.trim() || !url.trim()) {
       toast.error('Title and URL are required');
       return;
@@ -245,10 +249,8 @@ export function TrustPortalCustomLinks({
   };
 
   const handleDelete = (linkId: string) => {
-    if (confirm('Are you sure you want to delete this link?')) {
-      setLinks((prev) => prev.filter((l) => l.id !== linkId));
-      deleteLink.execute({ linkId });
-    }
+    setLinks((prev) => prev.filter((l) => l.id !== linkId));
+    deleteLink.execute({ linkId });
   };
 
   const handleDragEnd = (event: DragEndEvent) => {
@@ -370,7 +372,11 @@ export function TrustPortalCustomLinks({
 
               <div className="flex gap-2">
                 <div className="flex-1">
-                  <Button onClick={handleSave} width="full">
+                  <Button
+                    onClick={handleSave}
+                    width="full"
+                    loading={createLink.status === 'executing' || updateLink.status === 'executing'}
+                  >
                     {editingLink ? 'Update' : 'Create'}
                   </Button>
                 </div>

apps/app/src/app/(app)/[orgId]/trust/portal-settings/components/TrustPortalSwitch.tsx

@@ -117,7 +117,6 @@ type TrustVendor = {
   name: string;
   description: string;
   website: string | null;
-  isSubProcessor: boolean;
   showOnTrustPortal: boolean;
   logoUrl: string | null;
   complianceBadges: ComplianceBadge[] | null;

apps/app/src/app/(app)/[orgId]/trust/portal-settings/components/TrustPortalVendors.tsx

@@ -27,7 +27,6 @@ interface Vendor {
   name: string;
   description: string;
   website: string | null;
-  isSubProcessor: boolean;
   showOnTrustPortal: boolean;
   logoUrl: string | null;
   complianceBadges: ComplianceBadge[] | null;
@@ -178,15 +177,13 @@ export function TrustPortalVendors({
     });
   };
 
-  const subprocessorVendors = vendors.filter((v) => v.isSubProcessor);
-
   // Pagination logic
-  const totalPages = Math.max(1, Math.ceil(subprocessorVendors.length / ITEMS_PER_PAGE));
+  const totalPages = Math.max(1, Math.ceil(vendors.length / ITEMS_PER_PAGE));
   const startIndex = (currentPage - 1) * ITEMS_PER_PAGE;
   const endIndex = startIndex + ITEMS_PER_PAGE;
   const paginatedVendors = useMemo(
-    () => subprocessorVendors.slice(startIndex, endIndex),
-    [subprocessorVendors, startIndex, endIndex],
+    () => vendors.slice(startIndex, endIndex),
+    [vendors, startIndex, endIndex],
   );
 
   const handlePageChange = (page: number) => {
@@ -197,17 +194,16 @@ export function TrustPortalVendors({
   return (
     <div className="space-y-6">
       <div className="space-y-1">
-        <h3 className="text-lg font-medium">Vendors & Subprocessors</h3>
+        <h3 className="text-lg font-medium">Vendors</h3>
         <p className="text-sm text-muted-foreground">
-          Configure which vendors marked as subprocessors appear on your public trust portal
+          Configure which vendors appear on your public trust portal
         </p>
       </div>
 
-      {subprocessorVendors.length === 0 ? (
+      {vendors.length === 0 ? (
         <div className="rounded-md border border-dashed border-border p-8 text-center">
           <p className="text-sm text-muted-foreground">
-            No vendors marked as subprocessors. Go to the Vendors page to mark vendors as
-            subprocessors.
+            No vendors found. Go to the Vendors page to add vendors.
           </p>
         </div>
       ) : (
@@ -264,8 +260,8 @@ export function TrustPortalVendors({
           {totalPages > 1 && (
             <div className="flex items-center justify-between pt-4">
               <p className="text-sm text-muted-foreground">
-                Showing {startIndex + 1}-{Math.min(endIndex, subprocessorVendors.length)} of{' '}
-                {subprocessorVendors.length} vendors
+                Showing {startIndex + 1}-{Math.min(endIndex, vendors.length)} of{' '}
+                {vendors.length} vendors
               </p>
               <div className="flex items-center gap-2">
                 <Button

packages/docs/openapi.json

@@ -7024,6 +7024,7 @@
                     "enum": [
                       "todo",
                       "in_progress",
+                      "in_review",
                       "done",
                       "not_relevant",
                       "failed"
@@ -7332,6 +7333,7 @@
                     "enum": [
                       "todo",
                       "in_progress",
+                      "in_review",
                       "done",
                       "not_relevant",
                       "failed"