@salesforce/webapp-template-app-react-sample-b2e-experimental 1.80.1 → 1.82.0

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/lib/listPageConfig.ts

@@ -6,19 +6,19 @@ import {
 	MAINTENANCE_OBJECT_API_NAME,
 	MAINTENANCE_WORKER_OBJECT_API_NAME,
 	APPLICATION_OBJECT_API_NAME,
-} from "./globalSearchConstants.js";
-import { getMaintenanceColumns } from "./maintenanceColumns.js";
-import { getMaintenanceWorkerColumns } from "./maintenanceWorkerColumns.js";
-import { getApplicationListColumns } from "./applicationColumns.js";
+} from "./globalSearchConstants";
+import { getMaintenanceColumns } from "./maintenanceColumns";
+import { getMaintenanceWorkerColumns } from "./maintenanceWorkerColumns";
+import { getApplicationListColumns } from "./applicationColumns";
 import {
 	MAINTENANCE_FILTER_EXCLUDED_FIELD_PATHS,
 	MAINTENANCE_WORKER_FILTER_EXCLUDED_FIELD_PATHS,
 	APPLICATION_FILTER_EXCLUDED_FIELD_PATHS,
-} from "./constants.js";
-import { nodeToMaintenanceRequest } from "./maintenanceAdapter.js";
-import { nodeToMaintenanceWorker } from "./maintenanceWorkerAdapter.js";
-import { nodeToApplication } from "./applicationAdapter.js";
-import type { MaintenanceRequest, MaintenanceWorker, Application } from "./types.js";
+} from "./constants";
+import { nodeToMaintenanceRequest } from "./maintenanceAdapter";
+import { nodeToMaintenanceWorker } from "./maintenanceWorkerAdapter";
+import { nodeToApplication } from "./applicationAdapter";
+import type { MaintenanceRequest, MaintenanceWorker, Application } from "./types";
 
 export interface ListPageConfig<T> {
 	objectApiName: string;

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/lib/maintenanceAdapter.ts

@@ -1,7 +1,7 @@
 /**
  * Adapter: maps Maintenance_Request__c GraphQL node to app MaintenanceRequest type.
  */
-import type { MaintenanceRequest } from "./types.js";
+import type { MaintenanceRequest } from "./types";
 
 interface MaintenanceNode {
 	Id?: string;
@@ -16,7 +16,10 @@ interface MaintenanceNode {
 		Name?: { value?: string };
 	};
 	User__r?: { Name?: { value?: string }; DisplayValue?: { value?: string } };
-	Owner?: { Name?: { value?: string } };
+	Assigned_Worker__r?: {
+		Name?: { value?: string };
+		Employment_Type__c?: { value?: string };
+	};
 	ContentDocumentLinks?: {
 		edges?: Array<{
 			node?: {
@@ -68,7 +71,8 @@ export function nodeToMaintenanceRequest(
 		: undefined;
 
 	const tenantUnit = n.Property__r?.Name?.value ?? n.Property__r?.Address__c?.value;
-	const assignedWorkerName = n.Owner?.Name?.value ?? n.User__r?.Name?.value;
+	const assignedWorkerName = n.Assigned_Worker__r?.Name?.value;
+	const assignedWorkerOrg = n.Assigned_Worker__r?.Employment_Type__c?.value;
 
 	return {
 		id: n.Id ?? "",
@@ -83,7 +87,7 @@ export function nodeToMaintenanceRequest(
 		imageUrl,
 		tenantUnit,
 		assignedWorkerName: assignedWorkerName ?? undefined,
-		assignedWorkerOrg: undefined,
+		assignedWorkerOrg: assignedWorkerOrg ?? undefined,
 		formattedDate,
 	};
 }

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/lib/maintenanceColumns.ts

@@ -13,6 +13,18 @@ export const MAINTENANCE_EXTRA_COLUMNS: Column[] = [
 	},
 	{ fieldApiName: "Property__r.Name", label: "Property Name", searchable: false, sortable: false },
 	{ fieldApiName: "User__r.Name", label: "User Name", searchable: false, sortable: false },
+	{
+		fieldApiName: "Assigned_Worker__r.Name",
+		label: "Assigned Worker Name",
+		searchable: false,
+		sortable: false,
+	},
+	{
+		fieldApiName: "Assigned_Worker__r.Employment_Type__c",
+		label: "Worker Employment Type",
+		searchable: false,
+		sortable: false,
+	},
 	{ fieldApiName: "OwnerId", label: "Owner Id", searchable: false, sortable: false },
 	{ fieldApiName: "Owner", label: "Owner", searchable: false, sortable: false },
 ];

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/lib/maintenanceWorkerAdapter.ts

@@ -1,7 +1,7 @@
 /**
  * Adapter: maps Maintenance_Worker__c GraphQL node to app MaintenanceWorker type.
  */
-import type { MaintenanceWorker } from "./types.js";
+import type { MaintenanceWorker } from "./types";
 
 interface MaintenanceWorkerNode {
 	Id?: string;

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/lib/propertyAdapter.ts

@@ -1,7 +1,7 @@
 /**
  * Adapter: maps Property__c GraphQL node (from feature-global-search) to app Property type.
  */
-import type { Property } from "./types.js";
+import type { Property } from "./types";
 
 interface PropertyNode {
 	Id?: string;

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/pages/Applications.tsx

@@ -1,12 +1,12 @@
 import { useEffect, useState } from "react";
-import { useListPage } from "../hooks/useListPage.js";
-import { applicationsListConfig } from "../lib/listPageConfig.js";
-import { ListPageWithFilters } from "../components/list/ListPageWithFilters.js";
-import { PageHeader } from "../components/layout/PageHeader.js";
-import { ApplicationsTable } from "../components/ApplicationsTable.js";
-import { ApplicationDetailsModal } from "../components/ApplicationDetailsModal.js";
-import { updateApplicationStatus } from "../api/applications.js";
-import type { Application } from "../lib/types.js";
+import { useListPage } from "../hooks/useListPage";
+import { applicationsListConfig } from "../lib/listPageConfig";
+import { ListPageWithFilters } from "../components/list/ListPageWithFilters";
+import { PageHeader } from "../components/layout/PageHeader";
+import { ApplicationsTable } from "../components/ApplicationsTable";
+import { ApplicationDetailsModal } from "../components/ApplicationDetailsModal";
+import { updateApplicationStatus } from "../api/applications";
+import type { Application } from "../lib/types";
 
 export default function Applications() {
 	const list = useListPage(applicationsListConfig);

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/pages/Home.tsx

@@ -3,28 +3,27 @@ import { useNavigate } from "react-router";
 import { useRecordListGraphQL } from "../features/global-search/hooks/useRecordListGraphQL";
 import { useObjectInfoBatch } from "../features/global-search/hooks/useObjectInfoBatch";
 import { useObjectListMetadata } from "../features/global-search/hooks/useObjectSearchData";
-import { IssuesDonutChart } from "../components/IssuesDonutChart.js";
-import { MaintenanceTable } from "../components/MaintenanceTable.js";
-import { GlobalSearchBar } from "../components/dashboard/GlobalSearchBar.js";
-import { StatCard } from "../components/StatCard.js";
-import { PageContainer } from "../components/layout/PageContainer.js";
-import { PageLoadingState } from "../components/feedback/PageLoadingState.js";
-import { getDashboardMetrics, calculateMetrics } from "../api/dashboard.js";
-import type { DashboardMetrics, MaintenanceRequest } from "../lib/types.js";
+import { IssuesDonutChart } from "../components/IssuesDonutChart";
+import { MaintenanceTable } from "../components/MaintenanceTable";
+import { GlobalSearchBar } from "../components/dashboard/GlobalSearchBar";
+import { StatCard } from "../components/StatCard";
+import { PageContainer } from "../components/layout/PageContainer";
+import { PageLoadingState } from "../components/feedback/PageLoadingState";
+import { getDashboardMetrics, calculateMetrics } from "../api/dashboard";
+import type { DashboardMetrics, MaintenanceRequest } from "../lib/types";
 import {
 	GLOBAL_SEARCH_OBJECT_API_NAME,
 	SEARCHABLE_OBJECTS,
 	MAINTENANCE_OBJECT_API_NAME,
 	type SearchableObjectConfig,
-} from "../lib/globalSearchConstants.js";
-import { getMaintenanceColumns } from "../lib/maintenanceColumns.js";
-import { nodeToMaintenanceRequest } from "../lib/maintenanceAdapter.js";
-import { DASHBOARD_MAINTENANCE_LIMIT } from "../lib/constants.js";
-import { PATHS } from "../lib/routeConfig.js";
+} from "../lib/globalSearchConstants";
+import { getMaintenanceColumns } from "../lib/maintenanceColumns";
+import { nodeToMaintenanceRequest } from "../lib/maintenanceAdapter";
+import { DASHBOARD_MAINTENANCE_LIMIT } from "../lib/constants";
+import { PATHS } from "../lib/routeConfig";
 
-const CHART_ISSUE_TYPES = ["Plumbing", "HVAC", "Electrical"] as const;
-const CHART_OTHER_LABEL = "Other";
-const CHART_COLORS = ["#7C3AED", "#EC4899", "#14B8A6", "#06B6D4"] as const;
+const CHART_ISSUE_TYPES = ["Plumbing", "HVAC", "Electrical", "Appliance", "Pest"] as const;
+const CHART_COLORS = ["#7C3AED", "#EC4899", "#14B8A6", "#06B6D4", "#F59E0B"] as const;
 
 export default function Home() {
 	const navigate = useNavigate();
@@ -118,21 +117,21 @@ export default function Home() {
 			Plumbing: 0,
 			HVAC: 0,
 			Electrical: 0,
-			[CHART_OTHER_LABEL]: 0,
+			Appliance: 0,
+			Pest: 0,
 		};
 		maintenanceRequests.forEach((request) => {
 			const type = request.issueType;
 			if (CHART_ISSUE_TYPES.includes(type as (typeof CHART_ISSUE_TYPES)[number])) {
 				counts[type]++;
-			} else {
-				counts[CHART_OTHER_LABEL]++;
 			}
 		});
 		return [
 			{ name: "Plumbing", value: counts.Plumbing, color: CHART_COLORS[0] },
 			{ name: "HVAC", value: counts.HVAC, color: CHART_COLORS[1] },
 			{ name: "Electrical", value: counts.Electrical, color: CHART_COLORS[2] },
-			{ name: CHART_OTHER_LABEL, value: counts[CHART_OTHER_LABEL], color: CHART_COLORS[3] },
+			{ name: "Appliance", value: counts.Appliance, color: CHART_COLORS[3] },
+			{ name: "Pest Control", value: counts.Pest, color: CHART_COLORS[4] },
 		];
 	}, [maintenanceRequests]);
 

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

@@ -1,14 +1,14 @@
 import { useEffect, useState } from "react";
 import { ChevronDown } from "lucide-react";
-import { useListPage } from "../hooks/useListPage.js";
-import { maintenanceRequestsListConfig } from "../lib/listPageConfig.js";
-import { ListPageWithFilters } from "../components/list/ListPageWithFilters.js";
-import { PageHeader } from "../components/layout/PageHeader.js";
-import { UserAvatar } from "../components/UserAvatar.js";
-import { StatusBadge } from "../components/StatusBadge.js";
-import { MaintenanceDetailsModal } from "../components/MaintenanceDetailsModal.js";
-import { updateMaintenanceStatus } from "../api/maintenance.js";
-import type { MaintenanceRequest } from "../lib/types.js";
+import { useListPage } from "../hooks/useListPage";
+import { maintenanceRequestsListConfig } from "../lib/listPageConfig";
+import { ListPageWithFilters } from "../components/list/ListPageWithFilters";
+import { PageHeader } from "../components/layout/PageHeader";
+import { UserAvatar } from "../components/UserAvatar";
+import { StatusBadge } from "../components/StatusBadge";
+import { MaintenanceDetailsModal } from "../components/MaintenanceDetailsModal";
+import { updateMaintenanceStatus } from "../api/maintenance";
+import type { MaintenanceRequest } from "../lib/types";
 import PlumbingIcon from "../assets/icons/plumbing.svg";
 import HVACIcon from "../assets/icons/hvac.svg";
 import ElectricalIcon from "../assets/icons/electrical.svg";

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/pages/MaintenanceWorkers.tsx

@@ -1,13 +1,54 @@
-import { useState } from "react";
-import { useListPage } from "../hooks/useListPage.js";
-import { maintenanceWorkersListConfig } from "../lib/listPageConfig.js";
-import { ListPageWithFilters } from "../components/list/ListPageWithFilters.js";
-import { PageHeader } from "../components/layout/PageHeader.js";
-import type { MaintenanceWorker } from "../lib/types.js";
+import { useState, useEffect, useMemo } from "react";
+import { useListPage } from "../hooks/useListPage";
+import { maintenanceWorkersListConfig } from "../lib/listPageConfig";
+import { ListPageWithFilters } from "../components/list/ListPageWithFilters";
+import { PageHeader } from "../components/layout/PageHeader";
+import { getAllMaintenanceRequests } from "../api/maintenance";
+import type { MaintenanceWorker } from "../lib/types";
 
 export default function MaintenanceWorkers() {
 	const list = useListPage(maintenanceWorkersListConfig);
 	const [selectedWorker, setSelectedWorker] = useState<MaintenanceWorker | null>(null);
+	const [requestCountsLoading, setRequestCountsLoading] = useState(true);
+	const [requestCounts, setRequestCounts] = useState<Record<string, number>>({});
+
+	// Fetch maintenance requests to calculate active request counts per worker
+	useEffect(() => {
+		let mounted = true;
+		async function fetchRequestCounts() {
+			try {
+				setRequestCountsLoading(true);
+				const requests = await getAllMaintenanceRequests(500);
+				if (!mounted) return;
+
+				// Count active requests (not "Resolved") per worker
+				const counts: Record<string, number> = {};
+				for (const req of requests) {
+					if (req.status !== "Resolved" && req.assignedWorkerName) {
+						const workerName = req.assignedWorkerName;
+						counts[workerName] = (counts[workerName] || 0) + 1;
+					}
+				}
+				setRequestCounts(counts);
+			} catch (error) {
+				console.error("Error fetching request counts:", error);
+			} finally {
+				if (mounted) setRequestCountsLoading(false);
+			}
+		}
+		fetchRequestCounts();
+		return () => {
+			mounted = false;
+		};
+	}, []);
+
+	// Enrich workers with active request counts
+	const enrichedWorkers = useMemo(() => {
+		return list.items.map((worker) => ({
+			...worker,
+			activeRequestsCount: requestCounts[worker.name] || 0,
+		}));
+	}, [list.items, requestCounts]);
 
 	return (
 		<>
@@ -24,10 +65,10 @@ export default function MaintenanceWorkers() {
 					ariaLabel: maintenanceWorkersListConfig.filtersAriaLabel,
 				}}
 				filterError={list.filterError}
-				loading={list.loading}
+				loading={list.loading || requestCountsLoading}
 				error={list.error}
 				loadingMessage={maintenanceWorkersListConfig.loadingMessage}
-				isEmpty={list.items.length === 0}
+				isEmpty={enrichedWorkers.length === 0}
 				searchPlaceholder="Search by name, organization, status..."
 				searchAriaLabel="Search workers"
 			>
@@ -55,10 +96,10 @@ export default function MaintenanceWorkers() {
 						</div>
 					</div>
 					<div className="divide-y divide-gray-200">
-						{list.items.length === 0 ? (
+						{enrichedWorkers.length === 0 ? (
 							<div className="text-center py-12 text-gray-500">No maintenance workers found</div>
 						) : (
-							list.items.map((worker) => (
+							enrichedWorkers.map((worker) => (
 								<div
 									key={worker.id}
 									onClick={() => setSelectedWorker(worker)}

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/pages/Properties.tsx

@@ -4,25 +4,25 @@ import { type FilterCriteria } from "../features/global-search/types/filters/fil
 import { useObjectListMetadata } from "../features/global-search/hooks/useObjectSearchData";
 import { useRecordListGraphQL } from "../features/global-search/hooks/useRecordListGraphQL";
 
-import type { Property } from "../lib/types.js";
-import { PropertyCard } from "../components/PropertyCard.js";
-import { PropertyDetailsModal } from "../components/PropertyDetailsModal.js";
-import { PageContainer } from "../components/layout/PageContainer.js";
-import { PageHeader } from "../components/layout/PageHeader.js";
-import { PageLoadingState } from "../components/feedback/PageLoadingState.js";
-import { PageErrorState } from "../components/feedback/PageErrorState.js";
-import { FilterErrorAlert } from "../components/feedback/FilterErrorAlert.js";
-import { ListPageFilterRow } from "../components/filters/ListPageFilterRow.js";
-import { GLOBAL_SEARCH_OBJECT_API_NAME } from "../lib/globalSearchConstants.js";
-import { nodeToProperty } from "../lib/propertyAdapter.js";
-import { getPropertyListColumns } from "../lib/propertyColumns.js";
+import type { Property } from "../lib/types";
+import { PropertyCard } from "../components/PropertyCard";
+import { PropertyDetailsModal } from "../components/PropertyDetailsModal";
+import { PageContainer } from "../components/layout/PageContainer";
+import { PageHeader } from "../components/layout/PageHeader";
+import { PageLoadingState } from "../components/feedback/PageLoadingState";
+import { PageErrorState } from "../components/feedback/PageErrorState";
+import { FilterErrorAlert } from "../components/feedback/FilterErrorAlert";
+import { ListPageFilterRow } from "../components/filters/ListPageFilterRow";
+import { GLOBAL_SEARCH_OBJECT_API_NAME } from "../lib/globalSearchConstants";
+import { nodeToProperty } from "../lib/propertyAdapter";
+import { getPropertyListColumns } from "../lib/propertyColumns";
 import {
 	buildFilterCriteriaFromFormValues,
 	getDefaultFilterFormValues,
 	getApplicableFilters,
-} from "../lib/filterUtils.js";
-import { PAGE_SIZE_LIST, PROPERTY_FILTER_EXCLUDED_FIELD_PATHS } from "../lib/constants.js";
-import { useAccumulatedListPages } from "../hooks/useAccumulatedListPages.js";
+} from "../lib/filterUtils";
+import { PAGE_SIZE_LIST, PROPERTY_FILTER_EXCLUDED_FIELD_PATHS } from "../lib/constants";
+import { useAccumulatedListPages } from "../hooks/useAccumulatedListPages";
 
 const PROPERTIES_DEFAULT_SORT = "CreatedDate DESC";
 

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

@@ -12,7 +12,7 @@ import Maintenance from "./pages/Maintenance";
 import MaintenanceWorkers from "./pages/MaintenanceWorkers";
 import Properties from "./pages/Properties";
 import Applications from "./pages/Applications";
-import { PATHS } from "./lib/routeConfig.js";
+import { PATHS } from "./lib/routeConfig";
 
 export const routes: RouteObject[] = [
   {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.80.1",
+  "version": "1.82.0",
   "description": "Base SFDX project template",
   "private": true,
   "files": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-app-react-sample-b2e-experimental",
-  "version": "1.80.1",
+  "version": "1.82.0",
   "description": "B2E starter app template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",
@@ -16,8 +16,8 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@salesforce/webapp-experimental": "^1.80.1",
-    "@salesforce/webapp-template-feature-react-global-search-experimental": "^1.80.1"
+    "@salesforce/webapp-experimental": "^1.82.0",
+    "@salesforce/webapp-template-feature-react-global-search-experimental": "^1.82.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",