@onehat/ui 0.4.102 → 0.4.104

package/src/Components/Viewer/TextWithLinks.js

@@ -49,13 +49,21 @@ function TextWithLinksElement(props) {
 				modifiedText = modifiedText.replace(link, key);
 			});
 
-			const
+			let
 				textClassName = clsx(
 					'TextWithLinks-Text',
 					'text-base',
 					'overflow-hidden',
+					styles.FORM_TEXT_CLASSNAME,
 				),
 				textSegments = modifiedText.split(/(link_\d+)/);
+			if (props.className) {
+				const 
+					classes = props.className.split(' '),
+					newClasses = _.reject(classes, (c) => c === 'overflow-auto'),
+					className = newClasses.join(' ');
+				textClassName += ' ' + className;
+			}
 			if (textSegments.length === 1) {
 				return <Text className={textClassName}>{modifiedText}</Text>;
 			}

package/src/Components/Viewer/Viewer.js

@@ -278,39 +278,47 @@ function Viewer(props) {
 					value = record.properties[fkDisplayField].displayValue;
 				}
 			}
+			let element = null,
+				viewerFormatterReturnedReactComponent = false;
 			if (viewerFormatter) {
-				value = viewerFormatter(value, record, self);
-			}
-
-			let elementClassName = clsx(
-				'Viewer-field',
-				'basis-auto',
-				'grow',
-				'shrink',
-			);
-			const defaultsClassName = defaults.className;
-			if (defaultsClassName) {
-				elementClassName += ' ' + defaultsClassName;
-			}
-			const itemPropsToPassClassName = itemPropsToPass.className;
-			if (itemPropsToPassClassName) {
-				elementClassName += ' ' + itemPropsToPassClassName;
+				value = viewerFormatter(value, record, self); // viewerFormatter can return either a primitive value or a React component.
+				if (isValidElement(value)) {
+					// if it's a React component, render it directly
+					element = value;
+					viewerFormatterReturnedReactComponent = true;
+				}
 			}
-			const viewerTypeClassName = viewerTypeProps.className;
-			if (viewerTypeClassName) {
-				elementClassName += ' ' + viewerTypeClassName;
+			if (!viewerFormatterReturnedReactComponent) {
+				let elementClassName = clsx(
+					'Viewer-field',
+					'basis-auto',
+					'grow',
+					'shrink',
+				);
+				const defaultsClassName = defaults.className;
+				if (defaultsClassName) {
+					elementClassName += ' ' + defaultsClassName;
+				}
+				const itemPropsToPassClassName = itemPropsToPass.className;
+				if (itemPropsToPassClassName) {
+					elementClassName += ' ' + itemPropsToPassClassName;
+				}
+				const viewerTypeClassName = viewerTypeProps.className;
+				if (viewerTypeClassName) {
+					elementClassName += ' ' + viewerTypeClassName;
+				}
+				
+				element = <Element
+									{...testProps('field-' + name)}
+									value={value}
+									isEditable={false}
+									parent={self}
+									reference={name}
+									{...itemPropsToPass}
+									{...viewerTypeProps}
+									className={elementClassName}
+								/>;
 			}
-			
-			let element = <Element
-								{...testProps('field-' + name)}
-								value={value}
-								isEditable={false}
-								parent={self}
-								reference={name}
-								{...itemPropsToPass}
-								{...viewerTypeProps}
-								className={elementClassName}
-							/>;
 
 			if (item.additionalViewButtons) {
 				element = <HStack className="Viewer-HStack1 flex-wrap">
@@ -342,9 +350,11 @@ function Viewer(props) {
 			return <HStack key={ix} className="Viewer-HStack4 px-2 pb-1">{element}</HStack>;
 		},
 		buildAncillary = () => {
-			const components = [];
+			const
+				validAncillaryItems = _.filter(ancillaryItems, (item) => !!item), // filter out any null/undefined items
+				components = [];
 			setAncillaryButtons([]);
-			if (ancillaryItems.length) {
+			if (validAncillaryItems.length) {
 
 				// add the "scroll to top" button
 				getAncillaryButtons().push({
@@ -355,7 +365,7 @@ function Viewer(props) {
 					tooltip: 'Scroll to top',
 				});
 
-				_.each(ancillaryItems, (item, ix) => {
+				_.each(validAncillaryItems, (item, ix) => {
 					let {
 						type,
 						title = null,

package/src/Constants/PmSchedules.js

@@ -0,0 +1 @@
+export const PM_SCHEDULES__ONE_OFF = 200;

package/src/Functions/buildAdditionalButtons.js

@@ -5,6 +5,11 @@ import _ from 'lodash';
 export default function buildAdditionalButtons(configs, self, handlerArgs = {}) {
 	const additionalButtons = [];
 	_.each(configs, (config) => {
+
+		if (!config) {
+			return;
+		}
+		
 		const {
 				key,
 				color = '#fff',

package/src/Functions/flatten.js

@@ -0,0 +1,39 @@
+// This function takes a nested JSON object and flattens it into a single-level object with dot notation keys.
+// For example, { a: { b: 1 } } becomes { 'a.b': 1 }
+// or { a: [ { b: 1 }, { c: 2 } ] } becomes { 'a.0.b': 1, 'a.1.c': 2 }
+function isPlainObject(value) {
+	if (value === null || typeof value !== 'object') {
+		return false;
+	}
+
+	const prototype = Object.getPrototypeOf(value);
+	return prototype === Object.prototype || prototype === null;
+}
+
+export default function flatten(obj, prefix = '', result = {}) {
+	if (obj === null || typeof obj !== 'object') {
+		return result;
+	}
+
+	for (const key of Object.keys(obj)) {
+		const
+			newKey = prefix ? `${prefix}.${key}` : key,
+			value = obj[key];
+
+		if (isPlainObject(value)) {
+			flatten(value, newKey, result);
+		} else if (Array.isArray(value)) {
+			value.forEach((item, index) => {
+				const arrayKey = `${newKey}.${index}`;
+				if (isPlainObject(item) || Array.isArray(item)) {
+					flatten(item, arrayKey, result);
+				} else {
+					result[arrayKey] = item;
+				}
+			});
+		} else {
+			result[newKey] = value;
+		}
+	}
+	return result;
+}

package/src/Functions/verifyCanCrudPmEvents.js

@@ -0,0 +1,33 @@
+import {
+	PM_EVENT_TYPES__COMPLETE,
+	PM_EVENT_TYPES__RESET,
+	PM_EVENT_TYPES__DELAY_BY_DAYS,
+	PM_EVENT_TYPES__DELAY_BY_METER,
+	PM_EVENT_TYPES__SCHEDULE_PM,
+	PM_EVENT_TYPES__WILL_CALL,
+	PM_EVENT_TYPES__ASSIGN_TECHNICIAN,
+	PM_EVENT_TYPES__COMMENT,
+} from '../Constants/PmEventTypes.js';
+import inArray from './inArray.js';
+import _ from 'lodash';
+
+export default function verifyCanCrudPmEvents(selection) {
+	let canCrud = true;
+	_.each(selection, (entity) => {
+		if (!inArray(entity.pm_events__pm_event_type_id, [
+				// manual types
+				PM_EVENT_TYPES__COMPLETE,
+				PM_EVENT_TYPES__RESET,
+				PM_EVENT_TYPES__DELAY_BY_DAYS,
+				PM_EVENT_TYPES__DELAY_BY_METER,
+				PM_EVENT_TYPES__SCHEDULE_PM,
+				PM_EVENT_TYPES__WILL_CALL,
+				PM_EVENT_TYPES__ASSIGN_TECHNICIAN,
+				PM_EVENT_TYPES__COMMENT,
+			])) {
+			canCrud = false;
+			return false;
+		}
+	});
+	return canCrud;
+};