@salesforce/ui-bundle-template-app-react-sample-b2e 11.63.0 → 11.66.1

package/dist/CHANGELOG.md

@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.66.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.66.0...v11.66.1) (2026-08-20)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [11.66.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.65.3...v11.66.0) (2026-08-19)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [11.65.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.65.2...v11.65.3) (2026-08-19)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [11.65.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.65.1...v11.65.2) (2026-08-19)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [11.65.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.65.0...v11.65.1) (2026-08-19)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [11.65.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.64.0...v11.65.0) (2026-08-19)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [11.64.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.63.0...v11.64.0) (2026-08-18)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
 ## [11.63.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.62.1...v11.63.0) (2026-08-18)
 
 **Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project

package/dist/force-app/main/default/uiBundles/propertymanagementapp/package.json

@@ -18,8 +18,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/platform-sdk": "^11.63.0",
-    "@salesforce/ui-bundle": "^11.63.0",
+    "@salesforce/platform-sdk": "^11.66.1",
+    "@salesforce/ui-bundle": "^11.66.1",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -46,8 +46,8 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/graphiti": "^11.63.0",
-    "@salesforce/vite-plugin-ui-bundle": "^11.63.0",
+    "@salesforce/graphiti": "^11.66.1",
+    "@salesforce/vite-plugin-ui-bundle": "^11.66.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/adapters/cms/__tests__/cmsQueryFragment.test.ts

@@ -4,11 +4,7 @@
  * For full license text, see the LICENSE.txt file
  */
 
-/**
- * Tests for buildCmsQueryFragment (via the cmsAdapter and directly) — the
- * CONDITIONAL $cmsContentTypeFQNs rule, variable parameterization (no
- * interpolation), root placement, and afterCursor → offset decoding.
- */
+/** Tests for buildCmsQueryFragment: conditional content-type and language args, and cursor decoding. */
 import { describe, it, expect } from "vitest";
 import { buildCmsQueryFragment } from "../cmsQueryFragment";
 import { cmsAdapter } from "../index";
@@ -93,6 +89,41 @@ describe("buildCmsQueryFragment", () => {
 		expect(c.fragment).not.toContain("$cmsChannelId");
 		expect(c.variables.UIBundleId).toBe("0ap1");
 	});
+
+	it("no language: omits $cmsLanguage entirely (a UIBundle with no default lang would error)", () => {
+		const c = buildCmsQueryFragment({ keyword: "hi", uiBundleId: "0ap1", offset: 0, limit: 20 });
+		expect(c.variableDeclarations).not.toContain("$cmsLanguage: String");
+		expect(c.variables).not.toHaveProperty("cmsLanguage");
+		expect(c.fragment).not.toContain("language:");
+		expect(c.fragment).not.toContain("$cmsLanguage");
+	});
+
+	it("with language: declares, passes and supplies $cmsLanguage as a top-level arg", () => {
+		const c = buildCmsQueryFragment({
+			keyword: "hi",
+			uiBundleId: "0ap1",
+			offset: 0,
+			limit: 20,
+			language: "en-US",
+		});
+		expect(c.variableDeclarations).toContain("$cmsLanguage: String");
+		expect(c.variables.cmsLanguage).toBe("en-US");
+		// Top-level `language:` argument (sibling to keyword/pagination), never interpolated.
+		expect(c.fragment).toContain("language: $cmsLanguage");
+		expect(c.fragment).not.toContain('language: "');
+	});
+
+	it("empty language string is treated as absent (omitted)", () => {
+		const c = buildCmsQueryFragment({
+			keyword: "hi",
+			uiBundleId: "0ap1",
+			offset: 0,
+			limit: 20,
+			language: "",
+		});
+		expect(c.variableDeclarations).not.toContain("$cmsLanguage: String");
+		expect(c.fragment).not.toContain("language: $cmsLanguage");
+	});
 });
 
 describe("cmsAdapter.buildRequest", () => {
@@ -124,4 +155,16 @@ describe("cmsAdapter.buildRequest", () => {
 		expect(c.variables).not.toHaveProperty("cmsContentTypeFQNs");
 		expect(c.variableDeclarations).not.toContain("$cmsContentTypeFQNs: [String!]");
 	});
+
+	it("threads request.language into the $cmsLanguage variable", () => {
+		const c = cmsAdapter.buildRequest(req({ language: "fr-FR" }));
+		expect(c.variables.cmsLanguage).toBe("fr-FR");
+		expect(c.fragment).toContain("language: $cmsLanguage");
+	});
+
+	it("omits language when request.language is absent", () => {
+		const c = cmsAdapter.buildRequest(req());
+		expect(c.variables).not.toHaveProperty("cmsLanguage");
+		expect(c.fragment).not.toContain("language: $cmsLanguage");
+	});
 });

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/adapters/cms/__tests__/searchChannel.test.ts

@@ -4,16 +4,27 @@
  * For full license text, see the LICENSE.txt file
  */
 
-/** Tests for searchChannel UIBundle id resolution and validation. */
+/** Tests for searchChannel UIBundle id resolution, language, and validation. */
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { getUIBundleId, isConfiguredUIBundleId } from "../searchChannel";
+import {
+	DEFAULT_LANGUAGE,
+	getUIBundleId,
+	getUserLanguage,
+	isConfiguredUIBundleId,
+} from "../searchChannel";
 import type { CurrentApp } from "@salesforce/platform-sdk";
 
 vi.mock("@salesforce/platform-sdk", () => ({
 	getCurrentApp: vi.fn(),
+	createDataSDK: vi.fn(),
 }));
 
-const { getCurrentApp } = await import("@salesforce/platform-sdk");
+vi.mock("@salesforce/platform-sdk/i18n", () => ({
+	fetchI18nContext: vi.fn(),
+}));
+
+const { getCurrentApp, createDataSDK } = await import("@salesforce/platform-sdk");
+const { fetchI18nContext } = await import("@salesforce/platform-sdk/i18n");
 
 describe("searchChannel", () => {
 	beforeEach(() => {
@@ -70,6 +81,57 @@ describe("searchChannel", () => {
 		});
 	});
 
+	describe("getUserLanguage", () => {
+		const sdkWithGraphql = { graphql: {} } as unknown as Awaited<ReturnType<typeof createDataSDK>>;
+
+		it("returns the i18n context's lang tag", async () => {
+			vi.mocked(createDataSDK).mockResolvedValue(sdkWithGraphql);
+			vi.mocked(fetchI18nContext).mockResolvedValue({
+				lang: "en-US",
+				locale: "en-US",
+				dir: "ltr",
+				currency: "USD",
+				timeZone: "America/Los_Angeles",
+			});
+
+			expect(await getUserLanguage()).toBe("en-US");
+			expect(fetchI18nContext).toHaveBeenCalledWith(sdkWithGraphql);
+		});
+
+		it("falls back to the default when the context lang is empty", async () => {
+			vi.mocked(createDataSDK).mockResolvedValue(sdkWithGraphql);
+			vi.mocked(fetchI18nContext).mockResolvedValue({
+				lang: "",
+				locale: "",
+				dir: "ltr",
+				currency: "USD",
+				timeZone: "America/Los_Angeles",
+			});
+
+			expect(await getUserLanguage()).toBe(DEFAULT_LANGUAGE);
+		});
+
+		it("falls back to the default when the SDK has no graphql surface", async () => {
+			vi.mocked(createDataSDK).mockResolvedValue({} as Awaited<ReturnType<typeof createDataSDK>>);
+
+			expect(await getUserLanguage()).toBe(DEFAULT_LANGUAGE);
+			expect(fetchI18nContext).not.toHaveBeenCalled();
+		});
+
+		it("falls back to the default (never throws) when the SDK init rejects", async () => {
+			vi.mocked(createDataSDK).mockRejectedValue(new Error("no SDK on this surface"));
+
+			await expect(getUserLanguage()).resolves.toBe(DEFAULT_LANGUAGE);
+		});
+
+		it("falls back to the default when the i18n query rejects", async () => {
+			vi.mocked(createDataSDK).mockResolvedValue(sdkWithGraphql);
+			vi.mocked(fetchI18nContext).mockRejectedValue(new Error("I18nDetect failed"));
+
+			await expect(getUserLanguage()).resolves.toBe(DEFAULT_LANGUAGE);
+		});
+	});
+
 	describe("isConfiguredUIBundleId", () => {
 		it("returns true for a well-formed 9YE-shaped UIBundle id", () => {
 			expect(isConfiguredUIBundleId("9YE000001abcdEFGHi")).toBe(true);

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/adapters/cms/cmsQueryFragment.ts

@@ -5,7 +5,8 @@
  *
  * The `$cmsContentTypeFQNs` declaration, its `contentTypeFQNs:` argument, and
  * its variable value are all emitted only when a non-empty content-type list is
- * passed; on the bootstrap call (no types known) they are omitted entirely.
+ * passed; on the bootstrap call (no types known) they are omitted entirely. The
+ * `$cmsLanguage` pieces follow the same conditional pattern.
  */
 
 import type { QueryFragmentContribution } from "../types";
@@ -26,6 +27,8 @@ export interface BuildCmsFragmentParams {
 	 * `isValidCmsFqn`-validated values.
 	 */
 	contentTypes?: string[] | null;
+	/** User language tag for the `language` argument; emitted only when a non-empty string. */
+	language?: string | null;
 }
 
 /**
@@ -33,9 +36,10 @@ export interface BuildCmsFragmentParams {
  * included only when `params.contentTypes` is a non-empty array.
  */
 export function buildCmsQueryFragment(params: BuildCmsFragmentParams): QueryFragmentContribution {
-	const { keyword, uiBundleId, offset, limit, contentTypes } = params;
+	const { keyword, uiBundleId, offset, limit, contentTypes, language } = params;
 
 	const hasContentTypes = Array.isArray(contentTypes) && contentTypes.length > 0;
+	const hasLanguage = typeof language === "string" && language.length > 0;
 
 	const variableDeclarations = [
 		"$cmsKeyword: String!",
@@ -61,12 +65,19 @@ export function buildCmsQueryFragment(params: BuildCmsFragmentParams): QueryFrag
 		variables.cmsContentTypeFQNs = contentTypes;
 	}
 
+	// Top-level `language: String` arg, emitted only when a non-empty tag is provided.
+	const languageArg = hasLanguage ? "\n          language: $cmsLanguage" : "";
+	if (hasLanguage) {
+		variableDeclarations.push("$cmsLanguage: String");
+		variables.cmsLanguage = language;
+	}
+
 	const fragment = `managed_content {
   search {
     searchContentInChannels(
       searchIdentifiers: { uibundleIds: [$UIBundleId] }
       keyword: $cmsKeyword
-      pagination: { limit: $cmsLimit, offset: $cmsOffset }${contentTypesArg}
+      pagination: { limit: $cmsLimit, offset: $cmsOffset }${languageArg}${contentTypesArg}
     ) {
       total
       offset

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/adapters/cms/index.ts

@@ -44,6 +44,7 @@ function buildCmsRequest(request: SourceRequest<CmsSourceConfig>): QueryFragment
 		offset,
 		limit: request.pageSize,
 		contentTypes: contentTypes && contentTypes.length > 0 ? contentTypes : null,
+		language: request.language ?? null,
 	});
 }
 

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/adapters/cms/searchChannel.ts

@@ -1,4 +1,5 @@
-import { getCurrentApp } from "@salesforce/platform-sdk";
+import { createDataSDK, getCurrentApp } from "@salesforce/platform-sdk";
+import { fetchI18nContext } from "@salesforce/platform-sdk/i18n";
 
 /** Returns the UIBundle id for CMS search, resolved from the running app. */
 export async function getUIBundleId(): Promise<string> {
@@ -6,6 +7,21 @@ export async function getUIBundleId(): Promise<string> {
 	return app.identity?.bundleId ?? "";
 }
 
+/** Fallback language tag used when the user's own language can't be resolved. */
+export const DEFAULT_LANGUAGE = "en-US";
+
+/** Returns the current user's language tag (e.g. `"en-US"`), falling back to {@link DEFAULT_LANGUAGE}. */
+export async function getUserLanguage(): Promise<string> {
+	try {
+		const sdk = await createDataSDK();
+		if (!sdk?.graphql) return DEFAULT_LANGUAGE;
+		const ctx = await fetchI18nContext(sdk);
+		return ctx.lang || DEFAULT_LANGUAGE;
+	} catch {
+		return DEFAULT_LANGUAGE;
+	}
+}
+
 /** Shape guard for a UIBundle record id (9YE + 12-15 alphanumerics). */
 export const UI_BUNDLE_ID_PATTERN = /^9YE[a-zA-Z0-9]{12,15}$/;
 

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/adapters/types.ts

@@ -81,6 +81,8 @@ export interface SourceRequest<T extends SourceConfig = SourceConfig> {
 	 * synchronous. Ignored by non-CMS adapters.
 	 */
 	uiBundleId?: string;
+	/** CMS-only, optional. The current user's language tag fed to the CMS search `language` argument. */
+	language?: string;
 }
 
 /**

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/components/MergedSearchResults.tsx

@@ -40,6 +40,7 @@ import { FilterProvider, FilterResetButton } from "./filters/FilterContext";
 import { PaginationControls } from "./controls/PaginationControls";
 import { SortControl } from "./controls/SortControl";
 import { resolveResultRenderer, type ResultRenderer } from "./results/resolveResultRenderer";
+import { MIN_QUERY_LENGTH } from "../constants";
 import { ALL_SCOPE, type SearchHandle, type SourceController } from "../types";
 
 export interface MergedSearchResultsProps {
@@ -52,6 +53,8 @@ export interface MergedSearchResultsProps {
 	renderResult?: Record<string, ResultRenderer>;
 	/** Message shown when there are no results. Defaults to "No results found." */
 	emptyMessage?: string;
+	/** Message shown when the query is below {@link MIN_QUERY_LENGTH}. Defaults to "Start your search…" */
+	shortQueryMessage?: string;
 	/** Number of skeleton placeholders to show while loading. Defaults to `pageSize`. */
 	skeletonCount?: number;
 	/** Extra classes on the grid container. Defaults to a responsive 1/2/3-column grid. */
@@ -81,11 +84,16 @@ export function MergedSearchResults({
 	handle,
 	renderResult,
 	emptyMessage,
+	shortQueryMessage = "Start your search…",
 	skeletonCount,
 	gridClassName = DEFAULT_GRID_CLASS,
 	className,
 }: MergedSearchResultsProps) {
-	const { globalPagination: page, mergedResults, loading, error } = handle;
+	const { globalPagination: page, mergedResults, loading, error, q } = handle;
+	// Distinguishes "haven't typed enough yet" (useSearch short-circuits below
+	// MIN_QUERY_LENGTH without fetching) from a genuine zero-match search — both
+	// otherwise present identically as loading=false, mergedResults=[].
+	const isShortQuery = q.trim().length < MIN_QUERY_LENGTH;
 
 	// A single source is in scope when the scope is narrowed (selected from the
 	// dropdown) or locked (`lockedScope` / restrictTo). Its filter chrome can
@@ -111,9 +119,11 @@ export function MergedSearchResults({
 		? "Searching…"
 		: error
 			? "Search failed."
-			: mergedResults.length === 0
-				? (emptyMessage ?? "No results found.")
-				: `${page.totalCount} result${page.totalCount === 1 ? "" : "s"}`;
+			: isShortQuery
+				? shortQueryMessage
+				: mergedResults.length === 0
+					? (emptyMessage ?? "No results found.")
+					: `${page.totalCount} result${page.totalCount === 1 ? "" : "s"}`;
 
 	return (
 		<div className={`space-y-6 ${className ?? ""}`}>
@@ -161,6 +171,8 @@ export function MergedSearchResults({
 						<Skeleton key={i} className="h-48 w-full rounded-lg" />
 					))}
 				</div>
+			) : isShortQuery ? (
+				<p className="py-12 text-center text-sm text-muted-foreground">{shortQueryMessage}</p>
 			) : mergedResults.length === 0 ? (
 				<p className="py-12 text-center text-sm text-muted-foreground">
 					{emptyMessage ?? "No results found."}

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/components/SearchResults.tsx

@@ -80,6 +80,7 @@ export function SearchResults({
 						renderFilters={resolvedRenderFilters}
 						hideFilterChrome={filtersHidden}
 						emptyMessage={emptyMessages?.[key]}
+						q={handle.q}
 					/>
 				);
 			})}

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/components/SourceSection.tsx

@@ -16,6 +16,7 @@ import { ActiveFilters } from "./filters/ActiveFilters";
 import { FilterProvider, FilterResetButton } from "./filters/FilterContext";
 import { PaginationControls } from "./controls/PaginationControls";
 import { SortControl } from "./controls/SortControl";
+import { MIN_QUERY_LENGTH } from "../constants";
 import type { SourceController } from "../types";
 
 interface SourceSectionProps {
@@ -35,6 +36,15 @@ interface SourceSectionProps {
 	 */
 	hideFilterChrome?: boolean;
 	emptyMessage?: string;
+	/**
+	 * The current search query. Used to distinguish a not-yet-started search
+	 * (query below {@link MIN_QUERY_LENGTH}, so no fetch was issued) from a
+	 * genuine zero-match result, so the empty state can prompt instead of
+	 * claiming "No … found."
+	 */
+	q?: string;
+	/** Message shown when the query is below {@link MIN_QUERY_LENGTH}. Defaults to "Start your search…" */
+	shortQueryMessage?: string;
 	className?: string;
 }
 
@@ -44,6 +54,8 @@ export function SourceSection({
 	renderFilters,
 	hideFilterChrome,
 	emptyMessage,
+	q = "",
+	shortQueryMessage = "Start your search…",
 	className,
 }: SourceSectionProps) {
 	const { config, result, loading, error, filters, sort, pagination } = controller;
@@ -51,6 +63,9 @@ export function SourceSection({
 	const totalCount = result?.totalCount;
 	const showResults = !loading && !error && nodes.length > 0;
 	const showEmpty = !loading && !error && nodes.length === 0;
+	// A query below MIN_QUERY_LENGTH never triggers a fetch, so an empty result
+	// means "not searched yet" — prompt rather than report zero matches.
+	const isShortQuery = q.trim().length < MIN_QUERY_LENGTH;
 
 	const pageSizeOptions = pagination.pageSizeOptions ?? [pagination.pageSize];
 
@@ -70,7 +85,9 @@ export function SourceSection({
 		: error
 			? `Failed to load ${config.label}.`
 			: showEmpty
-				? (emptyMessage ?? `No ${config.label.toLowerCase()} found.`)
+				? isShortQuery
+					? shortQueryMessage
+					: (emptyMessage ?? `No ${config.label.toLowerCase()} found.`)
 				: totalCount != null
 					? `${config.label}: ${totalCount} ${totalCount === 1 ? "result" : "results"}`
 					: "";
@@ -155,7 +172,9 @@ export function SourceSection({
 						<div className="flex flex-col items-center justify-center py-10 text-center">
 							<SearchX className="size-10 text-muted-foreground mb-3" />
 							<p className="text-sm text-muted-foreground">
-								{emptyMessage ?? `No ${config.label.toLowerCase()} found.`}
+								{isShortQuery
+									? shortQueryMessage
+									: (emptyMessage ?? `No ${config.label.toLowerCase()} found.`)}
 							</p>
 						</div>
 					)}

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/components/__tests__/MergedSearchResults.test.tsx

@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2026, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+
+/**
+ * Regression test for the short-query vs. zero-match empty-state messaging in
+ * `<MergedSearchResults>`. Both states present identically as
+ * `loading=false, mergedResults=[]`, so the component must distinguish them via
+ * `q.trim().length < MIN_QUERY_LENGTH` rather than always falling back to
+ * "No results found." — asserted for both the visible empty-state paragraph and
+ * the aria-live region, which share the same three-way branch.
+ */
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router";
+import { MergedSearchResults } from "../MergedSearchResults";
+import type { SearchHandle } from "../../types";
+import { ALL_SCOPE } from "../../types";
+
+// The component tree transitively imports the platform SDK (via
+// DefaultFilterPanel's `useDistinctValues`), even though this test never
+// exercises the filter panel. Stub it so vite doesn't try to resolve its
+// internals under jsdom — matches the convention in Search.test.tsx.
+vi.mock("@salesforce/platform-sdk", () => ({
+	createDataSDK: vi.fn(),
+	getCurrentApp: vi.fn(() => ({ identity: { bundleId: "" } })),
+}));
+
+const noop = () => {};
+
+function makeHandle(overrides: Partial<SearchHandle>): SearchHandle {
+	return {
+		q: "",
+		setQ: noop,
+		scope: ALL_SCOPE,
+		setScope: noop,
+		scopeLocked: false,
+		sources: {},
+		inScopeSources: [],
+		mergedResults: [],
+		globalPagination: {
+			pageIndex: 0,
+			pageCount: 0,
+			pageSize: 10,
+			pageSizeOptions: [10],
+			hasNextPage: false,
+			hasPreviousPage: false,
+			totalCount: 0,
+			goToNextPage: noop,
+			goToPreviousPage: noop,
+			goToPage: noop,
+			setPageSize: noop,
+		},
+		loading: false,
+		error: null,
+		discoveredContentTypes: [],
+		resetAll: noop,
+		...overrides,
+	};
+}
+
+function renderMerged(handle: SearchHandle) {
+	return render(
+		<MemoryRouter>
+			<MergedSearchResults handle={handle} />
+		</MemoryRouter>,
+	);
+}
+
+describe("<MergedSearchResults> empty vs. short-query messaging", () => {
+	it("prompts for a longer query below MIN_QUERY_LENGTH, and reports zero matches at/above it", () => {
+		const { rerender } = renderMerged(makeHandle({ q: "ab", mergedResults: [] }));
+
+		// Below MIN_QUERY_LENGTH (3): the short-query prompt renders in both the
+		// visible empty state and the aria-live region; "No results found." must
+		// not appear — that would misreport an un-fetched search as a zero-match one.
+		expect(screen.getAllByText("Start your search…")).toHaveLength(2);
+		expect(screen.queryByText("No results found.")).not.toBeInTheDocument();
+
+		rerender(
+			<MemoryRouter>
+				<MergedSearchResults handle={makeHandle({ q: "abc", mergedResults: [] })} />
+			</MemoryRouter>,
+		);
+
+		// At MIN_QUERY_LENGTH with a genuine zero-match fetch: "No results
+		// found." renders in both spots; the short-query prompt must not appear.
+		expect(screen.getAllByText("No results found.")).toHaveLength(2);
+		expect(screen.queryByText("Start your search…")).not.toBeInTheDocument();
+	});
+});

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/components/__tests__/SourceSection.test.tsx

@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2026, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+
+/**
+ * Regression test for the short-query vs. zero-match empty-state messaging in
+ * `<SourceSection>` — the per-source renderer used in the "all"/per-source scope
+ * (a sibling to `<MergedSearchResults>`, which owns merged mode). Both states
+ * present identically as `loading=false, result.nodes=[]`, so the component must
+ * distinguish them via `q.trim().length < MIN_QUERY_LENGTH` rather than always
+ * falling back to "No <label> found." — asserted for both the visible empty-state
+ * paragraph and the aria-live region, which share the same three-way branch.
+ */
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router";
+import { SourceSection } from "../SourceSection";
+import type { SourceController } from "../../types";
+
+// The component tree transitively imports the platform SDK (via
+// FilterContext / control internals), even though this test never exercises the
+// filter panel. Stub it so vite doesn't try to resolve its internals under
+// jsdom — matches the convention in MergedSearchResults.test.tsx.
+vi.mock("@salesforce/platform-sdk", () => ({
+	createDataSDK: vi.fn(),
+	getCurrentApp: vi.fn(() => ({ identity: { bundleId: "" } })),
+}));
+
+const noop = () => {};
+
+function makeController(overrides: Partial<SourceController> = {}): SourceController {
+	return {
+		config: {
+			kind: "sobject",
+			key: "account",
+			objectName: "Account",
+			label: "Accounts",
+			displayFields: [],
+		},
+		result: { nodes: [], pageInfo: null, totalCount: null },
+		loading: false,
+		error: null,
+		filters: { active: [], set: noop, remove: noop },
+		sort: { current: null, set: noop },
+		pagination: {
+			pageSize: 10,
+			pageSizeOptions: [10],
+			pageIndex: 0,
+			hasNextPage: false,
+			hasPreviousPage: false,
+			setPageSize: noop,
+			goToNextPage: noop,
+			goToPreviousPage: noop,
+		},
+		...overrides,
+	} as SourceController;
+}
+
+function renderSection(q: string) {
+	return render(
+		<MemoryRouter>
+			<SourceSection controller={makeController()} renderResult={() => null} q={q} />
+		</MemoryRouter>,
+	);
+}
+
+describe("<SourceSection> empty vs. short-query messaging", () => {
+	it("prompts for a longer query below MIN_QUERY_LENGTH, and reports zero matches at/above it", () => {
+		const { rerender } = renderSection("ab");
+
+		// Below MIN_QUERY_LENGTH (3): the short-query prompt renders in both the
+		// visible empty state and the aria-live region; "No accounts found." must
+		// not appear — that would misreport an un-fetched search as a zero-match one.
+		expect(screen.getAllByText("Start your search…")).toHaveLength(2);
+		expect(screen.queryByText("No accounts found.")).not.toBeInTheDocument();
+
+		rerender(
+			<MemoryRouter>
+				<SourceSection controller={makeController()} renderResult={() => null} q="abc" />
+			</MemoryRouter>,
+		);
+
+		// At MIN_QUERY_LENGTH with a genuine zero-match fetch: "No accounts found."
+		// renders in both spots; the short-query prompt must not appear.
+		expect(screen.getAllByText("No accounts found.")).toHaveLength(2);
+		expect(screen.queryByText("Start your search…")).not.toBeInTheDocument();
+	});
+});

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/hooks/useSearch.ts

@@ -40,7 +40,11 @@ import { MIN_QUERY_LENGTH } from "../constants";
 // `resolveChannelId` derives the discovery channel id from a CMS result;
 // `useSearchableContentTypes` is the session-cached discovery hook;
 // `isValidCmsFqn` validates a selected FQN before it enters state or a query.
-import { getUIBundleId, isConfiguredUIBundleId } from "../adapters/cms/searchChannel";
+import {
+	getUIBundleId,
+	getUserLanguage,
+	isConfiguredUIBundleId,
+} from "../adapters/cms/searchChannel";
 import { getOrgSupportsCmsSearch } from "../adapters/cms/api/orgApiVersionService";
 import { resolveChannelId } from "../adapters/cms/channelResolver";
 import { useSearchableContentTypes } from "../adapters/cms/hooks/useSearchableContentTypes";
@@ -503,8 +507,8 @@ export function useSearch(config: SearchConfig, options?: UseSearchOptions): Sea
 		// page-level error — content-type narrowing is an enhancement, not a
 		// hard requirement. Read in `.catch` below.
 		let isDiscoveryRefetch = false;
-		Promise.all([getUIBundleId(), getOrgSupportsCmsSearch()])
-			.then(([uiBundleId, orgSupportsCmsSearch]) => {
+		Promise.all([getUIBundleId(), getUserLanguage(), getOrgSupportsCmsSearch()])
+			.then(([uiBundleId, userLanguage, orgSupportsCmsSearch]) => {
 				if (cancelled || generation !== fetchGenRef.current) return;
 
 				const requests: SourceRequest[] = activeSources.flatMap((source) => {
@@ -541,7 +545,7 @@ export function useSearch(config: SearchConfig, options?: UseSearchOptions): Sea
 					if (!cmsFqn && discoveredContentTypeFqns.length > 0) {
 						isDiscoveryRefetch = true;
 					}
-					return [{ ...base, uiBundleId, contentTypes }];
+					return [{ ...base, uiBundleId, language: userLanguage, contentTypes }];
 				});
 
 				// Every in-scope source was gated out (e.g. a CMS-only scope while CMS

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/ui-bundle-template-base-sfdx-project",
-  "version": "11.63.0",
+  "version": "11.66.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/ui-bundle-template-base-sfdx-project",
-      "version": "11.63.0",
+      "version": "11.66.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "fast-xml-parser": "^5.9.3",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/ui-bundle-template-base-sfdx-project",
-  "version": "11.63.0",
+  "version": "11.66.1",
   "description": "Base SFDX project template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "publishConfig": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/ui-bundle-template-app-react-sample-b2e",
-  "version": "11.63.0",
+  "version": "11.66.1",
   "description": "Salesforce sample property rental React app",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",
@@ -16,7 +16,7 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@salesforce/ui-bundle": "^11.63.0",
+    "@salesforce/ui-bundle": "^11.66.1",
     "sonner": "^1.7.0"
   },
   "devDependencies": {