Merge branch 'dev'

Author: vis97c

app.vue

@@ -102,7 +102,7 @@
 											<div
 												class="flx --flxRow --flx-center --gap-10 --txtSize-xs"
 											>
-												<template v-if="APP.instance?.config?.version">
+												<template v-if="APP.config?.version">
 													<span>{{ APP.instance.config.version }}</span>
 													⋅
 												</template>
@@ -127,9 +127,7 @@
 										</p>
 										<p
 											class="--txtSize-xs --txtColor-dark5"
-											:title="
-												APP.instance?.config?.siaMaintenanceTillAt?.toString()
-											"
+											:title="APP.config?.siaMaintenanceTillAt?.toString()"
 										>
 											Volveremos a la normalidad {{ SIAMaintenanceTillAt }}.
 										</p>
@@ -194,17 +192,17 @@
 
 	const isAdmin = computed(() => route.path.startsWith("/administrar"));
 	const SIAMaintenanceTillAt = computed(() => {
-		const date = new Date(APP.instance?.config?.siaMaintenanceTillAt || new Date());
+		const date = new Date(APP.config?.siaMaintenanceTillAt || new Date());
 
 		return useTimeAgo(date);
 	});
 	const ExplorerV1MaintenanceTillAt = computed(() => {
-		const date = new Date(APP.instance?.config?.explorerV1MaintenanceTillAt || new Date());
+		const date = new Date(APP.config?.explorerV1MaintenanceTillAt || new Date());
 
 		return useTimeAgo(date);
 	});
 	const ExplorerV2MaintenanceTillAt = computed(() => {
-		const date = new Date(APP.instance?.config?.explorerV2MaintenanceTillAt || new Date());
+		const date = new Date(APP.config?.explorerV2MaintenanceTillAt || new Date());
 
 		return useTimeAgo(date);
 	});

components/searchCourse.vue

@@ -14,13 +14,13 @@
 				<div class="txt">
 					<div>
 						<h3>
-							Resultados de la busqueda
+							Resultados de la búsqueda
 							<template v-if="lastSearch?.name || lastSearch?.code">
 								de "{{ lastSearch?.name || lastSearch?.code }}"
 							</template>
 							:
 						</h3>
-						<p class="--txtSize-xs">Datos obtenidos del buscador del SIA (Beta).</p>
+						<p class="--txtSize-xs">Datos obtenidos del explorador de cursos.</p>
 					</div>
 					<p>
 						{{ untrackedCurrentPage.totalRecords }} resultados. Pagina
@@ -125,11 +125,7 @@
 	import { XamuBaseAction } from "#components";
 	import type { Course } from "~/resources/types/entities";
 	import type { CourseValues } from "~/resources/types/values";
-	import {
-		eSIATypology,
-		type CoursesResponse,
-		type uSIAProgram,
-	} from "~/functions/src/types/SIA";
+	import { type CoursesResponse } from "~/functions/src/types/SIA";
 	import { getDocumentId } from "~/resources/utils/firestore";
 
 	/**
@@ -178,55 +174,16 @@
 		errors.value = undefined;
 
 		try {
-			const coursesPage = await useExplorerV1Courses(
-				props.values,
-				untrackedCurrentPage.value?.currentPage
-			);
-			const codes: string[] = [];
-			const dedupedCourses: Course[] = [];
-
-			/**
-			 * Remove duplicates & omit courses without groups
-			 * The system return entities with the same data but differing in the internal id
-			 */
-			coursesPage.data.forEach(({ faculties = [], ...course }) => {
-				if (!course.code || !course.groups?.length) return;
-
-				const dedupedCourseIndex = dedupedCourses.findIndex(({ id }) => id === course.id);
-
-				if (dedupedCourseIndex >= 0) {
-					// merge details
-					const dedupedCourse = dedupedCourses[dedupedCourseIndex];
-					const uniquePrograms = [
-						...new Set([dedupedCourse.programs, course.programs].flat()),
-					].filter((p: uSIAProgram | undefined): p is uSIAProgram => !!p);
-					const uniqueTypologies = [
-						...new Set([dedupedCourse.typologies, course.typologies].flat()),
-					].filter((p: eSIATypology | undefined): p is eSIATypology => !!p);
-
-					dedupedCourses[dedupedCourseIndex].programs = uniquePrograms;
-					dedupedCourses[dedupedCourseIndex].typologies = uniqueTypologies;
-
-					return;
-				}
-
-				// Inject faculty, that helped in search
-				if (props.values.faculty && !faculties.includes(props.values.faculty)) {
-					faculties.push(props.values.faculty);
-				}
-
-				codes.push(course.code);
-				dedupedCourses.push({ ...course, faculties });
-			});
+			const coursesPage = await useExplorerV2Courses(props.values);
 
 			// Refresh UI
 			lastSearch.value = { ...props.values, page: coursesPage.currentPage };
-			untrackedCourses.value = dedupedCourses;
+			untrackedCourses.value = coursesPage.data;
 			untrackedCurrentPage.value = coursesPage;
-			savedUntrackedCourses.value[coursesPage.currentPage] = dedupedCourses;
+			savedUntrackedCourses.value[coursesPage.currentPage] = coursesPage.data;
 
 			// Index course, do not await
-			indexCourses(dedupedCourses, coursesPage);
+			indexCourses(coursesPage.data, coursesPage);
 		} catch (err) {
 			useLogger("components:SearchCourse", err);
 			errors.value = err;

components/table/TeacherItem.vue

@@ -69,7 +69,7 @@
 	const Swal = useSwal();
 
 	const losEstudiantesProfessors = computed(() => {
-		const config = APP.instance?.config || {};
+		const config = APP.config || {};
 		const { losEstudiantesUrl = "", losEstudiantesProfessorsPath = "" } = config;
 
 		return `${losEstudiantesUrl}${losEstudiantesProfessorsPath}`;

composables/data.ts

@@ -1,58 +1,56 @@
-import { capitalize, deburr, startCase } from "lodash-es";
-
-import type { SIACourse, SIAGroup, uSIAFaculty, uSIAProgram } from "~/functions/src/types/SIA";
-import type { Course, Group, User } from "~/resources/types/entities";
+import { deburr } from "lodash-es";
 import {
-	eSIAAgrarianScienceBogotaProgram,
-	eSIAAgrarianSciencesMedellinProgram,
-	eSIAAmazoniaFaculty,
-	eSIAAmazoniaProgram,
-	eSIAArchitectureMedellinProgram,
-	eSIAArtsBogotaProgram,
+	type uSIAFaculty,
+	type uSIAProgram,
+	eSIAPlace,
 	eSIABogotaFaculty,
 	eSIABogotaProgram,
-	eSIACaribeFaculty,
-	eSIACaribeProgram,
-	eSIAEconomicalScienceBogotaProgram,
+	eSIAMedicineBogotaProgram,
+	eSIAVetMedicineBogotaProgram,
 	eSIAEnfermeryBogotaProgram,
-	eSIAEngineeringAndArchitectureManizalesProgram,
+	eSIAArtsBogotaProgram,
 	eSIAEngineeringBogotaProgram,
-	eSIAExactSciencesManizalesProgram,
+	eSIAOdontologyBogotaProgram,
+	eSIALawBogotaProgram,
+	eSIAScienceBogotaProgram,
 	eSIAHumanScienceBogotaProgram,
-	eSIAHumanSciencesAMedellinProgram,
+	eSIAEconomicalScienceBogotaProgram,
+	eSIAAgrarianScienceBogotaProgram,
 	eSIALaPazFaculty,
 	eSIALaPazProgram,
-	eSIALawBogotaProgram,
-	eSIAManagementManizalesProgram,
-	eSIAManizalesFaculty,
-	eSIAManizalesProgram,
+	eSIAPregradoLaPazProgram,
 	eSIAMedellinFaculty,
 	eSIAMedellinProgram,
-	eSIAMedicineBogotaProgram,
 	eSIAMinesMedellinProgram,
-	eSIAOdontologyBogotaProgram,
-	eSIAOrinoquiaFaculty,
-	eSIAOrinoquiaProgram,
+	eSIAArchitectureMedellinProgram,
+	eSIAScienceMedellinProgram,
+	eSIAAgrarianSciencesMedellinProgram,
+	eSIAHumanSciencesAMedellinProgram,
+	eSIAManizalesFaculty,
+	eSIAManizalesProgram,
+	eSIAEngineeringAndArchitectureManizalesProgram,
+	eSIAExactSciencesManizalesProgram,
+	eSIAManagementManizalesProgram,
 	eSIAPalmiraFaculty,
 	eSIAPalmiraProgram,
-	eSIAPlace,
-	eSIAPregradoLaPazProgram,
-	eSIAScienceBogotaProgram,
-	eSIAScienceMedellinProgram,
+	eSIAAmazoniaFaculty,
+	eSIAAmazoniaProgram,
+	eSIACaribeFaculty,
+	eSIACaribeProgram,
+	eSIAOrinoquiaFaculty,
+	eSIAOrinoquiaProgram,
 	eSIATumacoFaculty,
 	eSIATumacoProgram,
-	eSIATypology,
-	eSIAVetMedicineBogotaProgram,
-} from "~/functions/src/types/SIA/enums";
-import { isNotUndefString } from "~/resources/utils/guards";
-import { Cyrb53 } from "~/resources/utils/firestore";
+} from "~/functions/src/types/SIA";
+
+import type { Course, User } from "~/resources/types/entities";
 
 interface UNALItem {
 	faculty: uSIAFaculty;
 	programs: uSIAProgram[];
 }
 
-const UNAL: Record<eSIAPlace, UNALItem[]> = {
+export const UNAL: Record<eSIAPlace, UNALItem[]> = {
 	[eSIAPlace.BOGOTÁ]: [
 		{
 			faculty: eSIABogotaFaculty.SEDE_BOGOTÁ,
@@ -202,112 +200,6 @@ export function useMapUser({ role = 3, ...user }: User) {
 	return { ...user, role: roleName };
 }
 
-export function useMapGroupFromBETA(source: SIAGroup): Group {
-	const programsString = source.PLANES_ASOCIADOS || "";
-	const [, ...programs] = programsString.split("*** Plan:").map((p) => <uSIAProgram>p.trim());
-
-	return {
-		SIA: source.ID,
-		name: source.GRUPO,
-		spots: source.CUPOS,
-		schedule: [
-			source.HORARIO_LUNES,
-			source.HORARIO_MARTES,
-			source.HORARIO_MIERCOLES,
-			source.HORARIO_JUEVES,
-			source.HORARIO_VIERNES,
-			source.HORARIO_SABADO,
-			source.HORARIO_DOMINGO,
-		],
-		teachers: [startCase(source.DOCENTE.toLowerCase())],
-		activity: source.ACTIVIDAD,
-		availableSpots: source.CUPOS_DISPONIBLES,
-		classrooms: [source.AULA],
-		period: source.PERIODO,
-		programs,
-	};
-}
-
-/**
- * Map course from SIA beta
- */
-export function useMapCourseFromExplorerV1(source: SIACourse): Course {
-	// Generate deduped course UID
-	const id = `courses/${Cyrb53([source.CODIGO_ASIGNATURA])}`;
-	const groups: Group[] = [];
-	const typology = source.TIPOLOGIA;
-	const place = source.SEDE;
-	let faculty = source.FACULTAD;
-	let faculties = [faculty];
-	let programs = source.PLANDEESTUDIO ? [source.PLANDEESTUDIO] : [];
-
-	// Dedupe groups
-	source.DETALLECURSOASIGNATURA.forEach((groupBETA) => {
-		const group = useMapGroupFromBETA(groupBETA);
-		// Groups can be duplicated diff(teacher, schedule, classroom)
-		const groupIndex = groups.findIndex(({ name }) => name === group.name);
-
-		// Index group
-		if (groupIndex === -1) {
-			// Assign one of the associated programs
-			// Some global LE programs do not have an associated program and are hard to find on old SIA
-			if (!programs.length && typology === eSIATypology.LIBRE_ELECCIÓN) {
-				const [program] = group.programs || [];
-				const associatedFaculty = UNAL[place].find((f) => f.programs.includes(program));
-
-				if (!associatedFaculty) return groups.push(group);
-
-				faculty = associatedFaculty.faculty;
-				faculties = [faculty];
-				programs = [program];
-			}
-
-			return groups.push(group);
-		}
-
-		const currentSchedule = groups[groupIndex]?.schedule || [];
-		const newSchedule = group.schedule || [];
-		const uniqueClassrooms = [
-			...new Set([groups[groupIndex].classrooms, group.classrooms].flat()),
-		].filter(isNotUndefString);
-		const uniqueTeachers = [
-			...new Set([groups[groupIndex].teachers, group.teachers].flat()),
-		].filter(isNotUndefString);
-
-		// Complement existing group data
-		groups[groupIndex].classrooms = uniqueClassrooms;
-		groups[groupIndex].teachers = uniqueTeachers;
-		groups[groupIndex].schedule = [
-			currentSchedule[0] || newSchedule[0], // monday
-			currentSchedule[1] || newSchedule[1], // tuesday
-			currentSchedule[2] || newSchedule[2], // wednesday
-			currentSchedule[3] || newSchedule[3], // thursday
-			currentSchedule[4] || newSchedule[4], // friday
-			currentSchedule[5] || newSchedule[5], // saturday
-			currentSchedule[6] || newSchedule[6], // sunday
-		];
-	});
-
-	const spotsCount = groups.reduce((sum, { availableSpots = 0 }) => sum + availableSpots, 0);
-
-	return {
-		id,
-		SIA: source.IDBUSCADORCURSO,
-		name: capitalize(source.NOMBREASIGNATURA),
-		alternativeNames: [source.NOMBREASIGNATURA],
-		code: source.CODIGO_ASIGNATURA,
-		credits: source.NUM_CREDITOS,
-		typologies: [typology],
-		level: source.NIVELDEESTUDIO,
-		place,
-		faculty,
-		faculties,
-		programs,
-		groups,
-		spotsCount,
-	};
-}
-
 export function useMapCourse({ groups = [], ...course }: Course): Course {
 	const SESSION = useSessionStore();
 	const [, placeOnly] = deburr(SESSION.place).toLowerCase().replace(" de la", "").split("sede ");