Fix build

Author: yuriipalam

pom.xml

@@ -57,7 +57,7 @@
   </licenses>
 
   <modules>
-    <module>zookeeper-docs</module>
+    <module>zookeeper-website</module>
     <module>zookeeper-jute</module>
     <module>zookeeper-server</module>
     <module>zookeeper-metrics-providers</module>

zookeeper-website/README.md

@@ -386,7 +386,17 @@ Generated files are located under the `build/` directory.
 
 ### Maven Integration
 
-The website is integrated with the Apache ZooKeeper Maven build system using the `frontend-maven-plugin`. The website is configured to build **only during site generation** (`mvn site`) and will not build during regular Maven lifecycle phases like `mvn clean install`.
+The website is integrated into the Apache ZooKeeper Maven build through two POMs:
+
+- The repository root `pom.xml` includes `zookeeper-website` as a Maven module.
+- `zookeeper-website/pom.xml` owns the website-specific build and configures `frontend-maven-plugin`.
+
+The frontend plugin is intentionally bound only to the Maven `site` lifecycle:
+
+- `pre-site` installs Node.js/npm and runs `npm install`
+- `site` runs the website CI command
+
+Because of that, the website is built **only during site generation** (`mvn site`) and is skipped during regular Maven lifecycle phases such as `mvn clean install`.
 
 #### When the Website Builds
 
@@ -404,7 +414,7 @@ The website will **NOT** build during regular commands like:
 
 This keeps regular ZooKeeper builds fast while still allowing the website to be generated when needed.
 
-#### What Gets Executed During `mvn site`
+#### What the Website POM Does During `mvn site`
 
 When you run `mvn site`, the website module automatically:
 
@@ -452,7 +462,7 @@ mvn clean install
 **Build the Website:**
 
 ```bash
-# From ZooKeeper root or zookeeper-website directory
+# From ZooKeeper root directory
 mvn site
 ```
 
@@ -470,18 +480,21 @@ This runs `npm run ci-skip-tests` for the website module.
 **Build Website Only:**
 
 ```bash
-# From zookeeper-website directory
+# From ZooKeeper root directory
+mvn -pl zookeeper-website site
+
+# Or from the website module directory
 cd zookeeper-website
-mvn clean install
+mvn site
 ```
 
 **Skip Website Build:**
 
-If you want to build ZooKeeper but skip the website:
+If you are running the Maven `site` lifecycle but want to disable the website frontend build:
 
 ```bash
-# From ZooKeeper root directory
-mvn clean install -DskipSite
+# From ZooKeeper root or zookeeper-website directory
+mvn site -DskipSite
 ```
 
 ### Deployment

zookeeper-website/app/components/docs/older-docs-picker.tsx

@@ -26,18 +26,24 @@ import {
   CommandItem,
   CommandList
 } from "@/ui/command";
-import { RELEASED_DOC_VERSIONS } from "@/lib/released-docs-versions";
+import { getReleasedDocVersions } from "@/lib/released-docs-versions";
+
+interface OlderDocsVersionsProps {
+  versions?: string[];
+}
 
 /** Shared Command palette (search + list), used in both the
  *  sidebar popover and the navbar sub-menu. */
-export function OlderDocsVersionList() {
+export function OlderDocsVersionList({
+  versions = getReleasedDocVersions()
+}: OlderDocsVersionsProps) {
   return (
     <Command filter={(value, search) => (value.includes(search) ? 1 : 0)}>
       <CommandInput placeholder="Search version..." />
       <CommandList>
         <CommandEmpty>No versions found</CommandEmpty>
         <CommandGroup>
-          {RELEASED_DOC_VERSIONS.map((version) => (
+          {versions.map((version) => (
             <CommandItem key={version} value={version} asChild>
               <a href={`/released-docs/r${version}/index.html`}>{version}</a>
             </CommandItem>
@@ -49,7 +55,7 @@ export function OlderDocsVersionList() {
 }
 
 /** Sidebar variant — Popover that opens to the right of the trigger button. */
-export function OlderDocsPicker() {
+export function OlderDocsPicker({ versions }: OlderDocsVersionsProps) {
   return (
     <Popover>
       <PopoverTrigger asChild>
@@ -66,7 +72,7 @@ export function OlderDocsPicker() {
         className="w-56 p-0"
         aria-label="Older documentation versions"
       >
-        <OlderDocsVersionList />
+        <OlderDocsVersionList versions={versions} />
       </PopoverContent>
     </Popover>
   );

zookeeper-website/app/lib/released-docs-versions.ts

@@ -67,3 +67,26 @@ import { RAW_RELEASED_DOC_VERSIONS } from "virtual:released-docs-versions";
 export const RELEASED_DOC_VERSIONS: string[] = sortVersionsDesc(
   RAW_RELEASED_DOC_VERSIONS
 );
+
+export function getReleasedDocVersions(): string[] {
+  if (typeof window !== "undefined") {
+    const override = window.localStorage.getItem(
+      "__released_doc_versions_override__"
+    );
+    if (override) {
+      try {
+        const parsed = JSON.parse(override);
+        if (
+          Array.isArray(parsed) &&
+          parsed.every((value) => typeof value === "string")
+        ) {
+          return sortVersionsDesc(parsed);
+        }
+      } catch {
+        // Ignore invalid test overrides and fall back to build-time data.
+      }
+    }
+  }
+
+  return RELEASED_DOC_VERSIONS;
+}

zookeeper-website/e2e-tests/older-docs-picker.spec.ts

@@ -18,8 +18,20 @@
 
 import { test, expect } from "@playwright/test";
 
+const MOCK_RELEASED_DOC_VERSIONS = ["3.10.0", "3.9.4", "3.9.0-beta"];
+const RELEASED_DOC_VERSIONS_OVERRIDE_KEY = "__released_doc_versions_override__";
+
 test.describe("Older Docs Picker – sidebar", () => {
   test.beforeEach(async ({ page }) => {
+    await page.addInitScript(
+      ({ key, versions }) => {
+        window.localStorage.setItem(key, JSON.stringify(versions));
+      },
+      {
+        key: RELEASED_DOC_VERSIONS_OVERRIDE_KEY,
+        versions: MOCK_RELEASED_DOC_VERSIONS
+      }
+    );
     await page.goto("/docs");
     await page.waitForLoadState("networkidle");
   });
@@ -48,25 +60,19 @@ test.describe("Older Docs Picker – sidebar", () => {
 
     const options = list.getByRole("option");
     await expect(options.first()).toBeVisible();
-    const count = await options.count();
-    expect(count).toBeGreaterThan(0);
+    await expect(options).toHaveCount(MOCK_RELEASED_DOC_VERSIONS.length);
   });
 
   test("versions are displayed in descending order", async ({ page }) => {
     await page.getByRole("button", { name: /older docs/i }).click();
 
     const options = page.getByRole("option");
     await expect(options.first()).toBeVisible();
-    const count = await options.count();
-    expect(count).toBeGreaterThan(1);
-
-    const firstText = (await options.first().textContent()) ?? "";
-    const lastText = (await options.last().textContent()) ?? "";
 
-    // Simple sanity check: the first item should sort higher than the last
-    expect(firstText.trim()).not.toBe("");
-    expect(lastText.trim()).not.toBe("");
-    expect(firstText.trim() > lastText.trim()).toBe(true);
+    const texts = await options.allTextContents();
+    expect(texts.map((text) => text.trim())).toEqual(
+      MOCK_RELEASED_DOC_VERSIONS
+    );
   });
 
   test("each version item is a link to /released-docs/r{version}/index.html", async ({
@@ -75,13 +81,12 @@ test.describe("Older Docs Picker – sidebar", () => {
     await page.getByRole("button", { name: /older docs/i }).click();
 
     const options = page.getByRole("option");
-    await expect(options.first()).toBeVisible();
-
-    // With asChild, the <a> IS the option element — check href directly
-    const count = Math.min(await options.count(), 5);
-    for (let i = 0; i < count; i++) {
+    await expect(options).toHaveCount(MOCK_RELEASED_DOC_VERSIONS.length);
+    for (let i = 0; i < MOCK_RELEASED_DOC_VERSIONS.length; i++) {
       const href = await options.nth(i).getAttribute("href");
-      expect(href).toMatch(/^\/released-docs\/r[\d.].+\/index\.html$/);
+      expect(href).toBe(
+        `/released-docs/r${MOCK_RELEASED_DOC_VERSIONS[i]}/index.html`
+      );
     }
   });
 
@@ -103,8 +108,8 @@ test.describe("Older Docs Picker – sidebar", () => {
     const filtered = page.getByRole("option");
     const totalAfter = await filtered.count();
 
-    // The list should be smaller after filtering
-    expect(totalAfter).toBeLessThan(totalBefore);
+    expect(totalBefore).toBe(MOCK_RELEASED_DOC_VERSIONS.length);
+    expect(totalAfter).toBe(2);
 
     // Every remaining option must contain the search term
     for (let i = 0; i < totalAfter; i++) {
@@ -145,6 +150,15 @@ test.describe("Older Docs Picker – sidebar", () => {
 
 test.describe("Older Docs Picker – navbar Documentation menu", () => {
   test.beforeEach(async ({ page }) => {
+    await page.addInitScript(
+      ({ key, versions }) => {
+        window.localStorage.setItem(key, JSON.stringify(versions));
+      },
+      {
+        key: RELEASED_DOC_VERSIONS_OVERRIDE_KEY,
+        versions: MOCK_RELEASED_DOC_VERSIONS
+      }
+    );
     await page.goto("/");
     await page.waitForLoadState("networkidle");
   });
@@ -180,8 +194,9 @@ test.describe("Older Docs Picker – navbar Documentation menu", () => {
     await expect(page.getByRole("menu")).toHaveCount(2, { timeout: 10000 });
     const subMenu = page.getByRole("menu").last();
 
-    const options = subMenu.getByRole("option");
-    await expect(options.first()).toBeVisible();
+    const versionLinks = subMenu.locator('a[href^="/released-docs/r"]');
+    await expect(versionLinks.first()).toBeVisible();
+    await expect(versionLinks).toHaveCount(MOCK_RELEASED_DOC_VERSIONS.length);
   });
 
   test("navbar older-docs links point to /released-docs/", async ({ page }) => {
@@ -192,15 +207,18 @@ test.describe("Older Docs Picker – navbar Documentation menu", () => {
 
     const olderDocs = page.getByRole("menuitem", { name: /older docs/i });
     await olderDocs.hover();
+    await olderDocs.press("ArrowRight");
 
     const subMenu = page.getByRole("menu").last();
     await expect(subMenu).toBeVisible();
 
-    const links = subMenu.getByRole("link");
-    const count = Math.min(await links.count(), 3);
-    for (let i = 0; i < count; i++) {
+    const links = subMenu.locator('a[href^="/released-docs/r"]');
+    await expect(links).toHaveCount(MOCK_RELEASED_DOC_VERSIONS.length);
+    for (let i = 0; i < MOCK_RELEASED_DOC_VERSIONS.length; i++) {
       const href = await links.nth(i).getAttribute("href");
-      expect(href).toMatch(/^\/released-docs\/r[\d.].+\/index\.html$/);
+      expect(href).toBe(
+        `/released-docs/r${MOCK_RELEASED_DOC_VERSIONS[i]}/index.html`
+      );
     }
   });
 });