Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Release Notes
=============

Version 0.65.7
--------------

- filter server-side, remove video count (#3287)

Version 0.65.6 (Released May 04, 2026)
--------------

Expand Down
11 changes: 0 additions & 11 deletions frontends/api/src/hooks/learningResources/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,6 @@ const useSimilarLearningResources = (
})
}

const useVectorSimilarLearningResources = (
id: number,
opts?: { enabled?: boolean },
) => {
return useQuery({
...learningResourceQueries.vectorSimilar(id),
...opts,
})
}

const useInfiniteLearningResourceItems = (
id: number,
params: Omit<ItemsListRequest, "offset">,
Expand All @@ -229,7 +219,6 @@ export {
usePlatformsList,
useSchoolsList,
useSimilarLearningResources,
useVectorSimilarLearningResources,
useInfiniteLearningResourceItems,
learningResourceQueries,
offerorQueries,
Expand Down
16 changes: 9 additions & 7 deletions frontends/api/src/hooks/learningResources/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import type {
LearningResourcesApiLearningResourcesSummaryListRequest as LearningResourcesSummaryListRequest,
PaginatedLearningResourceRelationshipList,
VideoPlaylistResource,
LearningResourcesApiLearningResourcesVectorSimilarListRequest,
} from "../../generated/v1"
import type { VectorLearningResourcesSearchApiVectorLearningResourcesSearchRetrieveRequest as VectorLearningResourcesSearchRetrieveRequest } from "../../generated/v0"
import { infiniteQueryOptions, queryOptions } from "@tanstack/react-query"
Expand Down Expand Up @@ -54,10 +55,9 @@ const learningResourceKeys = {
detailsRoot: () => [...learningResourceKeys.root, "detail"],
detail: (id: number) => [...learningResourceKeys.detailsRoot(), id],
similar: (id: number) => [...learningResourceKeys.detail(id), "similar"],
vectorSimilar: (id: number) => [
...learningResourceKeys.detail(id),
"vector_similar",
],
vectorSimilar: (
params: LearningResourcesApiLearningResourcesVectorSimilarListRequest,
) => [...learningResourceKeys.detail(params.id), "vector_similar", params],
itemsRoot: (id: number) => [...learningResourceKeys.detail(id), "items"],
items: (id: number, params: ItemsListRequest) => [
...learningResourceKeys.itemsRoot(id),
Expand Down Expand Up @@ -174,12 +174,14 @@ const learningResourceQueries = {
.learningResourcesSimilarList({ id })
.then((res) => res.data),
}),
vectorSimilar: (id: number) =>
vectorSimilar: (
params: LearningResourcesApiLearningResourcesVectorSimilarListRequest,
) =>
queryOptions({
queryKey: learningResourceKeys.vectorSimilar(id),
queryKey: learningResourceKeys.vectorSimilar(params),
queryFn: () =>
learningResourcesApi
.learningResourcesVectorSimilarList({ id })
.learningResourcesVectorSimilarList(params)
.then((res) => res.data),
}),
list: (params: LearningResourcesListRequest) =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import { Typography, styled, theme } from "ol-components"
import { styled } from "ol-components"
import VideoContainer from "./VideoContainer"
import type { VideoResource } from "api/v1"
import { VideoCard, VideoCardSkeleton } from "./VideoCard"
Expand All @@ -18,22 +18,6 @@ const StyledContainer = styled(VideoContainer)(({ theme }) => ({
borderTop: `1px solid ${theme.custom.colors.lightGray2}`,
}))

const CollectionHeader = styled.div(({ theme }) => ({
display: "flex",
justifyContent: "space-between",
alignItems: "center",
margin: "32px 0 8px 0",
[theme.breakpoints.down("sm")]: {
margin: "24px 0 0 0",
},
}))

const CollectionTitle = styled(Typography)({
...theme.typography.body1,
fontWeight: theme.typography.fontWeightMedium,
color: theme.custom.colors.black,
})

const VideoCardList = styled.div(({ theme }) => ({
display: "flex",
flexDirection: "column",
Expand Down Expand Up @@ -61,10 +45,6 @@ const VideoCollection: React.FC<VideoCollectionProps> = ({
return (
<CollectionSection>
<StyledContainer>
<CollectionHeader>
<CollectionTitle>{videos.length} Videos</CollectionTitle>
</CollectionHeader>

<VideoCardList>
{isLoading
? Array.from({ length: 4 }).map((_, i) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ const VideoPlaylistCollectionPage: React.FC<
)

const { data: similarData, isLoading: similarLoading } = useQuery({
...learningResourceQueries.vectorSimilar(playlistId),
select: (data) =>
data.filter(
(resource) => resource.resource_type === ResourceTypeEnum.VideoPlaylist,
),
...learningResourceQueries.vectorSimilar({
id: playlistId,
limit: 6,
resource_type: [ResourceTypeEnum.VideoPlaylist],
}),
})

if (!showVideoPlaylistPage) {
Expand All @@ -88,7 +88,6 @@ const VideoPlaylistCollectionPage: React.FC<
(item): item is VideoResource =>
item.resource_type === VideoResourceResourceTypeEnum.Video,
)
const collectionVideos = videos.slice(1)
const playlistType = isOcwPlaylist(playlist)

const totalVideos = videos.length
Expand Down Expand Up @@ -128,7 +127,7 @@ const VideoPlaylistCollectionPage: React.FC<
) : null}
{!playlistType && (
<VideoCollection
videos={collectionVideos}
videos={videos.slice(1)} // 0th video is featured prominently
isLoading={isLoading}
getHref={getVideoHref}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ const getTabQuery = (tab: TabConfig): CarouselQuery => {
tab.data.params.id,
) as CarouselQuery
case "lr_vector_similar":
return learningResourceQueries.vectorSimilar(
tab.data.params.id,
) as CarouselQuery
return learningResourceQueries.vectorSimilar({
id: tab.data.params.id,
}) as CarouselQuery
}
}

Expand Down
2 changes: 1 addition & 1 deletion main/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from main.settings_pluggy import * # noqa: F403
from openapi.settings_spectacular import open_spectacular_settings

VERSION = "0.65.6"
VERSION = "0.65.7"

log = logging.getLogger()

Expand Down
Loading