@plusscommunities/pluss-maintenance-app-feedback 6.0.20 → 6.0.21

package/src/screens/ServiceRequest.js

@@ -103,8 +103,13 @@ class MaintenanceRequest extends Component {
   loadSiteUsers = async () => {
     try {
       const response = await userActions.getSiteUsers(this.props.site);
-      // PC-1255: Load all users (not just residents) to match web admin behavior
-      const users = _.sortBy(response.data.Items || [], u => (u.displayName || '').toLowerCase());
+
+      let items = response.data.Items || [];
+      if (this.props.optionOnlyForResidents) {
+        items = _.filter(items, u => u.category === 'resident');
+      }
+
+      const users = _.sortBy(items, u => (u.displayName || '').toLowerCase());
       this.setState({ users });
     } catch (error) {
       console.log('Error loading site users:', error);
@@ -173,25 +178,23 @@ class MaintenanceRequest extends Component {
         if (userDetails.unit) {
           update.roomNumber = userDetails.unit;
         }
-	if (!this.state.customFields || !_.some(this.state.customFields, 'isTitle')) {
-	    update.title = userDetails.displayName || null;
-	}
+        if (!this.state.customFields || !_.some(this.state.customFields, 'isTitle')) {
+          update.title = userDetails.displayName || null;
+        }
       }
     } catch (error) {
       // Permission denied (403) or other error - continue without auto-population
       // User can still manually enter contact details
       console.log('Could not fetch user details for auto-population:', error);
     } finally {
-	// In any case, we still need a title. Inform the user to set one form field as a title.
-	if (!state.title && !update.title) {
-	    update.title = "[Missing title - Set one of the form field as title in the community manager]"
-	}
-
+      // In any case, we still need a title. Inform the user to set one form field as a title.
+      if (!state.title && !update.title) {
+        update.title = '[Missing title - Set one of the form field as title in the community manager]';
+      }
     }
     this.setState(update);
   };
 
-
   onChangeAnswer = (fieldId, answer) => {
     const update = { customFields: _.cloneDeep(this.state.customFields) };
     const field = update.customFields[fieldId];
@@ -1558,6 +1561,7 @@ const mapStateToProps = state => {
     permissions,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
     strings: state.strings?.config || {},
+    optionOnlyForResidents: Helper.getSiteSettingFromState(state, values.optionOnlyForResidents),
   };
 };
 

package/src/values.config.a.js

@@ -32,6 +32,7 @@ const values = {
   textEntityName: 'Job',
   stringConfigJobStatus: 'maintenanceJobStatusA',
   stringConfigHideSeen: 'maintenanceDisableSeenA',
+  optionOnlyForResidents: 'onlyForResidentsMaintenanceA',
 };
 
 export { values };

package/src/values.config.default.js

@@ -38,6 +38,7 @@ const values = {
   forceCustomFields: false,
   stringConfigJobStatus: 'maintenanceJobStatus',
   stringConfigHideSeen: 'maintenanceDisableSeen',
+  optionOnlyForResidents: 'onlyForResidentsMaintenance',
 };
 
 export { values };

package/src/values.config.enquiry.js

@@ -38,6 +38,7 @@ const values = {
   forceCustomFields: true,
   stringConfigJobStatus: 'maintenanceJobStatusEnquiry',
   stringConfigHideSeen: 'maintenanceDisableSeenEnquiry',
+  optionOnlyForResidents: 'onlyForResidentsMaintenanceEnquiry',
 };
 
 export { values };

package/src/values.config.feedback.js

@@ -38,6 +38,7 @@ const values = {
   forceCustomFields: true,
   stringConfigJobStatus: 'maintenanceJobStatusFeedback',
   stringConfigHideSeen: 'maintenanceDisableSeenFeedback',
+  optionOnlyForResidents: 'onlyForResidentsMaintenanceFeedback',
 };
 
 export { values };

package/src/values.config.food.js

@@ -38,6 +38,7 @@ const values = {
   forceCustomFields: true,
   stringConfigJobStatus: 'maintenanceJobStatusFood',
   stringConfigHideSeen: 'maintenanceDisableSeenFood',
+  optionOnlyForResidents: 'onlyForResidentsMaintenanceFood',
 };
 
 export { values };

package/src/values.config.js

@@ -38,6 +38,7 @@ const values = {
   forceCustomFields: true,
   stringConfigJobStatus: 'maintenanceJobStatusFeedback',
   stringConfigHideSeen: 'maintenanceDisableSeenFeedback',
+  optionOnlyForResidents: 'onlyForResidentsMaintenanceFeedback',
 };
 
 export { values };