@plusscommunities/pluss-maintenance-app-forms 7.0.21 → 7.0.23-beta.0

package/src/reducers/JobsReducer.js

@@ -1,95 +1,76 @@
 /* eslint-disable no-param-reassign */
-import _ from "lodash";
-import { REHYDRATE } from "redux-persist";
-import {
-	JOBS_LOADED,
-	JOB_ADDED,
-	JOBS_ADDED,
-	JOBS_STATUSES_LOADED,
-	JOBS_HIDE_SEEN,
-	JOB_FILTER_LOADED,
-} from "../actions/types";
-import { ActionTypes } from "../core.config";
-import { values } from "../values.config";
+import _ from 'lodash';
+import { REHYDRATE } from 'redux-persist';
+import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED, JOBS_STATUSES_LOADED, JOBS_HIDE_SEEN, JOB_FILTER_LOADED } from '../actions/types';
+import { ActionTypes } from '../core.config';
+import { values } from '../values.config';
 
 const REDUCER_KEY = values.reducerKey;
 
 const INITIAL_STATE = {
-	jobs: [],
-	jobstatuses: [],
-	hideSeen: false,
-	jobfilters: {
-		status: "",
-		statusText: "",
-		priority: "",
-		priorityText: "",
-		type: "",
-		assignee: "",
-		assigneeName: "",
-	},
+  jobs: [],
+  jobstatuses: [],
+  hideSeen: false,
+  jobfilters: {
+    status: '',
+    statusText: '',
+    priority: '',
+    priorityText: '',
+    type: '',
+    assignee: '',
+    assigneeName: '',
+  },
 };
 
 export default (state = INITIAL_STATE, action) => {
-	let updateJobs = [];
-	let index = 0;
-	let jobstatuses = [];
+  let updateJobs = [];
+  let index = 0;
+  let jobstatuses = [];
 
-	switch (action.type) {
-		case ActionTypes.LOGOUT:
-		case ActionTypes.CHANGE_ROLE:
-			return INITIAL_STATE;
-		case JOBS_LOADED:
-			return {
-				...state,
-				jobs: action.payload.map((job) => ({
-					title: job.title || job.description,
-					...job,
-				})),
-			};
-		case JOBS_ADDED:
-			updateJobs = action.payload.map((job) => ({
-				title: job.title || job.description,
-				...job,
-			}));
-			updateJobs = _.unionWith(updateJobs, state.jobs, (j1, j2) => {
-				return j1.id === j2.id;
-			});
-			return { ...state, jobs: updateJobs };
-		case JOB_ADDED:
-			updateJobs = [...state.jobs];
-			index = updateJobs.findIndex((item) => item.id === action.payload.id);
-			if (index > -1) {
-				updateJobs[index] = action.payload;
-			} else {
-				updateJobs.push(action.payload);
-			}
-			return { ...state, jobs: updateJobs };
-		case JOBS_STATUSES_LOADED:
-			jobstatuses = _.orderBy(
-				_.unionWith(action.payload, state.jobstatuses, (v1, v2) => {
-					return v1 != null && v2 != null && v1.text === v2.text;
-				}),
-				"order",
-				"asc",
-			);
-			return { ...state, jobstatuses };
-		case JOBS_HIDE_SEEN:
-			return { ...state, hideSeen: action.payload };
-		case JOB_FILTER_LOADED:
-			return {
-				...state,
-				jobfilters: action.payload || INITIAL_STATE.jobfilters,
-			};
-		case REHYDRATE:
-			if (!action.payload) return state;
-			if (action.payload[REDUCER_KEY]) {
-				if (action.payload[REDUCER_KEY].jobs == null) {
-					action.payload[REDUCER_KEY].jobs = [];
-				}
-				return action.payload[REDUCER_KEY];
-			}
-			return state;
-		default:
-			return state;
-	}
+  switch (action.type) {
+    case ActionTypes.LOGOUT:
+    case ActionTypes.CHANGE_ROLE:
+      return INITIAL_STATE;
+    case JOBS_LOADED:
+      return { ...state, jobs: action.payload.map(job => ({ title: job.title || job.description, ...job })) };
+    case JOBS_ADDED:
+      updateJobs = action.payload.map(job => ({ title: job.title || job.description, ...job }));
+      updateJobs = _.unionWith(updateJobs, state.jobs, (j1, j2) => {
+        return j1.id === j2.id;
+      });
+      return { ...state, jobs: updateJobs };
+    case JOB_ADDED:
+      updateJobs = [...state.jobs];
+      index = updateJobs.findIndex(item => item.id === action.payload.id);
+      if (index > -1) {
+        updateJobs[index] = action.payload;
+      } else {
+        updateJobs.push(action.payload);
+      }
+      return { ...state, jobs: updateJobs };
+    case JOBS_STATUSES_LOADED:
+      jobstatuses = _.orderBy(
+        _.unionWith(action.payload, state.jobstatuses, (v1, v2) => {
+          return v1 != null && v2 != null && v1.text === v2.text;
+        }),
+        'order',
+        'asc',
+      );
+      return { ...state, jobstatuses };
+    case JOBS_HIDE_SEEN:
+      return { ...state, hideSeen: action.payload };
+    case JOB_FILTER_LOADED:
+      return { ...state, jobfilters: action.payload || INITIAL_STATE.jobfilters };
+    case REHYDRATE:
+      if (!action.payload) return state;
+      if (action.payload[REDUCER_KEY]) {
+        if (action.payload[REDUCER_KEY].jobs == null) {
+          action.payload[REDUCER_KEY].jobs = [];
+        }
+        return action.payload[REDUCER_KEY];
+      }
+      return state;
+    default:
+      return state;
+  }
 };

package/src/screens/JobTypePicker.js

@@ -1,130 +1,107 @@
-import React, { Component } from "react";
-import _ from "lodash";
-import { TouchableOpacity, View, ScrollView, Text } from "react-native";
-import { connect } from "react-redux";
-import { Icon } from "@rneui/themed";
-import { Services } from "../feature.config";
-import { Components, Colours } from "../core.config";
+import React, { Component } from 'react';
+import _ from 'lodash';
+import { TouchableOpacity, View, ScrollView, Text } from 'react-native';
+import { connect } from 'react-redux';
+import { Icon } from '@rneui/themed';
+import { Services } from '../feature.config';
+import { Components, Colours } from '../core.config';
 
 class JobTypePicker extends Component {
-	state = {
-		currentType: null,
-	};
+  state = {
+    currentType: null,
+  };
 
-	UNSAFE_componentWillMount() {
-		this.setState({ currentType: this.props.currentType });
-	}
+  UNSAFE_componentWillMount() {
+    this.setState({ currentType: this.props.currentType });
+  }
 
-	onPressBack() {
-		Services.navigation.goBack();
-	}
+  onPressBack() {
+    Services.navigation.goBack();
+  }
 
-	onTypePress(type) {
-		this.props.onSelectType(type);
-		this.setState({ currentType: type });
-		setTimeout(() => {
-			this.onPressBack();
-		}, 200);
-	}
+  onTypePress(type) {
+    this.props.onSelectType(type);
+    this.setState({ currentType: type });
+    setTimeout(() => {
+      this.onPressBack();
+    }, 200);
+  }
 
-	renderMain() {
-		if (_.isEmpty(this.props.types)) {
-			return (
-				<View style={{ marginTop: 16 }}>
-					<Components.Spinner />
-				</View>
-			);
-		}
+  renderMain() {
+    if (_.isEmpty(this.props.types)) {
+      return (
+        <View style={{ marginTop: 16 }}>
+          <Components.Spinner />
+        </View>
+      );
+    }
 
-		return (
-			<Components.FormCard style={{ marginTop: 16 }}>
-				{this.renderOptions()}
-			</Components.FormCard>
-		);
-	}
+    return <Components.FormCard style={{ marginTop: 16 }}>{this.renderOptions()}</Components.FormCard>;
+  }
 
-	renderOptions() {
-		return this.props.types.map((rep, index) => {
-			return (
-				<TouchableOpacity
-					key={index}
-					onPress={this.onTypePress.bind(this, rep.typeName)}
-				>
-					<Components.FormCardSection
-						label={rep.typeName}
-						labelStyle={{ height: 0, margin: 0 }}
-						hasUnderline
-						hasContent
-					>
-						<View style={styles.labelContainer}>
-							<Text style={styles.labelText}>{rep.typeName}</Text>
-							<Icon
-								name="check-circle"
-								//style={styles.uploadButtonInner}
-								type="font-awesome"
-								iconStyle={[
-									{ color: "#d5d9e0", fontSize: 20 },
-									rep.typeName === this.state.currentType && {
-										color: Colours.COLOUR_GREEN,
-									},
-								]}
-							/>
-						</View>
-						{!_.isEmpty(rep.description) && (
-							<Text style={styles.description}>{rep.description}</Text>
-						)}
-					</Components.FormCardSection>
-				</TouchableOpacity>
-			);
-		});
-	}
+  renderOptions() {
+    return this.props.types.map((rep, index) => {
+      return (
+        <TouchableOpacity key={index} onPress={this.onTypePress.bind(this, rep.typeName)}>
+          <Components.FormCardSection label={rep.typeName} labelStyle={{ height: 0, margin: 0 }} hasUnderline hasContent>
+            <View style={styles.labelContainer}>
+              <Text style={styles.labelText}>{rep.typeName}</Text>
+              <Icon
+                name="check-circle"
+                //style={styles.uploadButtonInner}
+                type="font-awesome"
+                iconStyle={[{ color: '#d5d9e0', fontSize: 20 }, rep.typeName === this.state.currentType && { color: Colours.COLOUR_GREEN }]}
+              />
+            </View>
+            {!_.isEmpty(rep.description) && <Text style={styles.description}>{rep.description}</Text>}
+          </Components.FormCardSection>
+        </TouchableOpacity>
+      );
+    });
+  }
 
-	render() {
-		return (
-			<View style={styles.container}>
-				<Components.Header
-					leftIcon="angle-left"
-					onPressLeft={this.onPressBack.bind(this)}
-					text="Select type"
-				/>
-				<ScrollView style={{ flex: 1 }}>{this.renderMain()}</ScrollView>
-			</View>
-		);
-	}
+  render() {
+    return (
+      <View style={styles.container}>
+        <Components.Header leftIcon="angle-left" onPressLeft={this.onPressBack.bind(this)} text="Select type" />
+        <ScrollView style={{ flex: 1 }}>{this.renderMain()}</ScrollView>
+      </View>
+    );
+  }
 }
 
 const styles = {
-	container: {
-		flex: 1,
-		position: "relative",
-		backgroundColor: "#f0f0f5",
-	},
-	row: {
-		flexDirection: "row",
-		alignItems: "center",
-		minHeight: 22,
-	},
-	text: {
-		flex: 1,
-		fontFamily: "sf-regular",
-		fontSize: 14,
-		color: Colours.TEXT_DARK,
-	},
-	labelContainer: {
-		flexDirection: "row",
-		justifyContent: "space-between",
-	},
-	labelText: {
-		fontFamily: "sf-medium",
-		fontSize: 16,
-		color: Colours.TEXT_DARK,
-	},
-	description: {
-		marginTop: 5,
-		fontSize: 14,
-		fontFamily: "sf-regular",
-		color: Colours.TEXT_DARK,
-	},
+  container: {
+    flex: 1,
+    position: 'relative',
+    backgroundColor: '#f0f0f5',
+  },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    minHeight: 22,
+  },
+  text: {
+    flex: 1,
+    fontFamily: 'sf-regular',
+    fontSize: 14,
+    color: Colours.TEXT_DARK,
+  },
+  labelContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
+  labelText: {
+    fontFamily: 'sf-medium',
+    fontSize: 16,
+    color: Colours.TEXT_DARK,
+  },
+  description: {
+    marginTop: 5,
+    fontSize: 14,
+    fontFamily: 'sf-regular',
+    color: Colours.TEXT_DARK,
+  },
 };
 
 export default connect(null, {})(JobTypePicker);

package/src/screens/MaintenancePage.js

@@ -1,105 +1,96 @@
-import React, { Component } from "react";
-import { View, StyleSheet } from "react-native";
-import { connect } from "react-redux";
-import _ from "lodash";
-import MaintenanceList from "../components/MaintenanceList";
-import { Services, BaseComponents } from "../feature.config";
-import { Components, Helper, Styles, Config } from "../core.config";
-import { values } from "../values.config";
+import React, { Component } from 'react';
+import { View, StyleSheet } from 'react-native';
+import { connect } from 'react-redux';
+import _ from 'lodash';
+import MaintenanceList from '../components/MaintenanceList';
+import { Services, BaseComponents } from '../feature.config';
+import { Components, Helper, Styles, Config } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenancePage extends Component {
-	constructor(props) {
-		super(props);
-		this.state = {
-			isHomeTab: false,
-			loading: false,
-		};
-	}
+  constructor(props) {
+    super(props);
+    this.state = {
+      isHomeTab: false,
+      loading: false,
+    };
+  }
 
-	componentDidMount() {
-		// console.log('!Services.navigation.getParentRoute()', !Services.navigation.getParentRoute());
-		this.setState({ isHomeTab: !Services.navigation.getParentRoute() });
-	}
+  componentDidMount() {
+    // console.log('!Services.navigation.getParentRoute()', !Services.navigation.getParentRoute());
+    this.setState({ isHomeTab: !Services.navigation.getParentRoute() });
+  }
 
-	onPressBack = () => {
-		Services.navigation.goBack();
-	};
+  onPressBack = () => {
+    Services.navigation.goBack();
+  };
 
-	onLoadingChanged = (loading) => {
-		this.setState({ loading });
-	};
+  onLoadingChanged = loading => {
+    this.setState({ loading });
+  };
 
-	renderHeader() {
-		const title =
-			this.props.title ||
-			this.props.strings[`${values.featureKey}_textFeatureTitle`] ||
-			values.textFeatureTitle;
-		if (this.state.isHomeTab) {
-			return (
-				<Components.Header
-					text={title}
-					rightContent={
-						_.includes(this.props.user.hidden, "notifications") ? null : (
-							<View style={styles.notificationContainer}>
-								<BaseComponents.NotificationBell
-									colourBrandingHeader={this.props.colourBrandingHeader}
-									containerStyle={Styles.notificationBell}
-								/>
-							</View>
-						)
-					}
-				/>
-			);
-		}
-		return (
-			<Components.Header
-				leftIcon="angle-left"
-				onPressLeft={this.onPressBack}
-				text={values.textFeatureTitle}
-			/>
-		);
-	}
+  renderHeader() {
+    const title = this.props.title || this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;
+    if (this.state.isHomeTab) {
+      return (
+        <Components.Header
+          text={title}
+          rightContent={
+            _.includes(this.props.user.hidden, 'notifications') ? null : (
+              <View style={styles.notificationContainer}>
+                <BaseComponents.NotificationBell
+                  colourBrandingHeader={this.props.colourBrandingHeader}
+                  containerStyle={Styles.notificationBell}
+                />
+              </View>
+            )
+          }
+        />
+      );
+    }
+    return <Components.Header leftIcon="angle-left" onPressLeft={this.onPressBack} text={values.textFeatureTitle} />;
+  }
 
-	render() {
-		const { isHomeTab } = this.state;
+  render() {
+    const { isHomeTab } = this.state;
 
-		return (
-			<View style={styles.container}>
-				{this.renderHeader()}
-				<Components.LoadingIndicator visible={this.state.loading} />
-				<MaintenanceList
-					style={styles.maintenanceList}
-					onLoadingChanged={this.onLoadingChanged}
-					enableAdd={!isHomeTab}
-					options={this.props.options}
-				/>
-				{/* {isHomeTab && <Components.AddContentButton />} */}
-			</View>
-		);
-	}
+    return (
+      <View style={styles.container}>
+        {this.renderHeader()}
+        <Components.LoadingIndicator visible={this.state.loading} />
+        <MaintenanceList
+          style={styles.maintenanceList}
+          onLoadingChanged={this.onLoadingChanged}
+          enableAdd={!isHomeTab}
+          options={this.props.options}
+        />
+        {/* {isHomeTab && <Components.AddContentButton />} */}
+      </View>
+    );
+  }
 }
 
 const styles = StyleSheet.create({
-	container: {
-		flex: 1,
-	},
-	notificationContainer: {
-		position: "absolute",
-		top: 0,
-		bottom: 0,
-		right: 0,
-		paddingTop: Helper.StatusBarHeight(0),
-	},
-	maintenanceList: {
-		marginTop: 12,
-	},
+  container: {
+    flex: 1,
+  },
+  notificationContainer: {
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    right: 0,
+    paddingTop: Helper.StatusBarHeight(0),
+  },
+  maintenanceList: {
+    marginTop: 12,
+  },
 });
 
-const mapStateToProps = (state) => {
-	return {
-		user: state.user,
-		strings: state.strings?.config || {},
-	};
+const mapStateToProps = state => {
+  return {
+    user: state.user,
+    strings: state.strings?.config || {},
+  };
 };
 
 export default connect(mapStateToProps, {})(MaintenancePage);