Merge pull request #2102 from ever-co/develop

Release

apps/web/app/[locale]/profile/[memberId]/page.tsx

@@ -12,23 +12,24 @@ import { ArrowLeft } from 'lib/components/svgs';
 import { TaskFilter, Timer, TimerStatus, UserProfileTask, getTimerStatusValue, useTaskFilter } from 'lib/features';
 import { MainHeader, MainLayout } from 'lib/layout';
 import Link from 'next/link';
-import { useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslations } from 'next-intl';
 import stc from 'string-to-color';
 
 import { useRecoilValue } from 'recoil';
 import { fullWidthState } from '@app/stores/fullWidth';
-import { ActivityFilters } from '@app/constants';
 import { ScreenshootTab } from 'lib/features/activity/screenshoots';
 import { AppsTab } from 'lib/features/activity/apps';
 import { VisitedSitesTab } from 'lib/features/activity/visited-sites';
 
-const Profile = ({ params }: { params: { memberId: string } }) => {
+type FilterTab = 'Tasks' | 'Screenshots' | 'Apps' | 'Visited Sites';
+
+const Profile = React.memo(function ProfilePage({ params }: { params: { memberId: string } }) {
 	const profile = useUserProfilePage();
 	const { user } = useAuthenticateUser();
 	const { isTrackingEnabled, activeTeam } = useOrganizationTeams();
 	const fullWidth = useRecoilValue(fullWidthState);
-	const [activityFilter, setActivityFilter] = useState<ActivityFilters>(ActivityFilters.TASKS);
+	const [activityFilter, setActivityFilter] = useState<FilterTab>('Tasks');
 
 	const hook = useTaskFilter(profile);
 	const canSeeActivity = profile.userProfile?.id === user?.id || user?.role?.name?.toUpperCase() == 'MANAGER';
@@ -39,11 +40,23 @@ const Profile = ({ params }: { params: { memberId: string } }) => {
 		{ title: JSON.parse(t('pages.profile.BREADCRUMB')) || '', href: `/profile/${params.memberId}` }
 	];
 
-	console.log({ activityFilter });
+	const activityScreens = {
+		Tasks: <UserProfileTask profile={profile} tabFiltered={hook} />,
+		Screenshots: <ScreenshootTab />,
+		Apps: <AppsTab />,
+		'Visited Sites': <VisitedSitesTab />
+	};
 
 	const profileIsAuthUser = useMemo(() => profile.isAuthUser, [profile.isAuthUser]);
 	const hookFilterType = useMemo(() => hook.filterType, [hook.filterType]);
 
+	const changeActivityFilter = useCallback(
+		(filter: FilterTab) => {
+			setActivityFilter(filter);
+		},
+		[setActivityFilter]
+	);
+
 	return (
 		<>
 			<MainLayout showTimer={!profileIsAuthUser && isTrackingEnabled}>
@@ -80,15 +93,15 @@ const Profile = ({ params }: { params: { memberId: string } }) => {
 				{hook.tab == 'worked' && canSeeActivity && (
 					<Container fullWidth={fullWidth} className="py-8">
 						<div className={clsxm('flex  justify-start items-center gap-4')}>
-							{Object.values(ActivityFilters).map((filter: ActivityFilters, i) => (
+							{Object.keys(activityScreens).map((filter, i) => (
 								<div key={i} className="flex cursor-pointer justify-start items-center gap-4">
 									{i !== 0 && <VerticalSeparator />}
 									<div
 										className={clsxm(
 											'text-gray-500',
 											activityFilter == filter && 'text-black dark:text-white'
 										)}
-										onClick={() => setActivityFilter(filter)}
+										onClick={() => changeActivityFilter(filter as FilterTab)}
 									>
 										{filter}
 									</div>
@@ -99,22 +112,12 @@ const Profile = ({ params }: { params: { memberId: string } }) => {
 				)}
 
 				<Container fullWidth={fullWidth} className="mb-10">
-					{hook.tab == 'worked' && activityFilter == ActivityFilters.TASKS ? (
-						<UserProfileTask profile={profile} tabFiltered={hook} />
-					) : hook.tab == 'worked' && canSeeActivity && activityFilter == ActivityFilters.SCREENSHOOTS ? (
-						<ScreenshootTab />
-					) : hook.tab == 'worked' && canSeeActivity && activityFilter == ActivityFilters.APPS ? (
-						<AppsTab />
-					) : hook.tab == 'worked' && canSeeActivity && activityFilter == ActivityFilters.VISITED_SITES ? (
-						<VisitedSitesTab />
-					) : (
-						<UserProfileTask profile={profile} tabFiltered={hook} />
-					)}
+					{activityScreens[activityFilter] ?? null}
 				</Container>
 			</MainLayout>
 		</>
 	);
-};
+});
 
 function UserProfileDetail({ member }: { member?: OT_Member }) {
 	const user = useMemo(() => member?.employee.user, [member?.employee.user]);

apps/web/app/[locale]/task/[id]/page.tsx

@@ -84,7 +84,7 @@ const TaskDetails = () => {
 								{/* <IssueCard related={true} /> */}
 
 								{/* <CompletionBlock /> */}
-								{/* <ActivityBlock /> */}
+								{/* <TaskActivity /> */}
 							</div>
 						</section>
 						<div className="flex flex-col mt-4 lg:mt-0 3xl:min-w-[24rem] w-full lg:w-[30%]">

apps/web/app/api/organization-projects/[id]/route.ts

@@ -9,14 +9,15 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
 	if (!user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
 
 	const { id } = params;
+
 	const body = await req.json();
 
-	return $res(
-		await editOrganizationProjectsRequest({
-			bearer_token: access_token,
-			id,
-			datas: body,
-			tenantId
-		})
-	);
+	const response = await editOrganizationProjectsRequest({
+		bearer_token: access_token,
+		id,
+		datas: body,
+		tenantId
+	});
+
+	return $res(response.data);
 }

apps/web/app/api/organization-projects/setting/[id]/route.ts

@@ -10,15 +10,13 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
 
 	const { id } = params;
 	const body = await req.json();
-	switch (req.method) {
-		case 'PUT':
-			return $res(
-				await editOrganizationProjectsSettingsRequest({
-					bearer_token: access_token,
-					id,
-					datas: body,
-					tenantId
-				})
-			);
-	}
+
+	const response = await editOrganizationProjectsSettingsRequest({
+		bearer_token: access_token,
+		id,
+		datas: body,
+		tenantId
+	});
+
+	$res(response.data);
 }

apps/web/app/api/organization-team-employee/[id]/active-task/route.ts

@@ -12,13 +12,13 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
 	const body = (await req.json()) as IOrganizationTeamEmployeeUpdate;
 
 	if (id) {
-		return $res(
-			await updateOrganizationTeamEmployeeActiveTaskRequest({
-				id: id as string,
-				bearer_token: access_token,
-				tenantId,
-				body
-			})
-		);
+		const response = await updateOrganizationTeamEmployeeActiveTaskRequest({
+			id: id as string,
+			bearer_token: access_token,
+			tenantId,
+			body
+		});
+
+		return $res(response.data);
 	}
 }

apps/web/app/api/organization-team-employee/[id]/route.ts

@@ -15,15 +15,15 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
 
 	const { id } = params;
 
+	const response = await updateOrganizationTeamEmployeeRequest({
+		id: id as string,
+		bearer_token: access_token,
+		tenantId,
+		body: body
+	});
+
 	if (id) {
-		return $res(
-			await updateOrganizationTeamEmployeeRequest({
-				id: id as string,
-				bearer_token: access_token,
-				tenantId,
-				body: body
-			})
-		);
+		return $res(response.data);
 	}
 }
 
@@ -37,16 +37,16 @@ export async function DELETE(req: Request, { params }: { params: { id: string }
 	const { employeeId } = searchParams as unknown as { employeeId: string };
 	const { id } = params;
 
+	const response = await deleteOrganizationTeamEmployeeRequest({
+		id: id as string,
+		bearer_token: access_token,
+		tenantId,
+		organizationId,
+		employeeId: employeeId as string,
+		organizationTeamId: teamId
+	});
+
 	if (id) {
-		return $res(
-			await deleteOrganizationTeamEmployeeRequest({
-				id: id as string,
-				bearer_token: access_token,
-				tenantId,
-				organizationId,
-				employeeId: employeeId as string,
-				organizationTeamId: teamId
-			})
-		);
+		return $res(response.data);
 	}
 }

apps/web/app/api/role-permissions/[id]/route.ts

@@ -2,23 +2,21 @@ import { authenticatedGuard } from '@app/services/server/guards/authenticated-gu
 import { getRolePermissionsRequest, updateRolePermissionRequest } from '@app/services/server/requests';
 import { NextResponse } from 'next/server';
 
-export async function GET(req: Request,  { params }: { params: { id: string } }) {
+export async function GET(req: Request, { params }: { params: { id: string } }) {
 	const res = new NextResponse();
 	const { $res, user, access_token, tenantId } = await authenticatedGuard(req, res);
 
 	if (!user) return $res('unauthorized');
 
 	const { id } = params;
 
-	return $res(
-		(
-			await getRolePermissionsRequest({
-				bearer_token: access_token,
-				tenantId,
-				roleId: id as string
-			})
-		).data
-	);
+	const response = await getRolePermissionsRequest({
+		bearer_token: access_token,
+		tenantId,
+		roleId: id as string
+	});
+
+	return $res(response.data);
 }
 
 export async function PUT(req: Request) {
@@ -29,13 +27,11 @@ export async function PUT(req: Request) {
 
 	const body = await req.json();
 
-	return $res(
-		(
-			await updateRolePermissionRequest({
-				bearer_token: access_token,
-				tenantId,
-				data: body
-			})
-		).data
-	);
+	const response = await updateRolePermissionRequest({
+		bearer_token: access_token,
+		tenantId,
+		data: body
+	});
+
+	return $res(response.data);
 }

apps/web/app/api/roles/route.ts

@@ -9,32 +9,30 @@ export async function GET(req: Request) {
 	const { $res, user, access_token, tenantId } = await authenticatedGuard(req, res);
 	if (!user) return $res('unauthorized');
 
-	return $res(
-		(
-			await getRolesRequest({
-				bearer_token: access_token,
-				tenantId
-			})
-		).data
-	);
+	const response = await getRolesRequest({
+		bearer_token: access_token,
+		tenantId
+	});
+
+	return $res(response.data);
 }
 
 export async function POST(req: Request) {
 	const res = new NextResponse();
 	const { $res, user, access_token, tenantId } = await authenticatedGuard(req, res);
+
 	const body = (await req.json()) as IRole;
+
 	if (!user) return $res('unauthorized');
 
-	return $res(
-		(
-			await createRoleRequest({
-				bearer_token: access_token,
-				tenantId,
-				data: {
-					...body,
-					tenantId
-				}
-			})
-		).data
-	);
+	const response = await createRoleRequest({
+		bearer_token: access_token,
+		tenantId,
+		data: {
+			...body,
+			tenantId
+		}
+	});
+
+	return $res(response.data);
 }

apps/web/app/hooks/features/useOrganizationTeams.ts

@@ -213,14 +213,14 @@ export function useOrganizationTeams() {
 
 	const setActiveTeam = useCallback(
 		(team: (typeof teams)[0]) => {
-			setActiveTeamIdCookie(team.id);
-			setOrganizationIdCookie(team.organizationId);
+			setActiveTeamIdCookie(team?.id);
+			setOrganizationIdCookie(team?.organizationId);
 			// This must be called at the end (Update store)
-			setActiveTeamId(team.id);
+			setActiveTeamId(team?.id);
 
 			// Set Project Id to cookie
 			// TODO: Make it dynamic when we add Dropdown in Navbar
-			if (team && team.projects && team.projects.length) {
+			if (team && team?.projects && team.projects.length) {
 				setActiveProjectIdCookie(team.projects[0].id);
 			}
 		},