Skip to content

Course: Apply natural sort to user course list display - refs #1655 #6210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2025
Merged

Course: Apply natural sort to user course list display - refs #1655 #6210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 41 additions & 29 deletions assets/vue/views/user/courses/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ const { result, fetchMore } = useQuery(GET_COURSE_REL_USER, {
after: null,
})

const sortCourses = () => {
courses.value.sort((a, b) => a.title.localeCompare(b.title, undefined, { numeric: true, sensitivity: "base" }))
}

watch(result, (newResult) => {
if (newResult?.courseRelUsers) {
const newCourses = newResult.courseRelUsers.edges.map(({ node }) => node.course)
Expand All @@ -74,12 +78,17 @@ watch(result, (newResult) => {
(newCourse) => !courses.value.some((existingCourse) => existingCourse._id === newCourse._id),
)

courses.value.push(...filteredCourses)
if (filteredCourses.length > 0) {
courses.value.push(...filteredCourses)
sortCourses()
}

endCursor.value = newResult.courseRelUsers.pageInfo.endCursor
hasMore.value = newResult.courseRelUsers.pageInfo.hasNextPage

nextTick(() => {
if (lastCourseRef.value) {
observer.unobserve(lastCourseRef.value)
observer.observe(lastCourseRef.value)
}
})
Expand All @@ -92,34 +101,37 @@ const loadMoreCourses = () => {
if (!hasMore.value || isLoading.value) return
isLoading.value = true

fetchMore({
variables: {
user: securityStore.user["@id"],
first: 10,
after: endCursor.value,
},
updateQuery: (previousResult, { fetchMoreResult }) => {
if (!fetchMoreResult) return previousResult

const newCourses = fetchMoreResult.courseRelUsers.edges.map(({ node }) => node.course)
const filteredCourses = newCourses.filter(
(newCourse) => !courses.value.some((existingCourse) => existingCourse._id === newCourse._id),
)
courses.value.push(...filteredCourses)
endCursor.value = fetchMoreResult.courseRelUsers.pageInfo.endCursor
hasMore.value = fetchMoreResult.courseRelUsers.pageInfo.hasNextPage

return {
...previousResult,
courseRelUsers: {
...fetchMoreResult.courseRelUsers,
edges: [...previousResult.courseRelUsers.edges, ...fetchMoreResult.courseRelUsers.edges],
},
}
},
}).finally(() => {
isLoading.value = false
})
setTimeout(() => {
fetchMore({
variables: {
user: securityStore.user["@id"],
first: 10,
after: endCursor.value,
},
updateQuery: (previousResult, { fetchMoreResult }) => {
if (!fetchMoreResult) return previousResult

const newCourses = fetchMoreResult.courseRelUsers.edges.map(({ node }) => node.course)
const filteredCourses = newCourses.filter(
(newCourse) => !courses.value.some((existingCourse) => existingCourse._id === newCourse._id),
)
courses.value.push(...filteredCourses)
sortCourses(courses.value)
endCursor.value = fetchMoreResult.courseRelUsers.pageInfo.endCursor
hasMore.value = fetchMoreResult.courseRelUsers.pageInfo.hasNextPage

return {
...previousResult,
courseRelUsers: {
...fetchMoreResult.courseRelUsers,
edges: [...previousResult.courseRelUsers.edges, ...fetchMoreResult.courseRelUsers.edges],
},
}
},
}).finally(() => {
isLoading.value = false
})
}, 300)
}

let observer = new IntersectionObserver(
Expand Down
Loading