tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

Merge pull request #265 from SELab-2/fix/op-thema-paginas-worden-enkel-nederlandstalige-leerpaden-getoond-#264

Browse source 
fix: Leerpaden voor thema's opvragen in de juiste taal
This commit is contained in:
Gerald Schmittinger 2025-05-14 21:37:29 +02:00 • committed by GitHub
commit fe7798b0d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/controllers/learning-paths.ts
View file

@ -26,8 +26,8 @@ export class LearningPathController extends BaseController {
}); });
return LearningPath.fromDTO(single(dtos)); return LearningPath.fromDTO(single(dtos));
} }
async getAllByTheme(theme: string): Promise<LearningPath[]> { async getAllByThemeAndLanguage(theme: string, language: Language): Promise<LearningPath[]> {
const dtos = await this.get<LearningPathDTO[]>("/", { theme }); const dtos = await this.get<LearningPathDTO[]>("/", { theme, language });
return dtos.map((dto) => LearningPath.fromDTO(dto)); return dtos.map((dto) => LearningPath.fromDTO(dto));
} }

7
frontend/src/queries/learning-paths.ts
View file

@ -22,12 +22,13 @@ export function useGetLearningPathQuery(
}); });
} }
export function useGetAllLearningPathsByThemeQuery( export function useGetAllLearningPathsByThemeAndLanguageQuery(
theme: MaybeRefOrGetter<string>, theme: MaybeRefOrGetter<string>,
language: MaybeRefOrGetter<Language>,
): UseQueryReturnType<LearningPath[], Error> { ): UseQueryReturnType<LearningPath[], Error> {
return useQuery({ return useQuery({
queryKey: [LEARNING_PATH_KEY, "getAllByTheme", theme], queryKey: [LEARNING_PATH_KEY, "getAllByTheme", theme, language],
queryFn: async () => learningPathController.getAllByTheme(toValue(theme)), queryFn: async () => learningPathController.getAllByThemeAndLanguage(toValue(theme), toValue(language)),
enabled: () => Boolean(toValue(theme)), enabled: () => Boolean(toValue(theme)),
}); });
} }

8
frontend/src/views/SingleTheme.vue
View file

@ -2,10 +2,11 @@
import type { LearningPath } from "@/data-objects/learning-paths/learning-path.ts"; import type { LearningPath } from "@/data-objects/learning-paths/learning-path.ts";
import LearningPathsGrid from "@/components/LearningPathsGrid.vue"; import LearningPathsGrid from "@/components/LearningPathsGrid.vue";
import UsingQueryResult from "@/components/UsingQueryResult.vue"; import UsingQueryResult from "@/components/UsingQueryResult.vue";
import { useGetAllLearningPathsByThemeQuery } from "@/queries/learning-paths.ts"; import { useGetAllLearningPathsByThemeAndLanguageQuery } from "@/queries/learning-paths.ts";
import { computed, ref } from "vue"; import { computed, ref } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useThemeQuery } from "@/queries/themes.ts"; import { useThemeQuery } from "@/queries/themes.ts";
import type { Language } from "@/data-objects/language";
const props = defineProps<{ theme: string }>(); const props = defineProps<{ theme: string }>();
@ -16,7 +17,10 @@
const currentThemeInfo = computed(() => themeQueryResult.data.value?.find((it) => it.key === props.theme)); const currentThemeInfo = computed(() => themeQueryResult.data.value?.find((it) => it.key === props.theme));
const learningPathsForThemeQueryResult = useGetAllLearningPathsByThemeQuery(() => props.theme); const learningPathsForThemeQueryResult = useGetAllLearningPathsByThemeAndLanguageQuery(
() => props.theme,
() => locale.value as Language,
);
const { t } = useI18n(); const { t } = useI18n();
const searchFilter = ref(""); const searchFilter = ref("");

2
frontend/tests/controllers/learning-paths-controller.test.ts
View file

@ -15,7 +15,7 @@ describe("Test controller learning paths", () => {
}); });
it("Can get learning path by id", async () => { it("Can get learning path by id", async () => {
const data = await controller.getAllByTheme("kiks"); const data = await controller.getAllByThemeAndLanguage("kiks", Language.Dutch);
expect(data).to.have.length.greaterThan(0); expect(data).to.have.length.greaterThan(0);
}); });
}); });