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

package/dist/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.81.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.80.1...v1.81.0) (2026-03-09)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 ## [1.80.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.80.0...v1.80.1) (2026-03-09)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental

package/dist/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls

@@ -0,0 +1,66 @@
+public with sharing class MaintenanceRequestTriggerHandler {
+
+    /**
+     * Handles before insert logic for Maintenance Request records
+     * Automatically assigns workers based on request type and updates status to Assigned
+     */
+    public static void handleBeforeInsert(List<Maintenance_Request__c> newRequests) {
+        // Map to store request type to worker type mappings
+        Map<String, String> requestTypeToWorkerType = new Map<String, String>{
+            'Plumbing' => 'Plumbing',
+            'Electrical' => 'Electrical',
+            'HVAC' => 'HVAC (Heating & Cooling)',
+            'Appliance' => 'Appliance Repair',
+            'Pest' => 'Pest Control'
+        };
+
+        // Collect unique worker types needed
+        Set<String> workerTypesNeeded = new Set<String>();
+        for (Maintenance_Request__c request : newRequests) {
+            if (request.Type__c != null && requestTypeToWorkerType.containsKey(request.Type__c)) {
+                workerTypesNeeded.add(requestTypeToWorkerType.get(request.Type__c));
+            }
+        }
+
+        // Query for available workers by type
+        Map<String, List<Maintenance_Worker__c>> workersByType = new Map<String, List<Maintenance_Worker__c>>();
+        if (!workerTypesNeeded.isEmpty()) {
+            for (Maintenance_Worker__c worker : [
+                SELECT Id, Name, Type__c, Rating__c
+                FROM Maintenance_Worker__c
+                WHERE Type__c IN :workerTypesNeeded
+                AND IsActive__c = true
+                ORDER BY Rating__c DESC NULLS LAST, Name ASC
+            ]) {
+                if (!workersByType.containsKey(worker.Type__c)) {
+                    workersByType.put(worker.Type__c, new List<Maintenance_Worker__c>());
+                }
+                workersByType.get(worker.Type__c).add(worker);
+            }
+        }
+
+        // Assign workers to requests
+        for (Maintenance_Request__c request : newRequests) {
+            // Only process requests with 'New' status (or null, since 'New' is the default)
+            if ((request.Status__c == 'New' || request.Status__c == null) &&
+                request.Type__c != null && requestTypeToWorkerType.containsKey(request.Type__c)) {
+                String workerType = requestTypeToWorkerType.get(request.Type__c);
+
+                // Check if we have available workers for this type
+                if (workersByType.containsKey(workerType) && !workersByType.get(workerType).isEmpty()) {
+                    // Assign the first available worker (highest rated)
+                    Maintenance_Worker__c assignedWorker = workersByType.get(workerType).get(0);
+                    request.Assigned_Worker__c = assignedWorker.Id;
+                    request.Status__c = 'Assigned';
+
+                    // Set scheduled date to 3 days from now
+                    request.Scheduled__c = DateTime.now().addDays(3);
+
+                    // Rotate worker to end of list for round-robin assignment
+                    workersByType.get(workerType).remove(0);
+                    workersByType.get(workerType).add(assignedWorker);
+                }
+            }
+        }
+    }
+}

package/dist/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>65.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

package/dist/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls

@@ -0,0 +1,308 @@
+/**
+ * Test class for MaintenanceRequestTriggerHandler
+ * Validates automatic worker assignment, status updates to Assigned, and scheduled date setting
+ */
+@isTest
+private class MaintenanceRequestTriggerHandler_Test {
+
+    /**
+     * Setup test data for all test methods
+     */
+    @testSetup
+    static void setupTestData() {
+        // Create test maintenance workers with different specialties
+        List<Maintenance_Worker__c> workers = new List<Maintenance_Worker__c>{
+            new Maintenance_Worker__c(
+                Name = 'John Plumber',
+                Type__c = 'Plumbing',
+                IsActive__c = true,
+                Rating__c = 4.5,
+                Phone__c = '555-0001'
+            ),
+            new Maintenance_Worker__c(
+                Name = 'Jane Electrician',
+                Type__c = 'Electrical',
+                IsActive__c = true,
+                Rating__c = 4.8,
+                Phone__c = '555-0002'
+            ),
+            new Maintenance_Worker__c(
+                Name = 'Bob HVAC',
+                Type__c = 'HVAC (Heating & Cooling)',
+                IsActive__c = true,
+                Rating__c = 4.2,
+                Phone__c = '555-0003'
+            ),
+            new Maintenance_Worker__c(
+                Name = 'Alice Appliance',
+                Type__c = 'Appliance Repair',
+                IsActive__c = true,
+                Rating__c = 4.7,
+                Phone__c = '555-0004'
+            ),
+            new Maintenance_Worker__c(
+                Name = 'Charlie Pest',
+                Type__c = 'Pest Control',
+                IsActive__c = true,
+                Rating__c = 4.3,
+                Phone__c = '555-0005'
+            ),
+            new Maintenance_Worker__c(
+                Name = 'Inactive Worker',
+                Type__c = 'Plumbing',
+                IsActive__c = false,
+                Rating__c = 5.0,
+                Phone__c = '555-0006'
+            )
+        };
+        insert workers;
+    }
+
+    /**
+     * Test that plumbing requests are assigned to plumbing workers
+     */
+    @isTest
+    static void testPlumbingRequestAssignment() {
+        // Query for plumbing worker
+        Maintenance_Worker__c plumber = [SELECT Id FROM Maintenance_Worker__c WHERE Type__c = 'Plumbing' AND IsActive__c = true LIMIT 1];
+
+        Test.startTest();
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Type__c = 'Plumbing',
+            Description__c = 'Leaky faucet in bathroom',
+            Priority__c = 'Standard'
+        );
+        insert request;
+        Test.stopTest();
+
+        // Verify assignment
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c, Scheduled__c, Type__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(plumber.Id, insertedRequest.Assigned_Worker__c, 'Worker should be assigned');
+        System.assertEquals('Assigned', insertedRequest.Status__c, 'Status should be Assigned');
+        System.assertNotEquals(null, insertedRequest.Scheduled__c, 'Scheduled date should be set');
+
+        // Verify scheduled date is approximately 3 days from now (within 1 minute tolerance)
+        DateTime expectedDate = DateTime.now().addDays(3);
+        Long timeDiff = Math.abs(insertedRequest.Scheduled__c.getTime() - expectedDate.getTime());
+        System.assert(timeDiff < 60000, 'Scheduled date should be 3 days from now');
+    }
+
+    /**
+     * Test that electrical requests are assigned to electrical workers
+     */
+    @isTest
+    static void testElectricalRequestAssignment() {
+        Maintenance_Worker__c electrician = [SELECT Id FROM Maintenance_Worker__c WHERE Type__c = 'Electrical' AND IsActive__c = true LIMIT 1];
+
+        Test.startTest();
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Type__c = 'Electrical',
+            Description__c = 'Outlet not working',
+            Priority__c = 'High (Same Day)'
+        );
+        insert request;
+        Test.stopTest();
+
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(electrician.Id, insertedRequest.Assigned_Worker__c, 'Electrician should be assigned');
+        System.assertEquals('Assigned', insertedRequest.Status__c, 'Status should be Assigned');
+    }
+
+    /**
+     * Test that HVAC requests are assigned to HVAC workers
+     */
+    @isTest
+    static void testHVACRequestAssignment() {
+        Maintenance_Worker__c hvacWorker = [SELECT Id FROM Maintenance_Worker__c WHERE Type__c = 'HVAC (Heating & Cooling)' AND IsActive__c = true LIMIT 1];
+
+        Test.startTest();
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Type__c = 'HVAC',
+            Description__c = 'AC not cooling',
+            Priority__c = 'High (Same Day)'
+        );
+        insert request;
+        Test.stopTest();
+
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(hvacWorker.Id, insertedRequest.Assigned_Worker__c, 'HVAC worker should be assigned');
+        System.assertEquals('Assigned', insertedRequest.Status__c, 'Status should be Assigned');
+    }
+
+    /**
+     * Test that appliance requests are assigned to appliance repair workers
+     */
+    @isTest
+    static void testApplianceRequestAssignment() {
+        Maintenance_Worker__c applianceWorker = [SELECT Id FROM Maintenance_Worker__c WHERE Type__c = 'Appliance Repair' AND IsActive__c = true LIMIT 1];
+
+        Test.startTest();
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Type__c = 'Appliance',
+            Description__c = 'Dishwasher not draining',
+            Priority__c = 'Standard'
+        );
+        insert request;
+        Test.stopTest();
+
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(applianceWorker.Id, insertedRequest.Assigned_Worker__c, 'Appliance worker should be assigned');
+        System.assertEquals('Assigned', insertedRequest.Status__c, 'Status should be Assigned');
+    }
+
+    /**
+     * Test that pest requests are assigned to pest control workers
+     */
+    @isTest
+    static void testPestRequestAssignment() {
+        Maintenance_Worker__c pestWorker = [SELECT Id FROM Maintenance_Worker__c WHERE Type__c = 'Pest Control' AND IsActive__c = true LIMIT 1];
+
+        Test.startTest();
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Type__c = 'Pest',
+            Description__c = 'Ants in kitchen',
+            Priority__c = 'Standard'
+        );
+        insert request;
+        Test.stopTest();
+
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(pestWorker.Id, insertedRequest.Assigned_Worker__c, 'Pest control worker should be assigned');
+        System.assertEquals('Assigned', insertedRequest.Status__c, 'Status should be Assigned');
+    }
+
+    /**
+     * Test bulk insert with multiple request types
+     */
+    @isTest
+    static void testBulkRequestAssignment() {
+        Test.startTest();
+        List<Maintenance_Request__c> requests = new List<Maintenance_Request__c>{
+            new Maintenance_Request__c(Type__c = 'Plumbing', Description__c = 'Leak 1', Priority__c = 'High (Same Day)'),
+            new Maintenance_Request__c(Type__c = 'Electrical', Description__c = 'Issue 1', Priority__c = 'Standard'),
+            new Maintenance_Request__c(Type__c = 'Plumbing', Description__c = 'Leak 2', Priority__c = 'Standard'),
+            new Maintenance_Request__c(Type__c = 'HVAC', Description__c = 'AC Issue', Priority__c = 'High (Same Day)'),
+            new Maintenance_Request__c(Type__c = 'Appliance', Description__c = 'Fridge Issue', Priority__c = 'Standard')
+        };
+        insert requests;
+        Test.stopTest();
+
+        List<Maintenance_Request__c> insertedRequests = [
+            SELECT Id, Assigned_Worker__c, Status__c, Type__c
+            FROM Maintenance_Request__c
+            WHERE Id IN :requests
+        ];
+
+        // Verify all requests were assigned
+        for (Maintenance_Request__c req : insertedRequests) {
+            System.assertNotEquals(null, req.Assigned_Worker__c, 'All requests should have assigned workers');
+            System.assertEquals('Assigned', req.Status__c, 'All requests should be Assigned');
+        }
+
+        System.assertEquals(5, insertedRequests.size(), 'All 5 requests should be inserted');
+    }
+
+    /**
+     * Test that requests without type are not assigned
+     */
+    @isTest
+    static void testRequestWithoutType() {
+        Test.startTest();
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Description__c = 'General maintenance',
+            Priority__c = 'Standard'
+        );
+        insert request;
+        Test.stopTest();
+
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(null, insertedRequest.Assigned_Worker__c, 'Worker should not be assigned without type');
+    }
+
+    /**
+     * Test that inactive workers are not assigned
+     */
+    @isTest
+    static void testInactiveWorkerNotAssigned() {
+        // Delete all active plumbing workers
+        delete [SELECT Id FROM Maintenance_Worker__c WHERE Type__c = 'Plumbing' AND IsActive__c = true];
+
+        Test.startTest();
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Type__c = 'Plumbing',
+            Description__c = 'Emergency leak',
+            Priority__c = 'High (Same Day)'
+        );
+        insert request;
+        Test.stopTest();
+
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(null, insertedRequest.Assigned_Worker__c, 'Inactive worker should not be assigned');
+    }
+
+    /**
+     * Test that requests with non-New status are not automatically processed
+     */
+    @isTest
+    static void testNonNewStatusNotProcessed() {
+        // Query for plumbing worker
+        Maintenance_Worker__c plumber = [SELECT Id FROM Maintenance_Worker__c WHERE Type__c = 'Plumbing' AND IsActive__c = true LIMIT 1];
+
+        Test.startTest();
+        // Create a request with status explicitly set to 'In Progress'
+        Maintenance_Request__c request = new Maintenance_Request__c(
+            Type__c = 'Plumbing',
+            Description__c = 'Manually assigned request',
+            Priority__c = 'Standard',
+            Status__c = 'In Progress'
+        );
+        insert request;
+        Test.stopTest();
+
+        // Verify the request was not processed by trigger (no worker assigned)
+        Maintenance_Request__c insertedRequest = [
+            SELECT Id, Assigned_Worker__c, Status__c, Scheduled__c
+            FROM Maintenance_Request__c
+            WHERE Id = :request.Id
+        ];
+
+        System.assertEquals(null, insertedRequest.Assigned_Worker__c, 'Worker should not be auto-assigned for non-New status');
+        System.assertEquals('In Progress', insertedRequest.Status__c, 'Status should remain as originally set');
+        System.assertEquals(null, insertedRequest.Scheduled__c, 'Scheduled date should not be set by trigger');
+    }
+}

package/dist/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>65.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

package/dist/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml

@@ -27,6 +27,11 @@
                 <default>false</default>
                 <label>Background Check</label>
             </value>
+            <value>
+                <fullName>Under Review</fullName>
+                <default>false</default>
+                <label>Under Review</label>
+            </value>
             <value>
                 <fullName>Approved</fullName>
                 <default>false</default>

package/dist/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Assigned_Worker__c</fullName>
+    <deleteConstraint>SetNull</deleteConstraint>
+    <description>The maintenance worker assigned to handle this request</description>
+    <externalId>false</externalId>
+    <label>Assigned Worker</label>
+    <referenceTo>Maintenance_Worker__c</referenceTo>
+    <relationshipLabel>Maintenance Requests</relationshipLabel>
+    <relationshipName>Maintenance_Requests</relationshipName>
+    <required>false</required>
+    <trackHistory>true</trackHistory>
+    <trackTrending>false</trackTrending>
+    <type>Lookup</type>
+</CustomField>

package/dist/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml

@@ -272,6 +272,11 @@
         <field>Maintenance_Request__c.Tenant_Home__c</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>true</editable>
+        <field>Maintenance_Request__c.Assigned_Worker__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
 
     <!-- Field Permissions: Maintenance_Worker__c -->
     <fieldPermissions>
@@ -363,12 +368,6 @@
         <readable>true</readable>
     </fieldPermissions>
 
-    <!-- Tab Visibility -->
-    <tabSettings>
-        <tab>Property__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.License_Expiry__c</field>
@@ -633,50 +632,4 @@
         <field>Tenant__c.Status__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
-    <!-- Tab Settings -->
-    <tabSettings>
-        <tab>Application__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>KPI_Snapshot__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Lease__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Maintenance_Request__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Maintenance_Worker__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Notification__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Payment__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Property__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Property_Owner__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Property_Sale__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
-    <tabSettings>
-        <tab>Tenant__c</tab>
-        <visibility>Visible</visibility>
-    </tabSettings>
 </PermissionSet>

package/dist/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger

@@ -0,0 +1,5 @@
+trigger MaintenanceRequestTrigger on Maintenance_Request__c (before insert) {
+    if (Trigger.isBefore && Trigger.isInsert) {
+        MaintenanceRequestTriggerHandler.handleBeforeInsert(Trigger.new);
+    }
+}

package/dist/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexTrigger xmlns="http://soap.sforce.com/2006/04/metadata">
+  <apiVersion>65.0</apiVersion>
+  <status>Active</status>
+</ApexTrigger>

package/dist/force-app/main/default/webapplications/appreactsampleb2e/package.json

@@ -15,9 +15,9 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/agentforce-conversation-client": "^1.80.1",
-    "@salesforce/sdk-data": "^1.80.1",
-    "@salesforce/webapp-experimental": "^1.80.1",
+    "@salesforce/agentforce-conversation-client": "^1.81.0",
+    "@salesforce/sdk-data": "^1.81.0",
+    "@salesforce/webapp-experimental": "^1.81.0",
     "@tailwindcss/vite": "^4.1.17",
     "@tanstack/react-form": "^1.28.4",
     "class-variance-authority": "^0.7.1",
@@ -42,7 +42,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.80.1",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.81.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications.ts

@@ -87,8 +87,8 @@ export async function getApplications(): Promise<Application[]> {
 			.map((edge) => {
 				if (!edge || !edge.node) return null;
 				const node = edge.node;
-				const firstName = node.Contact__r?.FirstName?.value || "";
-				const lastName = node.Contact__r?.LastName?.value || "";
+				const firstName = node.User__r?.FirstName?.value || "";
+				const lastName = node.User__r?.LastName?.value || "";
 				const applicantName = `${firstName} ${lastName}`.trim() || "Unknown";
 
 				return {

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/graphql-operations-types.ts

@@ -22,6 +22,7 @@ export type Scalars = {
 	DateTime: { input: string; output: string };
 	Double: { input: number | string; output: number };
 	Email: { input: string; output: string };
+	EncryptedString: { input: string; output: string };
 	/** Can be set to an ID or a Reference to the result of another mutation operation. */
 	IdOrRef: { input: string; output: string };
 	Latitude: { input: number | string; output: number };
@@ -45,8 +46,13 @@ export type Application__CUpdateInput = {
 };
 
 export type Application__CUpdateRepresentation = {
+	Employment__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
 	OwnerId?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Property__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	References__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	Start_Date__c?: InputMaybe<Scalars["Date"]["input"]>;
 	Status__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	User__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
 };
 
 export enum DataType {
@@ -88,14 +94,52 @@ export enum FieldExtraTypeInfo {
 	SwitchablePersonname = "SWITCHABLE_PERSONNAME",
 }
 
+export enum LayoutComponentType {
+	Canvas = "CANVAS",
+	CustomLink = "CUSTOM_LINK",
+	EmptySpace = "EMPTY_SPACE",
+	Field = "FIELD",
+	ReportChart = "REPORT_CHART",
+	VisualforcePage = "VISUALFORCE_PAGE",
+}
+
+export enum LayoutMode {
+	Create = "CREATE",
+	Edit = "EDIT",
+	View = "VIEW",
+}
+
+export enum LayoutType {
+	Compact = "COMPACT",
+	Full = "FULL",
+}
+
 export type Maintenance_Request__CUpdateInput = {
 	Id: Scalars["IdOrRef"]["input"];
 	Maintenance_Request__c: Maintenance_Request__CUpdateRepresentation;
 };
 
 export type Maintenance_Request__CUpdateRepresentation = {
+	Actual_Cost__c?: InputMaybe<Scalars["Currency"]["input"]>;
+	Assigned_Worker__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Completed__c?: InputMaybe<Scalars["DateTime"]["input"]>;
+	Description__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	Est_Cost__c?: InputMaybe<Scalars["Currency"]["input"]>;
 	OwnerId?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Priority__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	Property__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Scheduled__c?: InputMaybe<Scalars["DateTime"]["input"]>;
 	Status__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	Tenant_Home__c?: InputMaybe<Scalars["Boolean"]["input"]>;
+	Type__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	User__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+};
+
+/** Input for ObjectInfo and PickValues */
+export type ObjectInfoInput = {
+	apiName: Scalars["String"]["input"];
+	fieldNames?: InputMaybe<Array<Scalars["String"]["input"]>>;
+	recordTypeIDs?: InputMaybe<Array<Scalars["ID"]["input"]>>;
 };
 
 export enum ResultOrder {
@@ -103,6 +147,17 @@ export enum ResultOrder {
 	Desc = "DESC",
 }
 
+export enum TabOrder {
+	LeftRight = "LEFT_RIGHT",
+	TopDown = "TOP_DOWN",
+}
+
+export enum UiBehavior {
+	Edit = "EDIT",
+	Readonly = "READONLY",
+	Required = "REQUIRED",
+}
+
 export type GetApplicationsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GetApplicationsQuery = {
@@ -113,10 +168,9 @@ export type GetApplicationsQuery = {
 					node?: {
 						Id: string;
 						Name?: { value?: string | null } | null;
-						Contact__r?: {
+						User__r?: {
 							FirstName?: { value?: string | null } | null;
 							LastName?: { value?: string | null } | null;
-							Name?: { value?: string | null } | null;
 						} | null;
 						Property__r?: {
 							Name?: { value?: string | null } | null;
@@ -177,7 +231,7 @@ export type GetOpenApplicationsQuery = {
 					node?: {
 						Id: string;
 						Name?: { value?: string | null } | null;
-						Contact__r?: { Name?: { value?: string | null } | null } | null;
+						User__r?: { Name?: { value?: string | null } | null } | null;
 						Property__r?: { Address__c?: { value?: string | null } | null } | null;
 						Status__c?: { value?: string | null } | null;
 						CreatedDate?: { value?: string | null } | null;
@@ -215,10 +269,7 @@ export type GetMaintenanceRequestsQuery = {
 						Id: string;
 						Name?: { value?: string | null } | null;
 						Property__r?: { Address__c?: { value?: string | null } | null } | null;
-						Tenant__r?: {
-							Name?: { value?: string | null } | null;
-							User__r?: { Name?: { value?: string | null } | null } | null;
-						} | null;
+						User__r?: { Name?: { value?: string | null } | null } | null;
 						Type__c?: { value?: string | null } | null;
 						Priority__c?: { value?: string | null } | null;
 						Status__c?: { value?: string | null } | null;
@@ -253,11 +304,11 @@ export type GetAllMaintenanceRequestsQuery = {
 							Address__c?: { value?: string | null } | null;
 							Name?: { value?: string | null } | null;
 						} | null;
-						Tenant__r?: {
+						User__r?: { Name?: { value?: string | null } | null } | null;
+						Assigned_Worker__r?: {
 							Name?: { value?: string | null } | null;
-							User__r?: { Name?: { value?: string | null } | null } | null;
+							Employment_Type__c?: { value?: string | null } | null;
 						} | null;
-						Owner?: { Name?: { value?: string | null } | null } | Record<PropertyKey, never> | null;
 						ContentDocumentLinks?: {
 							edges?: Array<{
 								node?: {
@@ -312,10 +363,10 @@ export type GetPropertiesQuery = {
 						Year_Built__c?: { value?: number | null } | null;
 						Hero_Image__c?: { value?: string | null } | null;
 						Deposit__c?: { value?: number | null } | null;
-						Parking__c?: { value?: string | null } | null;
-						Pet_Friendly__c?: { value?: string | null } | null;
+						Parking__c?: { value?: number | null } | null;
+						Pet_Friendly__c?: { value?: boolean | null } | null;
 						Available_Date__c?: { value?: string | null } | null;
-						Lease_Term__c?: { value?: string | null } | null;
+						Lease_Term__c?: { value?: number | null } | null;
 						Features__c?: { value?: string | null } | null;
 						Utilities__c?: { value?: string | null } | null;
 						Tour_URL__c?: { value?: string | null } | null;
@@ -327,3 +378,100 @@ export type GetPropertiesQuery = {
 		};
 	};
 };
+
+export type GetObjectInfosQueryVariables = Exact<{
+	apiNames: Array<Scalars["String"]["input"]> | Scalars["String"]["input"];
+}>;
+
+export type GetObjectInfosQuery = {
+	uiapi: {
+		objectInfos?: Array<{
+			ApiName: string;
+			label?: string | null;
+			labelPlural?: string | null;
+			nameFields: Array<string | null>;
+			defaultRecordTypeId?: string | null;
+			keyPrefix?: string | null;
+			layoutable: boolean;
+			queryable: boolean;
+			searchable: boolean;
+			updateable: boolean;
+			deletable: boolean;
+			createable: boolean;
+			custom: boolean;
+			mruEnabled: boolean;
+			feedEnabled: boolean;
+			fields: Array<
+				| {
+						ApiName: string;
+						label?: string | null;
+						dataType?: DataType | null;
+						relationshipName?: string | null;
+						reference: boolean;
+						compound: boolean;
+						compoundFieldName?: string | null;
+						compoundComponentName?: string | null;
+						controllingFields: Array<string | null>;
+						controllerName?: string | null;
+						referenceToInfos: Array<{ ApiName: string; nameFields: Array<string | null> } | null>;
+				  }
+				| {
+						ApiName: string;
+						label?: string | null;
+						dataType?: DataType | null;
+						relationshipName?: string | null;
+						reference: boolean;
+						compound: boolean;
+						compoundFieldName?: string | null;
+						compoundComponentName?: string | null;
+						controllingFields: Array<string | null>;
+						controllerName?: string | null;
+						referenceToInfos: Array<{ ApiName: string; nameFields: Array<string | null> } | null>;
+				  }
+				| null
+			>;
+			recordTypeInfos: Array<{
+				recordTypeId?: string | null;
+				name?: string | null;
+				master: boolean;
+				available: boolean;
+				defaultRecordTypeMapping: boolean;
+			} | null>;
+			themeInfo?: { color?: string | null; iconUrl?: string | null } | null;
+			childRelationships: Array<{
+				relationshipName?: string | null;
+				fieldName?: string | null;
+				childObjectApiName: string;
+			} | null>;
+			dependentFields: Array<{ controllingField: string } | null>;
+		} | null> | null;
+	};
+};
+
+export type GetPicklistValuesQueryVariables = Exact<{
+	objectInfoInputs: Array<ObjectInfoInput> | ObjectInfoInput;
+}>;
+
+export type GetPicklistValuesQuery = {
+	uiapi: {
+		objectInfos?: Array<{
+			ApiName: string;
+			fields: Array<
+				| {
+						ApiName: string;
+						picklistValuesByRecordTypeIDs?: Array<{
+							recordTypeID: string;
+							defaultValue?: { value?: string | null } | null;
+							picklistValues?: Array<{
+								label?: string | null;
+								value?: string | null;
+								validFor?: Array<number | null> | null;
+							}> | null;
+						} | null> | null;
+				  }
+				| { ApiName: string }
+				| null
+			>;
+		} | null> | null;
+	};
+};

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenance.ts

@@ -98,11 +98,12 @@ const GET_ALL_MAINTENANCE_REQUESTS = gql`
 									value
 								}
 							}
-							Owner {
-								... on User {
-									Name {
-										value
-									}
+							Assigned_Worker__r {
+								Name {
+									value
+								}
+								Employment_Type__c {
+									value
 								}
 							}
 							ContentDocumentLinks(first: 1) {
@@ -241,8 +242,9 @@ function transformMaintenanceTaskFull(node: any): MaintenanceRequest {
 	// Get tenant unit from Property
 	const tenantUnit = node.Property__r?.Name?.value || node.Property__r?.Address__c?.value;
 
-	// Get assigned worker name from Owner
-	const assignedWorkerName = node.Owner?.Name?.value;
+	// Get assigned worker name and employment type from Assigned_Worker__r
+	const assignedWorkerName = node.Assigned_Worker__r?.Name?.value;
+	const assignedWorkerOrg = node.Assigned_Worker__r?.Employment_Type__c?.value;
 
 	return {
 		id: node.Id,
@@ -257,7 +259,7 @@ function transformMaintenanceTaskFull(node: any): MaintenanceRequest {
 		imageUrl,
 		tenantUnit,
 		assignedWorkerName,
-		assignedWorkerOrg: "ABC Diamond Technicians", // This would come from a related object in real scenario
+		assignedWorkerOrg,
 		formattedDate,
 	};
 }

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/maintenance-worker.svg

@@ -0,0 +1,8 @@
+<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 1.5L8.00006 0.5H7.99995L8 1.5ZM13.5967 6.56836L12.6015 6.66614L12.6826 7.49179L13.509 7.56451L13.5967 6.56836ZM13.4844 9.09375V10.0938V9.09375ZM2.40137 6.56836L2.49054 7.56438L3.31559 7.49051L3.39658 6.66612L2.40137 6.56836ZM8 1.5L7.99994 2.5C10.3989 2.50015 12.3717 4.32767 12.6015 6.66614L13.5967 6.56836L14.5919 6.47058C14.2626 3.11875 11.4383 0.500219 8.00006 0.5L8 1.5ZM13.5967 6.56836L13.509 7.56451C13.6446 7.57644 13.75 7.69093 13.75 7.82812H14.75H15.75C15.75 6.6431 14.8414 5.67402 13.6843 5.57221L13.5967 6.56836ZM14.75 7.82812H13.75C13.75 7.97483 13.6311 8.09375 13.4844 8.09375V9.09375V10.0938C14.7356 10.0938 15.75 9.0794 15.75 7.82812H14.75ZM13.4844 9.09375V8.09375H2.51562V9.09375V10.0938H13.4844V9.09375ZM2.51562 9.09375V8.09375C2.36892 8.09375 2.25 7.97483 2.25 7.82812H1.25H0.25C0.25 9.0794 1.26435 10.0938 2.51562 10.0938V9.09375ZM1.25 7.82812H2.25C2.25 7.69089 2.35531 7.57648 2.49054 7.56438L2.40137 6.56836L2.31219 5.57234C1.1566 5.67581 0.25 6.64446 0.25 7.82812H1.25ZM2.40137 6.56836L3.39658 6.66612C3.62626 4.32802 5.60062 2.50011 8.00005 2.5L8 1.5L7.99995 0.5C4.56208 0.500164 1.73548 3.11823 1.40616 6.47059L2.40137 6.56836Z" fill="#65185C"/>
+<line x1="8.25" y1="1" x2="8.25" y2="3.5" stroke="#65185C" stroke-width="2" stroke-linecap="round"/>
+<line x1="13.25" y1="3.66421" x2="11.6642" y2="5.25" stroke="#65185C" stroke-width="2" stroke-linecap="round"/>
+<line x1="4.33579" y1="5.25" x2="2.75" y2="3.66421" stroke="#65185C" stroke-width="2" stroke-linecap="round"/>
+<path d="M4 11C5.90288 13.8543 10.0971 13.8543 12 11" stroke="#65185C" stroke-width="2" stroke-linecap="round"/>
+<path d="M1 18C4.70577 13.7648 11.2942 13.7648 15 18" stroke="#65185C" stroke-width="2" stroke-linecap="round"/>
+</svg>

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { PieChart, Pie, Cell, ResponsiveContainer } from "recharts";
+import { PieChart, Pie, Cell, ResponsiveContainer, Tooltip } from "recharts";
 import { Card } from "./ui/card";
 import { MoreVertical } from "lucide-react";
 
@@ -15,7 +15,26 @@ interface IssuesDonutChartProps {
 
 export const IssuesDonutChart: React.FC<IssuesDonutChartProps> = ({ data }) => {
 	const total = data.reduce((sum, item) => sum + item.value, 0);
-	const mainPercentage = total > 0 ? Math.round((data[0]?.value / total) * 100) : 0;
+	const maxValue = data.length > 0 ? Math.max(...data.map((item) => item.value)) : 0;
+	const mainPercentage = total > 0 ? Math.round((maxValue / total) * 100) : 0;
+
+	const CustomTooltip = ({ active, payload }: any) => {
+		if (active && payload && payload.length) {
+			const percentage = total > 0 ? Math.round((payload[0].value / total) * 100) : 0;
+			return (
+				<div className="bg-white p-3 border border-gray-200 rounded shadow-lg z-50">
+					<p className="text-sm font-semibold text-gray-800">{payload[0].name}</p>
+					<p className="text-sm text-gray-600">
+						Count: <span className="font-medium">{payload[0].value}</span>
+					</p>
+					<p className="text-sm text-gray-600">
+						Percentage: <span className="font-medium">{percentage}%</span>
+					</p>
+				</div>
+			);
+		}
+		return null;
+	};
 
 	return (
 		<Card className="p-4 border-gray-200 shadow-sm flex flex-col relative">
@@ -43,10 +62,11 @@ export const IssuesDonutChart: React.FC<IssuesDonutChartProps> = ({ data }) => {
 								<Cell key={`cell-${index}`} fill={entry.color} />
 							))}
 						</Pie>
+						<Tooltip content={<CustomTooltip />} wrapperStyle={{ zIndex: 1000 }} />
 					</PieChart>
 				</ResponsiveContainer>
 				{/* Center text */}
-				<div className="absolute inset-0 flex items-center justify-center">
+				<div className="absolute inset-0 flex items-center justify-center pointer-events-none">
 					<div className="text-center">
 						<div className="text-5xl font-bold text-primary-purple">{mainPercentage}%</div>
 					</div>

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

@@ -21,11 +21,11 @@ export const MaintenanceDetailsModal: React.FC<MaintenanceDetailsModalProps> = (
 	const [isSaving, setIsSaving] = useState(false);
 
 	// Determine if status is editable
-	// Only New and In Progress can be updated to Resolved
-	const isStatusEditable = request.status === "New" || request.status === "In Progress";
+	// All statuses except Resolved can be edited
+	const isStatusEditable = request.status !== "Resolved";
 
-	// Status options
-	const statusOptions = ["New", "In Progress", "Resolved"];
+	// Status options - all possible statuses
+	const statusOptions = ["New", "Assigned", "In Progress", "On Hold", "Resolved"];
 
 	const handleSave = async () => {
 		if (!isStatusEditable) return;

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

@@ -4,6 +4,7 @@ import dashboardIcon from "../assets/icons/dashboard.svg";
 import filesIcon from "../assets/icons/files.svg";
 import propertiesIcon from "../assets/icons/properties.svg";
 import maintenanceIcon from "../assets/icons/maintenance.svg";
+import maintenanceWorkerIcon from "../assets/icons/maintenance-worker.svg";
 import { PATHS } from "../lib/routeConfig.js";
 
 interface NavItem {
@@ -17,7 +18,7 @@ const navItems: NavItem[] = [
 	{ path: PATHS.APPLICATIONS, icon: filesIcon, label: "Applications" },
 	{ path: PATHS.PROPERTIES, icon: propertiesIcon, label: "Properties" },
 	{ path: PATHS.MAINTENANCE_REQUESTS, icon: maintenanceIcon, label: "Maintenance Requests" },
-	{ path: PATHS.MAINTENANCE_WORKERS, icon: maintenanceIcon, label: "Maintenance Workers" },
+	{ path: PATHS.MAINTENANCE_WORKERS, icon: maintenanceWorkerIcon, label: "Maintenance Workers" },
 ];
 
 export const VerticalNav: React.FC = () => {
@@ -44,7 +45,7 @@ export const VerticalNav: React.FC = () => {
 					title={item.label}
 				>
 					<img src={item.icon} alt={item.label} className="w-6 h-6" />
-					<span className="text-xs font-medium">{item.label}</span>
+					<span className="text-xs font-medium text-center">{item.label}</span>
 				</Link>
 			))}
 		</div>

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

@@ -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/pages/Home.tsx

@@ -22,9 +22,8 @@ import { nodeToMaintenanceRequest } from "../lib/maintenanceAdapter.js";
 import { DASHBOARD_MAINTENANCE_LIMIT } from "../lib/constants.js";
 import { PATHS } from "../lib/routeConfig.js";
 
-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/MaintenanceWorkers.tsx

@@ -1,13 +1,54 @@
-import { useState } from "react";
+import { useState, useEffect, useMemo } 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 { getAllMaintenanceRequests } from "../api/maintenance.js";
 import type { MaintenanceWorker } from "../lib/types.js";
 
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.80.1",
+  "version": "1.81.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.81.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.81.0",
+    "@salesforce/webapp-template-feature-react-global-search-experimental": "^1.81.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",