Skip to content

Claudio/comp 105 simplify people management #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
claudfuen merged 2 commits into from
Apr 29, 2025
Merged

Claudio/comp 105 simplify people management #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74f1d10
refactor: rename employee routes and update related components
claudfuen Apr 29, 2025
c03e86c
Merge branch 'main' of https://github.com/trycompai/comp into claudio…
claudfuen Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/app/src/actions/organization/invite-employee.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const inviteEmployee = authActionClient
});

// Revalidate the employees list page
revalidatePath(`/${organizationId}/employees/all`);
revalidatePath(`/${organizationId}/people/all`);
revalidateTag(`user_${ctx.user.id}`); // Keep user tag revalidation

return {
Expand Down
4 changes: 2 additions & 2 deletions apps/app/src/actions/organization/remove-employee.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export const removeEmployeeRoleOrMember = authActionClient
]);

// Revalidate
revalidatePath(`/${organizationId}/employees/all`);
revalidatePath(`/${organizationId}/people/all`);
revalidateTag(`user_${currentUserId}`);

return { success: true, data: { removed: true } };
Expand All @@ -124,7 +124,7 @@ export const removeEmployeeRoleOrMember = authActionClient
});

// Revalidate
revalidatePath(`/${organizationId}/employees/all`);
revalidatePath(`/${organizationId}/people/all`);
revalidateTag(`user_${currentUserId}`);

return {
Expand Down
12 changes: 0 additions & 12 deletions apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/[employeeId]/layout.tsx
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/components/EmployeeRow.tsx
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions ...app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/components/EmployeesList.tsx
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions ...c/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/components/EmployeesListClient.tsx
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/layout.tsx
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/page.tsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ const getChecklistItems = cache(
title: "Add Employees",
description:
"You should add all of your employees to Comp AI, either through an integration or by manually adding them and then ask them to sign the policies you published in the employee portal.",
href: `/${orgId}/employees`,
href: `/${orgId}/people`,
dbColumn: "employees",
completed: onboarding.employees,
docs: "https://trycomp.ai/docs/employees",
docs: "https://trycomp.ai/docs/people",
buttonLabel: "Add an Employee",
icon: <Users className="h-5 w-5" />,
},
Expand Down
0 ...ployeeId]/actions/get-employee-details.ts → ...ployeeId]/actions/get-employee-details.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...[employeeId]/actions/update-department.ts → ...[employeeId]/actions/update-department.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export const updateEmployeeDepartment = authActionClient
});

// Revalidate related paths
revalidatePath(`/${organizationId}/employees/${employeeId}`);
revalidatePath(`/${organizationId}/employees`);
revalidatePath(`/${organizationId}/people/${employeeId}`);
revalidatePath(`/${organizationId}/people`);

return {
success: true,
Expand Down
4 changes: 2 additions & 2 deletions ...yeeId]/actions/update-employee-details.ts → ...yeeId]/actions/update-employee-details.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ export const updateEmployeeDetails = authActionClient
});

// Revalidate related paths
revalidatePath(`/${organizationId}/employees/${employeeId}`);
revalidatePath(`/${organizationId}/employees`);
revalidatePath(`/${organizationId}/people/${employeeId}`);
revalidatePath(`/${organizationId}/people`);

return {
success: true,
Expand Down
4 changes: 2 additions & 2 deletions ...oyeeId]/actions/update-employee-status.ts → ...oyeeId]/actions/update-employee-status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ export const updateEmployeeStatus = authActionClient
});

// Revalidate related paths
revalidatePath(`/${organizationId}/employees/${employeeId}`);
revalidatePath(`/${organizationId}/employees`);
revalidatePath(`/${organizationId}/people/${employeeId}`);
revalidatePath(`/${organizationId}/people`);

return {
success: true,
Expand Down
4 changes: 2 additions & 2 deletions ...s/[employeeId]/actions/update-employee.ts → ...e/[employeeId]/actions/update-employee.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ export const updateEmployee = authActionClient
}
});

revalidatePath(`/${organizationId}/employees/${employeeId}`);
revalidatePath(`/${organizationId}/employees`);
revalidatePath(`/${organizationId}/people/${employeeId}`);
revalidatePath(`/${organizationId}/people`);

return { success: true, data: updatedMemberResult };
} catch (error) {
Expand Down
0 ...oyeeId]/components/EditableDepartment.tsx → ...oyeeId]/components/EditableDepartment.tsx
View file
Open in desktop
File renamed without changes.
0 ...mployeeId]/components/EditableDetails.tsx → ...mployeeId]/components/EditableDetails.tsx
View file
Open in desktop
File renamed without changes.
0 ...employeeId]/components/EditableStatus.tsx → ...employeeId]/components/EditableStatus.tsx
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...mployeeId]/components/EmployeeDetails.tsx → ...mployeeId]/components/EmployeeDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ export function EmployeeDetails({
type="email"
placeholder="Employee email"
className="h-10"
disabled
/>
</FormControl>
<FormMessage />
Expand Down
Loading