fix(frontend): Typeringsproblemen opgelost.
This commit is contained in:
parent
4d98be78c1
commit
ed8b5c919d
9 changed files with 30 additions and 22 deletions
|
@ -14,9 +14,7 @@ const language = computed(() => locale.value);
|
|||
|
||||
const themeQueryResult = useThemeQuery(language);
|
||||
|
||||
const currentThemeInfo = computed(() =>
|
||||
themeQueryResult.isSuccess.value ? themeQueryResult.data.value.filter(it => it.key === props.theme)[0] : undefined
|
||||
);
|
||||
const currentThemeInfo = computed(() => themeQueryResult.data.value?.find(it => it.key === props.theme));
|
||||
|
||||
const learningPathsForThemeQueryResult = useGetAllLearningPathsByThemeQuery(() => props.theme);
|
||||
|
||||
|
@ -26,7 +24,7 @@ const searchFilter = ref("");
|
|||
function filterLearningPaths(learningPaths: LearningPath[]): LearningPath[] {
|
||||
return learningPaths.filter(it =>
|
||||
it.title.toLowerCase().includes(searchFilter.value.toLowerCase())
|
||||
|| it.description.toLowerCase().includes(searchFilter.value.toLowerCase)
|
||||
|| it.description.toLowerCase().includes(searchFilter.value.toLowerCase())
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -35,8 +33,8 @@ function filterLearningPaths(learningPaths: LearningPath[]): LearningPath[] {
|
|||
<template>
|
||||
<div class="container">
|
||||
<using-query-result :query-result="themeQueryResult">
|
||||
<h1>{{ currentThemeInfo.title }}</h1>
|
||||
<p>{{ currentThemeInfo.description }}</p>
|
||||
<h1>{{ currentThemeInfo!!.title }}</h1>
|
||||
<p>{{ currentThemeInfo!!.description }}</p>
|
||||
<div class="search-field-container">
|
||||
<v-text-field
|
||||
class="search-field"
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
const learningObjectListQueryResult = useLearningObjectListForPathQuery(learningPathQueryResult.data);
|
||||
|
||||
const nodesList: ComputedRef<LearningPathNode[] | null> = computed(() =>
|
||||
learningPathQueryResult.isSuccess ? learningPathQueryResult.data.value?.nodesAsList : null
|
||||
learningPathQueryResult.data.value?.nodesAsList ?? null
|
||||
);
|
||||
|
||||
const currentNode = computed(() => {
|
||||
|
@ -71,11 +71,11 @@
|
|||
|
||||
function isLearningObjectCompleted(learningObject: LearningObject): boolean {
|
||||
if (learningObjectListQueryResult.isSuccess) {
|
||||
return learningPathQueryResult.data.value.nodesAsList.find(it =>
|
||||
return learningPathQueryResult.data.value?.nodesAsList?.find(it =>
|
||||
it.learningobjectHruid === learningObject.key
|
||||
&& it.version === learningObject.version
|
||||
&& it.language === learningObject.language
|
||||
).done;
|
||||
)?.done ?? false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
|
||||
const query = computed(() => route.query.query as string | null);
|
||||
const query = computed(() => route.query.query as string | undefined);
|
||||
|
||||
const searchQueryResults = useSearchLearningPathQuery(query);
|
||||
</script>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue