Merge branch 'main' into jk/5920-prefetch-homepage

Author: jonkafton

docker-compose.opensearch.base.yml

@@ -1,6 +1,6 @@
 services:
   opensearch:
-    image: opensearchproject/opensearch:2.17.1
+    image: opensearchproject/opensearch:2.18.0
     environment:
       - "cluster.name=opensearch-cluster"
       - "bootstrap.memory_lock=true" # along with the memlock settings below, disables swapping

frontends/api/src/generated/v1/api.ts

@@ -18233,6 +18233,45 @@ export const LearningpathsApiAxiosParamCreator = function (
         options: localVarRequestOptions,
       }
     },
+    /**
+     * Get a list of all learning path items
+     * @summary List
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    learningpathsMembershipList: async (
+      options: RawAxiosRequestConfig = {},
+    ): Promise<RequestArgs> => {
+      const localVarPath = `/api/v1/learningpaths/membership/`
+      // use dummy base URL string because the URL constructor only accepts absolute URLs.
+      const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
+      let baseOptions
+      if (configuration) {
+        baseOptions = configuration.baseOptions
+      }
+
+      const localVarRequestOptions = {
+        method: "GET",
+        ...baseOptions,
+        ...options,
+      }
+      const localVarHeaderParameter = {} as any
+      const localVarQueryParameter = {} as any
+
+      setSearchParams(localVarUrlObj, localVarQueryParameter)
+      let headersFromBaseOptions =
+        baseOptions && baseOptions.headers ? baseOptions.headers : {}
+      localVarRequestOptions.headers = {
+        ...localVarHeaderParameter,
+        ...headersFromBaseOptions,
+        ...options.headers,
+      }
+
+      return {
+        url: toPathString(localVarUrlObj),
+        options: localVarRequestOptions,
+      }
+    },
     /**
      * Update individual fields of a learning path
      * @summary Update
@@ -18672,6 +18711,35 @@ export const LearningpathsApiFp = function (configuration?: Configuration) {
           configuration,
         )(axios, operationBasePath || basePath)
     },
+    /**
+     * Get a list of all learning path items
+     * @summary List
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async learningpathsMembershipList(
+      options?: RawAxiosRequestConfig,
+    ): Promise<
+      (
+        axios?: AxiosInstance,
+        basePath?: string,
+      ) => AxiosPromise<Array<MicroLearningPathRelationship>>
+    > {
+      const localVarAxiosArgs =
+        await localVarAxiosParamCreator.learningpathsMembershipList(options)
+      const index = configuration?.serverIndex ?? 0
+      const operationBasePath =
+        operationServerMap["LearningpathsApi.learningpathsMembershipList"]?.[
+          index
+        ]?.url
+      return (axios, basePath) =>
+        createRequestFunction(
+          localVarAxiosArgs,
+          globalAxios,
+          BASE_PATH,
+          configuration,
+        )(axios, operationBasePath || basePath)
+    },
     /**
      * Update individual fields of a learning path
      * @summary Update
@@ -18917,6 +18985,19 @@ export const LearningpathsApiFactory = function (
         )
         .then((request) => request(axios, basePath))
     },
+    /**
+     * Get a list of all learning path items
+     * @summary List
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    learningpathsMembershipList(
+      options?: RawAxiosRequestConfig,
+    ): AxiosPromise<Array<MicroLearningPathRelationship>> {
+      return localVarFp
+        .learningpathsMembershipList(options)
+        .then((request) => request(axios, basePath))
+    },
     /**
      * Update individual fields of a learning path
      * @summary Update
@@ -19456,6 +19537,19 @@ export class LearningpathsApi extends BaseAPI {
       .then((request) => request(this.axios, this.basePath))
   }
 
+  /**
+   * Get a list of all learning path items
+   * @summary List
+   * @param {*} [options] Override http request option.
+   * @throws {RequiredError}
+   * @memberof LearningpathsApi
+   */
+  public learningpathsMembershipList(options?: RawAxiosRequestConfig) {
+    return LearningpathsApiFp(this.configuration)
+      .learningpathsMembershipList(options)
+      .then((request) => request(this.axios, this.basePath))
+  }
+
   /**
    * Update individual fields of a learning path
    * @summary Update
@@ -24126,6 +24220,45 @@ export const UserlistsApiAxiosParamCreator = function (
         options: localVarRequestOptions,
       }
     },
+    /**
+     * Get a list of all userlist items for a user
+     * @summary List
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    userlistsMembershipList: async (
+      options: RawAxiosRequestConfig = {},
+    ): Promise<RequestArgs> => {
+      const localVarPath = `/api/v1/userlists/membership/`
+      // use dummy base URL string because the URL constructor only accepts absolute URLs.
+      const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL)
+      let baseOptions
+      if (configuration) {
+        baseOptions = configuration.baseOptions
+      }
+
+      const localVarRequestOptions = {
+        method: "GET",
+        ...baseOptions,
+        ...options,
+      }
+      const localVarHeaderParameter = {} as any
+      const localVarQueryParameter = {} as any
+
+      setSearchParams(localVarUrlObj, localVarQueryParameter)
+      let headersFromBaseOptions =
+        baseOptions && baseOptions.headers ? baseOptions.headers : {}
+      localVarRequestOptions.headers = {
+        ...localVarHeaderParameter,
+        ...headersFromBaseOptions,
+        ...options.headers,
+      }
+
+      return {
+        url: toPathString(localVarUrlObj),
+        options: localVarRequestOptions,
+      }
+    },
     /**
      * Viewset for UserLists
      * @summary Update
@@ -24504,6 +24637,33 @@ export const UserlistsApiFp = function (configuration?: Configuration) {
           configuration,
         )(axios, operationBasePath || basePath)
     },
+    /**
+     * Get a list of all userlist items for a user
+     * @summary List
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async userlistsMembershipList(
+      options?: RawAxiosRequestConfig,
+    ): Promise<
+      (
+        axios?: AxiosInstance,
+        basePath?: string,
+      ) => AxiosPromise<Array<MicroUserListRelationship>>
+    > {
+      const localVarAxiosArgs =
+        await localVarAxiosParamCreator.userlistsMembershipList(options)
+      const index = configuration?.serverIndex ?? 0
+      const operationBasePath =
+        operationServerMap["UserlistsApi.userlistsMembershipList"]?.[index]?.url
+      return (axios, basePath) =>
+        createRequestFunction(
+          localVarAxiosArgs,
+          globalAxios,
+          BASE_PATH,
+          configuration,
+        )(axios, operationBasePath || basePath)
+    },
     /**
      * Viewset for UserLists
      * @summary Update
@@ -24722,6 +24882,19 @@ export const UserlistsApiFactory = function (
         )
         .then((request) => request(axios, basePath))
     },
+    /**
+     * Get a list of all userlist items for a user
+     * @summary List
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    userlistsMembershipList(
+      options?: RawAxiosRequestConfig,
+    ): AxiosPromise<Array<MicroUserListRelationship>> {
+      return localVarFp
+        .userlistsMembershipList(options)
+        .then((request) => request(axios, basePath))
+    },
     /**
      * Viewset for UserLists
      * @summary Update
@@ -25127,6 +25300,19 @@ export class UserlistsApi extends BaseAPI {
       .then((request) => request(this.axios, this.basePath))
   }
 
+  /**
+   * Get a list of all userlist items for a user
+   * @summary List
+   * @param {*} [options] Override http request option.
+   * @throws {RequiredError}
+   * @memberof UserlistsApi
+   */
+  public userlistsMembershipList(options?: RawAxiosRequestConfig) {
+    return UserlistsApiFp(this.configuration)
+      .userlistsMembershipList(options)
+      .then((request) => request(this.axios, this.basePath))
+  }
+
   /**
    * Viewset for UserLists
    * @summary Update

frontends/api/src/hooks/learningResources/index.ts

@@ -531,10 +531,5 @@ export {
   useListItemMove,
   usePlatformsList,
   useSchoolsList,
-  /*
-   * Not intended to be imported except for special cases.
-   * It's used in the ResourceCarousel to dynamically build a single useQueries hook
-   * from config because a React component cannot conditionally call hooks during renders.
-   */
   learningResources,
 }

frontends/api/src/ssr/usePrefetchWarnings.test.ts

@@ -22,10 +22,6 @@ describe("SSR prefetch warnings", () => {
     jest.spyOn(console, "table").mockImplementation(() => {})
   })
 
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-
   it("Warns if a query is requested on the client that has not been prefetched", async () => {
     const { wrapper, queryClient } = setupReactQueryTest()
 
@@ -46,14 +42,12 @@ describe("SSR prefetch warnings", () => {
     )
     expect(console.table).toHaveBeenCalledWith(
       [
-        {
+        expect.objectContaining({
           disabled: false,
-          hash: '["learningResources","detail",1]',
           initialStatus: "loading",
-          key: ["learningResources", "detail", 1],
+          key: learningResources.detail(1).queryKey,
           observerCount: 1,
-          status: "loading",
-        },
+        }),
       ],
       ["hash", "initialStatus", "status", "observerCount", "disabled"],
     )
@@ -71,7 +65,7 @@ describe("SSR prefetch warnings", () => {
       wrapper,
       initialProps: {
         queryClient,
-        exemptions: [["learningResources", "detail", 1]],
+        exemptions: [learningResources.detail(1).queryKey],
       },
     })
 
@@ -111,9 +105,9 @@ describe("SSR prefetch warnings", () => {
       [
         {
           disabled: false,
-          hash: '["learningResources","detail",1]',
+          hash: JSON.stringify(learningResources.detail(1).queryKey),
           initialStatus: "success",
-          key: ["learningResources", "detail", 1],
+          key: learningResources.detail(1).queryKey,
           observerCount: 0,
           status: "success",
         },

frontends/main/src/app-pages/SearchPage/SearchPage.test.tsx

@@ -491,6 +491,32 @@ describe("Search Page Tabs", () => {
     expect(params2.get("department")).toBe("8") // should preserve other params
   })
 
+  test("Switching from learning materials tab clears resource type only", async () => {
+    setMockApiResponses({
+      search: {
+        count: 1000,
+        metadata: {
+          aggregations: {
+            resource_type: [{ key: "video", doc_count: 100 }],
+          },
+          suggestions: [],
+        },
+      },
+    })
+    const { location } = renderWithProviders(<SearchPage />, {
+      url: "?resource_category=learning_material&resource_type=video&topic=Biology",
+    })
+    const tabLM = screen.getByRole("tab", { name: /Learning Materials/ })
+    const tabCourses = screen.getByRole("tab", { name: /Courses/ })
+    expect(tabLM).toHaveAttribute("aria-selected")
+
+    // Click "Courses"
+    await user.click(tabCourses)
+    expect(location.current.search).toBe(
+      "?resource_category=course&topic=Biology",
+    )
+  })
+
   test("Tab titles show corret result counts", async () => {
     setMockApiResponses({
       search: {

frontends/main/src/app/page.tsx

@@ -67,11 +67,6 @@ const Page: React.FC = async () => {
     learningResources.topics({ is_toplevel: true }),
 
     testimonials.list({ position: 1 }),
-    newsEvents.list({
-      feed_type: [NewsEventsListFeedTypeEnum.News],
-      limit: 6,
-      sortby: "-news_date",
-    }),
     newsEvents.list({
       feed_type: [NewsEventsListFeedTypeEnum.Events],
       limit: 5,

frontends/main/src/page-components/SearchDisplay/ResourceCategoryTabs.tsx

@@ -94,6 +94,9 @@ const ResourceCategoryTabList: React.FC<ResourceCategoryTabsProps> = ({
         const tab = tabs.find((t) => t.name === value)
         setSearchParams((prev) => {
           const next = new URLSearchParams(prev)
+          if (prev.get("resource_category") === "learning_material") {
+            next.delete("resource_type")
+          }
           if (tab?.resource_category) {
             next.set("resource_category", tab.resource_category)
           } else {

frontends/ol-components/package.json

@@ -45,7 +45,7 @@
     "validator": "^13.11.0"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "^1.9.0",
+    "@chromatic-com/storybook": "^3.0.0",
     "@faker-js/faker": "^9.0.0",
     "@storybook/addon-actions": "^8.2.9",
     "@storybook/addon-essentials": "^8.2.9",