devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved part of the assignments pages

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-10-31 10:42:35 +00:00
parent 28c5d13682
commit f29daa0d94
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/assignments/index.tsx
View File

@@ -10,7 +10,7 @@ import {Assignment} from "@/interfaces/results";
import {CorporateUser, Group, User} from "@/interfaces/user";
import {sessionOptions} from "@/lib/session";
import {getUserCompanyName} from "@/resources/user";
import {mapBy, redirect, serialize} from "@/utils";
import {findBy, mapBy, redirect, serialize} from "@/utils";
import { requestUser } from "@/utils/api";
import {
activeAssignmentFilter,
@@ -53,7 +53,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
const groups =
await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(mapBy(allowedEntities, 'id')));
return {props: serialize({user, users, entities, assignments, groups})};
return {props: serialize({user, users, entities: allowedEntities, assignments, groups})};
}, sessionOptions);
const SEARCH_FIELDS = [["name"]];
@@ -131,7 +131,7 @@ export default function AssignmentsPage({assignments, corporateAssignments, enti
</div>
<div className="flex flex-wrap gap-2">
{activeItems.map((a) => (
<AssignmentCard {...a} users={users} onClick={() => router.push(`/assignments/${a.id}`)} key={a.id} />
<AssignmentCard {...a} entityObj={findBy(entities, 'id', a.entity)} users={users} onClick={() => router.push(`/assignments/${a.id}`)} key={a.id} />
))}
</div>
</section>
@@ -153,6 +153,7 @@ export default function AssignmentsPage({assignments, corporateAssignments, enti
<AssignmentCard
{...a}
users={users}
entityObj={findBy(entities, 'id', a.entity)}
onClick={
mapBy(entitiesAllowEdit, 'id').includes(a.entity || "")
? () => router.push(`/assignments/creator/${a.id}`)
@@ -175,6 +176,7 @@ export default function AssignmentsPage({assignments, corporateAssignments, enti
<AssignmentCard
{...a}
users={users}
entityObj={findBy(entities, 'id', a.entity)}
onClick={() => router.push(`/assignments/${a.id}`)}
key={a.id}
allowDownload
@@ -195,6 +197,7 @@ export default function AssignmentsPage({assignments, corporateAssignments, enti
<AssignmentCard
{...a}
users={users}
entityObj={findBy(entities, 'id', a.entity)}
onClick={() => router.push(`/assignments/${a.id}`)}
key={a.id}
allowDownload
@@ -217,6 +220,7 @@ export default function AssignmentsPage({assignments, corporateAssignments, enti
users={users}
onClick={() => router.push(`/assignments/${a.id}`)}
key={a.id}
entityObj={findBy(entities, 'id', a.entity)}
allowDownload
allowUnarchive
allowExcelDownload