@onehat/ui 0.3.18 → 0.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.18",
+	"version": "0.3.21",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",

package/src/Components/Grid/GridRow.js

@@ -7,6 +7,7 @@ import {
 import {
 	VERTICAL,
 } from '../../Constants/Directions.js';
+import getComponentFromType from '../../Functions/getComponentFromType.js';
 import UiGlobals from '../../UiGlobals.js';
 import withDraggable from '../Hoc/withDraggable.js';
 import AngleRight from '../Icons/AngleRight.js';
@@ -25,10 +26,17 @@ export default function GridRow(props) {
 			item,
 			isInlineEditorShown,
 		} = props,
-		styles = UiGlobals.styles,
+		styles = UiGlobals.styles;
+
+	if (item.isDestroyed) {
+		return null;
+	}
+
+	const
 		isPhantom = item.isPhantom,
 		hash = item?.hash || item;
 
+
 		return useMemo(() => {
 			const renderColumns = (item) => {
 				if (_.isArray(columnsConfig)) {
@@ -86,9 +94,30 @@ export default function GridRow(props) {
 								return <Row key={key} {...propsToPass} {...extraProps}>{config.renderer(item)}</Row>;
 							}
 							if (config.fieldName) {
-								if (item.properties && item.properties[config.fieldName]) {
-									const property = item.properties[config.fieldName];	
+								if (item?.properties && item.properties[config.fieldName]) {
+									const property = item.properties[config.fieldName];
 									value = property.displayValue;
+
+									if (property?.viewerType?.type) {
+										const Element = getComponentFromType(property?.viewerType?.type);
+										return <Element
+													value={value}
+													key={key}
+													overflow="hidden"
+													textOverflow="ellipsis"
+													alignSelf="center"
+													style={{
+														userSelect: 'none',
+													}}
+													fontSize={styles.GRID_CELL_FONTSIZE}
+													px={styles.GRID_CELL_PX}
+													py={styles.GRID_CELL_PY}
+													numberOfLines={1}
+													ellipsizeMode="head"
+													{...propsToPass}
+													{...propsToPass}
+												/>;
+									}
 								} else if (item[config.fieldName]) {
 									value = item[config.fieldName];
 								} else if (fields) {

package/src/Components/Hoc/withEditor.js

@@ -121,6 +121,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				}
 			},
 			onEdit = async () => {
+				if (_.isEmpty(selection) || (_.isArray(selection) && (selection.length > 1 || selection[0]?.isDestroyed))) {
+					return;
+				}
 				if (getListeners().onBeforeEdit) {
 					const listenerResult = await getListeners().onBeforeEdit();
 					if (listenerResult === false) {
@@ -132,6 +135,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				setIsEditorShown(true);
 			},
 			onDelete = async (cb) => {
+				if (_.isEmpty(selection) || (_.isArray(selection) && (selection.length > 1 || selection[0]?.isDestroyed))) {
+					return;
+				}
 				if (getListeners().onBeforeDelete) {
 					const listenerResult = await getListeners().onBeforeDelete();
 					if (listenerResult === false) {
@@ -165,7 +171,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					deleteRecord(cb);
 				} else {
 					const identifier = getRecordIdentifier(selection);
-					confirm('Are you sure you want to delete the ' + identifier, () => deleteRecord(cb));
+					confirm('Are you sure you want to delete the ' + identifier, () => deleteRecord(null, cb));
 				}
 			},
 			onMoveChildren = (cb) => {
@@ -268,7 +274,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				async function doIt() {
 					const
 						isSingle = selection.length === 1,
-						isPhantom = selection[0] && selection[0].isPhantom;
+						isPhantom = selection[0] && !selection[0]?.isDestroyed && selection[0].isPhantom;
 					if (isSingle && isPhantom) {
 						await deleteRecord();
 					}
@@ -301,7 +307,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 							// For multiple entities selected, change it to edit multiple mode
 							mode = EDITOR_MODE__EDIT;
 						}
-					} else if (selection.length === 1 && selection[0].isPhantom) {
+					} else if (selection.length === 1 && !selection[0].isDestroyed && selection[0].isPhantom) {
 						if (!disableAdd) {
 							// When a phantom entity is selected, change it to add mode.
 							mode = EDITOR_MODE__ADD;
@@ -354,12 +360,12 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					setIsEditorShown={setIsEditorShown}
 					onAdd={(!userCanEdit || disableAdd) ? null : onAdd}
 					onEdit={(!userCanEdit || disableEdit) ? null : onEdit}
-					onDelete={(!userCanEdit || disableDelete || (editorMode === EDITOR_MODE__ADD && (selection[0]?.isPhantom || currentRecord?.isPhantom))) ? null : onDelete}
+					onDelete={(!userCanEdit || disableDelete) ? null : onDelete}
 					onView={viewRecord}
 					onDuplicate={duplicateRecord}
 					onEditorSave={onEditorSave}
 					onEditorCancel={onEditorCancel}
-					onEditorDelete={(!userCanEdit || disableDelete || (editorMode === EDITOR_MODE__ADD && (selection[0]?.isPhantom || currentRecord?.isPhantom))) ? null : onEditorDelete}
+					onEditorDelete={(!userCanEdit || disableDelete) ? null : onEditorDelete}
 					onEditorClose={onEditorClose}
 					setWithEditListeners={setListeners}
 					isEditor={true}

package/src/Components/Hoc/withFilters.js

@@ -80,13 +80,12 @@ export default function withFilters(WrappedComponent) {
 						if (propertyDef) {
 							title = propertyDef.title;
 							type = propertyDef.filterType;
-						} else {
-							if (!modelFilterTypes[field]) {
-								throw Error('not a propertyDef, and not an ancillaryFilter!');
-							}
+						} else if (modelAncillaryFilters[field]) {
 							const ancillaryFilter = modelFilterTypes[field];
 							title = ancillaryFilter.title;
 							type = FILTER_TYPE_ANCILLARY;
+						} else {
+							throw Error('not a propertyDef, and not an ancillaryFilter!');
 						}
 						formatted = {
 							field,
@@ -330,6 +329,7 @@ export default function withFilters(WrappedComponent) {
 							const {
 									field,
 									value,
+									type,
 								} = filter,
 								isFilterRange = getIsFilterRange(filter);
 							if (isFilterRange) {
@@ -345,8 +345,11 @@ export default function withFilters(WrappedComponent) {
 									newRepoFilters.push({ name: lowField, value: lowValue, });
 								}
 							} else {
-								newFilterNames.push(field);
-								newRepoFilters.push({ name: field, value, });
+								const
+									isAncillary = type === FILTER_TYPE_ANCILLARY,
+									filterName =  (isAncillary ? 'ancillary___' : '') + field;
+								newFilterNames.push(filterName);
+								newRepoFilters.push({ name: filterName, value, });
 							}
 						});
 
@@ -421,7 +424,7 @@ export default function withFilters(WrappedComponent) {
 				_.each(modalSlots, (field, ix) => {
 
 					// Create the data for the combobox. (i.e. List all the possible filters for this slot)
-					const data = [];
+					let data = [];
 					_.each(modelFilterTypes, (filterType, filterField) => {
 						if (inArray(filterField, usedFields) && field !== filterField) { // Show all filters not yet applied, but include the current filter
 							return; // skip, since it's already been used
@@ -430,7 +433,7 @@ export default function withFilters(WrappedComponent) {
 						// Is it an ancillary filter?
 						const isAncillary = _.isPlainObject(filterType) && filterType.isAncillary;
 						if (isAncillary) {
-							data.push([ filterField, filterType.title ]);
+							data.push([ filterField, filterType.title + ' •' ]);
 							return;
 						}
 
@@ -439,6 +442,9 @@ export default function withFilters(WrappedComponent) {
 						data.push([ filterField, propertyDef.title ]);
 					});
 
+					// sort by title
+					data = _.sortBy(data, [function(datum) { return datum[1]; }]);
+
 					const
 						ixPlusOne = (ix +1),
 						filterName = 'filter' + ixPlusOne;

package/src/Components/Hoc/withPresetButtons.js

@@ -143,7 +143,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						if (selectorId && !selectorSelected) {
 							isDisabled = true;
 						}
-						if (_.isEmpty(selection)) {
+						if (_.isEmpty(selection) || (_.isArray(selection) && selection.length > 1)) {
 							isDisabled = true;
 						}
 						break;
@@ -154,7 +154,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						if (selectorId && !selectorSelected) {
 							isDisabled = true;
 						}
-						if (_.isEmpty(selection) || selection.length > 1) {
+						if (_.isEmpty(selection) || (_.isArray(selection) && selection.length > 1)) {
 							isDisabled = true;
 						}
 						break;

package/src/Components/Viewer/TagViewer.js

@@ -0,0 +1,28 @@
+import {
+	Text,
+} from 'native-base';
+import UiGlobals from '../../UiGlobals.js';
+import _ from 'lodash';
+
+function TagViewer(props) {
+	const {
+			value,
+		} = props,
+		parsedValue = value ? JSON.parse(value) : null,
+		values = parsedValue ? _.map(parsedValue, (val) => {
+			const ret = val?.text;
+			return ret;
+		}).join(', ') : [],
+		styles = UiGlobals.styles;
+
+	return <Text
+				numberOfLines={1}
+				ellipsizeMode="head"
+				// fontSize={styles.FORM_TEXT_FONTSIZE}
+				// minHeight='40px'
+				// px={3}
+				// py={2}
+				{...props}
+			>{values}</Text>;
+}
+export default TagViewer;

package/src/Components/index.js

@@ -38,6 +38,7 @@ import PlusMinusButton from './Buttons/PlusMinusButton.js';
 import RadioGroup from './Form/Field/RadioGroup/RadioGroup.js';
 import TabPanel from './Panel/TabPanel.js';
 import Tag from './Form/Field/Combo/Tag.js';
+import TagViewer from './Viewer/TagViewer.js';
 import TextArea from './Form/Field/TextArea.js';
 import Text from './Form/Field/Text.js';
 import TimezonesCombo from './Form/Field/Combo/TimezonesCombo.js';
@@ -87,6 +88,7 @@ const components = {
 	RadioGroup,
 	TabPanel,
 	Tag,
+	TagViewer,
 	Text,
 	TextArea,
 	TimezonesCombo,