@salesforce/ui-bundle-template-app-react-sample-b2e 11.19.0 → 11.21.0

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceRequestCard.tsx

@@ -1,80 +1,107 @@
 import React from "react";
-import { Card } from "../ui/card";
-import { Button } from "../ui/button";
+import { Wrench, MapPin, User, CalendarClock } from "lucide-react";
 import type { MaintenanceRequestSearchNode } from "../../api/maintenanceRequests/maintenanceRequestSearchService";
 
 interface MaintenanceRequestCardProps {
 	request: MaintenanceRequestSearchNode;
-	onView: (id: string) => void;
+	onClick?: (request: MaintenanceRequestSearchNode) => void;
 }
 
-const priorityConfig: Record<
-	"Emergency" | "High" | "Standard",
-	{ color: string; label: string; emoji: string }
-> = {
-	Emergency: { color: "text-red-500", label: "EMERGENCY (2HR)", emoji: "🔴" },
-	High: { color: "text-orange-500", label: "HIGH (SAME DAY)", emoji: "🟠" },
-	Standard: { color: "text-blue-500", label: "STANDARD", emoji: "🔵" },
+const priorityStyles: Record<string, string> = {
+	Emergency: "bg-red-100 text-red-700",
+	High: "bg-orange-100 text-orange-700",
+	Standard: "bg-blue-100 text-blue-700",
 };
 
-const issueIcons: Record<string, string> = {
-	Plumbing: "💧",
-	HVAC: "❄️",
-	Electrical: "🔌",
-	Appliance: "🔧",
-	Pest: "🐛",
+const statusStyles: Record<string, string> = {
+	New: "bg-purple-100 text-purple-700",
+	Assigned: "bg-blue-100 text-blue-700",
+	"In Progress": "bg-yellow-100 text-yellow-700",
+	"On Hold": "bg-gray-100 text-gray-700",
+	Resolved: "bg-green-100 text-green-700",
 };
 
 export const MaintenanceRequestCard: React.FC<MaintenanceRequestCardProps> = ({
 	request,
-	onView,
+	onClick,
 }) => {
-	const priorityValue = request.Priority__c?.value;
-	const priority =
-		priorityConfig[priorityValue as keyof typeof priorityConfig] || priorityConfig.Standard;
+	const name = request.Name?.value || "Request";
 	const issueType = request.Type__c?.value || "General";
-	const issueIcon = issueIcons[issueType] || "🔧";
-	const propertyAddress = request.Property__r?.Address__c?.value || "Unknown Address";
+	const priority = request.Priority__c?.value || "Standard";
 	const status = request.Status__c?.value || "New";
-	const description = request.Description__c?.value || "";
-	const scheduledDate = request.Scheduled__c?.value
-		? new Date(request.Scheduled__c.value).toLocaleString()
+	const description = request.Description__c?.value || "No description provided.";
+	const propertyAddress = request.Property__r?.Address__c?.value || "Unknown address";
+	const assignedWorker = request.Assigned_Worker__r?.Name?.value;
+	const scheduled = request.Scheduled__c?.value
+		? new Date(request.Scheduled__c.value).toLocaleString(undefined, {
+				month: "short",
+				day: "numeric",
+				hour: "numeric",
+				minute: "2-digit",
+			})
 		: undefined;
-	const assignedWorker = request.Assigned_Worker__r?.Name?.value || "Unassigned";
+
+	const handleClick = () => onClick?.(request);
 
 	return (
-		<Card className="p-4 mb-3">
-			<div className="space-y-2">
-				<div className="flex items-start justify-between gap-4">
-					<div className="flex items-start gap-2 flex-1">
-						<span className={`${priority.color} font-bold text-sm`}>
-							{priority.emoji} {priority.label}
-						</span>
-						<span className="text-gray-700 font-medium">{propertyAddress}</span>
-					</div>
-					<span className="text-sm text-gray-500 uppercase">{status}</span>
+		<div
+			role="button"
+			tabIndex={0}
+			aria-label={name}
+			className="h-full bg-white rounded-lg shadow-md p-5 hover:shadow-lg transition-shadow cursor-pointer flex flex-col gap-3 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-purple focus-visible:ring-offset-2"
+			onClick={handleClick}
+			onKeyDown={(e) => {
+				if (e.key === "Enter" || e.key === " ") {
+					e.preventDefault();
+					handleClick();
+				}
+			}}
+		>
+			<div className="flex items-start justify-between gap-2">
+				<div className="flex items-center gap-2 min-w-0">
+					<Wrench className="w-5 h-5 text-purple-600 shrink-0" />
+					<h3 className="text-base font-semibold text-gray-900 truncate">{name}</h3>
 				</div>
+				<span
+					className={`shrink-0 px-2.5 py-0.5 rounded-full text-xs font-medium ${
+						statusStyles[status] ?? "bg-gray-100 text-gray-700"
+					}`}
+				>
+					{status}
+				</span>
+			</div>
 
-				<div className="flex items-center gap-2">
-					<span className="text-xl">{issueIcon}</span>
-					<span className="text-sm text-gray-700">
-						{issueType} - {description}
-					</span>
-				</div>
+			<div className="flex flex-wrap items-center gap-2">
+				<span
+					className={`px-2.5 py-0.5 rounded-full text-xs font-medium ${
+						priorityStyles[priority] ?? priorityStyles.Standard
+					}`}
+				>
+					{priority}
+				</span>
+				<span className="px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-700">
+					{issueType}
+				</span>
+			</div>
 
-				{assignedWorker && (
-					<div className="text-sm text-gray-600">👷 Assigned to: {assignedWorker}</div>
-				)}
+			<p className="text-sm text-gray-700 line-clamp-2">{description}</p>
 
-				{scheduledDate && (
-					<div className="flex items-center justify-between">
-						<div className="text-sm text-gray-600">📅 Scheduled: {scheduledDate}</div>
-						<Button onClick={() => onView(request.Id)} variant="outline" size="sm">
-							View
-						</Button>
+			<div className="mt-auto space-y-1 text-sm text-gray-600">
+				<div className="flex items-center gap-2">
+					<MapPin className="w-4 h-4 text-gray-400 shrink-0" />
+					<span className="truncate">{propertyAddress}</span>
+				</div>
+				<div className="flex items-center gap-2">
+					<User className="w-4 h-4 text-gray-400 shrink-0" />
+					<span className="truncate">{assignedWorker || "Unassigned"}</span>
+				</div>
+				{scheduled && (
+					<div className="flex items-center gap-2">
+						<CalendarClock className="w-4 h-4 text-gray-400 shrink-0" />
+						<span className="truncate">{scheduled}</span>
 					</div>
 				)}
 			</div>
-		</Card>
+		</div>
 	);
 };

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceWorkers/WorkerCard.tsx

@@ -0,0 +1,87 @@
+import React from "react";
+import { HardHat, Phone, MapPin, Star, DollarSign } from "lucide-react";
+import type { MaintenanceWorkerSearchNode } from "../../api/maintenanceWorkers/maintenanceWorkerSearchService";
+
+interface WorkerCardProps {
+	worker: MaintenanceWorkerSearchNode;
+	onClick?: (worker: MaintenanceWorkerSearchNode) => void;
+}
+
+export const WorkerCard: React.FC<WorkerCardProps> = ({ worker, onClick }) => {
+	const name = worker.Name?.value || "Worker";
+	const employmentType = worker.Employment_Type__c?.value || worker.Type__c?.value;
+	const phone = worker.Phone__c?.value;
+	const location = worker.Location__c?.value;
+	const rating = worker.Rating__c?.value;
+	const hourlyRate = worker.Hourly_Rate__c?.value;
+	const isActive = worker.IsActive__c?.value;
+	const active = typeof isActive === "boolean" ? isActive : undefined;
+
+	const handleClick = () => onClick?.(worker);
+
+	return (
+		<div
+			role="button"
+			tabIndex={0}
+			aria-label={name}
+			className="h-full bg-white rounded-lg shadow-md p-5 hover:shadow-lg transition-shadow cursor-pointer flex flex-col gap-3 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-purple focus-visible:ring-offset-2"
+			onClick={handleClick}
+			onKeyDown={(e) => {
+				if (e.key === "Enter" || e.key === " ") {
+					e.preventDefault();
+					handleClick();
+				}
+			}}
+		>
+			<div className="flex items-start justify-between gap-2">
+				<div className="flex items-center gap-3 min-w-0">
+					<div className="w-10 h-10 rounded-full bg-purple-100 flex items-center justify-center shrink-0">
+						<HardHat className="w-5 h-5 text-purple-700" />
+					</div>
+					<div className="min-w-0">
+						<h3 className="text-base font-semibold text-gray-900 truncate">{name}</h3>
+						{employmentType && <p className="text-sm text-gray-500 truncate">{employmentType}</p>}
+					</div>
+				</div>
+				{active !== undefined && (
+					<span
+						className={`shrink-0 px-2.5 py-0.5 rounded-full text-xs font-medium ${
+							active ? "bg-green-100 text-green-700" : "bg-gray-100 text-gray-600"
+						}`}
+					>
+						{active ? "Active" : "Inactive"}
+					</span>
+				)}
+			</div>
+
+			<div className="mt-auto space-y-1 text-sm text-gray-600">
+				{phone && (
+					<div className="flex items-center gap-2">
+						<Phone className="w-4 h-4 text-gray-400 shrink-0" />
+						<span className="truncate">{phone}</span>
+					</div>
+				)}
+				{location && (
+					<div className="flex items-center gap-2">
+						<MapPin className="w-4 h-4 text-gray-400 shrink-0" />
+						<span className="truncate">{location}</span>
+					</div>
+				)}
+				<div className="flex items-center gap-4">
+					{rating != null && (
+						<div className="flex items-center gap-1">
+							<Star className="w-4 h-4 text-yellow-500 shrink-0" />
+							<span>{rating}</span>
+						</div>
+					)}
+					{hourlyRate != null && (
+						<div className="flex items-center gap-1">
+							<DollarSign className="w-4 h-4 text-gray-400 shrink-0" />
+							<span>{hourlyRate}/hr</span>
+						</div>
+					)}
+				</div>
+			</div>
+		</div>
+	);
+};

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

@@ -0,0 +1,213 @@
+/**
+ * UnifiedSearch — the single search surface for the whole app.
+ *
+ * A thin wrapper over feature-react-search's drop-in `<Search>` (see
+ * `lib/searchConfig.ts` for the source definitions and the `pagination.mode:
+ * "merged"` that selects the combined-grid layout). The feature owns all the
+ * search chrome — search bar, scope selector, single-source filter/sort panel,
+ * the results count, the merged card grid, and one global pager over the
+ * cumulative result set. This component supplies only what's app-specific:
+ *
+ *   - **Cards** — one per object type, via `renderResult` keyed by source.
+ *   - **Detail modals** — opened on card click; maintenance requests and
+ *     applications also support an inline status update. Because the search
+ *     hook exposes no refetch, saved statuses are reflected optimistically via
+ *     `statusOverrides`.
+ *
+ * The per-card source badge in the mixed ("All") grid is supplied by the feature
+ * automatically (each source's `label`, auto-colored) — no app code needed.
+ *
+ * One implementation serves both the unified `/search` page (no `restrictTo`)
+ * and each single-object page (`restrictTo="properties"` etc.): passing
+ * `restrictTo` locks the scope, hides the selector, and collapses the grid to
+ * that one source.
+ */
+
+import { useCallback, useState } from "react";
+import { Search, type SearchConfig } from "../../features/search";
+import { toast } from "../ui/sonner";
+import { searchConfig, SOURCE_KEYS, type SourceKey } from "../../lib/searchConfig";
+import { PropertyCard } from "../properties/PropertyCard";
+import { MaintenanceRequestCard } from "../maintenanceRequests/MaintenanceRequestCard";
+import { WorkerCard } from "../maintenanceWorkers/WorkerCard";
+import { ApplicationCard } from "../applications/ApplicationCard";
+import { PropertyDetailsModal } from "../properties/PropertyDetailsModal";
+import { MaintenanceDetailsModal } from "../maintenanceRequests/MaintenanceDetailsModal";
+import { WorkerDetailsModal } from "../maintenanceWorkers/WorkerDetailsModal";
+import { ApplicationDetailsModal } from "../applications/ApplicationDetailsModal";
+import type { PropertySearchNode } from "../../api/properties/propertySearchService";
+import type { MaintenanceRequestSearchNode } from "../../api/maintenanceRequests/maintenanceRequestSearchService";
+import type { MaintenanceWorkerSearchNode } from "../../api/maintenanceWorkers/maintenanceWorkerSearchService";
+import type { ApplicationSearchNode } from "../../api/applications/applicationSearchService";
+import { updateMaintenanceStatus } from "../../api/maintenanceRequests/maintenanceRequests";
+import { updateApplicationStatus } from "../../api/applications/applications";
+
+const config: SearchConfig = searchConfig;
+
+export interface UnifiedSearchProps {
+	title?: string;
+	subtitle?: string;
+	searchPlaceholder?: string;
+	/** Lock the search to a single source; hides the scope selector. */
+	restrictTo?: SourceKey;
+}
+
+/** Discriminated handle on the record whose detail modal is open. */
+type Selected =
+	| { key: typeof SOURCE_KEYS.PROPERTIES; node: PropertySearchNode }
+	| { key: typeof SOURCE_KEYS.MAINTENANCE; node: MaintenanceRequestSearchNode }
+	| { key: typeof SOURCE_KEYS.WORKERS; node: MaintenanceWorkerSearchNode }
+	| { key: typeof SOURCE_KEYS.APPLICATIONS; node: ApplicationSearchNode };
+
+type StatusNode = {
+	Id: string;
+	Status__c?: { value?: string | null; displayValue?: string | null } | null;
+};
+
+/** Returns a copy of `node` with its status replaced by an optimistic override, if any. */
+function withStatusOverride<T extends StatusNode>(node: T, overrides: Record<string, string>): T {
+	const next = overrides[node.Id];
+	if (next == null) return node;
+	return { ...node, Status__c: { ...(node.Status__c ?? {}), value: next, displayValue: next } };
+}
+
+export function UnifiedSearch({
+	title = "Search",
+	subtitle,
+	searchPlaceholder = "Search…",
+	restrictTo,
+}: UnifiedSearchProps) {
+	const [selected, setSelected] = useState<Selected | null>(null);
+	const [statusOverrides, setStatusOverrides] = useState<Record<string, string>>({});
+
+	// -- Optimistic status save -------------------------------------------------
+
+	const applyOptimisticStatus = useCallback((key: Selected["key"], id: string, status: string) => {
+		setStatusOverrides((prev) => ({ ...prev, [id]: status }));
+		setSelected((prev) => {
+			if (!prev || prev.key !== key || prev.node.Id !== id) return prev;
+			// Only the status-bearing sources (maintenance, applications) reach
+			// here; cast through StatusNode so the union's non-status members
+			// don't trip the type checker.
+			const current = prev.node as StatusNode;
+			return {
+				...prev,
+				node: {
+					...prev.node,
+					Status__c: { ...(current.Status__c ?? {}), value: status, displayValue: status },
+				},
+			} as Selected;
+		});
+	}, []);
+
+	const handleMaintenanceSave = useCallback(
+		async (id: string, status: string) => {
+			const ok = await updateMaintenanceStatus(id, status);
+			if (!ok) {
+				toast.error("Update failed", {
+					description: "Could not update the maintenance request. Please try again.",
+				});
+				throw new Error("Failed to update maintenance status");
+			}
+			applyOptimisticStatus(SOURCE_KEYS.MAINTENANCE, id, status);
+			toast.success("Status updated", {
+				description: "Maintenance request status has been updated.",
+			});
+		},
+		[applyOptimisticStatus],
+	);
+
+	const handleApplicationSave = useCallback(
+		async (id: string, status: string) => {
+			const ok = await updateApplicationStatus(id, status);
+			if (!ok) {
+				toast.error("Update failed", {
+					description: "Could not update the application. Please try again.",
+				});
+				throw new Error("Failed to update application status");
+			}
+			applyOptimisticStatus(SOURCE_KEYS.APPLICATIONS, id, status);
+			toast.success("Status updated", {
+				description: "Application status has been updated.",
+			});
+		},
+		[applyOptimisticStatus],
+	);
+
+	// -- Card rendering ---------------------------------------------------------
+
+	const renderResult = {
+		[SOURCE_KEYS.PROPERTIES]: (node: unknown) => {
+			const property = node as PropertySearchNode;
+			return (
+				<PropertyCard
+					property={property}
+					onClick={() => setSelected({ key: SOURCE_KEYS.PROPERTIES, node: property })}
+				/>
+			);
+		},
+		[SOURCE_KEYS.MAINTENANCE]: (node: unknown) => {
+			const request = withStatusOverride(node as MaintenanceRequestSearchNode, statusOverrides);
+			return (
+				<MaintenanceRequestCard
+					request={request}
+					onClick={() => setSelected({ key: SOURCE_KEYS.MAINTENANCE, node: request })}
+				/>
+			);
+		},
+		[SOURCE_KEYS.WORKERS]: (node: unknown) => {
+			const worker = node as MaintenanceWorkerSearchNode;
+			return (
+				<WorkerCard
+					worker={worker}
+					onClick={() => setSelected({ key: SOURCE_KEYS.WORKERS, node: worker })}
+				/>
+			);
+		},
+		[SOURCE_KEYS.APPLICATIONS]: (node: unknown) => {
+			const application = withStatusOverride(node as ApplicationSearchNode, statusOverrides);
+			return (
+				<ApplicationCard
+					application={application}
+					onClick={() => setSelected({ key: SOURCE_KEYS.APPLICATIONS, node: application })}
+				/>
+			);
+		},
+	};
+
+	return (
+		<>
+			<Search
+				config={config}
+				title={title}
+				subtitle={subtitle}
+				searchPlaceholder={searchPlaceholder}
+				restrictTo={restrictTo ? { kind: "sobject", key: restrictTo } : undefined}
+				renderResult={renderResult}
+			/>
+
+			{selected?.key === SOURCE_KEYS.PROPERTIES && (
+				<PropertyDetailsModal property={selected.node} isOpen onClose={() => setSelected(null)} />
+			)}
+			{selected?.key === SOURCE_KEYS.MAINTENANCE && (
+				<MaintenanceDetailsModal
+					request={selected.node}
+					isOpen
+					onClose={() => setSelected(null)}
+					onSave={handleMaintenanceSave}
+				/>
+			)}
+			{selected?.key === SOURCE_KEYS.WORKERS && (
+				<WorkerDetailsModal worker={selected.node} isOpen onClose={() => setSelected(null)} />
+			)}
+			{selected?.key === SOURCE_KEYS.APPLICATIONS && (
+				<ApplicationDetailsModal
+					application={selected.node}
+					isOpen
+					onClose={() => setSelected(null)}
+					onSave={handleApplicationSave}
+				/>
+			)}
+		</>
+	);
+}

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/api/distinctValuesService.ts

@@ -0,0 +1,84 @@
+/**
+ * Fetches distinct values for a picklist field via the uiapi aggregate
+ * `groupBy` query.
+ *
+ * Used by the auto-render pathway when a picklist filter does not declare
+ * inline `options`. Each call hits the GraphQL endpoint once and returns the
+ * sorted set of distinct values plus their display labels.
+ */
+
+import { createDataSDK } from "@salesforce/platform-sdk";
+
+export interface PicklistOption {
+	value: string;
+	label: string;
+}
+
+const KEY_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+
+function assertValidIdentifier(name: string, kind: string): void {
+	if (!KEY_PATTERN.test(name)) {
+		throw new Error(
+			`Invalid ${kind} "${name}". Must match /^[A-Za-z_][A-Za-z0-9_]*$/ to be a valid GraphQL identifier.`,
+		);
+	}
+}
+
+/**
+ * Builds and executes a `uiapi.aggregate.<objectName>(groupBy: { <field>: { group: true } })`
+ * query and extracts the distinct values.
+ */
+export async function fetchDistinctValues(
+	objectName: string,
+	fieldName: string,
+): Promise<PicklistOption[]> {
+	assertValidIdentifier(objectName, "objectName");
+	assertValidIdentifier(fieldName, "fieldName");
+
+	const document = `query DistinctValues {
+		uiapi {
+			aggregate {
+				${objectName}(groupBy: { ${fieldName}: { group: true } }) {
+					edges {
+						node {
+							aggregate @optional {
+								${fieldName} @optional {
+									value
+									displayValue
+									label
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}`;
+
+	const data = await createDataSDK();
+	const response = await data.graphql!.query<unknown>({ query: document });
+
+	if (response.errors?.length) {
+		throw new Error(response.errors.map((e) => e.message).join("; "));
+	}
+
+	const root = response.data as Record<string, unknown> | undefined;
+	const aggregate = (root?.uiapi as Record<string, unknown> | undefined)?.aggregate as
+		| Record<string, unknown>
+		| undefined;
+	const objectAgg = aggregate?.[objectName] as
+		| { edges?: Array<{ node?: { aggregate?: Record<string, unknown> } }> }
+		| undefined;
+	const edges = objectAgg?.edges ?? [];
+
+	return edges
+		.map((edge) => {
+			const field = edge?.node?.aggregate?.[fieldName] as
+				| { value?: string | null; displayValue?: string | null; label?: string | null }
+				| undefined;
+			const value = field?.value;
+			if (value == null || value === "") return null;
+			return { value, label: field?.label ?? field?.displayValue ?? value };
+		})
+		.filter((opt): opt is PicklistOption => opt !== null);
+}

package/dist/force-app/main/default/uiBundles/propertymanagementapp/src/features/search/api/searchService.ts

@@ -0,0 +1,71 @@
+/**
+ * Executes a search request and parses results into a per-source map.
+ *
+ * Today there's only one adapter — SObjects via the platform-sdk uiapi GraphQL
+ * bridge. Future adapters (CMS, REST, etc.) can run alongside this one and
+ * have their results merged into the same `Record<sourceKey, SourceResult>`
+ * by the hook.
+ */
+
+import { createDataSDK } from "@salesforce/platform-sdk";
+import { buildSearchQuery, type SourceRequest } from "../queryBuilder";
+import type { SourceResult } from "../types";
+
+interface RawSourceResult {
+	edges?: Array<{ node?: unknown }> | null;
+	pageInfo?: {
+		hasNextPage?: boolean | null;
+		hasPreviousPage?: boolean | null;
+		startCursor?: string | null;
+		endCursor?: string | null;
+	} | null;
+	totalCount?: number | null;
+}
+
+/**
+ * Runs a single multi-aliased GraphQL request against uiapi.query.
+ *
+ * Returns a plain object keyed by source.key. A source whose alias is missing
+ * from the response (e.g. due to a partial GraphQL error) is omitted; the
+ * caller can detect this by `result[sourceKey] == null`.
+ */
+export async function runSearch(requests: SourceRequest[]): Promise<Record<string, SourceResult>> {
+	const { document, variables } = buildSearchQuery(requests);
+
+	const data = await createDataSDK();
+	const response = await data.graphql!.query<unknown, Record<string, unknown>>({
+		query: document,
+		variables,
+	});
+
+	if (response.errors?.length) {
+		throw new Error(response.errors.map((e) => e.message).join("; "));
+	}
+
+	const root = response.data as Record<string, unknown> | undefined;
+	const queryRoot = (root?.uiapi as Record<string, unknown> | undefined)?.query as
+		| Record<string, RawSourceResult | null | undefined>
+		| undefined;
+
+	const out: Record<string, SourceResult> = {};
+	for (const request of requests) {
+		const raw = queryRoot?.[request.source.key];
+		if (raw == null) continue;
+		const nodes = (raw.edges ?? [])
+			.map((edge) => edge?.node)
+			.filter((node): node is unknown => node != null);
+		out[request.source.key] = {
+			nodes,
+			pageInfo: raw.pageInfo
+				? {
+						hasNextPage: raw.pageInfo.hasNextPage ?? false,
+						hasPreviousPage: raw.pageInfo.hasPreviousPage ?? false,
+						startCursor: raw.pageInfo.startCursor ?? null,
+						endCursor: raw.pageInfo.endCursor ?? null,
+					}
+				: null,
+			totalCount: raw.totalCount ?? null,
+		};
+	}
+	return out;
+}