ENCOA-283 or ENCOA-282, I don't know someone deleted the issue

This commit is contained in:
Carlos-Mesquita
2024-12-22 21:19:27 +00:00
parent 98a1636d0c
commit 860f1295e5
6 changed files with 314 additions and 56 deletions

View File

@@ -161,10 +161,9 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
readXlsxFile(
file.content, { schema, ignoreEmptyRows: false })
.then((data) => {
setClassroomTransferState((prev) => ({...prev, parsedExcel: data}))
console.log(data);
setClassroomTransferState((prev) => ({ ...prev, parsedExcel: data }))
});
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [filesContent]);
@@ -236,7 +235,6 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
} as UserImport;
})
.filter((item): item is UserImport => item !== undefined);
console.log(infos);
// On import reset state except excel parsing
setClassroomTransferState((prev) => ({
@@ -260,26 +258,26 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
const emails = classroomTransferState.imports.map((i) => i.email);
const crossRefUsers = async () => {
try {
console.log(user.entities);
const { data: nonExistantUsers } = await axios.post("/api/users/controller?op=dontExist", { emails });
const { data: nonEntityUsers } = await axios.post("/api/users/controller?op=entityCheck", { entities: user.entities, emails });
const { data: alreadyPlaced } = await axios.post("/api/users/controller?op=crossRefClassrooms", {
sets: classroomTransferState.imports.map((info) => ({
email: info.email,
classroom: info.groupName
}))
})),
entity
});
const excludeEmails = new Set([
...nonExistantUsers,
...nonEntityUsers,
...nonEntityUsers.map((o: any) => o.email),
...alreadyPlaced
]);
const filteredImports = classroomTransferState.imports.filter(i => !excludeEmails.has(i.email));
const nonExistantEmails = new Set(nonExistantUsers);
const nonEntityEmails = new Set(nonEntityUsers);
const nonEntityEmails = new Set(nonEntityUsers.map((o: any) => o.email));
const alreadyPlacedEmails = new Set(alreadyPlaced);
setClassroomTransferState((prev) => ({
@@ -287,7 +285,14 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
stage: 2,
imports: filteredImports,
notFoundUsers: classroomTransferState.imports.filter(i => nonExistantEmails.has(i.email)),
otherEntityUsers: classroomTransferState.imports.filter(i => nonEntityEmails.has(i.email)),
otherEntityUsers: classroomTransferState.imports.filter(i => nonEntityEmails.has(i.email))
.map(user => {
const nonEntityUser = nonEntityUsers.find((o: any) => o.email === user.email);
return {
...user,
entityLabels: nonEntityUser?.names || []
};
}),
alreadyInClass: classroomTransferState.imports.filter(i => alreadyPlacedEmails.has(i.email)),
}));
} catch (error) {
@@ -299,14 +304,14 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
crossRefUsers();
}
}, [classroomTransferState.imports, user.entities, classroomTransferState.stage])
}, [classroomTransferState.imports, user.entities, classroomTransferState.stage, entity])
// Stage 3 - Classroom Filter
// - See if there are classrooms with same name but different admin
// - Find which new classrooms need to be created
useEffect(() => {
const crossRefClassrooms = async () => {
const classrooms = new Set(classroomTransferState.imports.map((i) => i.groupName));
const classrooms = Array.from(new Set(classroomTransferState.imports.map((i) => i.groupName)));
try {
const { data: notOwnedClassroomsSameName } = await axios.post("/api/groups/controller?op=crossRefOwnership", {
@@ -362,7 +367,42 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
try {
setIsLoading(true);
const groupedUsers = classroomTransferState.imports.reduce((acc, user) => {
const getIds = async () => {
try {
const { data: emailIdMap } = await axios.post("/api/users/controller?op=getIds", {
emails: classroomTransferState.imports.map((u) => u.email)
});
return classroomTransferState.imports.map(importUser => {
const matchingUser = emailIdMap.find((mapping: any) => mapping.email === importUser.email);
return {
...importUser,
id: matchingUser?.id || undefined
};
});
} catch (error) {
toast.error("Something went wrong, please try again later!");
}
};
const imports = await getIds();
if (!imports) return;
await axios.post("/api/groups/controller?op=deletePriorEntitiesGroups", {
ids: imports.map((u) => u.id),
entity
});
await axios.post("/api/users/controller?op=assignToEntity", {
ids: imports.map((u) => u.id),
entity
});
const groupedUsers = imports.reduce((acc, user) => {
if (!acc[user.groupName]) {
acc[user.groupName] = [];
}
@@ -385,33 +425,38 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
return axios.post('/api/groups', groupData);
});
const existingGroupUsers = Object.fromEntries(
Object.entries(groupedUsers)
.filter(([groupName]) => !classroomTransferState.classroomsToCreate.includes(groupName))
);
const { groups: groupNameToId, users: userEmailToId } = await axios.post('/api/groups?op=getIds', {
names: Object.keys(existingGroupUsers),
userEmails: Object.values(existingGroupUsers).flat().map(user => user.email)
}).then(response => response.data);
let updatePromises: Promise<any>[] = [];
const existingGroupsWithIds = Object.entries(existingGroupUsers).reduce((acc, [groupName, users]) => {
acc[groupNameToId[groupName]] = users;
return acc;
}, {} as Record<string, any[]>);
if (Object.keys(existingGroupUsers).length > 0) {
const { groups: groupNameToId, users: userEmailToId } = await axios.post('/api/groups?op=getIds', {
names: Object.keys(existingGroupUsers),
userEmails: Object.values(existingGroupUsers).flat().map(user => user.email)
}).then(response => response.data);
const updatePromises = Object.entries(existingGroupsWithIds).map(([groupId, users]) => {
const userIds = users.map(user => userEmailToId[user.email]);
return axios.patch(`/api/groups/${groupId}`, {
participants: userIds
const existingGroupsWithIds = Object.entries(existingGroupUsers).reduce((acc, [groupName, users]) => {
acc[groupNameToId[groupName]] = users;
return acc;
}, {} as Record<string, any[]>);
updatePromises = Object.entries(existingGroupsWithIds).map(([groupId, users]) => {
const userIds = users.map(user => userEmailToId[user.email]);
return axios.patch(`/api/groups/${groupId}`, {
participants: userIds
});
});
});
}
await Promise.all([
...createGroupPromises,
...updatePromises
]);
toast.success(`Successfully assigned all ${classroomTransferState.imports.length} user(s)!`);
onFinish();
} catch (error) {
@@ -537,14 +582,14 @@ const StudentClassroomTransfer: React.FC<{ user: User; entities?: EntityWithRole
</Button>
</div>
<div className={clsx("flex flex-col gap-4")}>
<label className="font-normal text-base text-mti-gray-dim">Entity</label>
<Select
defaultValue={{ value: (entities || [])[0]?.id, label: (entities || [])[0]?.label }}
options={entities.map((e) => ({ value: e.id, label: e.label }))}
onChange={(e) => setEntity(e?.value || undefined)}
isClearable={checkAccess(user, ["admin", "developer"])}
/>
</div>
<label className="font-normal text-base text-mti-gray-dim">Entity</label>
<Select
defaultValue={{ value: (entities || [])[0]?.id, label: (entities || [])[0]?.label }}
options={entities.map((e) => ({ value: e.id, label: e.label }))}
onChange={(e) => setEntity(e?.value || undefined)}
isClearable={checkAccess(user, ["admin", "developer"])}
/>
</div>
</div>
{classroomTransferState.parsedExcel?.rows !== undefined && (
<ClassroomImportSummary state={classroomTransferState} />