@plusscommunities/pluss-maintenance-app-forms 7.0.21 → 8.0.1-auth.0

package/src/screens/ServiceRequest.js

@@ -1,16 +1,17 @@
 import React, { Component } from "react";
+import { Text } from "@plusscommunities/pluss-core-app/components";
 import {
 	Dimensions,
 	Platform,
 	KeyboardAvoidingView,
 	ScrollView,
-	Text,
 	TouchableOpacity,
 	View,
 	Switch,
 	FlatList,
 	ImageBackground,
 	Keyboard,
+	Alert,
 } from "react-native";
 import DateTimePicker from "react-native-modal-datetime-picker";
 import { Icon } from "@rneui/themed";
@@ -109,8 +110,9 @@ class MaintenanceRequest extends Component {
 			if (this.props.optionOnlyForResidents) {
 				items = _.filter(items, (u) => u.category === "resident");
 			}
-
-			const users = _.sortBy(items, (u) => (u.displayName || "").toLowerCase());
+			const users = _.sortBy(response.data.Items || [], (u) =>
+				(u.displayName || "").toLowerCase(),
+			);
 			this.setState({ users });
 		} catch (error) {
 			console.log("Error loading site users:", error);
@@ -195,7 +197,7 @@ class MaintenanceRequest extends Component {
 			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) {
+			if (!this.state.title && !update.title) {
 				update.title =
 					"[Missing title - Set one of the form field as title in the community manager]";
 			}
@@ -320,7 +322,7 @@ class MaintenanceRequest extends Component {
 		this.setImages(imagesUpdate, imageFieldId);
 	};
 
-	onLibrarySelected = (uri) => {
+	onLibrarySelectedImage = (uri) => {
 		const { imageFieldId } = this.state;
 		const imagesUpdate = this.getImages(imageFieldId);
 		imagesUpdate.splice(imagesUpdate.length - 1, 0, {
@@ -487,10 +489,14 @@ class MaintenanceRequest extends Component {
 		maintenanceActions
 			.getJobTypes(Helper.getSite(this.props.site))
 			.then((res) => {
-				this.setState({
-					types: res.data,
-				});
-				this.getDefaultJob();
+				this.setState(
+					{
+						types: res.data,
+					},
+					() => {
+						this.getDefaultJob();
+					},
+				);
 			})
 			.catch(() => {});
 	}
@@ -566,9 +572,14 @@ class MaintenanceRequest extends Component {
 			return field;
 		});
 
+		const userID =
+			this.state.canCreateOnBehalf && this.state.selectedUser
+				? this.state.selectedUser.userId || this.state.selectedUser.Id
+				: this.props.uid;
+
 		maintenanceActions
 			.sendMaintenanceRequest(
-				this.props.uid,
+				userID,
 				this.state.userName,
 				this.state.phone,
 				this.state.roomNumber,
@@ -637,9 +648,11 @@ class MaintenanceRequest extends Component {
 			title,
 			roomNumber,
 			isHome,
+			customFieldImages,
 			times,
 		} = this.state;
 		const hasCustomFields = customFields && customFields.length > 0;
+		function showFormErrorAlert() {}
 
 		if (submitting || !this.props.connected) {
 			if (!this.props.connected) {
@@ -650,30 +663,45 @@ class MaintenanceRequest extends Component {
 			return;
 		}
 		if (uploadingImage) return;
-
 		this.setState({ error: null, showError: false });
 
 		// PC-1255: Validate user selection for on-behalf requests
 		if (this.state.canCreateOnBehalf && !this.state.selectedUser) {
 			console.log("submitRequest - no user selected for on-behalf request");
+			Alert.alert(
+				"Missing Information",
+				"Please select a user to submit the form on behalf of",
+			);
 			this.setState({ showError: true });
 			return;
 		}
 
 		if (title.length === 0 || !roomNumber || roomNumber.length === 0) {
 			console.log("submitRequest - error", { title, roomNumber });
+			Alert.alert(
+				"Missing Information",
+				"Please fill out your address details",
+			);
 			this.setState({ showError: true });
 			return;
 		}
 		if (hasCustomFields) {
 			if (!this.validateCustomFields()) {
 				console.log("submitRequest - custom fields error");
+				Alert.alert(
+					"Invalid Information",
+					"Please review the form for errors and try submitting again.",
+				);
 				this.setState({ showError: true });
 				return;
 			}
 		} else {
 			if (isHome && times.length < 2) {
 				console.log("submitRequest - error", { isHome, times });
+				Alert.alert(
+					"Invalid Information",
+					"Please review the form for errors and try submitting again.",
+				);
 				this.setState({ showError: true });
 				return;
 			}
@@ -966,26 +994,38 @@ class MaintenanceRequest extends Component {
 		);
 	}
 
-	// renderDocumentList(fieldId) {
-	//   const documentsList = this.getDocuments(fieldId);
-	//   return (
-	//     <View style={styles.documentListContainer}>
-	//       {documentsList.length > 0 ? documentsList.map((document, index) => this.renderDocument(document, index, fieldId)) : null}
-	//       <Components.DocumentUploader
-	//         buttonTitle="Add Files"
-	//         allowedTypes={['application/pdf']}
-	//         onUploadStarted={(uploadUri, uri, name, ext) => this.onUploadStartedDocument(uploadUri, uri, name, ext, fieldId)}
-	//         onUploadProgress={progress => this.onUploadProgressDocument(progress, fieldId)}
-	//         onUploadSuccess={(uri, uploadUri) => this.onUploadSuccessDocument(uri, uploadUri, fieldId)}
-	//         onUploadFailed={uploadUri => this.onUploadFailedDocument(uploadUri, fieldId)}
-	//         fileName="serviceDocument"
-	//         userId={this.props.uid}
-	//         disabled={false}
-	//         multiple
-	//       />
-	//     </View>
-	//   );
-	// }
+	renderDocumentList(fieldId) {
+		const documentsList = this.getDocuments(fieldId);
+		return (
+			<View style={styles.documentListContainer}>
+				{documentsList.length > 0
+					? documentsList.map((document, index) =>
+							this.renderDocument(document, index, fieldId),
+						)
+					: null}
+				<Components.DocumentUploader
+					buttonTitle="Add Files"
+					allowedTypes={["application/pdf"]}
+					onUploadStarted={(uploadUri, uri, name, ext) =>
+						this.onUploadStartedDocument(uploadUri, uri, name, ext, fieldId)
+					}
+					onUploadProgress={(progress) =>
+						this.onUploadProgressDocument(progress, fieldId)
+					}
+					onUploadSuccess={(uri, uploadUri) =>
+						this.onUploadSuccessDocument(uri, uploadUri, fieldId)
+					}
+					onUploadFailed={(uploadUri) =>
+						this.onUploadFailedDocument(uploadUri, fieldId)
+					}
+					fileName="serviceDocument"
+					userId={this.props.uid}
+					disabled={false}
+					multiple
+				/>
+			</View>
+		);
+	}
 
 	renderDateField(field, fieldId, sectionStyle) {
 		let displayText, placeHolder, icon, errorText;
@@ -1176,19 +1216,19 @@ class MaintenanceRequest extends Component {
 						{this.renderImageList(fieldId)}
 					</Components.GenericInputSection>
 				);
-			// case 'document':
-			//   return (
-			//     <Components.GenericInputSection
-			//       key={fieldId}
-			//       label={field.label}
-			//       sectionStyle={sectionStyle}
-			//       isValid={() => this.isFieldValid(field, fieldId)}
-			//       required={field.mandatory}
-			//       showError={this.state.showError}
-			//     >
-			//       {this.renderDocumentList(fieldId)}
-			//     </Components.GenericInputSection>
-			//   );
+			case "document":
+				return (
+					<Components.GenericInputSection
+						key={fieldId}
+						label={field.label}
+						sectionStyle={sectionStyle}
+						isValid={() => this.isFieldValid(field, fieldId)}
+						required={field.mandatory}
+						showError={this.state.showError}
+					>
+						{this.renderDocumentList(fieldId)}
+					</Components.GenericInputSection>
+				);
 			default:
 				return null;
 		}
@@ -1530,6 +1570,7 @@ class MaintenanceRequest extends Component {
 					onCancel={() => this.setState({ isDateTimePickerVisible: false })}
 					mode={popUpType}
 					headerTextIOS={`Pick a ${popUpType}`}
+					date={new Date()}
 				/>
 			</KeyboardAvoidingView>
 		);

package/src/values.config.a.js

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

package/src/values.config.default.js

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

package/src/values.config.enquiry.js

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

package/src/values.config.feedback.js

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

package/src/values.config.food.js

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