diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityDetails.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityDetails.tsx index 0bb8e04b..e335ee26 100644 --- a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityDetails.tsx +++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityDetails.tsx @@ -127,6 +127,7 @@ export default function AllActivityDetails({ > ({ ...run, + repo_full_name: run.repos?.repo_full_name || 'Unknown repository', project_name: run.project_name || run.projects?.name || 'Unknown', project_slug: run.projects?.slug || 'Unknown', }))} diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityTable.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityTable.tsx index df15c25a..e976970e 100644 --- a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityTable.tsx +++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/org/[organizationId]/(specific-organization-pages)/activity/AllActivityTable.tsx @@ -16,6 +16,7 @@ export const AllActivityTable = ({ runs, allowedRunsForUser }: { project_slug: string; project_name: string; repo_id: number; + repo_full_name: string; approver_user_name: string | null; }[] allowedRunsForUser: string[] @@ -32,7 +33,7 @@ export const AllActivityTable = ({ runs, allowedRunsForUser }: { Commit ID Status Last updated - Project ID + Project name User name @@ -60,7 +61,16 @@ export const AllActivityTable = ({ runs, allowedRunsForUser }: { )} - {run.commit_id} + {allowedRunsForUser.includes(run.id) ? + + + {run.commit_id.substring(0, 8)} + + + : + {run.commit_id.substring(0, 8)} + } {run.status.toUpperCase()} diff --git a/src/data/user/runs.ts b/src/data/user/runs.ts index 4f1b3ed9..656ea525 100644 --- a/src/data/user/runs.ts +++ b/src/data/user/runs.ts @@ -136,7 +136,8 @@ export async function getAllRunsByOrganizationId(organizationId: string) { status, updated_at, project_id, - repo_id, + repo_id, + repos(repo_full_name), approver_user_id, projects(name, slug) `,