[comp] Production Deploy (#1428)

github-actions[bot] · Marfuen · Dhanus3133 · web-flow · commit 8dbb944ac5b6 · 2025-08-28T17:35:54.000-04:00
* refactor: enhance EmployeeCompletionChart with profile links - Added external profile links for employees in the EmployeeCompletionChart, allowing users to view detailed profiles. - Integrated organization ID retrieval using useParams for dynamic linking. - Improved layout of employee details for better visual presentation. * fix: Enforce role-based access control in app * fix: Prisma seed command in `packages/db` * fix: Move role checks on org level * fix: Allow access to auditor role * chore: Just restrict access to employee role * chore(deps): bump @tiptap/extension-highlight from 2.22.3 to 3.3.0 (#1404) Bumps [@tiptap/extension-highlight](https://github.com/ueberdosis/tiptap/tree/HEAD/packages/extension-highlight) from 2.22.3 to 3.3.0. - [Release notes](https://github.com/ueberdosis/tiptap/releases) - [Changelog](https://github.com/ueberdosis/tiptap/blob/develop/packages/extension-highlight/CHANGELOG.md) - [Commits](https://github.com/ueberdosis/tiptap/commits/v3.3.0/packages/extension-highlight) --- updated-dependencies: - dependency-name: "@tiptap/extension-highlight" dependency-version: 3.3.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump dub from 0.63.7 to 0.66.1 (#1399) Bumps [dub](https://github.com/dubinc/dub-ts) from 0.63.7 to 0.66.1. - [Release notes](https://github.com/dubinc/dub-ts/releases) - [Changelog](https://github.com/dubinc/dub-ts/blob/main/RELEASES.md) - [Commits](dubinc/dub-ts@v0.63.7...v0.66.1) --- updated-dependencies: - dependency-name: dub dependency-version: 0.66.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> * chore(deps): bump @dub/embed-react from 0.0.15 to 0.0.16 (#1337) Bumps [@dub/embed-react](https://github.com/dubinc/dub) from 0.0.15 to 0.0.16. - [Commits](https://github.com/dubinc/dub/commits) --- updated-dependencies: - dependency-name: "@dub/embed-react" dependency-version: 0.0.16 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> * chore: update Header component and enhance NoAccess page layout (#1425) - Added Header component to NoAccess page for better organization context. - Adjusted layout of NoAccess page to improve user experience and visual structure. - Updated Header component to conditionally render AssistantButton based on hideChat prop. Dependencies updated in bun.lock for @dub/embed-react, dub, and @tiptap/extension-highlight. Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> * fix: remove duplicate dependsOn key (#1426) Signed-off-by: Golamrabbi Azad <35021384+golamrabbiazad@users.noreply.github.com> * [dev] [Marfuen] mariano/videos (#1427) * chore: update Header component and enhance NoAccess page layout - Added Header component to NoAccess page for better organization context. - Adjusted layout of NoAccess page to improve user experience and visual structure. - Updated Header component to conditionally render AssistantButton based on hideChat prop. Dependencies updated in bun.lock for @dub/embed-react, dub, and @tiptap/extension-highlight. * feat: implement training video backfill functionality - Added scripts and server actions to trigger training video completion backfill for all organizations or specific organizations. - Created jobs to handle backfilling of training video records for existing members in organizations. - Enhanced employee onboarding processes by ensuring new members have training video completion entries created upon invitation or organization creation. - Updated README with usage instructions and details on the backfill jobs. This implementation improves the tracking of training video completions for all members, ensuring accurate data representation in the system. --------- Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> * [dev] [Marfuen] mariano/fix-bug (#1429) * chore: update Header component and enhance NoAccess page layout - Added Header component to NoAccess page for better organization context. - Adjusted layout of NoAccess page to improve user experience and visual structure. - Updated Header component to conditionally render AssistantButton based on hideChat prop. Dependencies updated in bun.lock for @dub/embed-react, dub, and @tiptap/extension-highlight. * feat: implement training video backfill functionality - Added scripts and server actions to trigger training video completion backfill for all organizations or specific organizations. - Created jobs to handle backfilling of training video records for existing members in organizations. - Enhanced employee onboarding processes by ensuring new members have training video completion entries created upon invitation or organization creation. - Updated README with usage instructions and details on the backfill jobs. This implementation improves the tracking of training video completions for all members, ensuring accurate data representation in the system. * fix: update database access in training video backfill action - Replaced direct database access reference with a centralized db import for improved consistency and maintainability in the triggerTrainingVideoBackfill action. * chore: remove backfill training videos script - Deleted the backfill-training-videos.ts script as it is no longer needed for triggering training video completion backfill jobs. This change simplifies the codebase and removes redundant functionality. * chore: remove training video backfill action and documentation - Deleted the trigger-training-video-backfill action and its associated README documentation as they are no longer needed. This change streamlines the codebase and eliminates outdated references to backfill functionality. --------- Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> * Mariano/updated employees (#1430) * chore: update Header component and enhance NoAccess page layout - Added Header component to NoAccess page for better organization context. - Adjusted layout of NoAccess page to improve user experience and visual structure. - Updated Header component to conditionally render AssistantButton based on hideChat prop. Dependencies updated in bun.lock for @dub/embed-react, dub, and @tiptap/extension-highlight. * feat: implement training video backfill functionality - Added scripts and server actions to trigger training video completion backfill for all organizations or specific organizations. - Created jobs to handle backfilling of training video records for existing members in organizations. - Enhanced employee onboarding processes by ensuring new members have training video completion entries created upon invitation or organization creation. - Updated README with usage instructions and details on the backfill jobs. This implementation improves the tracking of training video completions for all members, ensuring accurate data representation in the system. * fix: update database access in training video backfill action - Replaced direct database access reference with a centralized db import for improved consistency and maintainability in the triggerTrainingVideoBackfill action. * chore: remove backfill training videos script - Deleted the backfill-training-videos.ts script as it is no longer needed for triggering training video completion backfill jobs. This change simplifies the codebase and removes redundant functionality. * chore: remove training video backfill action and documentation - Deleted the trigger-training-video-backfill action and its associated README documentation as they are no longer needed. This change streamlines the codebase and eliminates outdated references to backfill functionality. * chore: remove training video backfill action and related documentation (#1431) - Deleted the trigger-training-video-backfill action and its associated README documentation as they are no longer needed. This change streamlines the codebase and eliminates outdated references to backfill functionality. Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> * [dev] [Marfuen] mariano/batch (#1432) * chore: remove training video backfill action and related documentation - Deleted the trigger-training-video-backfill action and its associated README documentation as they are no longer needed. This change streamlines the codebase and eliminates outdated references to backfill functionality. * feat: enhance training video backfill process with batch processing - Updated the backfillTrainingVideosForAllOrgs function to process organizations in batches of 500, improving efficiency and handling of large datasets. - Added logging for batch processing to track the number of organizations processed and any errors encountered during triggering. - Adjusted return values to reflect the total number of organizations processed and the number of batches created. --------- Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Golamrabbi Azad <35021384+golamrabbiazad@users.noreply.github.com> Co-authored-by: Mariano Fuentes <marfuen98@gmail.com> Co-authored-by: Dhanus <dhanus3133@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Golamrabbi Azad <35021384+golamrabbiazad@users.noreply.github.com>
diff --git a/apps/app/scripts/backfill-training-videos.ts b/apps/app/scripts/backfill-training-videos.ts
@@ -0,0 +1,58 @@
+#!/usr/bin/env tsx
+
+/**
+ * Script to trigger the training video completion backfill job.
+ *
+ * Usage:
+ *   # Backfill all organizations
+ *   bun run scripts/backfill-training-videos.ts
+ *
+ *   # Backfill specific organization
+ *   bun run scripts/backfill-training-videos.ts --org <organizationId>
+ *
+ * This script is useful for:
+ * - Running the backfill manually
+ * - Testing the backfill process
+ * - Running on-demand backfills for specific organizations
+ */
+
+import { backfillTrainingVideosForAllOrgs } from '@/jobs/tasks/onboarding/backfill-training-videos-for-all-orgs';
+import { backfillTrainingVideosForOrg } from '@/jobs/tasks/onboarding/backfill-training-videos-for-org';
+
+async function main() {
+  const args = process.argv.slice(2);
+  const orgIndex = args.indexOf('--org');
+  const organizationId = orgIndex !== -1 ? args[orgIndex + 1] : null;
+
+  try {
+    if (organizationId) {
+      console.log(`🚀 Triggering training video backfill for organization: ${organizationId}`);
+
+      const handle = await backfillTrainingVideosForOrg.trigger({
+        organizationId: organizationId,
+      });
+
+      console.log(`✅ Successfully triggered job with ID: ${handle.id}`);
+      console.log(`📊 You can monitor the progress in the Trigger.dev dashboard`);
+    } else {
+      console.log('🚀 Triggering training video backfill for ALL organizations');
+
+      const handle = await backfillTrainingVideosForAllOrgs.trigger();
+
+      console.log(`✅ Successfully triggered batch job with ID: ${handle.id}`);
+      console.log(`📊 You can monitor the progress in the Trigger.dev dashboard`);
+      console.log(`⚠️  This will process ALL organizations and their members`);
+    }
+  } catch (error) {
+    console.error('❌ Error triggering backfill job:', error);
+    process.exit(1);
+  }
+}
+
+// Only run if this script is executed directly
+if (require.main === module) {
+  main().catch((error) => {
+    console.error('❌ Script failed:', error);
+    process.exit(1);
+  });
+}
diff --git a/apps/app/src/actions/organization/accept-invitation.ts b/apps/app/src/actions/organization/accept-invitation.ts
@@ -1,5 +1,6 @@
 'use server';
 
+import { createTrainingVideoEntries } from '@/lib/db/employee';
 import { db } from '@db';
 import { revalidatePath, revalidateTag } from 'next/cache';
 import { redirect } from 'next/navigation';
@@ -96,7 +97,7 @@ export const completeInvitation = authActionClientWithoutOrg
           throw new Error('Invitation role is required');
         }
 
-        await db.member.create({
+        const newMember = await db.member.create({
           data: {
             userId: user.id,
             organizationId: invitation.organizationId,
@@ -105,6 +106,9 @@ export const completeInvitation = authActionClientWithoutOrg
           },
         });
 
+        // Create training video completion entries for the new member
+        await createTrainingVideoEntries(newMember.id);
+
         await db.invitation.update({
           where: {
             id: invitation.id,
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts
@@ -1,5 +1,6 @@
 'use server';
 
+import { createTrainingVideoEntries } from '@/lib/db/employee';
 import { auth } from '@/utils/auth';
 import type { Role } from '@db';
 import { db } from '@db';
@@ -61,6 +62,11 @@ export const addEmployeeWithoutInvite = async ({
       },
     });
 
+    // Create training video completion entries for the new member
+    if (member?.id) {
+      await createTrainingVideoEntries(member.id);
+    }
+
     return { success: true, data: member };
   } catch (error) {
     console.error('Error adding employee:', error);
diff --git a/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeeCompletionChart.tsx b/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeeCompletionChart.tsx
@@ -228,10 +228,15 @@ export function EmployeeCompletionChart({
                       </div>
                       <p className="text-muted-foreground text-xs">{stat.email}</p>
                     </div>
-                    <span className="text-muted-foreground">
-                      {stat.policiesCompleted + stat.trainingsCompleted} / {stat.totalTasks}{' '}
-                      {'tasks'}
-                    </span>
+                    <div className="text-muted-foreground text-right text-xs">
+                      <div>
+                        {stat.policiesCompleted + stat.trainingsCompleted} / {stat.totalTasks} tasks
+                      </div>
+                      <div className="text-xs">
+                        {stat.policiesCompleted}/{stat.policiesTotal} policies •{' '}
+                        {stat.trainingsCompleted}/{stat.trainingsTotal} training
+                      </div>
+                    </div>
                   </div>
 
                   <TaskBarChart stat={stat} />
diff --git a/apps/app/src/app/(app)/setup/actions/create-organization-minimal.ts b/apps/app/src/app/(app)/setup/actions/create-organization-minimal.ts
@@ -2,6 +2,7 @@
 
 import { initializeOrganization } from '@/actions/organization/lib/initialize-organization';
 import { authActionClientWithoutOrg } from '@/actions/safe-action';
+import { createTrainingVideoEntries } from '@/lib/db/employee';
 import { auth } from '@/utils/auth';
 import { db } from '@db';
 import { revalidatePath } from 'next/cache';
@@ -64,6 +65,19 @@ export const createOrganizationMinimal = authActionClientWithoutOrg
 
       const orgId = newOrg.id;
 
+      // Get the member that was created with the organization (the owner)
+      const ownerMember = await db.member.findFirst({
+        where: {
+          userId: session.user.id,
+          organizationId: orgId,
+        },
+      });
+
+      // Create training video completion entries for the owner
+      if (ownerMember) {
+        await createTrainingVideoEntries(ownerMember.id);
+      }
+
       // Create onboarding record for new org
       await db.onboarding.create({
         data: {
diff --git a/apps/app/src/app/(app)/setup/actions/create-organization.ts b/apps/app/src/app/(app)/setup/actions/create-organization.ts
@@ -4,6 +4,7 @@ import { initializeOrganization } from '@/actions/organization/lib/initialize-or
 import { authActionClientWithoutOrg } from '@/actions/safe-action';
 import { createFleetLabelForOrg } from '@/jobs/tasks/device/create-fleet-label-for-org';
 import { onboardOrganization as onboardOrganizationTask } from '@/jobs/tasks/onboarding/onboard-organization';
+import { createTrainingVideoEntries } from '@/lib/db/employee';
 import { auth } from '@/utils/auth';
 import { db } from '@db';
 import { tasks } from '@trigger.dev/sdk';
@@ -63,6 +64,19 @@ export const createOrganization = authActionClientWithoutOrg
 
       const orgId = newOrg.id;
 
+      // Get the member that was created with the organization (the owner)
+      const ownerMember = await db.member.findFirst({
+        where: {
+          userId: session.user.id,
+          organizationId: orgId,
+        },
+      });
+
+      // Create training video completion entries for the owner
+      if (ownerMember) {
+        await createTrainingVideoEntries(ownerMember.id);
+      }
+
       // Create onboarding record for new org
       await db.onboarding.create({
         data: {
diff --git a/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-all-orgs.ts b/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-all-orgs.ts
@@ -0,0 +1,95 @@
+import { db } from '@db';
+import { logger, task } from '@trigger.dev/sdk';
+import { backfillTrainingVideosForOrg } from './backfill-training-videos-for-org';
+
+export const backfillTrainingVideosForAllOrgs = task({
+  id: 'backfill-training-videos-for-all-orgs',
+  run: async () => {
+    logger.info('Starting training video completion backfill for all organizations');
+
+    try {
+      // Get all organizations
+      const organizations = await db.organization.findMany({
+        select: {
+          id: true,
+          name: true,
+          _count: {
+            select: {
+              members: true,
+            },
+          },
+        },
+        orderBy: {
+          createdAt: 'asc', // Process older organizations first
+        },
+      });
+
+      logger.info(`Found ${organizations.length} organizations to process`);
+
+      if (organizations.length === 0) {
+        logger.info('No organizations found, nothing to backfill');
+        return {
+          success: true,
+          organizationsProcessed: 0,
+        };
+      }
+
+      // Log some stats about what we're about to process
+      const totalMembers = organizations.reduce((sum, org) => sum + org._count.members, 0);
+      logger.info(
+        `About to process ${organizations.length} organizations with a total of ${totalMembers} members`,
+      );
+
+      // Create batch items for processing
+      const allBatchItems = organizations.map((organization) => ({
+        payload: {
+          organizationId: organization.id,
+        },
+      }));
+
+      // Split into chunks of 500 (Trigger.dev batch size limit)
+      const BATCH_SIZE = 500;
+      const batches: (typeof allBatchItems)[] = [];
+
+      for (let i = 0; i < allBatchItems.length; i += BATCH_SIZE) {
+        batches.push(allBatchItems.slice(i, i + BATCH_SIZE));
+      }
+
+      logger.info(
+        `Splitting ${allBatchItems.length} organizations into ${batches.length} batches of max ${BATCH_SIZE} each`,
+      );
+
+      // Process each batch
+      let totalTriggered = 0;
+      for (let i = 0; i < batches.length; i++) {
+        const batch = batches[i];
+        logger.info(
+          `Triggering batch ${i + 1}/${batches.length} with ${batch.length} organizations`,
+        );
+
+        try {
+          await backfillTrainingVideosForOrg.batchTrigger(batch);
+          totalTriggered += batch.length;
+          logger.info(`Successfully triggered batch ${i + 1}/${batches.length}`);
+        } catch (error) {
+          logger.error(`Failed to trigger batch ${i + 1}/${batches.length}: ${error}`);
+          throw error;
+        }
+      }
+
+      logger.info(
+        `Successfully triggered training video backfill jobs for ${totalTriggered} organizations across ${batches.length} batches`,
+      );
+
+      return {
+        success: true,
+        organizationsProcessed: totalTriggered,
+        totalBatches: batches.length,
+        totalMembers,
+      };
+    } catch (error) {
+      logger.error(`Error during training video backfill batch trigger: ${error}`);
+      throw error;
+    }
+  },
+});
diff --git a/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-org.ts b/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-org.ts
@@ -0,0 +1,115 @@
+import { trainingVideos } from '@/lib/data/training-videos';
+import { db } from '@db';
+import { logger, task } from '@trigger.dev/sdk';
+
+export const backfillTrainingVideosForOrg = task({
+  id: 'backfill-training-videos-for-org',
+  retry: {
+    maxAttempts: 3,
+  },
+  run: async (payload: { organizationId: string }) => {
+    logger.info(`Starting training video backfill for organization ${payload.organizationId}`);
+
+    try {
+      // Get all members for this organization
+      const members = await db.member.findMany({
+        where: {
+          organizationId: payload.organizationId,
+        },
+        select: {
+          id: true,
+          user: {
+            select: {
+              email: true,
+            },
+          },
+        },
+      });
+
+      logger.info(`Found ${members.length} members in organization ${payload.organizationId}`);
+
+      if (members.length === 0) {
+        logger.info(`No members found for organization ${payload.organizationId}, skipping`);
+        return {
+          success: true,
+          organizationId: payload.organizationId,
+          membersProcessed: 0,
+          recordsCreated: 0,
+        };
+      }
+
+      let totalRecordsCreated = 0;
+      let membersProcessed = 0;
+      let membersSkipped = 0;
+
+      // Process each member
+      for (const member of members) {
+        try {
+          logger.info(`Processing member ${member.id} (${member.user.email})`);
+
+          // Check if this member already has any training video completion records
+          // (including old video IDs like sat-1, sat-2, etc.)
+          const existingRecords = await db.employeeTrainingVideoCompletion.findMany({
+            where: {
+              memberId: member.id,
+            },
+            select: {
+              videoId: true,
+            },
+          });
+
+          if (existingRecords.length > 0) {
+            const videoIds = existingRecords.map((r) => r.videoId).join(', ');
+            logger.info(
+              `Member ${member.id} already has ${existingRecords.length} training video completion records (${videoIds}), skipping`,
+            );
+            membersSkipped++;
+            continue;
+          }
+
+          // Create training video completion entries for this member
+          // Using skipDuplicates to prevent duplicate records
+          const result = await db.employeeTrainingVideoCompletion.createMany({
+            data: trainingVideos.map((video) => ({
+              memberId: member.id,
+              videoId: video.id,
+            })),
+            skipDuplicates: true,
+          });
+
+          totalRecordsCreated += result.count;
+          membersProcessed++;
+
+          logger.info(
+            `Created ${result.count} training video completion records for member ${member.id}`,
+          );
+        } catch (memberError) {
+          logger.error(
+            `Failed to process member ${member.id} (${member.user.email}): ${memberError}`,
+          );
+          // Continue processing other members even if one fails
+        }
+      }
+
+      logger.info(
+        `Completed training video backfill for organization ${payload.organizationId}. ` +
+          `Total members: ${members.length}, New records created: ${membersProcessed}, ` +
+          `Skipped (already had records): ${membersSkipped}, Records created: ${totalRecordsCreated}`,
+      );
+
+      return {
+        success: true,
+        organizationId: payload.organizationId,
+        membersProcessed,
+        membersSkipped,
+        totalMembers: members.length,
+        recordsCreated: totalRecordsCreated,
+      };
+    } catch (error) {
+      logger.error(
+        `Error during training video backfill for organization ${payload.organizationId}: ${error}`,
+      );
+      throw error;
+    }
+  },
+});
diff --git a/apps/app/src/lib/db/employee.ts b/apps/app/src/lib/db/employee.ts
diff --git a/turbo.json b/turbo.json
