@onehat/ui 0.4.23 → 0.4.25

package/package.json

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

package/src/Components/Form/Field/Combo/Combo.js

@@ -10,7 +10,7 @@ import {
 	Text,
 	TextNative,
 	Tooltip,
-	VStack,
+	VStackNative,
 } from '@project-components/Gluestack';
 import {
 	UI_MODE_NATIVE,
@@ -180,7 +180,7 @@ export function ComboComponent(props) {
 					displayValue = _.each(value, (id) => {
 						const entity = Repository.getById(id);
 						if (entity) {
-							displayValue.push(entity.displayValue)
+							displayValue.push(entity.displayValue);
 						}
 					});
 				} else {
@@ -202,6 +202,9 @@ export function ComboComponent(props) {
 							await Repository.waitUntilDoneLoading();
 						}
 						entity = Repository.getById(value);
+						if (!entity) {
+							entity = await Repository.getSingleEntityFromServer(value);
+						}
 					}
 					displayValue = entity?.displayValue || '';
 				} else {
@@ -243,10 +246,12 @@ export function ComboComponent(props) {
 					}
 
 					let id = null;
-					if (gridSelection.length && gridSelection[0].id) {
-						id = gridSelection[0].id;
+					if (gridSelection.length) {
+						id = Repository ? gridSelection[0].id : gridSelection[0][idIx];
+					}
+					if (id !== value) {
+						setValue(id);
 					}
-					setValue(id);
 					hideMenu();
 					break;
 				case 'ArrowDown':
@@ -444,11 +449,12 @@ export function ComboComponent(props) {
 					});
 				}
 
-				setNewEntityDisplayValue(value); // capture the search query so we can tell Grid what to use for a new entity's displayValue
-			
+				if (!isId) {
+					setNewEntityDisplayValue(value); // capture the search query so we can tell Grid what to use for a new entity's displayValue
+				}
 			} else {
 				// Search through data
-				const regex = new RegExp('^' + value);
+				const regex = new RegExp('^' + value, 'i'); // case-insensitive
 				found = _.filter(data, (item) => {
 					if (_.isString(item[displayIx]) && _.isString(value)) {
 						return item[displayIx].match(regex);
@@ -1021,7 +1027,7 @@ export function ComboComponent(props) {
 	if (isRendered && additionalButtons?.length && containerWidth < 500) {
 		// be responsive for small screen sizes and bump additionalButtons to the next line
 		assembledComponents = 
-			<VStack
+			<VStackNative
 				testID={testID}
 				className="Combo-VStack"
 			>
@@ -1038,11 +1044,12 @@ export function ComboComponent(props) {
 				<HStack className="mt-1">
 					{additionalButtons}
 				</HStack>
-			</VStack>;
+			</VStackNative>;
 	} else {
 		assembledComponents = 
 			<HStackNative
 				{...refProps}
+				testID={testID}
 				onLayout={onLayout}
 				className={className}
 			>

package/src/Components/Form/Field/Input.js

@@ -14,7 +14,6 @@ import _ from 'lodash';
 
 const InputElement = forwardRef((props, ref) => {
 	let { // so localValue can be changed, if needed
-			testID,
 			value,
 			setValue,
 			maxLength,

package/src/Components/Form/Field/Tag/Tag.js

@@ -1,7 +1,7 @@
 import { useRef, } from 'react';
 import {
 	HStack,
-	VStack,
+	VStackNative,
 } from '@project-components/Gluestack';
 import {
 	EDITOR_TYPE__WINDOWED,
@@ -27,6 +27,7 @@ function TagComponent(props) {
 			Editor,
 			_combo = {},
 			tooltip,
+			testID,
 
 			// parent Form
 			onChangeValue,
@@ -301,7 +302,8 @@ function TagComponent(props) {
 		}
 	}
 	
-	return <VStack
+	return <VStackNative
+				testID={testID}
 				className={className}
 				style={style}
 			>
@@ -322,7 +324,7 @@ function TagComponent(props) {
 									{..._combo}
 									className={comboClassName}
 								/>}
-			</VStack>;
+			</VStackNative>;
 	
 }
 

package/src/Components/Form/Field/TextArea.js

@@ -17,6 +17,7 @@ const
 				onChangeText,
 				placeholder,
 				minimizeForRow = false,
+				testID,
 			} = props,
 			value = _.isNil(props.value) ? '' : props.value, // null value may not actually reset this TextArea, so set it explicitly to empty string
 			styles = UiGlobals.styles,
@@ -95,6 +96,7 @@ const
 
 		return <Textarea className={textareaClassName}>
 					<TextareaInput
+						testID={testID}
 						ref={props.outerRef}
 						onChangeText={onChangeTextLocal}
 						value={localValue}

package/src/Components/Hoc/withAlert.js

@@ -97,6 +97,7 @@ function withAlert(WrappedComponent) {
 					}
 				}
 				showModal({
+					testID: 'AlertModal',
 					title,
 					body: getBody({
 						icon: TriangleExclamation,
@@ -119,6 +120,7 @@ function withAlert(WrappedComponent) {
 			onConfirm = (message, onYes, includeCancel = false, onNo) => {
 				hideModal();
 				showModal({
+					testID: 'ConfirmModal',
 					title: 'Confirm',
 					body: getBody({
 						icon: CircleQuestion,
@@ -142,6 +144,7 @@ function withAlert(WrappedComponent) {
 			onInfo = (message) => {
 				hideModal();
 				showModal({
+					testID: 'InfoModal',
 					title: 'Info',
 					body: getBody({
 						icon: CircleInfo,

package/src/Components/Hoc/withModal.js

@@ -36,6 +36,7 @@ export default function withModal(WrappedComponent) {
 			[customButtons, setCustomButtons] = useState(),
 			[body, setBody] = useState(),
 			[whichModal, setWhichModal] = useState(),
+			[testID, setTestID] = useState('Modal'),
 			autoFocusRef = useRef(null),
 			cancelRef = useRef(null),
 			[windowWidth, windowHeight] = useAdjustedWindowSize(w, h),
@@ -59,6 +60,7 @@ export default function withModal(WrappedComponent) {
 					h = null,
 					w = null,
 					whichModal = null,
+					testID = null,
 					formProps = null, // deprecated
 				} = args;
 				
@@ -83,6 +85,9 @@ export default function withModal(WrappedComponent) {
 				setWidth(w); // || 400
 				setWhichModal(whichModal);
 				setIsModalShown(true);
+				if (testID) {
+					setTestID(testID);
+				}
 			},
 			updateModalBody = (newBody) => {
 				setBody(newBody);
@@ -185,6 +190,7 @@ export default function withModal(WrappedComponent) {
 							isOpen={true}
 							onClose={onCancel}
 							className="withModal-Modal"
+							{...testProps(testID)}
 						>
 							<ModalBackdrop className="withModal-ModalBackdrop" />
 							{modalBody}

package/src/Components/Messages/ErrorMessage.js

@@ -1,11 +1,14 @@
 import {
 	Box,
-	ButtonText,
+	HStack,
 	Icon,
 	Modal, ModalBackdrop, ModalHeader, ModalContent, ModalCloseButton, ModalBody, ModalFooter,
 	Text,
 } from '@project-components/Gluestack';
-import Button from '../Buttons/Button';
+import useAdjustedWindowSize from '../../Hooks/useAdjustedWindowSize.js';
+import Button from '../Buttons/Button.js';
+import Panel from '../Panel/Panel.js';
+import Footer from '../Layout/Footer.js';
 import testProps from '../../Functions/testProps.js';
 import TriangleExclamation from '../Icons/TriangleExclamation.js';
 
@@ -14,33 +17,75 @@ export default function ErrorMessage(props) {
 			text = 'Error',
 			color = 'red-500',
 			onOk,
-		} = props;
+		} = props,
+		[width, height] = useAdjustedWindowSize(500, 250);
 
 	return <Modal isOpen={true} {...props} {...testProps('ErrorMessage')}>
 				<ModalBackdrop />
-				<ModalContent>
-					<ModalHeader>Alert</ModalHeader>
-					<ModalBody
-						className={`
-							flex-row
-							align-center
+
+				<Panel
+					title="Alert"
+					isCollapsible={false}
+					className="bg-white overflow-auto"
+					h={height}
+					w={width}
+					isWindow={true}
+					disableAutoFlex={true}
+					onClose={onOk}
+					footer={<Footer
+								className={`
+									justify-end
+									py-2
+									px-4
+									bg-grey-100
+								`}
+							>
+								<Button
+									{...testProps('okBtn')}
+									key="okBtn"
+									onPress={onOk}
+									text="OK"
+									className="text-white"
+								/>
+							</Footer>}
+				>
+					<HStack className="ErrorMessage-HStack flex-1 w-full p-4">
+						<Box className={`
+							ErrorMessage-Box1
+							h-full
+							w-[100px]
+							flex
+							items-center
+							justify-center 
+							pr-3
+						`}>
+							<Icon as={TriangleExclamation} className={`
+								ErrorMessage-Icon
+								h-[40px]
+								w-[40px]
+								text-${color}
+							`} />
+						</Box>
+						<Box className={`
+							ErrorMessage-Box2
+							h-full
+							flex
+							flex-1
+							items-start
 							justify-center
-							p-3
-							bg-white
-							border-t-0
-							rounded-md
-						`}
-					>
-						<Box className="w-[50px] mx-1">
-							<Icon as={TriangleExclamation} size="10" className="text-red-500" />
+							overflow-hidden
+						`}>
+							<Text className={`
+								ErrorMessage-Text
+								text-${color}
+								text-[18px]
+								break-words
+								whitespace-normal
+								w-full
+								overflow-auto
+							`}>{text}</Text>
 						</Box>
-						<Text className={` text-${color} flex-1 text-[18px] `}>{text}</Text>
-					</ModalBody>
-					<ModalFooter className="py-2 pr-4">
-						<Button onPress={onOk} className="text-primary-800">
-							<ButtonText>OK</ButtonText>
-						</Button>
-					</ModalFooter>
-				</ModalContent>
+					</HStack>
+				</Panel>
 			</Modal>;
 }

package/src/Functions/Cypress/button_functions.js

@@ -1,4 +1,4 @@
-
+import 'cypress-if'; // for clickButtonIfExists only!
 import {
 	getDomNode,
 	getDomNodes,
@@ -8,78 +8,110 @@ const $ = Cypress.$;
 
 
 export function clickAddButton(parentSelectors) {
+	cy.log('clickAddButton');
 	return clickButton(parentSelectors, 'addBtn');
 }
 export function clickSaveButton(parentSelectors) {
+	cy.log('clickSaveButton');
 	return clickButton(parentSelectors, 'saveBtn');
 }
 export function clickEditButton(parentSelectors) {
+	cy.log('clickEditButton');
 	return clickButton(parentSelectors, 'editBtn');
 }
 export function clickDeleteButton(parentSelectors) {
+	cy.log('clickDeleteButton');
 	return clickButton(parentSelectors, 'deleteBtn');
 }
 export function clickDuplicateButton(parentSelectors) {
+	cy.log('clickDuplicateButton');
 	return clickButton(parentSelectors, 'duplicateBtn');
 }
 export function clickReloadButton(parentSelectors) {
+	cy.log('clickReloadButton');
 	return clickButton(parentSelectors, 'reloadBtn');
 }
 export function clickCloseButton(parentSelectors) {
+	cy.log('clickCloseButton');
 	return clickButton(parentSelectors, 'closeBtn');
 }
 export function clickCancelButton(parentSelectors) {
+	cy.log('clickCancelButton');
 	return clickButton(parentSelectors, 'cancelBtn');
 }
 export function clickOkButton(parentSelectors) {
+	cy.log('clickOkButton');
 	return clickButton(parentSelectors, 'okBtn');
 }
 export function clickYesButton(parentSelectors) {
+	cy.log('clickYesButton');
 	return clickButton(parentSelectors, 'yesBtn');
 }
 export function clickNoButton(parentSelectors) {
+	cy.log('clickNoButton');
 	return clickButton(parentSelectors, 'noBtn');
 }
 export function clickExpandButton(parentSelectors) {
+	cy.log('clickExpandButton');
 	return clickButton(parentSelectors, 'expandBtn');
 }
 export function clickXButton(parentSelectors) {
+	cy.log('clickXButton');
 	return clickButton(parentSelectors, 'xBtn');
 }
+export function clickXButtonIfEnabled(parentSelectors) {
+	cy.log('clickXButtonIfEnabled');
+	return clickButtonIfEnabled(parentSelectors, 'xBtn', true);
+}
 export function clickTrigger(parentSelectors) {
+	cy.log('clickTrigger');
 	return clickButton(parentSelectors, 'trigger');
 }
 export function clickToEditButton(parentSelectors) {
+	cy.log('clickToEditButton');
 	return clickButton(parentSelectors, 'toEditBtn');
 }
 export function clickToEditButtonIfExists(parentSelectors) {
+	cy.log('clickToEditButtonIfExists');
 	return clickButtonIfExists(parentSelectors, 'toEditBtn');
 }
 export function clickToViewButton(parentSelectors) {
+	cy.log('clickToViewButton');
 	return clickButton(parentSelectors, 'toViewBtn');
 }
 export function clickToViewButtonIfExists(parentSelectors) {
+	cy.log('clickToViewButtonIfExists');
 	return clickButtonIfExists(parentSelectors, 'toViewBtn');
 }
 export function toFullMode(parentSelectors) {
-	return clickButton(parentSelectors, 'fullModeBtn');
+	cy.log('toFullMode');
+	return clickButtonIfEnabled(parentSelectors, 'fullModeBtn');
 }
 export function toSideMode(parentSelectors) {
-	return clickButton(parentSelectors, 'sideModeBtn');
+	cy.log('toSideMode');
+	return clickButtonIfEnabled(parentSelectors, 'sideModeBtn');
+}
+export function clickButton(parentSelectors, name) { // requires the button to be enabled
+	if (_.isString(parentSelectors)) {
+		parentSelectors = [parentSelectors];
+	}
+	cy.log('clickButton ' + name);
+	return getDomNode([...parentSelectors, name])
+				.should('not.have.attr', 'data-disabled', 'true') // Check that the element is not disabled
+				.click({ force: true });
 }
-export function clickButton(parentSelectors, name) {
+export function clickButtonIfEnabled(parentSelectors, name) { // allows button to be disabled
 	if (_.isString(parentSelectors)) {
 		parentSelectors = [parentSelectors];
 	}
 	return getDomNode([...parentSelectors, name])
-				// .scrollIntoView()
 				.click({ force: true });
 }
 export function clickButtonIfExists(parentSelectors, name) {
 	if (_.isString(parentSelectors)) {
 		parentSelectors = [parentSelectors];
 	}
-	return getDomNode([...parentSelectors, name]).then((node) => {
+	return getDomNode([...parentSelectors, name]).if().then((node) => { // NOTE if() is a cypress-if function
 		if (node) {
 			node.click();
 		}

package/src/Functions/Cypress/common_functions.js

@@ -5,6 +5,7 @@ import {
 
 
 export function markForPageReload() {
+	cy.log('markForPageReload');
 	// See https://github.com/cypress-io/cypress/issues/1805#issuecomment-525482440
 	cy.window()
 		.then((win) => {
@@ -12,11 +13,13 @@ export function markForPageReload() {
 		});
 }
 export function waitForPageReload() {
+	cy.log('waitForPageReload');
 	// See https://github.com/cypress-io/cypress/issues/1805#issuecomment-525482440
 	cy.window({ timeout: 30000 })
 		.should('not.have.prop', 'beforeReload');
 }
 export function waitForNavigationTo(url) {
+	cy.log('waitForNavigationTo ' + url);
 	return cy.location('pathname', { timeout: 30000 })
 		.should('include', url);
 }
@@ -30,10 +33,12 @@ export function waitForNavigationTo(url) {
 // /_/  /_/\___/____/____/\__,_/\__, /\___/_____/\____/_/|_|
 //                             /____/
 export function clickMessageBoxDefaultButton() {
-	getDomNode(['AlertDialogue', 'okBtn'])
+	cy.log('clickMessageBoxDefaultButton');
+	getDomNode(['AlertModal', 'okBtn'])
 		.click();
 }
 export function verifyNoErrorBox() {
+	cy.log('verifyNoErrorBox');
 	getDomNode('ErrorMessage', { timeout: 1000 })
 		.should('not.exist', 'Error dialogue popped up.');
 }

package/src/Functions/Cypress/crud_functions.js

@@ -1,6 +1,7 @@
 import {
 	fixInflector,
 	getLastPartOfPath,
+	bootstrapRouteWaiters,
 } from './utilities.js';
 import {
 	login,
@@ -81,9 +82,7 @@ export const FULL = 'FULL';
 
 // Form fields
 export function crudCombo(selector, newData, editData, schema, ancillaryData, level = 0) {
-	cy.then(() => {
-		Cypress.log({ name: 'crudCombo' });
-	});
+	cy.log('crudCombo');
 
 	const
 		fieldName = selector[1].match(/^field-(.*)$/)[1],
@@ -96,9 +95,7 @@ export function crudCombo(selector, newData, editData, schema, ancillaryData, le
 	clickTrigger(selector);
 }
 export function crudTag(selector, newData, editData, schema, ancillaryData, level = 0) {
-	cy.then(() => {
-		Cypress.log({ name: 'crudTag' });
-	});
+	cy.log('crudTag');
 
 	const
 		fieldName = selector[1].match(/^field-(.*)$/)[1],
@@ -114,9 +111,7 @@ export function crudTag(selector, newData, editData, schema, ancillaryData, leve
 	clickTrigger(selector);
 }
 export function crudJson(selector, newData, editData, schema, ancillaryData, level = 0) {
-	cy.then(() => {
-		Cypress.log({ name: 'crudJson' });
-	});
+	cy.log('crudJson');
 
 	// do nothing for now
 }
@@ -125,9 +120,7 @@ export function crudJson(selector, newData, editData, schema, ancillaryData, lev
 // Grid
 export function crudWindowedGridRecord(gridSelector, newData, editData, schema, ancillaryData, level = 0) {
 
-	cy.then(() => {
-		Cypress.log({ name: 'crudWindowedGridRecord ' + gridSelector });
-	});
+	cy.log('crudWindowedGridRecord ' + gridSelector);
 
 	getDomNode(gridSelector).scrollIntoView();
 
@@ -136,9 +129,7 @@ export function crudWindowedGridRecord(gridSelector, newData, editData, schema,
 	
 	cy.get('@id' + level).then((id) => {
 
-		cy.then(() => {
-			Cypress.log({ name: 'crudWindowedGridRecord: continue thru CRUD ' + gridSelector });
-		});
+		cy.log('crudWindowedGridRecord: continue thru CRUD ' + gridSelector);
 
 		// read
 		clickReloadButton(gridSelector);
@@ -156,9 +147,7 @@ export function crudWindowedGridRecord(gridSelector, newData, editData, schema,
 }
 export function crudInlineGridRecord(gridSelector, newData, editData, schema, ancillaryData, level = 0) {
 
-	cy.then(() => {
-		Cypress.log({ name: 'crudInlineGridRecord ' + gridSelector });
-	});
+	cy.log('crudInlineGridRecord ' + gridSelector);
 
 	getDomNode(gridSelector).scrollIntoView();
 
@@ -167,9 +156,7 @@ export function crudInlineGridRecord(gridSelector, newData, editData, schema, an
 	
 	cy.get('@id' + level).then((id) => {
 
-		cy.then(() => {
-			Cypress.log({ name: 'crudWindowedGridRecord: continue thru CRUD ' + gridSelector });
-		});
+		cy.log('crudWindowedGridRecord: continue thru CRUD ' + gridSelector);
 
 		// read
 		clickReloadButton(gridSelector);
@@ -189,9 +176,7 @@ export function crudSideGridRecord(gridSelector, newData, editData, schema, anci
 	// NOTE: the 'level' arg allows this fn to be called recursively 
 	// and to use the @id alias correctly, keeping track of the level of recursion
 	// so the CRUD operations don't step on each other at different levels.
-	cy.then(() => {
-		Cypress.log({ name: 'crudSideGridRecord ' + gridSelector });
-	});
+	cy.log('crudSideGridRecord ' + gridSelector);
 	
 	getDomNode(gridSelector).scrollIntoView();
 
@@ -216,16 +201,18 @@ export function crudSideGridRecord(gridSelector, newData, editData, schema, anci
 }
 export function addGridRecord(gridSelector, fieldValues, schema, ancillaryData, level = 0) {
 
-	cy.then(() => {
-		Cypress.log({ name: 'addGridRecord ' + gridSelector });
-	});
+	cy.log('addGridRecord ' + gridSelector);
 
 	const
 		editorSelector = gridSelector + '/editor',
 		viewerSelector = editorSelector + '/viewer',
-		formSelector = editorSelector + '/form';
+		formSelector = editorSelector + '/form',
+		isRemotePhantomMode = schema.repository.isRemotePhantomMode;
 
 	clickAddButton(gridSelector);
+	if (isRemotePhantomMode) {
+		cy.wait('@addWaiter');
+	}
 	getDomNode(formSelector).should('exist');
 
 	fillForm(formSelector, fieldValues, schema, level +1);
@@ -233,12 +220,11 @@ export function addGridRecord(gridSelector, fieldValues, schema, ancillaryData,
 	// TODO: Change this to wait until save button is enabled
 
 	let method = 'add';
-	if (schema.repository.isRemotePhantomMode) {
+	if (isRemotePhantomMode) {
 		method = 'edit';
 	}
-	cy.intercept('POST', '**/' + method + '**').as('waiter');
 	clickSaveButton(formSelector); // it's labeled 'Add' in the form, but is really the save button
-	cy.wait('@waiter');
+	cy.wait('@' + method + 'Waiter');
 
 	verifyNoErrorBox();
 
@@ -262,8 +248,11 @@ export function addGridRecord(gridSelector, fieldValues, schema, ancillaryData,
 				schema = data.schema,
 				newData = data.newData,
 				editData = data.editData,
-				ancillaryData = data.ancillaryData,
-				ancillaryGridSelector = formSelector + '/' + (gridType || Models + 'GridEditor');
+				ancillaryData = data.ancillaryData;
+			let ancillaryGridSelector = formSelector + '/' + (gridType || Models + 'GridEditor');
+			if (ancillaryGridSelector.match(/^(.*)Side(A|B)(.*)$/)) {
+				ancillaryGridSelector = ancillaryGridSelector.replace(/^(.*)Side(A|B)(.*)$/, '$1$3Side$2');
+			}
 			crudWindowedGridRecord(ancillaryGridSelector, newData, editData, schema, ancillaryData, level+1);
 		});
 	}
@@ -271,15 +260,11 @@ export function addGridRecord(gridSelector, fieldValues, schema, ancillaryData,
 export function addWindowedGridRecord(gridSelector, fieldValues, schema, ancillaryData, level = 0) {
 	// adds the record as normal, then closes the editor window
 
-	cy.then(() => {
-		Cypress.log({ name: 'addWindowedGridRecord ' + gridSelector });
-	});
+	cy.log('addWindowedGridRecord ' + gridSelector);
 
 	addGridRecord(gridSelector, fieldValues, schema, ancillaryData, level);
 
-	cy.then(() => {
-		Cypress.log({ name: 'addWindowedGridRecord: close window ' + gridSelector });
-	});
+	cy.log('addWindowedGridRecord: close window ' + gridSelector);
 	const formSelector = gridSelector + '/editor/form';
 	clickCloseButton(formSelector);
 	cy.wait(500); // allow window to close
@@ -288,25 +273,18 @@ export function addWindowedGridRecord(gridSelector, fieldValues, schema, ancilla
 export function addInlineGridRecord(gridSelector, fieldValues, schema, ancillaryData, level = 0) {
 	// adds the record as normal, then closes the editor window
 
-	cy.then(() => {
-		Cypress.log({ name: 'addInlineGridRecord ' + gridSelector });
-	});
+	cy.log('addInlineGridRecord ' + gridSelector);
 
-	addGridRecord(gridSelector, fieldValues, schema, ancillaryData, level);
+	addGridRecord(gridSelector, fieldValues, schema, [], level); // NOTE: ancillaryData is not passed to addGridRecord because can't edit ancillary data in an inline editor
 
-	cy.then(() => {
-		Cypress.log({ name: 'addWindowedGridRecord: close window ' + gridSelector });
-	});
+	cy.log('addWindowedGridRecord: close window ' + gridSelector);
 	const formSelector = gridSelector + '/editor/form';
 	clickCloseButton(formSelector);
 	cy.wait(500); // allow window to close
 	// TODO: Change this to wait until window is closed
 }
 export function editGridRecord(gridSelector, fieldValues, schema, id, level = 0, whichEditor = WINDOWED) {
-	
-	cy.then(() => {
-		Cypress.log({ name: 'editGridRecord ' + gridSelector + ' ' + id});
-	});
+	cy.log('editGridRecord ' + gridSelector + ' ' + id);
 	
 	selectGridRowIfNotAlreadySelectedById(gridSelector, id);
 
@@ -316,11 +294,11 @@ export function editGridRecord(gridSelector, fieldValues, schema, id, level = 0,
 		formSelector = editorSelector + '/form';
 
 	if (whichEditor === SIDE) {
-		Cypress.log({ name: 'switch to Edit mode if necessary ' + viewerSelector});
+		cy.log('switch to Edit mode if necessary ' + viewerSelector);
 		clickToEditButtonIfExists(viewerSelector);
 	} else {
 		// windowed or inline editor
-		Cypress.log({ name: 'click editBtn ' + gridSelector});
+		cy.log('click editBtn ' + gridSelector);
 		clickEditButton(gridSelector);
 	}
 	cy.wait(1500); // allow form to build
@@ -329,10 +307,9 @@ export function editGridRecord(gridSelector, fieldValues, schema, id, level = 0,
 	fillForm(formSelector, fieldValues, schema, level +1);
 	cy.wait(500); // allow validator to enable save button
 	// TODO: Change this to wait until save button is enabled
-
-	cy.intercept('POST', '**/edit**').as('waiter');
+	
 	clickSaveButton(formSelector);
-	cy.wait('@waiter');
+	cy.wait('@editWaiter');
 
 	verifyNoErrorBox();
 	// cy.wait(1000);
@@ -341,9 +318,7 @@ export function editGridRecord(gridSelector, fieldValues, schema, id, level = 0,
 export function editWindowedGridRecord(gridSelector, fieldValues, schema, id, level = 0) {
 	// edits the record as normal, then closes the editor window
 
-	cy.then(() => {
-		Cypress.log({ name: 'editWindowedGridRecord ' + gridSelector + ' ' + id});
-	});
+	cy.log('editWindowedGridRecord ' + gridSelector + ' ' + id);
 	
 	editGridRecord(gridSelector, fieldValues, schema, id, level, WINDOWED);
 
@@ -355,9 +330,7 @@ export function editWindowedGridRecord(gridSelector, fieldValues, schema, id, le
 export function editInlineGridRecord(gridSelector, fieldValues, schema, id, level = 0) {
 	// edits the record as normal, then closes the editor window
 
-	cy.then(() => {
-		Cypress.log({ name: 'editWindowedGridRecord ' + gridSelector + ' ' + id});
-	});
+	cy.log('editWindowedGridRecord ' + gridSelector + ' ' + id);
 	
 	editGridRecord(gridSelector, fieldValues, schema, id, level, INLINE);
 
@@ -367,27 +340,21 @@ export function editInlineGridRecord(gridSelector, fieldValues, schema, id, leve
 	// TODO: Change this to wait until window is closed
 }
 export function deleteGridRecord(gridSelector, id) {
-
-	cy.then(() => {
-		Cypress.log({ name: 'deleteGridRecord ' + gridSelector + ' ' + id });
-	});
+	cy.log('deleteGridRecord ' + gridSelector + ' ' + id);
 	
 	selectGridRowIfNotAlreadySelectedById(gridSelector, id);
 	clickDeleteButton(gridSelector);
 	cy.wait(500); // allow confirmation box to appear
 	
 	// Click OK on confirmation box
-	cy.intercept('POST', '**/delete**').as('waiter');
-	clickYesButton('AlertDialog');
-	cy.wait('@waiter');
+	clickYesButton('ConfirmModal');
+	cy.wait('@deleteWaiter');
 
 	verifyNoErrorBox();
 	// cy.wait(1000);
 }
 export function switchToEditModeIfNecessary(editorSelector) {
-	cy.then(() => {
-		Cypress.log({ name: 'switchToEditModeIfNecessary ' + editorSelector });
-	});
+	cy.log('switchToEditModeIfNecessary ' + editorSelector);
 	
 	getDomNode(editorSelector).then((editor) => {
 		const btn = editor.find('.toEditBtn');
@@ -399,9 +366,7 @@ export function switchToEditModeIfNecessary(editorSelector) {
 	});
 }
 export function switchToViewModeIfNecessary(editorSelector) {
-	cy.then(() => {
-		Cypress.log({ name: 'switchToViewModeIfNecessary ' + editorSelector });
-	});
+	cy.log('switchToViewModeIfNecessary ' + editorSelector);
 
 	getDomNode(editorSelector).then((editor) => {
 		const btn = editor.find('.toViewBtn');
@@ -417,9 +382,7 @@ export function switchToViewModeIfNecessary(editorSelector) {
 // Tree
 export function crudWindowedTreeRecord(treeSelector, newData, editData, schema, ancillaryData, level = 0) {
 
-	cy.then(() => {
-		Cypress.log({ name: 'crudWindowedTreeRecord ' + treeSelector });
-	});
+	cy.log('crudWindowedTreeRecord ' + treeSelector);
 
 	getDomNode(treeSelector).scrollIntoView();
 
@@ -428,9 +391,7 @@ export function crudWindowedTreeRecord(treeSelector, newData, editData, schema,
 	
 	cy.get('@id' + level).then((id) => {
 
-		cy.then(() => {
-			Cypress.log({ name: 'crudWindowedTreeRecord: continue thru CRUD ' + treeSelector });
-		});
+		cy.log('crudWindowedTreeRecord: continue thru CRUD ' + treeSelector);
 		
 		// read
 		clickReloadButton(treeSelector);
@@ -450,9 +411,7 @@ export function crudSideTreeRecord(treeSelector, newData, editData, schema, anci
 	// NOTE: the 'level' arg allows this fn to be called recursively 
 	// and to use the @id alias correctly, keeping track of the level of recursion
 	// so the CRUD operations don't step on each other at different levels.
-	cy.then(() => {
-		Cypress.log({ name: 'crudSideTreeRecord ' + treeSelector });
-	});
+	cy.log('crudSideTreeRecord ' + treeSelector);
 	
 	getDomNode(treeSelector).scrollIntoView();
 
@@ -477,9 +436,7 @@ export function crudSideTreeRecord(treeSelector, newData, editData, schema, anci
 }
 export function addTreeRecord(treeSelector, fieldValues, schema, ancillaryData, level = 0) {
 
-	cy.then(() => {
-		Cypress.log({ name: 'addTreeRecord ' + treeSelector });
-	});
+	cy.log('addTreeRecord ' + treeSelector);
 
 	const
 		editorSelector = treeSelector + '/editor',
@@ -508,9 +465,8 @@ export function addTreeRecord(treeSelector, fieldValues, schema, ancillaryData,
 	if (schema.repository.isRemotePhantomMode) {
 		method = 'edit';
 	}
-	cy.intercept('POST', '**/' + method + '**').as('waiter');
 	clickSaveButton(formSelector); // it's labeled 'Add' in the form, but is really the save button
-	cy.wait('@waiter');
+	cy.wait('@' + method + 'Waiter');
 
 	verifyNoErrorBox();
 
@@ -534,8 +490,11 @@ export function addTreeRecord(treeSelector, fieldValues, schema, ancillaryData,
 				schema = data.schema,
 				newData = data.newData,
 				editData = data.editData,
-				ancillaryData = data.ancillaryData,
-				ancillaryGridSelector = formSelector + '/' + (gridType || Models + 'GridEditor');
+				ancillaryData = data.ancillaryData;
+			let ancillaryGridSelector = formSelector + '/' + (gridType || Models + 'GridEditor');
+			if (ancillaryGridSelector.match(/^(.*)Side(A|B)(.*)$/)) {
+				ancillaryGridSelector = ancillaryGridSelector.replace(/^(.*)Side(A|B)(.*)$/, '$1$3Side$2');
+			}
 			crudWindowedGridRecord(ancillaryGridSelector, newData, editData, schema, ancillaryData, level+1);
 		});
 	}
@@ -543,15 +502,11 @@ export function addTreeRecord(treeSelector, fieldValues, schema, ancillaryData,
 export function addWindowedTreeRecord(treeSelector, fieldValues, schema, ancillaryData, level = 0) {
 	// adds the record as normal, then closes the editor window
 
-	cy.then(() => {
-		Cypress.log({ name: 'addWindowedTreeRecord ' + treeSelector });
-	});
+	cy.log('addWindowedTreeRecord ' + treeSelector);
 
 	addTreeRecord(treeSelector, fieldValues, schema, ancillaryData, level);
 
-	cy.then(() => {
-		Cypress.log({ name: 'addWindowedTreeRecord: close window ' + treeSelector });
-	});
+	cy.log('addWindowedTreeRecord: close window ' + treeSelector);
 	const formSelector = treeSelector + '/editor/form';
 	clickCloseButton(formSelector);
 	cy.wait(500); // allow window to close
@@ -559,9 +514,7 @@ export function addWindowedTreeRecord(treeSelector, fieldValues, schema, ancilla
 }
 export function editTreeRecord(treeSelector, fieldValues, schema, id, level = 0, whichEditor = WINDOWED) {
 	
-	cy.then(() => {
-		Cypress.log({ name: 'editTreeRecord ' + treeSelector + ' ' + id});
-	});
+	cy.log('editTreeRecord ' + treeSelector + ' ' + id);
 	
 	selectTreeNodeIfNotAlreadySelectedById(treeSelector, id);
 
@@ -571,10 +524,10 @@ export function editTreeRecord(treeSelector, fieldValues, schema, id, level = 0,
 		formSelector = editorSelector + '/form';
 
 	if (whichEditor === SIDE) {
-		Cypress.log({ name: 'switch to Edit mode if necessary ' + viewerSelector});
+		cy.log('switch to Edit mode if necessary ' + viewerSelector);
 		clickToEditButtonIfExists(viewerSelector);
 	} else {
-		Cypress.log({ name: 'click editBtn ' + treeSelector});
+		cy.log('click editBtn ' + treeSelector);
 		clickEditButton(treeSelector);
 	}
 	cy.wait(1500); // allow form to build
@@ -584,9 +537,8 @@ export function editTreeRecord(treeSelector, fieldValues, schema, id, level = 0,
 	cy.wait(500); // allow validator to enable save button
 	// TODO: Change this to wait until save button is enabled
 
-	cy.intercept('POST', '**/edit**').as('waiter');
 	clickSaveButton(formSelector);
-	cy.wait('@waiter');
+	cy.wait('@editWaiter');
 
 	verifyNoErrorBox();
 	// cy.wait(1000);
@@ -595,9 +547,7 @@ export function editTreeRecord(treeSelector, fieldValues, schema, id, level = 0,
 export function editWindowedTreeRecord(treeSelector, fieldValues, schema, id, level = 0) {
 	// edits the record as normal, then closes the editor window
 
-	cy.then(() => {
-		Cypress.log({ name: 'editWindowedTreeRecord ' + treeSelector + ' ' + id});
-	});
+	cy.log('editWindowedTreeRecord ' + treeSelector + ' ' + id);
 	
 	editTreeRecord(treeSelector, fieldValues, schema, id, level, WINDOWED);
 
@@ -608,18 +558,15 @@ export function editWindowedTreeRecord(treeSelector, fieldValues, schema, id, le
 }
 export function deleteTreeRecord(treeSelector, id) {
 
-	cy.then(() => {
-		Cypress.log({ name: 'deleteTreeRecord ' + treeSelector + ' ' + id });
-	});
+	cy.log('deleteTreeRecord ' + treeSelector + ' ' + id);
 	
 	selectTreeNodeIfNotAlreadySelectedById(treeSelector, id);
 	clickDeleteButton(treeSelector);
 	cy.wait(500); // allow confirmation box to appear
 	
 	// Click OK on confirmation box
-	cy.intercept('POST', '**/delete**').as('waiter');
-	clickYesButton('AlertDialog');
-	cy.wait('@waiter');
+	clickYesButton('ConfirmModal');
+	cy.wait('@deleteWaiter');
 
 	verifyNoErrorBox();
 	// cy.wait(1000);
@@ -636,6 +583,7 @@ export function runClosureTreeControlledManagerScreenCrudTests(model, schema, ne
 	describe(Models + 'Manager', () => {
 
 		beforeEach(function () {
+			bootstrapRouteWaiters();
 			login();
 			cy.restoreLocalStorage();
 			cy.url().then((currentUrl) => {
@@ -732,6 +680,7 @@ export function runClosureTreeManagerScreenCrudTests(args) {
 	describe(Models + 'Manager', () => {
 
 		beforeEach(function () {
+			bootstrapRouteWaiters();
 			login();
 			cy.restoreLocalStorage();
 			cy.url().then((currentUrl) => {
@@ -796,6 +745,7 @@ export function runManagerScreenCrudTests(args) {
 	describe(Models + 'Manager', () => {
 
 		beforeEach(function () {
+			bootstrapRouteWaiters();
 			login();
 			cy.restoreLocalStorage();
 			cy.url().then((currentUrl) => {
@@ -854,6 +804,7 @@ export function runReportsManagerTests(reportData) {
 	describe('ReportsManager', () => {
 
 		beforeEach(function () {
+			bootstrapRouteWaiters();
 			login();
 			cy.url().then((currentUrl) => {
 				if (!currentUrl.endsWith(url)) {
@@ -866,9 +817,7 @@ export function runReportsManagerTests(reportData) {
 
 			it('Report ' + report.id, function() {
 
-				cy.then(() => {
-					Cypress.log({ name: 'report ' + report.id });
-				});
+				cy.log('report ' + report.id);
 
 				const selector = 'Report-' + report.id;
 
@@ -878,17 +827,15 @@ export function runReportsManagerTests(reportData) {
 
 
 				// Press Excel button
-				cy.intercept('GET', '**/getReport**').as('waiter');
 				clickButton(selector, 'excelBtn');
-				cy.wait('@waiter', { timeout: 10000 }).then((interception) => {
+				cy.wait('@getWaiter', { timeout: 10000 }).then((interception) => {
 					expect(interception.response.headers['content-type']).to.include('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
 				});
 
 
 				// Press PDF button
-				cy.intercept('POST', '**/getReport**').as('waiter');
 				clickButton(selector, 'pdfBtn');
-				cy.wait('@waiter', { timeout: 10000 }).then((interception) => {
+				cy.wait('@getReportWaiter', { timeout: 10000 }).then((interception) => {
 					expect(interception.response.headers['content-type']).to.include('pdf');
 				});
 

package/src/Functions/Cypress/form_functions.js

@@ -12,6 +12,9 @@ import {
 	crudTag,
 	crudJson,
 } from './crud_functions.js';
+import {
+	clickXButtonIfEnabled
+} from './button_functions.js';
 import natsort from 'natsort';
 import _ from 'lodash';
 const $ = Cypress.$;
@@ -29,6 +32,7 @@ export function setCustomFormFunctions(fns) {
  * @param {object} schema - fieldName/fieldType pairs
  */
 export function fillForm(selector, fieldValues, schema, level = 0) {
+	cy.log('fillForm');
 	_.each(fieldValues, (value, fieldName) => {
 
 		const selectors = [selector, 'field-' + fieldName];
@@ -116,6 +120,7 @@ export function fillForm(selector, fieldValues, schema, level = 0) {
 // export function setFileValue(field, value) {
 // }
 export function setArrayComboValue(selectors, value) {
+	cy.log('setArrayComboValue ' + value);
 	getDomNode([...selectors, 'input']).then((field) => {
 		cy.get(field).clear({ force: true });
 		if (value) {
@@ -129,18 +134,20 @@ export function setArrayComboValue(selectors, value) {
 	});
 }
 export function setComboValue(selectors, value) {
+	cy.log('setComboValue ' + value);
 	getDomNode([...selectors, 'input']).then((field) => {
-		cy.get(field).clear({ force: true });
+		// cy.get(field).clear({ force: true });
+		clickXButtonIfEnabled(selectors); // clear current value
 		if (value) {
-			cy.intercept('GET', '**/get**').as('getWaiter'); // set up waiter
 			cy.get(field)
 				.type(value, { delay: 40, force: true }) // slow it down a bit, so React has time to re-render
 				.wait('@getWaiter'); // allow dropdown to load
 				
 			cy.get(field)
-				.wait(2000) // render
+				.wait(1000) // render
+
 				.type('{downarrow}')
-				.wait(1000) // allow time for selection
+				.wait(500) // allow time for selection
 
 				.type('{enter}')
 				.wait(250); // allow time to register enter key
@@ -148,6 +155,7 @@ export function setComboValue(selectors, value) {
 	});
 }
 export function setTagValue(selectors, value) {
+	cy.log('setTagValue ' + value);
 	const values = !_.isEmpty(value) ? JSON.parse(value) : null;
 
 	// Clear any previously selected tags
@@ -173,15 +181,14 @@ export function setTagValue(selectors, value) {
 		if (!_.isEmpty(values)) {
 			_.each(values, (value) => {
 				const id = value.id;
-				cy.intercept('GET', '**/get**').as('getWaiter'); // set up waiter
 				cy.get(field)
 					.type('id:' + id, { delay: 40, force: true }) // slow it down a bit, so React has time to re-render
 					.wait('@getWaiter'); // allow dropdown to load
 					
 				cy.get(field)
-					.wait(2000) // render
+					.wait(1000) // render
 					.type('{downarrow}')
-					.wait(1000); // allow time for selection
+					.wait(500); // allow time for selection
 			});
 
 			// press trigger to hide dropdown
@@ -190,6 +197,7 @@ export function setTagValue(selectors, value) {
 	});
 }
 export function setDateValue(selectors, value) {
+	cy.log('setDateValue ' + value);
 	getDomNode(selectors).then((field) => {
 		cy.get(field).clear({ force: true });
 		if (value) {
@@ -200,6 +208,7 @@ export function setDateValue(selectors, value) {
 	});
 }
 export function setNumberValue(selectors, value) {
+	cy.log('setNumberValue ' + value);
 	// setTextValue(selectors, value);
 
 	getDomNode(selectors).clear({ force: true });
@@ -210,6 +219,7 @@ export function setNumberValue(selectors, value) {
 	}
 }
 export function setToggleValue(selectors, value) {
+	cy.log('setToggleValue ' + value);
 	selectors.push('input[role="switch"]');
 	if (value) {
 		getToggleState(selectors).then((isYes) => {
@@ -228,6 +238,7 @@ export function setToggleValue(selectors, value) {
 	}
 }
 export function getToggleState(selectors) {
+	cy.log('getToggleState');
 	return getDomNode(selectors).then((node) => {
 		if (!node.length) {
 			return null;
@@ -236,9 +247,11 @@ export function getToggleState(selectors) {
 	});
 }
 export function clickToggle(selectors, options = {}) {
+	cy.log('clickToggle');
 	getDomNode(selectors).click(options);
 }
 export function setTextValue(selectors, value) {
+	cy.log('setTextValue ' + value);
 	getDomNode(selectors).clear({ force: true });
 	if (value !== null && value !== '') {
 		getDomNode(selectors)
@@ -247,6 +260,7 @@ export function setTextValue(selectors, value) {
 	}
 }
 export function setTextAreaValue(selectors, value) {
+	cy.log('setTextAreaValue ' + value);
 	getDomNode(selectors).clear({ force: true });
 	if (value !== null && value !== '') {
 		getDomNode(selectors)
@@ -254,6 +268,7 @@ export function setTextAreaValue(selectors, value) {
 	}
 }
 export function setInputValue(selectors, value) {
+	cy.log('setInputValue ' + value);
 	setTextValue(selectors, value);
 }
 

package/src/Functions/Cypress/grid_functions.js

@@ -14,9 +14,11 @@ const $ = Cypress.$;
 
 // Get rows
 export function hasRowWithFieldValue(gridSelector, field, value) {
+	cy.log('hasRowWithFieldValue ' + gridSelector + ' ' + field + ' ' + value);
 	return getDomNodes([gridSelector, 'row', 'cell-' + field]).contains(value);
 }
 export function getRowWithFieldValue(gridSelector, field, value) {
+	cy.log('getRowWithFieldValue ' + gridSelector + ' ' + field + ' ' + value);
 	return getDomNodes([gridSelector, 'row', 'cell-' + field]).contains(value).then((cells) => {
 		if (!cells.length) {
 			return null;
@@ -39,17 +41,13 @@ export function getRowWithFieldValue(gridSelector, field, value) {
 
 // Select rows
 export function selectGridRowById(gridSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'selectGridRowById ' + gridSelector + ' ' + id});
-	});
+	cy.log('selectGridRowById ' + gridSelector + ' ' + id);
 	const rowSelector = getGridRowSelectorById(gridSelector, id);
 	getDomNode([gridSelector, rowSelector])
 		.click();
 }
 export function selectGridRowIfNotAlreadySelectedById(gridSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'selectGridRowIfNotAlreadySelectedById ' + gridSelector + ' ' + id});
-	});
+	cy.log('selectGridRowIfNotAlreadySelectedById ' + gridSelector + ' ' + id);
 	const rowSelector = getGridRowSelectorById(gridSelector, id);
 	getDomNode([gridSelector, rowSelector]).then((row) => {
 		const found = row.find('[data-testid="row-selected"]')
@@ -86,6 +84,7 @@ export function verifyGridRecordDoesNotExistByValue(gridSelector, fieldValues, s
 		field = schema.model.displayProperty,
 		value = fieldValues[field];
 		
+	cy.log('verifyGridRecordDoesNotExistByValue ' + gridSelector + ' ' + value);
 	getDomNodes([gridSelector, 'row', 'cell-' + field])
 		.contains(value, { timeout: 500 })
 		.should('not.exist');
@@ -95,31 +94,26 @@ export function verifyGridRecordExistsByValue(gridSelector, fieldValues, schema)
 		field = schema.model.displayProperty,
 		value = fieldValues[field];
 		
+	cy.log('verifyGridRecordExistsByValue ' + gridSelector + ' ' + value);
 	getDomNodes([gridSelector, 'row', 'cell-' + field])
 		.contains(value, { timeout: 500 })
 		.should('exist');
 }
 export function verifyGridRecordExistsById(gridSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'verifyGridRecordExistsById ' + gridSelector + ' ' + id });
-	});
+	cy.log('verifyGridRecordExistsById ' + gridSelector + ' ' + id);
 	
 	const rowSelector = getGridRowSelectorById(gridSelector, id);
 	getDomNodes([gridSelector, rowSelector])
 		.should('exist');
 }
 export function verifyGridRecordDoesNotExistById(gridSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'verifyGridRecordDoesNotExistById ' + gridSelector + ' ' + id });
-	});
+	cy.log('verifyGridRecordDoesNotExistById ' + gridSelector + ' ' + id);
 	const rowSelector = getGridRowSelectorById(gridSelector, id);
 	getDomNodes([gridSelector, rowSelector])
 		.should('not.exist');
 }
 export function verifyGridRowIsSelectedById(gridSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'verifyGridRowIsSelectedById ' + gridSelector + ' ' + id});
-	});
+	cy.log('verifyGridRowIsSelectedById ' + gridSelector + ' ' + id);
 	const rowSelector = getGridRowSelectorById(gridSelector, id);
 	getDomNodes([gridSelector, rowSelector, 'row-selected'])
 		.should('exist');

package/src/Functions/Cypress/navigation_functions.js

@@ -12,6 +12,7 @@ import {
 //             /____/
 
 export function login(loginId = null, password = null) {
+	cy.log('login');
 	if (!loginId) {
 		loginId = Cypress.env('loginId');
 	}
@@ -34,6 +35,7 @@ export function login(loginId = null, password = null) {
 		});
 }
 export function logout() {
+	cy.log('logout');
 	const baseDir = Cypress.env('baseDir');
 	getDomNode(baseDir + 'logout').click({ force: true });
 }
@@ -47,6 +49,7 @@ export function logout() {
 //                     /____/
 
 export function navigateViaTabOrHomeButtonTo(url) {
+	cy.log('navigateViaTabOrHomeButtonTo ' + url);
 	// i.e. If we're on home screen, press the button.
 	// If we have a tab navigation, press the tab's button
 	const baseDir = Cypress.env('baseDir');
@@ -54,9 +57,11 @@ export function navigateViaTabOrHomeButtonTo(url) {
 	cy.url().should('include', url);
 }
 export function navigateToHome() {
+	cy.log('navigateToHome');
 	navigateToScreen('home');
 }
 export function navigateToScreen(path) {
+	cy.log('navigateToScreen ' + path);
 	const
 		baseUrl = Cypress.env('baseUrl'),
 		baseDir = Cypress.env('baseDir');

package/src/Functions/Cypress/tree_functions.js

@@ -14,9 +14,11 @@ const $ = Cypress.$;
 
 // Get rows
 export function hasNodeWithFieldValue(treeSelector, field, value) {
+	cy.log('hasNodeWithFieldValue ' + treeSelector + ' ' + field + ' ' + value);
 	return getDomNodes([treeSelector, 'row', 'cell-' + field]).contains(value);
 }
 export function getNodeWithFieldValue(treeSelector, field, value) {
+	cy.log('getNodeWithFieldValue ' + treeSelector + ' ' + field + ' ' + value);
 	return getDomNodes([treeSelector, 'row', 'cell-' + field]).contains(value).then((cells) => {
 		if (!cells.length) {
 			return null;
@@ -27,6 +29,7 @@ export function getNodeWithFieldValue(treeSelector, field, value) {
 	});
 }
 export function getFirstTreeRootNode(treeSelector) {
+	cy.log('getFirstTreeRootNode ' + treeSelector);
 	return cy.get('[data-testid="' + treeSelector + '"]:first ' + 
 					'[data-testid="ScrollView"]:first > div > div:first'); // this is fragile!
 }
@@ -43,17 +46,13 @@ export function getFirstTreeRootNode(treeSelector) {
 
 // Select rows
 export function selectTreeNodeById(treeSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'selectTreeNodeById ' + treeSelector + ' ' + id});
-	});
+	cy.log('selectTreeNodeById ' + treeSelector + ' ' + id);
 	const rowSelector = getTreeNodeSelectorById(treeSelector, id);
 	getDomNode([treeSelector, rowSelector])
 		.click();
 }
 export function selectTreeNodeIfNotAlreadySelectedById(treeSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'selectTreeNodeIfNotAlreadySelectedById ' + treeSelector + ' ' + id});
-	});
+	cy.log('selectTreeNodeIfNotAlreadySelectedById ' + treeSelector + ' ' + id);
 	const rowSelector = getTreeNodeSelectorById(treeSelector, id);
 	getDomNode([treeSelector, rowSelector]).then((row) => {
 		const found = row.find('[data-testid="node-selected"]')
@@ -90,6 +89,7 @@ export function verifyTreeRecordDoesNotExistByValue(treeSelector, fieldValues, s
 		field = schema.model.displayProperty,
 		value = fieldValues[field];
 		
+	cy.log('verifyTreeRecordDoesNotExistByValue ' + treeSelector + ' ' + value);
 	getDomNodes([treeSelector, 'row', 'cell-' + field])
 		.contains(value, { timeout: 500 })
 		.should('not.exist');
@@ -99,31 +99,26 @@ export function verifyTreeRecordExistsByValue(treeSelector, fieldValues, schema)
 		field = schema.model.displayProperty,
 		value = fieldValues[field];
 		
+	cy.log('verifyTreeRecordExistsByValue ' + treeSelector + ' ' + value);
 	getDomNodes([treeSelector, 'row', 'cell-' + field])
 		.contains(value, { timeout: 500 })
 		.should('exist');
 }
 export function verifyTreeRecordExistsById(treeSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'verifyTreeRecordExistsById ' + treeSelector + ' ' + id });
-	});
+	cy.log('verifyTreeRecordExistsById ' + treeSelector + ' ' + id);
 	
 	const rowSelector = getTreeNodeSelectorById(treeSelector, id);
 	getDomNodes([treeSelector, rowSelector])
 		.should('exist');
 }
 export function verifyTreeRecordDoesNotExistById(treeSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'verifyTreeRecordDoesNotExistById ' + treeSelector + ' ' + id });
-	});
+	cy.log('verifyTreeRecordDoesNotExistById ' + treeSelector + ' ' + id);
 	const rowSelector = getTreeNodeSelectorById(treeSelector, id);
 	getDomNodes([treeSelector, rowSelector])
 		.should('not.exist');
 }
 export function verifyTreeNodeIsSelectedById(treeSelector, id) {
-	cy.then(() => {
-		Cypress.log({ name: 'verifyTreeNodeIsSelectedById ' + treeSelector + ' ' + id});
-	});
+	cy.log('verifyTreeNodeIsSelectedById ' + treeSelector + ' ' + id);
 	const rowSelector = getTreeNodeSelectorById(treeSelector, id);
 	getDomNodes([treeSelector, rowSelector, 'node-selected'])
 		.should('exist');

package/src/Functions/Cypress/utilities.js

@@ -6,10 +6,21 @@ import moment from 'moment';
 // / /_/ / /_/ / / / /_/ /  __(__  )
 // \____/\__/_/_/_/\__/_/\___/____/
 
-
+export function bootstrapRouteWaiters() {
+	cy.log('bootstrapRouteWaiters');
+	cy.intercept('GET', '**/get**').as('getWaiter');
+	cy.intercept('POST', '**/add**').as('addWaiter');
+	cy.intercept('POST', '**/edit**').as('editWaiter');
+	cy.intercept('POST', '**/delete**').as('deleteWaiter');
+	cy.intercept('POST', '**/getReport**').as('getReportWaiter');
+}
 export function fixInflector(str) {
 	// inflector-js doesn't handle pluralization of 'equipment' correctly
 	str = str.replace(/quipments/, 'quipment');
+
+	// Don't pluralize 'SideA' or 'SideB'
+	str = str.replace(/SideAs/, 'SideA');
+	str = str.replace(/SideBs/, 'SideB');
 	return str;
 }
 export function getPropertyDefinitionFromSchema(fieldName, schema) {