@salesforce/webapp-template-app-react-sample-b2x-experimental 1.116.4 → 1.116.6

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts

@@ -101,6 +101,14 @@ const PROPERTY_QUERY = gql`
 								value
 								displayValue
 							}
+							Coordinates__Latitude__s @optional {
+								value
+								displayValue
+							}
+							Coordinates__Longitude__s @optional {
+								value
+								displayValue
+							}
 							Type__c @optional {
 								value
 								displayValue
@@ -143,6 +151,10 @@ export interface PropertyDetail {
 	bathrooms: number | string | null;
 	squareFootage: number | string | null;
 	description: string | null;
+	coordinates: {
+		lat: number | null;
+		lng: number | null;
+	} | null;
 }
 
 export async function fetchPropertyById(propertyId: string): Promise<PropertyDetail | null> {
@@ -178,6 +190,23 @@ export async function fetchPropertyById(propertyId: string): Promise<PropertyDet
 			node.Description__c?.value != null
 				? String(node.Description__c.value)
 				: (node.Description__c?.displayValue ?? null),
+		coordinates:
+			node.Coordinates__Latitude__s && node.Coordinates__Longitude__s
+				? {
+						lat:
+							typeof node.Coordinates__Latitude__s.value === "number"
+								? node.Coordinates__Latitude__s.value
+								: node.Coordinates__Latitude__s.displayValue != null
+									? Number(node.Coordinates__Latitude__s.displayValue)
+									: null,
+						lng:
+							typeof node.Coordinates__Longitude__s.value === "number"
+								? node.Coordinates__Longitude__s.value
+								: node.Coordinates__Longitude__s.displayValue != null
+									? Number(node.Coordinates__Longitude__s.displayValue)
+									: null,
+					}
+				: null,
 	};
 }
 

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyListingGraphQL.ts

@@ -28,6 +28,8 @@ type PropertyListingNode = {
 	Property__r?: {
 		Name?: { value?: string | null; displayValue?: string | null } | null;
 		Address__c?: { value?: string | null; displayValue?: string | null } | null;
+		Coordinates__Latitude__s?: { value?: number | null; displayValue?: string | null } | null;
+		Coordinates__Longitude__s?: { value?: number | null; displayValue?: string | null } | null;
 		Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
 	} | null;
 };
@@ -83,6 +85,18 @@ function nodeToSearchResultRecordData(node: PropertyListingNode): SearchResultRe
 			prop.Bedrooms__c as { value?: unknown; displayValue?: string | null },
 		);
 	}
+	const lat = prop?.Coordinates__Latitude__s;
+	if (lat != null && typeof lat === "object" && "value" in lat) {
+		fields["Property__r.Coordinates__Latitude__s"] = nodeToFieldValue(
+			lat as { value?: unknown; displayValue?: string | null },
+		);
+	}
+	const lng = prop?.Coordinates__Longitude__s;
+	if (lng != null && typeof lng === "object" && "value" in lng) {
+		fields["Property__r.Coordinates__Longitude__s"] = nodeToFieldValue(
+			lng as { value?: unknown; displayValue?: string | null },
+		);
+	}
 	return {
 		id: node.Id,
 		apiName: typeof node.ApiName === "string" ? node.ApiName : OBJECT_API_NAME,
@@ -134,6 +148,14 @@ const PROPERTY_LISTINGS_QUERY = gql`
 									value
 									displayValue
 								}
+								Coordinates__Latitude__s @optional {
+									value
+									displayValue
+								}
+								Coordinates__Longitude__s @optional {
+									value
+									displayValue
+								}
 								Bedrooms__c @optional {
 									value
 									displayValue

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/app.tsx

@@ -2,7 +2,6 @@ import { createBrowserRouter, RouterProvider } from "react-router";
 import { routes } from "@/routes";
 import { StrictMode, Component, type ReactNode } from "react";
 import { createRoot } from "react-dom/client";
-import { AuthProvider } from "./features/authentication/context/AuthContext";
 import "./styles/global.css";
 
 class ErrorBoundary extends Component<
@@ -37,9 +36,7 @@ if (rootEl) {
 	createRoot(rootEl).render(
 		<StrictMode>
 			<ErrorBoundary>
-				<AuthProvider>
-					<RouterProvider router={router} />
-				</AuthProvider>
+				<RouterProvider router={router} />
 			</ErrorBoundary>
 		</StrictMode>,
 	);

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts

@@ -19,6 +19,26 @@ function getListingName(record: {
 	return "Property";
 }
 
+function toFiniteNumber(value: unknown): number | null {
+	if (typeof value === "number" && Number.isFinite(value)) return value;
+	if (typeof value === "string" && value.trim() !== "") {
+		const n = Number(value);
+		return Number.isFinite(n) ? n : null;
+	}
+	return null;
+}
+
+function getCoordinatesFromRecord(record: {
+	fields?: Record<string, { value?: unknown }>;
+}): { lat: number; lng: number } | null {
+	const latRaw = record.fields?.["Property__r.Coordinates__Latitude__s"]?.value;
+	const lngRaw = record.fields?.["Property__r.Coordinates__Longitude__s"]?.value;
+	const lat = toFiniteNumber(latRaw);
+	const lng = toFiniteNumber(lngRaw);
+	if (lat == null || lng == null) return null;
+	return { lat, lng };
+}
+
 /** Round to 5 decimals (~1 m) so near-duplicate coords group together */
 function key(lat: number, lng: number): string {
 	return `${lat.toFixed(5)},${lng.toFixed(5)}`;
@@ -84,14 +104,39 @@ export function usePropertyMapMarkers(results: SearchResultRecord[]): {
 		let cancelled = false;
 		setLoading(true);
 		const uniqIds = [...new Set(propertyIds)];
-		fetchPropertyAddresses(uniqIds)
+		const directMarkers: MapMarker[] = [];
+		const missingIds: string[] = [];
+		for (const r of results) {
+			if (!r?.record) continue;
+			const id = getPropertyIdFromRecord(r.record);
+			if (!id || !uniqIds.includes(id)) continue;
+			const coords = getCoordinatesFromRecord(r.record);
+			if (coords) {
+				directMarkers.push({
+					lat: coords.lat,
+					lng: coords.lng,
+					label: propertyIdToLabel.get(id) ?? "Property",
+					propertyId: id,
+				});
+			}
+		}
+		for (const id of uniqIds) {
+			const hasDirect = directMarkers.some((m) => m.propertyId === id);
+			if (!hasDirect) missingIds.push(id);
+		}
+		if (missingIds.length === 0) {
+			setMarkers(spreadDuplicateMarkers(directMarkers));
+			setLoading(false);
+			return;
+		}
+		fetchPropertyAddresses(missingIds)
 			.then((idToAddress) => {
 				if (cancelled) return;
 				const toGeocode = Object.entries(idToAddress).filter(
 					([, addr]) => addr != null && addr.trim() !== "",
 				);
 				if (toGeocode.length === 0) {
-					setMarkers([]);
+					setMarkers(spreadDuplicateMarkers(directMarkers));
 					setLoading(false);
 					return;
 				}
@@ -111,7 +156,7 @@ export function usePropertyMapMarkers(results: SearchResultRecord[]): {
 				)
 					.then((resolved) => {
 						if (cancelled) return;
-						const raw: MapMarker[] = resolved
+						const geocoded: MapMarker[] = resolved
 							.filter((r): r is { id: string; coords: { lat: number; lng: number } } => r != null)
 							.map(({ id, coords }) => ({
 								lat: coords.lat,
@@ -119,7 +164,7 @@ export function usePropertyMapMarkers(results: SearchResultRecord[]): {
 								label: propertyIdToLabel.get(id) ?? "Property",
 								propertyId: id,
 							}));
-						setMarkers(spreadDuplicateMarkers(raw));
+						setMarkers(spreadDuplicateMarkers([...directMarkers, ...geocoded]));
 					})
 					.catch(() => {
 						if (!cancelled) setMarkers([]);

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertyDetails.tsx

@@ -5,6 +5,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 import PropertyMap from "@/components/properties/PropertyMap";
 import { usePropertyDetail } from "@/hooks/usePropertyDetail";
 import { useGeocode } from "@/hooks/useGeocode";
+import type { GeocodeResult } from "@/utils/geocode";
 
 function formatCurrency(val: number | string | null): string {
 	if (val == null) return "—";
@@ -108,7 +109,12 @@ export default function PropertyDetails() {
 	const { id } = useParams<{ id: string }>();
 	const { listing, property, images, costs, features, loading, error } = usePropertyDetail(id);
 	const addressForGeocode = property?.address?.replace(/\n/g, ", ") ?? null;
-	const { coords: addressCoords } = useGeocode(addressForGeocode);
+	// Always call hook in the same order; disable geocoding when coordinates already exist.
+	const { coords: geocodedCoords } = useGeocode(property?.coordinates ? null : addressForGeocode);
+	const addressCoords: GeocodeResult | null =
+		property?.coordinates?.lat != null && property?.coordinates?.lng != null
+			? { lat: property.coordinates.lat, lng: property.coordinates.lng }
+			: geocodedCoords;
 
 	if (loading) {
 		return <PropertyDetailsSkeleton />;

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/routes.tsx

@@ -3,6 +3,7 @@ import Home from '@/pages/Home';
 import NotFound from '@/pages/NotFound';
 import AccountSearch from "./features/object-search/__examples__/pages/AccountSearch";
 import AccountObjectDetail from "./features/object-search/__examples__/pages/AccountObjectDetailPage";
+import AuthAppLayout from "./features/authentication/layouts/AuthAppLayout";
 import Login from "./features/authentication/pages/Login";
 import Register from "./features/authentication/pages/Register";
 import ForgotPassword from "./features/authentication/pages/ForgotPassword";
@@ -12,7 +13,6 @@ import ChangePassword from "./features/authentication/pages/ChangePassword";
 import AuthenticationRoute from "./features/authentication/layouts/authenticationRouteLayout";
 import PrivateRoute from "./features/authentication/layouts/privateRouteLayout";
 import { ROUTES } from "./features/authentication/authenticationConfig";
-import AppLayout from "@/appLayout";
 import Dashboard from "@/pages/Dashboard";
 import Maintenance from "@/pages/Maintenance";
 import PropertySearch from "@/pages/PropertySearch";
@@ -23,7 +23,7 @@ import Contact from "@/pages/Contact";
 export const routes: RouteObject[] = [
   {
     path: "/",
-    element: <AppLayout />,
+    element: <AuthAppLayout />,
     children: [
       {
         index: true,

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.116.4",
+  "version": "1.116.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-      "version": "1.116.4",
+      "version": "1.116.6",
       "license": "SEE LICENSE IN LICENSE.txt",
       "devDependencies": {
         "@lwc/eslint-plugin-lwc": "^3.3.0",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.116.4",
+  "version": "1.116.6",
   "description": "Base SFDX project template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "publishConfig": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-app-react-sample-b2x-experimental",
-  "version": "1.116.4",
+  "version": "1.116.6",
   "description": "Salesforce sample property rental React app",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",