@salesforce/ui-bundle-template-app-react-sample-b2x 2.2.1 → 3.1.0

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/maintenanceRequestApi.ts

@@ -43,6 +43,8 @@ export interface CreateMaintenanceRequestInput {
 	Priority__c?: string;
 	Status__c?: string;
 	Scheduled__c?: string | null;
+	Property__c?: string | null;
+	User__c?: string | null;
 }
 
 function getRecordIdFromResponse(result: Record<string, unknown>): string {
@@ -66,6 +68,8 @@ export async function createMaintenanceRequest(
 	};
 	if (input.Type__c?.trim()) fields.Type__c = input.Type__c.trim();
 	if (input.Scheduled__c?.trim()) fields.Scheduled__c = input.Scheduled__c.trim();
+	if (input.Property__c?.trim()) fields.Property__c = input.Property__c.trim();
+	if (input.User__c?.trim()) fields.User__c = input.User__c.trim();
 	const result = (await createRecord(OBJECT_API_NAME, fields)) as unknown as Record<
 		string,
 		unknown

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/api/query/tenantProperties.graphql

@@ -0,0 +1,24 @@
+query TenantProperties($userId: ID!) {
+	uiapi {
+		query {
+			Tenant__c(where: { User__c: { eq: $userId } }, first: 50) {
+				edges {
+					node {
+						Id
+						Property__c @optional {
+							value
+						}
+						Property__r @optional {
+							Name @optional {
+								value
+							}
+							Address__c @optional {
+								value
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/api/tenants/tenantApi.ts

@@ -0,0 +1,23 @@
+import TENANT_PROPERTIES_QUERY from "../query/tenantProperties.graphql?raw";
+import type {
+	TenantPropertiesQuery,
+	TenantPropertiesQueryVariables,
+} from "../graphql-operations-types.js";
+import { executeGraphQL } from "@/api/graphqlClient.js";
+
+export type TenantProperty = NonNullable<
+	NonNullable<
+		NonNullable<NonNullable<TenantPropertiesQuery["uiapi"]["query"]["Tenant__c"]>["edges"]>[number]
+	>["node"]
+> & { Property__c: { value: string } };
+
+export async function getTenantProperties(userId: string): Promise<TenantProperty[]> {
+	if (!userId.trim()) return [];
+	const response = await executeGraphQL<TenantPropertiesQuery, TenantPropertiesQueryVariables>(
+		TENANT_PROPERTIES_QUERY,
+		{ userId },
+	);
+	return (response.uiapi?.query?.Tenant__c?.edges ?? [])
+		.map((edge) => edge?.node)
+		.filter((node): node is TenantProperty => Boolean(node?.Property__c?.value));
+}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/alerts/status-alert.tsx

@@ -1,5 +1,5 @@
 import { cva, type VariantProps } from 'class-variance-authority';
-import { AlertCircleIcon, CheckCircle2Icon } from 'lucide-react';
+import { AlertCircleIcon, CheckCircle2Icon, InfoIcon } from 'lucide-react';
 import { Alert, AlertDescription } from '../../components/ui/alert';
 import { useId } from 'react';
 
@@ -8,6 +8,7 @@ const statusAlertVariants = cva('', {
     variant: {
       error: '',
       success: '',
+      info: 'text-blue-600 *:[svg]:text-current *:data-[slot=alert-description]:text-blue-600/90',
     },
   },
   defaultVariants: {
@@ -18,11 +19,11 @@ const statusAlertVariants = cva('', {
 interface StatusAlertProps extends VariantProps<typeof statusAlertVariants> {
   children?: React.ReactNode;
   /** Alert variant type. @default "error" */
-  variant?: 'error' | 'success';
+  variant?: 'error' | 'success' | 'info';
 }
 
 /**
- * Status alert component for displaying error or success messages.
+ * Status alert component for displaying error, success, or info messages.
  * Returns null if no children are provided.
  */
 export function StatusAlert({ children, variant = 'error' }: StatusAlertProps) {
@@ -31,6 +32,12 @@ export function StatusAlert({ children, variant = 'error' }: StatusAlertProps) {
 
   const isError = variant === 'error';
 
+  const icon = {
+    error: <AlertCircleIcon aria-hidden="true" />,
+    success: <CheckCircle2Icon aria-hidden="true" />,
+    info: <InfoIcon aria-hidden="true" />,
+  }[variant];
+
   return (
     <Alert
       variant={isError ? 'destructive' : 'default'}
@@ -38,11 +45,7 @@ export function StatusAlert({ children, variant = 'error' }: StatusAlertProps) {
       aria-describedby={descriptionId}
       role={isError ? 'alert' : 'status'}
     >
-      {isError ? (
-        <AlertCircleIcon aria-hidden="true" />
-      ) : (
-        <CheckCircle2Icon aria-hidden="true" />
-      )}
+      {icon}
       <AlertDescription id={descriptionId}>{children}</AlertDescription>
     </Alert>
   );

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/input.tsx

@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
       type={type}
       data-slot="input"
       className={cn(
-        'dark:bg-input/30 border-input focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 disabled:bg-input/50 dark:disabled:bg-input/80 h-8 rounded-lg border bg-transparent px-2.5 py-1 text-base transition-colors file:h-6 file:text-sm file:font-medium focus-visible:ring-3 aria-invalid:ring-3 md:text-sm file:text-foreground placeholder:text-muted-foreground w-full min-w-0 outline-none file:inline-flex file:border-0 file:bg-transparent disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
+        'dark:bg-input/30 border-input focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 disabled:bg-input/50 dark:disabled:bg-input/80 h-8 rounded-lg border bg-transparent px-2.5 py-1 text-base transition-colors file:h-6 file:text-sm file:font-medium focus-visible:ring-3 aria-invalid:ring-3 md:text-sm file:text-foreground placeholder:text-muted-foreground/70 placeholder:italic w-full min-w-0 outline-none file:inline-flex file:border-0 file:bg-transparent disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
         className
       )}
       {...props}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/context/TenantAccessContext.tsx

@@ -1,38 +1,48 @@
 import { createContext, useContext, useEffect, useState, type ReactNode } from "react";
 import { useAuth } from "@/features/authentication/context/AuthContext";
-import { hasTenantAccess } from "@/api/tenantApi";
+import { getTenantProperties, type TenantProperty } from "@/api/tenants/tenantApi";
 
 interface TenantAccessContextType {
 	hasTenantRecord: boolean;
+	tenantProperties: TenantProperty[];
 	loading: boolean;
 }
 
 const TenantAccessContext = createContext<TenantAccessContextType>({
 	hasTenantRecord: false,
+	tenantProperties: [],
 	loading: true,
 });
 
 export function TenantAccessProvider({ children }: { children: ReactNode }) {
 	const { user } = useAuth();
-	const [hasTenantRecord, setHasTenantRecord] = useState(false);
+	const [tenantProperties, setTenantProperties] = useState<TenantProperty[]>([]);
 	const [loading, setLoading] = useState(true);
 
-	useEffect(() => {
+	// Reset state synchronously during render when user changes
+	const [prevUserId, setPrevUserId] = useState(user?.id);
+	if (prevUserId !== user?.id) {
+		setPrevUserId(user?.id);
 		const id = user?.id?.trim() ?? "";
 		if (!id) {
-			setHasTenantRecord(false);
-			setLoading(false);
-			return;
+			if (tenantProperties.length > 0) setTenantProperties([]);
+			if (loading) setLoading(false);
+		} else {
+			if (!loading) setLoading(true);
 		}
+	}
+
+	useEffect(() => {
+		const id = user?.id?.trim() ?? "";
+		if (!id) return;
 
 		let cancelled = false;
-		setLoading(true);
-		hasTenantAccess(id)
-			.then((allowed) => {
-				if (!cancelled) setHasTenantRecord(allowed);
+		getTenantProperties(id)
+			.then((props) => {
+				if (!cancelled) setTenantProperties(props);
 			})
 			.catch(() => {
-				if (!cancelled) setHasTenantRecord(false);
+				if (!cancelled) setTenantProperties([]);
 			})
 			.finally(() => {
 				if (!cancelled) setLoading(false);
@@ -43,8 +53,10 @@ export function TenantAccessProvider({ children }: { children: ReactNode }) {
 		};
 	}, [user?.id]);
 
+	const hasTenantRecord = tenantProperties.length > 0;
+
 	return (
-		<TenantAccessContext.Provider value={{ hasTenantRecord, loading }}>
+		<TenantAccessContext.Provider value={{ hasTenantRecord, tenantProperties, loading }}>
 			{children}
 		</TenantAccessContext.Provider>
 	);

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/api/userProfileApi.ts

@@ -48,7 +48,8 @@ function getUserProfileMutation(fields: string): string {
 
 function throwOnGraphQLErrors(response: any): void {
 	if (response?.errors?.length) {
-		throw new Error(response.errors.map((e: any) => e.message).join("; "));
+		console.error("GraphQL request failed", response.errors);
+		throw new Error("An unexpected error occurred");
 	}
 }
 

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authenticationConfig.ts

@@ -49,13 +49,13 @@ export const AUTH_REDIRECT_PARAM = "startUrl";
  * Placeholder text constants for authentication form inputs.
  */
 export const AUTH_PLACEHOLDERS = {
-	EMAIL: "asalesforce@example.com",
-	PASSWORD: "",
-	PASSWORD_CREATE: "",
-	PASSWORD_CONFIRM: "",
-	PASSWORD_NEW: "",
-	PASSWORD_NEW_CONFIRM: "",
-	FIRST_NAME: "Astro",
-	LAST_NAME: "Salesforce",
-	USERNAME: "asalesforce",
+	EMAIL: "e.g. name@example.com",
+	PASSWORD: "Enter your password",
+	PASSWORD_CREATE: "Create a password",
+	PASSWORD_CONFIRM: "Re-enter your password",
+	PASSWORD_NEW: "Enter new password",
+	PASSWORD_NEW_CONFIRM: "Re-enter new password",
+	FIRST_NAME: "e.g. Alex",
+	LAST_NAME: "e.g. Smith",
+	USERNAME: "e.g. asmith",
 } as const;

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/context/AuthContext.tsx

@@ -35,8 +35,8 @@ export function AuthProvider({ children }: AuthProviderProps) {
 			const userData = await getCurrentUser();
 			setUser(userData);
 		} catch (err) {
-			const errorMessage = err instanceof Error ? err.message : "Authentication failed";
-			setError(errorMessage);
+			console.error("Authentication failed", err);
+			setError("Authentication failed");
 			setUser(null);
 		} finally {
 			setLoading(false);
@@ -53,8 +53,25 @@ export function AuthProvider({ children }: AuthProviderProps) {
 	}, []);
 
 	useEffect(() => {
-		checkAuth();
-	}, [checkAuth]);
+		let cancelled = false;
+		getCurrentUser()
+			.then((userData) => {
+				if (!cancelled) setUser(userData);
+			})
+			.catch((err) => {
+				console.error("Authentication failed", err);
+				if (!cancelled) {
+					setError("Authentication failed");
+					setUser(null);
+				}
+			})
+			.finally(() => {
+				if (!cancelled) setLoading(false);
+			});
+		return () => {
+			cancelled = true;
+		};
+	}, []);
 
 	const value: AuthContextType = {
 		user,

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/auth-form.tsx

@@ -4,6 +4,7 @@ import { FooterLink } from "../footers/footer-link";
 import { SubmitButton } from "./submit-button";
 import { CardLayout } from "../../../components/layouts/card-layout";
 import { useFormContext } from "../hooks/form";
+import { useAuth } from "../context/AuthContext";
 import { useId } from "react";
 
 /**
@@ -15,6 +16,8 @@ interface AuthFormProps extends Omit<React.ComponentProps<"form">, "onSubmit"> {
 	description: string;
 	error?: React.ReactNode;
 	success?: React.ReactNode;
+	/** Whether to show the "already logged in" alert and disable submit when authenticated. @default true */
+	showAlreadyLoggedIn?: boolean;
 	submit: {
 		text: string;
 		loadingText?: string;
@@ -32,6 +35,10 @@ interface AuthFormProps extends Omit<React.ComponentProps<"form">, "onSubmit"> {
  * Wraps the specific logic of Login/Register forms with a consistent visual frame (Card),
  * title, and error alert placement. Extends form element props for flexibility.
  * This ensures all auth-related pages look and behave similarly.
+ *
+ * Auth-aware behavior:
+ * - While auth state is loading, the submit button is disabled.
+ * - If the user is already authenticated, an info alert is shown and submit is disabled.
  */
 export function AuthForm({
 	id: providedId,
@@ -39,18 +46,25 @@ export function AuthForm({
 	description,
 	error,
 	success,
+	showAlreadyLoggedIn = true,
 	children,
 	submit,
 	footer,
 	...props
 }: AuthFormProps) {
 	const form = useFormContext();
+	const { isAuthenticated, loading } = useAuth();
 	const generatedId = useId();
 	const id = providedId ?? generatedId;
 
+	const showAuthAlert = showAlreadyLoggedIn && isAuthenticated;
+	const isSubmitDisabled = submit.disabled || showAuthAlert || loading;
+
 	return (
 		<CardLayout title={title} description={description}>
 			<div className="space-y-6">
+				{/* [Dev Note] Auth status alert for authenticated users on public pages */}
+				{showAuthAlert && <StatusAlert variant="info">You are already logged in.</StatusAlert>}
 				{/* [Dev Note] Global form error alert (e.g. "Invalid Credentials") */}
 				{error && <StatusAlert variant="error">{error}</StatusAlert>}
 				{success && <StatusAlert variant="success">{success}</StatusAlert>}
@@ -69,7 +83,7 @@ export function AuthForm({
 						form={id}
 						label={submit.text}
 						loadingLabel={submit.loadingText}
-						disabled={submit.disabled}
+						disabled={isSubmitDisabled}
 						className="mt-6"
 					/>
 				</form>

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/form.tsx

@@ -40,7 +40,7 @@ function TextField({
 	const id = providedId ?? generatedId;
 	const descriptionId = `${id}-description`;
 	const errorId = `${id}-error`;
-	const isInvalid = field.state.meta.isTouched && field.state.meta.errors.length > 0;
+	const isInvalid = field.state.meta.isBlurred && field.state.meta.errors.length > 0;
 
 	// Deduplicate errors by message
 	const errors = field.state.meta.errors;

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx

@@ -1,15 +1,6 @@
 import { Navigate, Outlet, useLocation } from "react-router";
 import { useAuth } from "../context/AuthContext";
 import { AUTH_REDIRECT_PARAM, ROUTES } from "../authenticationConfig";
-import { CardSkeleton } from "../layout/card-skeleton";
-
-export interface PrivateRouteProps {
-	/**
-	 * Whether to show a card skeleton placeholder while authentication is loading.
-	 * @default false
-	 */
-	showCardSkeleton?: boolean;
-}
 
 /**
  * [Dev Note] Route Guard:
@@ -17,11 +8,11 @@ export interface PrivateRouteProps {
  * Otherwise, redirects to Login with a 'startUrl' parameter so the user can be
  * returned to this page after successful login.
  */
-export default function PrivateRoute({ showCardSkeleton = false }: PrivateRouteProps) {
+export default function PrivateRoute() {
 	const { isAuthenticated, loading } = useAuth();
 	const location = useLocation();
 
-	if (loading) return showCardSkeleton ? <CardSkeleton contentMaxWidth="md" /> : null;
+	if (loading) return null;
 
 	if (!isAuthenticated) {
 		const searchParams = new URLSearchParams();

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ChangePassword.tsx

@@ -7,7 +7,7 @@ import { useAppForm } from "../hooks/form";
 import { createDataSDK } from "@salesforce/platform-sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
 import { newPasswordSchema } from "../authHelpers";
-import { handleApiResponse, getErrorMessage } from "../utils/helpers";
+import { ApiError, handleApiResponse } from "../utils/helpers";
 
 const changePasswordSchema = z
 	.object({
@@ -17,7 +17,7 @@ const changePasswordSchema = z
 
 export default function ChangePassword() {
 	const [success, setSuccess] = useState(false);
-	const [submitError, setSubmitError] = useState<string | null>(null);
+	const [submitError, setSubmitError] = useState<React.ReactNode>(null);
 
 	const form = useAppForm({
 		defaultValues: { currentPassword: "", newPassword: "", confirmPassword: "" },
@@ -40,11 +40,26 @@ export default function ChangePassword() {
 						Accept: "application/json",
 					},
 				});
-				await handleApiResponse(response, "Password change failed");
+				await handleApiResponse(response);
 				setSuccess(true);
 				form.reset();
 			} catch (err) {
-				setSubmitError(getErrorMessage(err, "Password change failed"));
+				console.error("Password change failed", err);
+				if (err instanceof ApiError) {
+					setSubmitError(
+						err.errors.length === 1 ? (
+							err.errors[0]
+						) : (
+							<ul>
+								{err.errors.map((e, i) => (
+									<li key={i}>{e}</li>
+								))}
+							</ul>
+						),
+					);
+				} else {
+					setSubmitError("Password change failed");
+				}
 			}
 		},
 		onSubmitInvalid: () => {},
@@ -56,6 +71,7 @@ export default function ChangePassword() {
 				<AuthForm
 					title="Change Password"
 					description="Enter your current and new password below"
+					showAlreadyLoggedIn={false}
 					error={submitError}
 					success={
 						success && (

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ForgotPassword.tsx

@@ -5,7 +5,7 @@ import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
 import { createDataSDK } from "@salesforce/platform-sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
-import { handleApiResponse, getErrorMessage } from "../utils/helpers";
+import { ApiError, handleApiResponse } from "../utils/helpers";
 
 const forgotPasswordSchema = z.object({
 	username: z.string().trim().toLowerCase().email("Please enter a valid username"),
@@ -13,7 +13,7 @@ const forgotPasswordSchema = z.object({
 
 export default function ForgotPassword() {
 	const [success, setSuccess] = useState(false);
-	const [submitError, setSubmitError] = useState<string | null>(null);
+	const [submitError, setSubmitError] = useState<React.ReactNode>(null);
 
 	const form = useAppForm({
 		defaultValues: { username: "" },
@@ -33,10 +33,25 @@ export default function ForgotPassword() {
 						Accept: "application/json",
 					},
 				});
-				await handleApiResponse(response, "Failed to send reset link");
+				await handleApiResponse(response);
 				setSuccess(true);
 			} catch (err) {
-				setSubmitError(getErrorMessage(err, "Failed to send reset link"));
+				console.error("Failed to send reset link", err);
+				if (err instanceof ApiError) {
+					setSubmitError(
+						err.errors.length === 1 ? (
+							err.errors[0]
+						) : (
+							<ul>
+								{err.errors.map((e, i) => (
+									<li key={i}>{e}</li>
+								))}
+							</ul>
+						),
+					);
+				} else {
+					setSubmitError("Failed to send reset link");
+				}
 			}
 		},
 		onSubmitInvalid: () => {},

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Login.tsx

@@ -7,7 +7,7 @@ import { useAppForm } from "../hooks/form";
 import { createDataSDK } from "@salesforce/platform-sdk-data";
 import { ROUTES } from "../authenticationConfig";
 import { emailSchema, getStartUrl, type AuthResponse } from "../authHelpers";
-import { handleApiResponse, getErrorMessage } from "../utils/helpers";
+import { ApiError, handleApiResponse } from "../utils/helpers";
 
 const loginSchema = z.object({
 	email: emailSchema,
@@ -17,7 +17,7 @@ const loginSchema = z.object({
 export default function Login() {
 	const navigate = useNavigate();
 	const [searchParams] = useSearchParams();
-	const [submitError, setSubmitError] = useState<string | null>(null);
+	const [submitError, setSubmitError] = useState<React.ReactNode>(null);
 
 	const form = useAppForm({
 		defaultValues: { email: "", password: "" },
@@ -43,7 +43,7 @@ export default function Login() {
 						Accept: "application/json",
 					},
 				});
-				const result = await handleApiResponse<AuthResponse>(response, "Login failed");
+				const result = await handleApiResponse<AuthResponse>(response);
 				if (result?.redirectUrl) {
 					// Hard navigate to the URL which establishes the server session cookie
 					window.location.replace(result.redirectUrl);
@@ -52,7 +52,22 @@ export default function Login() {
 					navigate("/", { replace: true });
 				}
 			} catch (err) {
-				setSubmitError(getErrorMessage(err, "Login failed"));
+				console.error("Login failed", err);
+				if (err instanceof ApiError) {
+					setSubmitError(
+						err.errors.length === 1 ? (
+							err.errors[0]
+						) : (
+							<ul>
+								{err.errors.map((e, i) => (
+									<li key={i}>{e}</li>
+								))}
+							</ul>
+						),
+					);
+				} else {
+					setSubmitError("Login failed");
+				}
 			}
 		},
 		onSubmitInvalid: () => {},