@salesforce/webapp-template-app-react-sample-b2x-experimental 1.116.9 → 1.116.10

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/api/query/tenantAccess.graphql

@@ -0,0 +1,13 @@
+query TenantAccess($userId: ID!) {
+	uiapi {
+		query {
+			Tenant__c(where: { User__c: { eq: $userId } }, first: 1) {
+				edges {
+					node {
+						Id
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,12 @@
+import TENANT_ACCESS_QUERY from "./query/tenantAccess.graphql?raw";
+import type { TenantAccessQuery, TenantAccessQueryVariables } from "./graphql-operations-types.js";
+import { executeGraphQL } from "@/api/graphqlClient.js";
+
+export async function hasTenantAccess(userId: string): Promise<boolean> {
+	if (!userId.trim()) return false;
+	const response = await executeGraphQL<TenantAccessQuery, TenantAccessQueryVariables>(
+		TENANT_ACCESS_QUERY,
+		{ userId },
+	);
+	return Boolean(response.uiapi?.query?.Tenant__c?.edges?.[0]?.node?.Id);
+}

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

@@ -1,6 +1,7 @@
 import { Link, useLocation } from "react-router";
 import { Home, Search, BarChart3, Wrench, Phone, type LucideIcon } from "lucide-react";
 import { useAuth } from "@/features/authentication/context/AuthContext";
+import { useTenantAccess } from "@/hooks/useTenantAccess";
 import { useMemo } from "react";
 
 interface NavItem {
@@ -25,11 +26,20 @@ interface NavMenuProps {
 
 export function NavMenu({ isOpen = false, onClose }: NavMenuProps) {
 	const location = useLocation();
-	const { isAuthenticated } = useAuth();
+	const { isAuthenticated, user } = useAuth();
+	const { hasTenantRecord } = useTenantAccess(user?.id);
 
 	const visibleItems = useMemo(
-		() => navItems.filter((item) => !item.authRequired || isAuthenticated),
-		[isAuthenticated],
+		() =>
+			navItems.filter((item) => {
+				if (!item.authRequired) return true;
+				if (!isAuthenticated) return false;
+				if (item.path === "/dashboard" || item.path === "/maintenance") {
+					return hasTenantRecord;
+				}
+				return true;
+			}),
+		[hasTenantRecord, isAuthenticated],
 	);
 
 	const isActive = (path: string) => {

package/dist/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layouts/TenantRoute.tsx

@@ -0,0 +1,22 @@
+import { Navigate, Outlet, useLocation } from "react-router";
+import { useAuth } from "@/features/authentication/context/AuthContext";
+import { ROUTES } from "@/features/authentication/authenticationConfig";
+import { useTenantAccess } from "@/hooks/useTenantAccess";
+
+export default function TenantRoute() {
+	const location = useLocation();
+	const { isAuthenticated, loading, user } = useAuth();
+	const { hasTenantRecord, loading: tenantLoading } = useTenantAccess(user?.id);
+
+	if (loading || tenantLoading) return null;
+
+	if (!isAuthenticated) {
+		return <Navigate to={ROUTES.LOGIN.PATH} state={{ from: location.pathname }} replace />;
+	}
+
+	if (!hasTenantRecord) {
+		return <Navigate to="/" replace />;
+	}
+
+	return <Outlet />;
+}

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

@@ -0,0 +1,38 @@
+import { useEffect, useState } from "react";
+import { hasTenantAccess } from "@/api/tenantApi";
+
+export function useTenantAccess(userId: string | undefined): {
+	hasTenantRecord: boolean;
+	loading: boolean;
+} {
+	const [hasTenantRecord, setHasTenantRecord] = useState(false);
+	const [loading, setLoading] = useState(false);
+
+	useEffect(() => {
+		const id = userId?.trim() ?? "";
+		if (!id) {
+			setHasTenantRecord(false);
+			setLoading(false);
+			return;
+		}
+
+		let cancelled = false;
+		setLoading(true);
+		hasTenantAccess(id)
+			.then((allowed) => {
+				if (!cancelled) setHasTenantRecord(allowed);
+			})
+			.catch(() => {
+				if (!cancelled) setHasTenantRecord(false);
+			})
+			.finally(() => {
+				if (!cancelled) setLoading(false);
+			});
+
+		return () => {
+			cancelled = true;
+		};
+	}, [userId]);
+
+	return { hasTenantRecord, loading };
+}

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

@@ -31,21 +31,21 @@ import type { FilterFieldConfig } from "@/features/object-search/utils/filterUti
 import type { SortFieldConfig } from "@/features/object-search/utils/sortUtils";
 
 const TYPE_OPTIONS = [
-	"Plumbing",
-	"Electrical",
-	"HVAC",
-	"Appliance",
-	"Structural",
-	"Cleaning",
-	"Security",
-	"Pest",
-	"Other",
+	{ value: "Plumbing", label: "Plumbing" },
+	{ value: "Electrical", label: "Electrical" },
+	{ value: "HVAC", label: "HVAC" },
+	{ value: "Appliance", label: "Appliance" },
+	{ value: "Carpentry", label: "Carpentry" },
+	{ value: "Landscaping", label: "Landscaping" },
+	{ value: "Cleaning", label: "Cleaning" },
+	{ value: "Pest", label: "Pest Control" },
+	{ value: "Other", label: "Other" },
 ] as const;
 
 const PRIORITY_OPTIONS = [
 	{ value: "Standard", label: "Standard" },
-	{ value: "High", label: "High (Same Day)" },
-	{ value: "Emergency", label: "Emergency (2hr)" },
+	{ value: "High (Same Day)", label: "High (Same Day)" },
+	{ value: "Emergency (2hr)", label: "Emergency (2hr)" },
 ] as const;
 
 const FILTER_CONFIGS: FilterFieldConfig[] = [];
@@ -253,8 +253,8 @@ export default function Maintenance() {
 								>
 									<option value="">—</option>
 									{TYPE_OPTIONS.map((o) => (
-										<option key={o} value={o}>
-											{o}
+										<option key={o.value} value={o.value}>
+											{o.label}
 										</option>
 									))}
 								</select>

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

@@ -19,6 +19,7 @@ import PropertySearch from "@/pages/PropertySearch";
 import PropertyDetails from "@/pages/PropertyDetails";
 import Application from "@/pages/Application";
 import Contact from "@/pages/Contact";
+import TenantRoute from "./features/authentication/layouts/TenantRoute";
 
 export const routes: RouteObject[] = [
   {
@@ -102,6 +103,15 @@ export const routes: RouteObject[] = [
       },
       {
         element: <PrivateRoute />,
+        children: [
+          {
+            path: "application",
+            element: <Application />
+          }
+        ]
+      },
+      {
+        element: <TenantRoute />,
         children: [
           {
             path: "dashboard",
@@ -112,10 +122,6 @@ export const routes: RouteObject[] = [
             path: "maintenance",
             element: <Maintenance />,
             handle: { showInNavigation: true, label: "Maintenance" }
-          },
-          {
-            path: "application",
-            element: <Application />
           }
         ]
       }

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.116.9",
+  "version": "1.116.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-      "version": "1.116.9",
+      "version": "1.116.10",
       "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.9",
+  "version": "1.116.10",
   "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.9",
+  "version": "1.116.10",
   "description": "Salesforce sample property rental React app",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",