Skip to content
Open
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ repos:
- "config/keycloak/realms/ol-local-realm.json"
additional_dependencies: ["gibberish-detector"]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.14.1"
rev: "v0.14.5"
hooks:
- id: ruff-format
- id: ruff
Expand Down
600 changes: 300 additions & 300 deletions .yarn/releases/yarn-4.10.3.cjs → .yarn/releases/yarn-4.11.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.10.3.cjs
yarnPath: .yarn/releases/yarn-4.11.0.cjs

# https://github.com/vitejs/vite-plugin-react-swc/issues/74#issuecomment-1520484130
# https://github.com/swc-project/swc/issues/5616#issuecomment-1265639797
Expand Down
15 changes: 15 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
Release Notes
=============

Version 0.47.14
---------------

- use qdrant vectors for hybrid search (#2718)
- update posthog, add useFeatureFlagsLoaded (#2720)
- setting create_runs=False in factory init (#2719)
- feat: Add Custom Media Embed Plugin for Tiptap Editor (#2711)
- chore(deps): update yarn to v4.11.0 (#2709)
- chore(deps): update dependency ruff to v0.14.5 (#2705)
- [pre-commit.ci] pre-commit autoupdate (#2641)
- Add best_run_id to REST/search API results (#2696)
- Require a non-yanked version of configargparse (#2714)
- add task decorator back to command (#2712)
- Scale certificate name to fit within available space (#2687)

Version 0.47.13 (Released November 24, 2025)
---------------

Expand Down
48 changes: 48 additions & 0 deletions frontends/api/src/generated/v0/api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 48 additions & 0 deletions frontends/api/src/generated/v1/api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontends/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"next-nprogress-bar": "^2.4.2",
"ol-components": "0.0.0",
"ol-utilities": "0.0.0",
"posthog-js": "^1.157.2",
"posthog-js": "^1.297.2",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-slick": "^0.30.2",
Expand Down
20 changes: 15 additions & 5 deletions frontends/main/src/app-pages/ProductPages/CoursePage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ import { assertHeadings } from "ol-test-utilities"
import { notFound } from "next/navigation"

import { useFeatureFlagEnabled } from "posthog-js/react"
import { useFeatureFlagsLoaded } from "@/common/useFeatureFlagsLoaded"
import invariant from "tiny-invariant"

jest.mock("posthog-js/react")
const mockedUseFeatureFlagEnabled = jest.mocked(useFeatureFlagEnabled)
jest.mock("@/common/useFeatureFlagsLoaded")
const mockedUseFeatureFlagsLoaded = jest.mocked(useFeatureFlagsLoaded)

const makeCourse = factories.courses.course
const makePage = factories.pages.coursePageItem
Expand Down Expand Up @@ -46,12 +49,19 @@ const setupApis = ({
describe("CoursePage", () => {
beforeEach(() => {
mockedUseFeatureFlagEnabled.mockReturnValue(true)
mockedUseFeatureFlagsLoaded.mockReturnValue(true)
})

test.each([true, false])(
test.each([
{ flagsLoaded: true, isEnabled: true, shouldNotFound: false },
{ flagsLoaded: true, isEnabled: false, shouldNotFound: true },
{ flagsLoaded: false, isEnabled: true, shouldNotFound: false },
{ flagsLoaded: false, isEnabled: false, shouldNotFound: false },
])(
"Calls noFound if and only the feature flag is disabled",
async (isEnabled) => {
async ({ flagsLoaded, isEnabled, shouldNotFound }) => {
mockedUseFeatureFlagEnabled.mockReturnValue(isEnabled)
mockedUseFeatureFlagsLoaded.mockReturnValue(flagsLoaded)

const course = makeCourse()
const page = makePage({ course_details: course })
Expand All @@ -60,10 +70,10 @@ describe("CoursePage", () => {
url: `/courses/${course.readable_id}/`,
})

if (isEnabled) {
expect(notFound).not.toHaveBeenCalled()
} else {
if (shouldNotFound) {
expect(notFound).toHaveBeenCalled()
} else {
expect(notFound).not.toHaveBeenCalled()
}
},
)
Expand Down
8 changes: 5 additions & 3 deletions frontends/main/src/app-pages/ProductPages/CoursePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import ProductPageTemplate, {
} from "./ProductPageTemplate"
import { CoursePageItem } from "@mitodl/mitxonline-api-axios/v2"
import { DEFAULT_RESOURCE_IMG } from "ol-utilities"
import { useFeatureFlagsLoaded } from "@/common/useFeatureFlagsLoaded"

type CoursePageProps = {
readableId: string
Expand Down Expand Up @@ -76,10 +77,11 @@ const CoursePage: React.FC<CoursePageProps> = ({ readableId }) => {
const page = pages.data?.items[0]
const course = courses.data?.results?.[0]
const enabled = useFeatureFlagEnabled(FeatureFlags.ProductPageCourse)
if (enabled === false) {
return notFound()
const flagsLoaded = useFeatureFlagsLoaded()

if (!enabled) {
return flagsLoaded ? notFound() : null
}
if (!enabled) return

const doneLoading = pages.isSuccess && courses.isSuccess

Expand Down
19 changes: 14 additions & 5 deletions frontends/main/src/app-pages/ProductPages/ProgramPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ import { notFound } from "next/navigation"
import { useFeatureFlagEnabled } from "posthog-js/react"
import invariant from "tiny-invariant"
import { ResourceTypeEnum } from "api"
import { useFeatureFlagsLoaded } from "@/common/useFeatureFlagsLoaded"

jest.mock("posthog-js/react")
const mockedUseFeatureFlagEnabled = jest.mocked(useFeatureFlagEnabled)
jest.mock("@/common/useFeatureFlagsLoaded")
const mockedUseFeatureFlagsLoaded = jest.mocked(useFeatureFlagsLoaded)

const makeProgram = factories.programs.program
const makePage = factories.pages.programPageItem
Expand Down Expand Up @@ -67,10 +70,16 @@ describe("ProgramPage", () => {
mockedUseFeatureFlagEnabled.mockReturnValue(true)
})

test.each([true, false])(
test.each([
{ flagsLoaded: true, isEnabled: true, shouldNotFound: false },
{ flagsLoaded: true, isEnabled: false, shouldNotFound: true },
{ flagsLoaded: false, isEnabled: true, shouldNotFound: false },
{ flagsLoaded: false, isEnabled: false, shouldNotFound: false },
])(
"Calls noFound if and only the feature flag is disabled",
async (isEnabled) => {
async ({ flagsLoaded, isEnabled, shouldNotFound }) => {
mockedUseFeatureFlagEnabled.mockReturnValue(isEnabled)
mockedUseFeatureFlagsLoaded.mockReturnValue(flagsLoaded)

const program = makeProgram()
const page = makePage({ program_details: program })
Expand All @@ -79,10 +88,10 @@ describe("ProgramPage", () => {
url: `/programs/${program.readable_id}/`,
})

if (isEnabled) {
expect(notFound).not.toHaveBeenCalled()
} else {
if (shouldNotFound) {
expect(notFound).toHaveBeenCalled()
} else {
expect(notFound).not.toHaveBeenCalled()
}
},
)
Expand Down
8 changes: 5 additions & 3 deletions frontends/main/src/app-pages/ProductPages/ProgramPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { ProgramSummary } from "./ProductSummary"
import { DEFAULT_RESOURCE_IMG } from "ol-utilities"
import { learningResourceQueries } from "api/hooks/learningResources"
import { ResourceTypeEnum } from "api"
import { useFeatureFlagsLoaded } from "@/common/useFeatureFlagsLoaded"

type ProgramPageProps = {
readableId: string
Expand Down Expand Up @@ -89,10 +90,11 @@ const ProgramPage: React.FC<ProgramPageProps> = ({ readableId }) => {
const program = programs.data?.results?.[0]
const programResource = programResources.data?.results?.[0]
const enabled = useFeatureFlagEnabled(FeatureFlags.ProductPageCourse)
if (enabled === false) {
return notFound()
const flagsLoaded = useFeatureFlagsLoaded()

if (!enabled) {
return flagsLoaded ? notFound() : null
}
if (!enabled) return

const isLoading =
pages.isLoading || programs.isLoading || programResources.isLoading
Expand Down
Loading
Loading