@plusscommunities/pluss-maintenance-app-forms 8.0.12 → 8.0.13

package/src/apis/maintenanceActions.js

@@ -23,7 +23,7 @@ export const maintenanceActions = {
 			data: { site, status, type },
 		});
 	},
-	getJobs2: (site, status, priority, type, lastKey) => {
+	getJobs2: (site, status, priority, type, lastKey, assignee) => {
 		const query = { site };
 		if (status) {
 			query.status = status;
@@ -37,13 +37,21 @@ export const maintenanceActions = {
 		if (lastKey) {
 			query.lastKey = JSON.stringify(lastKey);
 		}
+		if (assignee) {
+			query.assignee = assignee;
+		}
 		return Session.authedFunction({
 			method: "GET",
 			url: Helper.getUrl(values.serviceKey, "get/requests", query),
 		});
 	},
+	/**
+	 * @deprecated Use getJobs2 with pagination instead.
+	 * This method recursively fetches ALL pages which can be slow for large datasets.
+	 * For better performance, use getJobs2 directly and implement pagination in the UI.
+	 */
 	getJobsRecursive: (site, status, priority, type, lastKey, jobs = []) => {
-		return new Promise((resolve) => {
+		return new Promise((resolve, reject) => {
 			maintenanceActions
 				.getJobs2(site, status, priority, type, lastKey)
 				.then((jobRes) => {
@@ -51,17 +59,19 @@ export const maintenanceActions = {
 					if (!jobRes.data.LastKey) {
 						return resolve(newJobs);
 					}
-					return resolve(
-						maintenanceActions.getJobsRecursive(
+					maintenanceActions
+						.getJobsRecursive(
 							site,
 							status,
 							priority,
 							type,
 							jobRes.data.LastKey,
 							newJobs,
-						),
-					);
-				});
+						)
+						.then(resolve)
+						.catch(reject);
+				})
+				.catch(reject);
 		});
 	},
 	sendMaintenanceRequest: (

package/src/components/MaintenanceList.js

@@ -25,6 +25,9 @@ class MaintenanceList extends Component {
 			types: [],
 			filteredList: props.jobs,
 			loading: false,
+			loadingMore: false,
+			hasMore: true,
+			lastKey: null,
 			searchText: "",
 			showFilterPopup: false,
 		};
@@ -51,22 +54,25 @@ class MaintenanceList extends Component {
 		this.onLoadingChanged(true, async () => {
 			try {
 				const { jobfilters } = this.props;
-				const res = await maintenanceActions.getJobsRecursive(
+				const res = await maintenanceActions.getJobs2(
 					this.props.site,
 					jobfilters.status,
 					jobfilters.priority,
 					jobfilters.type,
+					null, // No lastKey = first page
+					jobfilters.assignee,
 				);
-				// console.log('refresh', res ? JSON.stringify(res[0], null, 2) : null);
-				if (
-					!_.isEmpty(jobfilters.status) ||
-					!_.isEmpty(jobfilters.priority) ||
-					!_.isEmpty(jobfilters.type)
-				) {
-					this.props.jobsAdded(res);
-				} else {
-					this.props.jobsLoaded(res);
-				}
+
+				const jobs = res.data.Items;
+				const lastKey = res.data.LastKey;
+
+				// Always replace jobs on refresh (filters are server-side)
+				this.props.jobsLoaded(jobs);
+
+				this.setState({
+					lastKey,
+					hasMore: !!lastKey,
+				});
 			} catch (error) {
 				console.log("refresh error", error);
 			} finally {
@@ -75,6 +81,42 @@ class MaintenanceList extends Component {
 		});
 	};
 
+	loadMore = () => {
+		const { loading, loadingMore, hasMore, lastKey, searchText } = this.state;
+
+		// Don't load if already loading, no more pages, or during search
+		if (loading || loadingMore || !hasMore || !lastKey || searchText) return;
+
+		this.setState({ loadingMore: true }, async () => {
+			try {
+				const { jobfilters } = this.props;
+				const res = await maintenanceActions.getJobs2(
+					this.props.site,
+					jobfilters.status,
+					jobfilters.priority,
+					jobfilters.type,
+					lastKey,
+					jobfilters.assignee,
+				);
+
+				const newJobs = res.data.Items;
+				const newLastKey = res.data.LastKey;
+
+				// Append to existing jobs
+				this.props.jobsAdded(newJobs);
+
+				this.setState({
+					lastKey: newLastKey,
+					hasMore: !!newLastKey,
+				});
+			} catch (error) {
+				console.log("loadMore error", error);
+			} finally {
+				this.setState({ loadingMore: false });
+			}
+		});
+	};
+
 	refreshTypes = async () => {
 		const { data } = await maintenanceActions.getJobTypes(
 			Helper.getSite(this.props.site),
@@ -116,12 +158,13 @@ class MaintenanceList extends Component {
 	}
 
 	resetDataSource = (source = "") => {
-		const { jobfilters } = this.props;
 		const { searchText } = this.state;
 		const { jobs } = this.props;
 
 		let filteredList = jobs;
 		let jobIdMatch = null;
+
+		// Client-side search filtering (search is not supported server-side)
 		if (searchText) {
 			jobIdMatch = _.find(jobs, (j) => j.jobId === searchText);
 			filteredList = jobs.filter((j) => {
@@ -135,22 +178,10 @@ class MaintenanceList extends Component {
 			});
 			if (!jobIdMatch) this.fetchJob(searchText);
 		}
-		if (jobfilters.status)
-			filteredList = filteredList.filter((j) =>
-				jobfilters.status.includes(j.status),
-			);
-		if (jobfilters.priority)
-			filteredList = filteredList.filter((j) =>
-				jobfilters.priority.includes(j.priority),
-			);
-		if (jobfilters.type)
-			filteredList = filteredList.filter((j) =>
-				jobfilters.type.includes(j.type),
-			);
-		if (jobfilters.assignee)
-			filteredList = filteredList.filter((j) =>
-				jobfilters.assignee.includes(j.AssigneeId),
-			);
+
+		// Note: status, priority, type, and assignee filters are applied server-side
+		// via getJobs2, so no client-side filtering needed for those
+
 		if (jobIdMatch) {
 			const jobIndex = filteredList.indexOf(jobIdMatch);
 			if (jobIndex > -1) {
@@ -158,7 +189,8 @@ class MaintenanceList extends Component {
 			}
 			filteredList.unshift(jobIdMatch);
 		}
-		if (source !== "search") this.refresh();
+		// Only refresh on initial load, not on filter changes (pagination handles data)
+		if (source !== "search" && source !== "filter") this.refresh();
 
 		this.setState({ filteredList });
 	};
@@ -188,6 +220,10 @@ class MaintenanceList extends Component {
 	onSelectFilter = (selected) => {
 		this.props.jobsFilterLoaded(selected);
 		this.onToggleFilter();
+		// Reset pagination and clear existing list before refresh
+		this.setState({ lastKey: null, hasMore: true, filteredList: [] }, () => {
+			this.refresh();
+		});
 	};
 
 	getFilterButtonText = () => {
@@ -286,10 +322,23 @@ class MaintenanceList extends Component {
 				)}
 				ListEmptyComponent={this.renderEmptyList()}
 				ListHeaderComponent={this.renderListHeader()}
+				ListFooterComponent={this.renderListFooter()}
+				onEndReached={this.loadMore}
+				onEndReachedThreshold={0.5}
 			/>
 		);
 	}
 
+	renderListFooter = () => {
+		if (!this.state.loadingMore) return null;
+
+		return (
+			<View style={styles.loadingMore}>
+				<Components.LoadingIndicator visible={true} />
+			</View>
+		);
+	};
+
 	renderFilterPopup() {
 		const { jobfilters } = this.props;
 		const { showFilterPopup, types } = this.state;
@@ -363,6 +412,10 @@ const styles = StyleSheet.create({
 		fontFamily: "sf-semibold",
 		fontSize: 16,
 	},
+	loadingMore: {
+		paddingVertical: 20,
+		alignItems: "center",
+	},
 });
 
 const mapStateToProps = (state) => {

package/src/screens/RequestDetail.js

@@ -80,13 +80,19 @@ class RequestDetail extends Component {
 				this.getExternalSync();
 			} catch (error) {
 				console.log("getJob error", error.toString());
-				// check for 403 or 404 error
-				if (error.response.status === 403 || error.response.status === 404) {
+				// Log full error details for debugging
+				console.log("getJob error details:", {
+					message: error.message,
+					code: error.code,
+					responseStatus: error.response?.status,
+					responseData: error.response?.data,
+				});
+				// check for 403 or 404 error (use optional chaining to prevent crash)
+				if (error.response?.status === 403 || error.response?.status === 404) {
 					this.setState({
 						forbidden: true,
 					});
 				}
-				console.log("getJob error", error);
 			} finally {
 				this.setState({ loading: false });
 			}

package/src/screens/ServiceRequest.js

@@ -572,9 +572,13 @@ 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,