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

Some quick hotfixes

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-10-31 10:34:37 +00:00
parent 35ca933339
commit 28c5d13682
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pages/dashboard/student.tsx
View File

@@ -59,7 +59,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
const entityIDS = mapBy(user.entities, "id") || []; const entityIDS = mapBy(user.entities, "id") || [];
const entities = await getEntitiesWithRoles(entityIDS); const entities = await getEntitiesWithRoles(entityIDS);
const assignments = await getAssignmentsByAssignee(user.id, {archived: false}); const assignments = await getAssignmentsByAssignee(user.id, {archived: {$ne: true}});
const stats = await getStatsByUser(user.id); const stats = await getStatsByUser(user.id);
const sessions = await getSessionsByUser(user.id, 10); const sessions = await getSessionsByUser(user.id, 10);
const invites = await getInvitesByInvitee(user.id); const invites = await getInvitesByInvitee(user.id);
@@ -149,16 +149,9 @@ export default function Dashboard({user, entities, assignments, stats, invites,
]} ]}
/> />
{/* Bio */}
<section className="flex flex-col gap-1 md:gap-3">
<span className="text-lg font-bold">Bio</span>
<span className="text-mti-gray-taupe">
{user.bio || "Your bio will appear here, you can change it by clicking on your name in the top right corner."}
</span>
</section>
{/* Assignments */} {/* Assignments */}
<section className="flex flex-col gap-1 md:gap-3"> <section className="flex flex-col gap-1 md:gap-3">
<span className="text-mti-black text-lg font-bold">Assignments</span>
<span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll"> <span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
{studentAssignments.length === 0 && "Assignments will appear here. It seems that for now there are no assignments for you."} {studentAssignments.length === 0 && "Assignments will appear here. It seems that for now there are no assignments for you."}
{studentAssignments {studentAssignments

9
src/pages/entities/[id]/index.tsx
View File

@@ -16,7 +16,7 @@ import {convertToUsers, getGroup} from "@/utils/groups.be";
import {shouldRedirectHome} from "@/utils/navigation.disabled"; import {shouldRedirectHome} from "@/utils/navigation.disabled";
import {checkAccess, doesEntityAllow, getTypesOfUser} from "@/utils/permissions"; import {checkAccess, doesEntityAllow, getTypesOfUser} from "@/utils/permissions";
import {getUserName, isAdmin} from "@/utils/users"; import {getUserName, isAdmin} from "@/utils/users";
import {getEntitiesUsers, getEntityUsers, getLinkedUsers, getSpecificUsers, getUsers} from "@/utils/users.be"; import {filterAllowedUsers, getEntitiesUsers, getEntityUsers, getLinkedUsers, getSpecificUsers, getUsers} from "@/utils/users.be";
import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react"; import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
import axios from "axios"; import axios from "axios";
import clsx from "clsx"; import clsx from "clsx";
@@ -55,8 +55,9 @@ export const getServerSideProps = withIronSessionSsr(async ({req, params}) => {
if (!doesEntityAllow(user, entity, "view_entities")) return redirect(`/entities`) if (!doesEntityAllow(user, entity, "view_entities")) return redirect(`/entities`)
const linkedUsers = await (isAdmin(user) ? getUsers() : getEntitiesUsers(mapBy(user.entities, 'id'))) const linkedUsers = await (isAdmin(user) ? getUsers() : getEntitiesUsers(mapBy(user.entities, 'id'),
const entityUsers = await getEntityUsers(id); {$and: [{type: {$ne: "developer"}}, {type: {$ne: "admin"}}]}))
const entityUsers = await (isAdmin(user) ? getEntityUsers(id) : filterAllowedUsers(user, [entity]));
const usersWithRole = entityUsers.map((u) => { const usersWithRole = entityUsers.map((u) => {
const e = u.entities.find((e) => e.id === id); const e = u.entities.find((e) => e.id === id);
@@ -363,7 +364,7 @@ export default function Home({user, entity, users, linkedUsers}: Props) {
<CardList<User | UserWithRole> <CardList<User | UserWithRole>
list={isAdding ? linkedUsers : users} list={isAdding ? linkedUsers : users}
renderCard={renderCard} renderCard={renderCard}
searchFields={[["name"], ["corporateInformation", "companyInformation", "name"], ["role", "label"], ["type"]]} searchFields={[["name"], ["email"], ["corporateInformation", "companyInformation", "name"], ["role", "label"], ["type"]]}
/> />
</section> </section>
</Layout> </Layout>