Merge branch 'dev'

Author: vis97c

composables/inputs/courses.ts

@@ -2,7 +2,7 @@ import { FormInput } from "@open-xamu-co/ui-common-helpers";
 import { eFormType } from "@open-xamu-co/ui-common-enums";
 
 import type { Course } from "~/resources/types/entities";
-import { eSIALevel, type uSIAFaculty, type uSIAProgram } from "~/functions/src/types/SIA";
+import { eSIALevel, type uSIAFaculty } from "~/functions/src/types/SIA";
 
 export function useCourseInputs(course: Course = {}): FormInput[] {
 	const SESSION = useSessionStore();
@@ -33,6 +33,10 @@ export function useCourseInputs(course: Course = {}): FormInput[] {
 			const unwatch = watch(
 				programs,
 				(newPrograms) => {
+					if (fixCourse) {
+						newPrograms.unshift({ value: "", alias: "CUALQUIERA" });
+					}
+
 					// set first program as value
 					programInput.options = newPrograms;
 					programInput.values = [newPrograms[0].value as any];
@@ -45,19 +49,19 @@ export function useCourseInputs(course: Course = {}): FormInput[] {
 			selectedFaculty.value = newFaculty;
 		}
 	);
+
+	if (fixCourse) {
+		programs.value.unshift({ value: "", alias: "CUALQUIERA" });
+	}
+
 	const programInput = new FormInput({
-		values: [
-			course?.program || fixCourse
-				? <uSIAProgram>programs.value[0].value
-				: SESSION.lastProgramSearch,
-		],
+		values: [fixCourse ? "" : course?.program || SESSION.lastProgramSearch],
 		name: "program",
 		title: "Programa del curso (Sede Bogotá)",
 		placeholder: "Ej: Ciencias de la computación",
 		options: programs.value,
 		type: eFormType.SELECT,
 		icon: "chess-rook",
-		required: fixCourse,
 	});
 
 	const inputs: FormInput[] = [

composables/store/session.ts

@@ -83,8 +83,9 @@ export const useSessionStore = defineStore("session", {
 		},
 		canDevelop({ user }) {
 			const role = user?.role ?? 3;
+			const { production } = useRuntimeConfig().public;
 
-			return role < 0;
+			return role < 0 || !production;
 		},
 	},
 	actions: {

pages/administrar/registros.vue

@@ -40,7 +40,7 @@
 <script setup lang="ts">
 	import type { iGetPage, iPage } from "@open-xamu-co/ui-common-types";
 
-	import type { Log } from "~/resources/types/entities";
+	import type { CourseLog } from "~/resources/types/entities";
 
 	/**
 	 * Developer logs page
@@ -52,14 +52,11 @@
 		middleware: ["can-develop"],
 	});
 
-	function mapLog({ createdBy, updatedBy, ...log }: Log) {
-		return {
-			...log,
-			createdBy,
-		};
+	function mapLog({ createdBy, updatedBy, course, ...log }: CourseLog) {
+		return { ...log, course, createdBy };
 	}
 
-	const logsPage: iGetPage<Log> = (pagination) => {
-		return useFetchQuery<iPage<Log> | undefined>("/api/all/logs", pagination);
+	const logsPage: iGetPage<CourseLog> = (pagination) => {
+		return useFetchQuery<iPage<CourseLog> | undefined>("/api/all/logs", pagination);
 	};
 </script>

pages/cursos/[courseId].vue

@@ -68,7 +68,7 @@
 									<XamuIconFa name="bell" :size="20" />
 								</XamuActionButtonToggle>
 								<XamuModal
-									v-if="withScrapingErrors"
+									v-if="withScrapingErrors || SESSION.canDevelop"
 									key="fix-course"
 									class="--txtColor"
 									title="Corregir curso mal indexado"
@@ -288,6 +288,7 @@
 	const Swal = useSwal();
 	const { $clientFirestore } = useNuxtApp();
 	const { getResponse } = useFormInput();
+	const { debugScrapper } = useRuntimeConfig().public;
 
 	const estudiantesTheme = "estudiantes" as any;
 	const scraping = ref(false);
@@ -531,26 +532,21 @@
 				if (!course.value) return { data: null };
 
 				try {
-					// Update course, do not await
-					useDocumentUpdate<Course>(course.value, {
+					const updatedCourse = {
 						typologies: typology ? [typology] : deleteField(),
 						faculty,
 						faculties: [faculty],
-						programs: [program],
-					});
+						programs: program ? [program] : deleteField(),
+					};
 
-					const minutes = APP.instance?.config?.coursesScrapeRate || 5;
-					const nowMilis = new Date().getTime();
-					const scrapedAtMilis = new Date(course.value.scrapedAt || "").getTime();
-					const scrapedDiffMilis = nowMilis - scrapedAtMilis;
+					if (debugScrapper) console.debug("Updated course", updatedCourse);
 
-					// Do once & update if updated more than threshold
-					if (scrapedDiffMilis < useMinMilis(minutes)) {
-						if (course.value.description) return { data: false };
-					}
-
-					// Atemp course scraping
-					await scrapeCourse(course.value);
+					// Update course, do not await
+					useDocumentUpdate<Course>(course.value, updatedCourse);
+					setTimeout(() => {
+						// Atemp course scraping, do not await
+						scrapeCourse(course.value!);
+					}, 30 * 1000);
 
 					return { data: true };
 				} catch (errors: FirebaseError | unknown) {