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

package/src/components/WidgetSmall.js

@@ -1,174 +1,154 @@
-import React, { Component } from "react";
-import { Text, View, ScrollView, StyleSheet } from "react-native";
-import { connect } from "react-redux";
-import _ from "lodash";
-import { maintenanceActions } from "../apis";
-import { jobsLoaded, jobStatusesUpdate, jobHideSeenUpdate } from "../actions";
-import MaintenanceWidgetItem from "./MaintenanceWidgetItem";
-import { Services } from "../feature.config";
-import { Colours, Components } from "../core.config";
-import { values } from "../values.config";
+import React, { Component } from 'react';
+import { Text, View, ScrollView, StyleSheet } from 'react-native';
+import { connect } from 'react-redux';
+import _ from 'lodash';
+import { maintenanceActions } from '../apis';
+import { jobsLoaded, jobStatusesUpdate, jobHideSeenUpdate } from '../actions';
+import MaintenanceWidgetItem from './MaintenanceWidgetItem';
+import { Services } from '../feature.config';
+import { Colours, Components } from '../core.config';
+import { values } from '../values.config';
 
 const MAX_ITEMS = 10;
 
 class WidgetSmall extends Component {
-	constructor(props) {
-		super(props);
-		this.state = { loading: false };
-	}
+  constructor(props) {
+    super(props);
+    this.state = { loading: false };
+  }
 
-	componentDidMount() {
-		this.props.jobStatusesUpdate(this.props.site);
-		this.props.jobHideSeenUpdate(this.props.site);
-		this.refresh();
-	}
+  componentDidMount() {
+    this.props.jobStatusesUpdate(this.props.site);
+    this.props.jobHideSeenUpdate(this.props.site);
+    this.refresh();
+  }
 
-	componentDidUpdate(prevProps) {
-		if (!prevProps.dataUpdated && this.props.dataUpdated) this.refresh();
-	}
+  componentDidUpdate(prevProps) {
+    if (!prevProps.dataUpdated && this.props.dataUpdated) this.refresh();
+  }
 
-	getTitle = () => {
-		const { options } = this.props;
-		if (options && !_.isEmpty(options.Title)) return options.Title;
-		return (
-			this.props.strings[`${values.featureKey}_textFeatureTitle`] ||
-			values.textFeatureTitle
-		);
-	};
+  getTitle = () => {
+    const { options } = this.props;
+    if (options && !_.isEmpty(options.Title)) return options.Title;
+    return this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;
+  };
 
-	getEmptyStateText = () => {
-		const { options, userCategory } = this.props;
-		if (options && !_.isEmpty(options.EmptyText)) return options.EmptyText;
-		return userCategory === "staff"
-			? values.emptyRequestsStaff
-			: values.emptyRequestsUser;
-	};
+  getEmptyStateText = () => {
+    const { options, userCategory } = this.props;
+    if (options && !_.isEmpty(options.EmptyText)) return options.EmptyText;
+    return userCategory === 'staff' ? values.emptyRequestsStaff : values.emptyRequestsUser;
+  };
 
-	refresh = () => {
-		this.onLoadingChanged(true, async () => {
-			try {
-				const res = await maintenanceActions.getJobsRecursive(this.props.site);
-				// console.log('WidgetSmall - refresh', res.data);
-				this.props.jobsLoaded(res);
-			} catch (error) {
-				console.log("refresh error", error);
-			} finally {
-				this.onLoadingChanged(false);
-			}
-		});
-	};
+  refresh = () => {
+    this.onLoadingChanged(true, async () => {
+      try {
+        const res = await maintenanceActions.getJobsRecursive(this.props.site);
+        // console.log('WidgetSmall - refresh', res.data);
+        this.props.jobsLoaded(res);
+      } catch (error) {
+        console.log('refresh error', error);
+      } finally {
+        this.onLoadingChanged(false);
+      }
+    });
+  };
 
-	onLoadingChanged = (loading, callback) => {
-		this.setState({ loading }, () => {
-			if (this.props.onLoadingChanged)
-				this.props.onLoadingChanged(this.state.loading);
-			if (callback) callback();
-		});
-	};
+  onLoadingChanged = (loading, callback) => {
+    this.setState({ loading }, () => {
+      if (this.props.onLoadingChanged) this.props.onLoadingChanged(this.state.loading);
+      if (callback) callback();
+    });
+  };
 
-	onPressAll = () => {
-		Services.navigation.navigate(values.screenMaintenance, {
-			options: this.props.options,
-		});
-	};
+  onPressAll = () => {
+    Services.navigation.navigate(values.screenMaintenance, { options: this.props.options });
+  };
 
-	renderContent() {
-		const { jobs } = this.props;
-		if (_.isEmpty(jobs)) {
-			if (this.state.loading) {
-				return (
-					<View style={styles.loadingPadding}>
-						<Components.LoadingStateWidget height={180} />
-					</View>
-				);
-			}
-			return (
-				<View style={styles.loadingPadding}>
-					<Components.EmptyStateWidget
-						title={this.getEmptyStateText()}
-						height={180}
-					/>
-				</View>
-			);
-		}
-		return (
-			<ScrollView
-				horizontal
-				contentContainerStyle={{ paddingLeft: 6, paddingRight: 8 }}
-				showsHorizontalScrollIndicator={false}
-			>
-				{jobs.slice(0, MAX_ITEMS).map((job) => {
-					return <MaintenanceWidgetItem key={job.id} job={job} />;
-				})}
-			</ScrollView>
-		);
-	}
+  renderContent() {
+    const { jobs } = this.props;
+    if (_.isEmpty(jobs)) {
+      if (this.state.loading) {
+        return (
+          <View style={styles.loadingPadding}>
+            <Components.LoadingStateWidget height={180} />
+          </View>
+        );
+      }
+      return (
+        <View style={styles.loadingPadding}>
+          <Components.EmptyStateWidget title={this.getEmptyStateText()} height={180} />
+        </View>
+      );
+    }
+    return (
+      <ScrollView horizontal contentContainerStyle={{ paddingLeft: 6, paddingRight: 8 }} showsHorizontalScrollIndicator={false}>
+        {jobs.slice(0, MAX_ITEMS).map(job => {
+          return <MaintenanceWidgetItem key={job.id} job={job} />;
+        })}
+      </ScrollView>
+    );
+  }
 
-	render() {
-		const { colourBrandingMain } = this.props;
+  render() {
+    const { colourBrandingMain } = this.props;
 
-		return (
-			<View style={styles.sectionContainer}>
-				<View style={styles.sectionPadding}>
-					<View style={styles.sectionHeading}>
-						<Text style={styles.sectionTitle}>{this.getTitle()}</Text>
-						<Components.InlineButton
-							onPress={this.onPressAll}
-							color={colourBrandingMain}
-							touchableStyle={{ paddingTop: 6 }}
-							textStyle={{ color: "#fff" }}
-						>
-							View All
-						</Components.InlineButton>
-					</View>
-				</View>
-				{this.renderContent()}
-			</View>
-		);
-	}
+    return (
+      <View style={styles.sectionContainer}>
+        <View style={styles.sectionPadding}>
+          <View style={styles.sectionHeading}>
+            <Text style={styles.sectionTitle}>{this.getTitle()}</Text>
+            <Components.InlineButton
+              onPress={this.onPressAll}
+              color={colourBrandingMain}
+              touchableStyle={{ paddingTop: 6 }}
+              textStyle={{ color: '#fff' }}
+            >
+              View All
+            </Components.InlineButton>
+          </View>
+        </View>
+        {this.renderContent()}
+      </View>
+    );
+  }
 }
 
 const styles = StyleSheet.create({
-	sectionContainer: {
-		backgroundColor: "#fff",
-		paddingTop: 16,
-	},
-	sectionPadding: {
-		paddingHorizontal: 16,
-		paddingBottom: 6,
-	},
-	loadingPadding: {
-		paddingHorizontal: 16,
-	},
-	sectionHeading: {
-		marginBottom: 4,
-		flexDirection: "row",
-		alignContent: "flex-start",
-		justifyContent: "space-between",
-	},
-	sectionTitle: {
-		fontFamily: "sf-bold",
-		fontSize: 24,
-		color: Colours.TEXT_DARKEST,
-	},
+  sectionContainer: {
+    backgroundColor: '#fff',
+    paddingTop: 16,
+  },
+  sectionPadding: {
+    paddingHorizontal: 16,
+    paddingBottom: 6,
+  },
+  loadingPadding: {
+    paddingHorizontal: 16,
+  },
+  sectionHeading: {
+    marginBottom: 4,
+    flexDirection: 'row',
+    alignContent: 'flex-start',
+    justifyContent: 'space-between',
+  },
+  sectionTitle: {
+    fontFamily: 'sf-bold',
+    fontSize: 24,
+    color: Colours.TEXT_DARKEST,
+  },
 });
 
-const mapStateToProps = (state) => {
-	const { user, notifications } = state;
-	const jobs = state[values.reducerKey];
-	return {
-		colourBrandingMain: Colours.getMainBrandingColourFromState(state),
-		jobs: _.orderBy(jobs.jobs, ["createdUnix"], ["desc"]),
-		site: user.site,
-		userCategory: user.category,
-		dataUpdated: notifications.dataUpdated[values.updateKey],
-		strings: state.strings?.config || {},
-	};
+const mapStateToProps = state => {
+  const { user, notifications } = state;
+  const jobs = state[values.reducerKey];
+  return {
+    colourBrandingMain: Colours.getMainBrandingColourFromState(state),
+    jobs: _.orderBy(jobs.jobs, ['createdUnix'], ['desc']),
+    site: user.site,
+    userCategory: user.category,
+    dataUpdated: notifications.dataUpdated[values.updateKey],
+    strings: state.strings?.config || {},
+  };
 };
 
-export default connect(
-	mapStateToProps,
-	{ jobsLoaded, jobStatusesUpdate, jobHideSeenUpdate },
-	null,
-	{ forwardRef: true },
-)(WidgetSmall);
+export default connect(mapStateToProps, { jobsLoaded, jobStatusesUpdate, jobHideSeenUpdate }, null, { forwardRef: true })(WidgetSmall);

package/src/core.config.js

@@ -1,29 +1,5 @@
 // import * as PlussCore from '../../pluss-core/src';
-import * as PlussCore from "@plusscommunities/pluss-core-app";
+import * as PlussCore from '@plusscommunities/pluss-core-app';
 
-const {
-	Apis,
-	Fonts,
-	Actions,
-	ActionTypes,
-	Config,
-	Components,
-	Styles,
-	Session,
-	Helper,
-	Constants,
-	Colours,
-} = PlussCore;
-export {
-	Apis,
-	Fonts,
-	Actions,
-	ActionTypes,
-	Config,
-	Components,
-	Styles,
-	Session,
-	Helper,
-	Constants,
-	Colours,
-};
+const { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours } = PlussCore;
+export { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours };

package/src/feature.config.js

@@ -1,73 +1,73 @@
 // import * as PlussCore from '../../pluss-core/src';
-import * as PlussCore from "@plusscommunities/pluss-core-app";
-import { values } from "./values.config";
+import * as PlussCore from '@plusscommunities/pluss-core-app';
+import { values } from './values.config';
 
 export const Services = {
-	navigation: null,
+  navigation: null,
 };
 
 export const BaseComponents = {
-	NotificationBell: null,
+  NotificationBell: null,
 };
 
 const FeatureConfig = {
-	key: values.featureKey,
-	aliases: values.aliases,
-	title: values.textFeatureTitle,
-	gridMenu: {
-		icon: values.iconGridMenu,
-		viewBox: values.gridViewBox,
-		navigate: values.screenMaintenance,
-	},
-	addMenu: {
-		order: values.orderAddMenu,
-		icon: values.iconAddMenu,
-		title: values.textAddMenuTitle,
-		navigate: values.screenServiceRequest,
-		visibleExps: { type: "feature", value: values.featureKey },
-	},
-	moreMenu: values.hasMoreOption
-		? {
-				order: values.orderMoreMenu,
-				title: values.textMoreMenuTitle,
-				navigate: values.screenMaintenance,
-				visibleExps: {
-					type: "and",
-					exps: [
-						{ type: "notHidden", value: "maintenanceRequest" },
-						{ type: "notUserType", value: "KIOSK" },
-					],
-				},
-			}
-		: undefined,
-	kioskAction: {
-		order: values.orderKioskAction,
-		icon: values.iconKioskAction,
-		title: values.textKioskActionTitle,
-		navigate: values.screenServiceRequest,
-	},
-	hideTabBar: [],
-	env: {
-		baseStage: "",
-		baseAPIUrl: "",
-		hasGradientHeader: false,
-		defaultProfileImage: "",
-		tinyChatDefault: "",
-		baseUploadsUrl: "",
-		allowMediaDownload: false,
-		allowMediaSharing: false,
-		awsUploadsBucket: "",
-		awsStorageBucket: "",
-		preferredSite: "",
-		strings: {},
-		newEventDefaults: "",
-		defaultAllowComments: true,
-	},
-	init: (environment, navigation, notificationBell) => {
-		FeatureConfig.env = environment;
-		Services.navigation = navigation;
-		BaseComponents.NotificationBell = notificationBell;
-		PlussCore.Config.init(environment, navigation);
-	},
+  key: values.featureKey,
+  aliases: values.aliases,
+  title: values.textFeatureTitle,
+  gridMenu: {
+    icon: values.iconGridMenu,
+    viewBox: values.gridViewBox,
+    navigate: values.screenMaintenance,
+  },
+  addMenu: {
+    order: values.orderAddMenu,
+    icon: values.iconAddMenu,
+    title: values.textAddMenuTitle,
+    navigate: values.screenServiceRequest,
+    visibleExps: { type: 'feature', value: values.featureKey },
+  },
+  moreMenu: values.hasMoreOption
+    ? {
+        order: values.orderMoreMenu,
+        title: values.textMoreMenuTitle,
+        navigate: values.screenMaintenance,
+        visibleExps: {
+          type: 'and',
+          exps: [
+            { type: 'notHidden', value: 'maintenanceRequest' },
+            { type: 'notUserType', value: 'KIOSK' },
+          ],
+        },
+      }
+    : undefined,
+  kioskAction: {
+    order: values.orderKioskAction,
+    icon: values.iconKioskAction,
+    title: values.textKioskActionTitle,
+    navigate: values.screenServiceRequest,
+  },
+  hideTabBar: [],
+  env: {
+    baseStage: '',
+    baseAPIUrl: '',
+    hasGradientHeader: false,
+    defaultProfileImage: '',
+    tinyChatDefault: '',
+    baseUploadsUrl: '',
+    allowMediaDownload: false,
+    allowMediaSharing: false,
+    awsUploadsBucket: '',
+    awsStorageBucket: '',
+    preferredSite: '',
+    strings: {},
+    newEventDefaults: '',
+    defaultAllowComments: true,
+  },
+  init: (environment, navigation, notificationBell) => {
+    FeatureConfig.env = environment;
+    Services.navigation = navigation;
+    BaseComponents.NotificationBell = notificationBell;
+    PlussCore.Config.init(environment, navigation);
+  },
 };
 export default FeatureConfig;

package/src/helper.js

@@ -1,76 +1,71 @@
-import { Colours } from "./core.config";
+import { Colours } from './core.config';
 
-const STATUS_NOT_ACTIONED = "Not Actioned";
-const STATUS_IN_PROGRESS = "In Progress";
-const STATUS_COMPLETED = "Completed";
+const STATUS_NOT_ACTIONED = 'Not Actioned';
+const STATUS_IN_PROGRESS = 'In Progress';
+const STATUS_COMPLETED = 'Completed';
 
 const jobStatusOptions = [
-	{
-		text: "Open",
-		order: 0,
-		color: Colours.LINEGREY,
-		category: STATUS_NOT_ACTIONED,
-	},
-	{
-		text: "In Progress",
-		order: 1,
-		color: Colours.COLOUR_TEAL,
-		category: STATUS_IN_PROGRESS,
-	},
-	{
-		text: "Completed",
-		order: 2,
-		color: Colours.COLOUR_GREEN_LIGHT,
-		category: STATUS_COMPLETED,
-	},
+  {
+    text: 'Open',
+    order: 0,
+    color: Colours.LINEGREY,
+    category: STATUS_NOT_ACTIONED,
+  },
+  {
+    text: 'In Progress',
+    order: 1,
+    color: Colours.COLOUR_TEAL,
+    category: STATUS_IN_PROGRESS,
+  },
+  {
+    text: 'Completed',
+    order: 2,
+    color: Colours.COLOUR_GREEN_LIGHT,
+    category: STATUS_COMPLETED,
+  },
 ];
 
 const jobPriorityOptions = [
-	{
-		label: "Low",
-		color: Colours.COLOUR_GREEN,
-		default: true,
-	},
-	{
-		label: "Medium",
-		color: Colours.COLOUR_TANGERINE,
-	},
-	{
-		label: "High",
-		color: Colours.COLOUR_RED,
-	},
+  {
+    label: 'Low',
+    color: Colours.COLOUR_GREEN,
+    default: true,
+  },
+  {
+    label: 'Medium',
+    color: Colours.COLOUR_TANGERINE,
+  },
+  {
+    label: 'High',
+    color: Colours.COLOUR_RED,
+  },
 ];
 
-const getJobStatusOptions = (props) =>
-	props?.statusTypes?.length ? props?.statusTypes : jobStatusOptions;
+const getJobStatusOptions = props => (props?.statusTypes?.length ? props?.statusTypes : jobStatusOptions);
 
-const getDefaultJobStatuses = (props) =>
-	getJobStatusOptions(props).filter((s) => s.category === STATUS_NOT_ACTIONED);
+const getDefaultJobStatuses = props => getJobStatusOptions(props).filter(s => s.category === STATUS_NOT_ACTIONED);
 
-const getIncompleteJobStatuses = (props) =>
-	getJobStatusOptions(props).filter((s) => s.category === STATUS_IN_PROGRESS);
+const getIncompleteJobStatuses = props => getJobStatusOptions(props).filter(s => s.category === STATUS_IN_PROGRESS);
 
 const getJobStatus = (status, props) => {
-	const statusOptions = getJobStatusOptions(props);
-	// console.log('getJobStatus', JSON.stringify({ status, statusOptions }, null, 2));
-	let statusOption = null;
-	if (status) statusOption = statusOptions.find((s) => s.text === status);
-	return statusOption || getDefaultJobStatuses(props)[0];
+  const statusOptions = getJobStatusOptions(props);
+  // console.log('getJobStatus', JSON.stringify({ status, statusOptions }, null, 2));
+  let statusOption = null;
+  if (status) statusOption = statusOptions.find(s => s.text === status);
+  return statusOption || getDefaultJobStatuses(props)[0];
 };
 
-const getDefaultJobPriority = () => jobPriorityOptions.find((p) => p.default);
+const getDefaultJobPriority = () => jobPriorityOptions.find(p => p.default);
 
-const getJobPriority = (priority) =>
-	jobPriorityOptions.find((p) => p.label === priority) ||
-	getDefaultJobPriority();
+const getJobPriority = priority => jobPriorityOptions.find(p => p.label === priority) || getDefaultJobPriority();
 
 export {
-	jobStatusOptions,
-	jobPriorityOptions,
-	getJobStatusOptions,
-	getDefaultJobStatuses,
-	getIncompleteJobStatuses,
-	getJobStatus,
-	getJobPriority,
-	getDefaultJobPriority,
+  jobStatusOptions,
+  jobPriorityOptions,
+  getJobStatusOptions,
+  getDefaultJobStatuses,
+  getIncompleteJobStatuses,
+  getJobStatus,
+  getJobPriority,
+  getDefaultJobPriority,
 };

package/src/index.js

@@ -1,27 +1,27 @@
-import MaintenancePage from "./screens/MaintenancePage";
-import RequestDetail from "./screens/RequestDetail";
-import ServiceRequest from "./screens/ServiceRequest";
-import JobTypePicker from "./screens/JobTypePicker";
-import RequestNotes from "./screens/RequestNotes";
-import MaintenanceUserPicker from "./screens/MaintenanceUserPicker";
-import JobsReducer from "./reducers/JobsReducer";
-import { values } from "./values.config";
+import MaintenancePage from './screens/MaintenancePage';
+import RequestDetail from './screens/RequestDetail';
+import ServiceRequest from './screens/ServiceRequest';
+import JobTypePicker from './screens/JobTypePicker';
+import RequestNotes from './screens/RequestNotes';
+import MaintenanceUserPicker from './screens/MaintenanceUserPicker';
+import JobsReducer from './reducers/JobsReducer';
+import { values } from './values.config';
 
 export const Reducers = (() => {
-	const reducers = {};
-	reducers[values.reducerKey] = JobsReducer;
-	return reducers;
+  const reducers = {};
+  reducers[values.reducerKey] = JobsReducer;
+  return reducers;
 })();
 export const Screens = (() => {
-	const screens = {};
-	screens[values.screenMaintenance] = MaintenancePage;
-	screens[values.screenRequestDetail] = RequestDetail;
-	screens[values.screenServiceRequest] = ServiceRequest;
-	screens[values.screenJobTypePicker] = JobTypePicker;
-	screens[values.screenRequestNotes] = RequestNotes;
-	screens[values.screenUserPicker] = MaintenanceUserPicker;
-	return screens;
+  const screens = {};
+  screens[values.screenMaintenance] = MaintenancePage;
+  screens[values.screenRequestDetail] = RequestDetail;
+  screens[values.screenServiceRequest] = ServiceRequest;
+  screens[values.screenJobTypePicker] = JobTypePicker;
+  screens[values.screenRequestNotes] = RequestNotes;
+  screens[values.screenUserPicker] = MaintenanceUserPicker;
+  return screens;
 })();
-export { default as Config } from "./feature.config";
-export { default as WidgetSmall } from "./components/WidgetSmall";
-export { default as WidgetLarge } from "./components/WidgetLarge";
+export { default as Config } from './feature.config';
+export { default as WidgetSmall } from './components/WidgetSmall';
+export { default as WidgetLarge } from './components/WidgetLarge';