@onehat/ui 0.3.342 → 0.3.344

package/package.json

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

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

@@ -278,7 +278,6 @@ export function ComboComponent(props) {
 			}
 
 			setTextInputValue(value);
-			showMenu();
 
 			clearTimeout(typingTimeout.current);
 			typingTimeout.current = setTimeout(() => {
@@ -409,12 +408,6 @@ export function ComboComponent(props) {
 			}
 		},
 		searchForMatches = async (value) => {
-			if (!isMenuShown) {
-				showMenu();
-			}
-
-			setIsSearchMode(true);
-
 			let found;
 			if (Repository) {
 				if (Repository.isLoading) {
@@ -464,6 +457,11 @@ export function ComboComponent(props) {
 				});
 				setFilteredData(found);
 			}
+
+			if (!isMenuShown) {
+				showMenu();
+			}
+			setIsSearchMode(true);
 		};
 
 	useEffect(() => {

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

@@ -1,7 +1,5 @@
-import React, { useState, useEffect, useRef, } from 'react';
 import {
 	Row,
-	Text,
 	Tooltip,
 } from 'native-base';
 import {
@@ -11,7 +9,6 @@ import {
 import UiGlobals from '../../../UiGlobals.js';
 import withComponent from '../../Hoc/withComponent.js';
 import withValue from '../../Hoc/withValue.js';
-import testProps from '../../../Functions/testProps.js';
 import getComponentFromType from '../../../Functions/getComponentFromType.js';
 import _ from 'lodash';
 
@@ -45,6 +42,7 @@ export function JsonElement(props) {
 				flex={1}
 				{...propsToPass}
 				justifyContent="flex-start"
+				testID={testID}
 			>
 				<JsonEditor
 					width="100%"
@@ -55,6 +53,7 @@ export function JsonElement(props) {
 					onEdit={(obj) => {
 						setValue(JSON.stringify(obj.updated_src));
 					}}
+					{...props}
 				/>
 			</Row>;
 

package/src/Functions/Cypress/crud_functions.js

@@ -73,6 +73,11 @@ import Inflector from 'inflector-js';
 import _ from 'lodash';
 const $ = Cypress.$;
 
+const
+	WINDOWED = 'WINDOWED',
+	INLINE = 'INLINE',
+	SIDE = 'SIDE';
+
 
 // Form fields
 export function crudCombo(selector, newData, editData, schema, ancillaryData, level = 0) {
@@ -108,6 +113,13 @@ 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' });
+	});
+
+	// do nothing for now
+}
 
 
 // Grid
@@ -194,7 +206,7 @@ export function crudSideGridRecord(gridSelector, newData, editData, schema, anci
 		verifyGridRecordExistsById(gridSelector, id);
 
 		// edit
-		editGridRecord(gridSelector, editData, schema, id);
+		editGridRecord(gridSelector, editData, schema, id, 0, SIDE);
 
 		// delete
 		verifyGridRecordExistsById(gridSelector, id);
@@ -290,7 +302,7 @@ export function addInlineGridRecord(gridSelector, fieldValues, schema, ancillary
 	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) {
+export function editGridRecord(gridSelector, fieldValues, schema, id, level = 0, whichEditor = WINDOWED) {
 	
 	cy.then(() => {
 		Cypress.log({ name: 'editGridRecord ' + gridSelector + ' ' + id});
@@ -303,13 +315,13 @@ export function editGridRecord(gridSelector, fieldValues, schema, id, level = 0)
 		viewerSelector = editorSelector + '/viewer',
 		formSelector = editorSelector + '/form';
 
-	const gridName = getLastPartOfPath(gridSelector);
-	if (gridName.match(/SideGrid/)) { // as opposed to 'SideA' -- we want the side editor, not particular sides of another editor
-		// side editor
+	if (whichEditor === SIDE) {
 		// switch to Edit mode if necessary
+		Cypress.log({ name: 'switch to Edit mode if necessary ' + viewerSelector});
 		clickToEditButtonIfExists(viewerSelector);
 	} else {
 		// windowed or inline editor
+		Cypress.log({ name: 'SHOULD NOT BE HERE!!'});
 		clickEditButton(gridSelector);
 	}
 	cy.wait(1500); // allow form to build
@@ -334,7 +346,7 @@ export function editWindowedGridRecord(gridSelector, fieldValues, schema, id, le
 		Cypress.log({ name: 'editWindowedGridRecord ' + gridSelector + ' ' + id});
 	});
 	
-	editGridRecord(gridSelector, fieldValues, schema, id, level);
+	editGridRecord(gridSelector, fieldValues, schema, id, level, WINDOWED);
 
 	const formSelector = gridSelector + '/editor/form';
 	clickCloseButton(formSelector);
@@ -348,7 +360,7 @@ export function editInlineGridRecord(gridSelector, fieldValues, schema, id, leve
 		Cypress.log({ name: 'editWindowedGridRecord ' + gridSelector + ' ' + id});
 	});
 	
-	editGridRecord(gridSelector, fieldValues, schema, id, level);
+	editGridRecord(gridSelector, fieldValues, schema, id, level, INLINE);
 
 	const formSelector = gridSelector + '/editor/form';
 	clickCloseButton(formSelector);
@@ -811,7 +823,7 @@ export function runInlineManagerScreenCrudTests(model, schema, newData, editData
 	});
 
 }
-export function runManagerScreenCrudTests(model, schema, newData, editData, ancillaryData) {
+export function runManagerScreenCrudTests(model, schema, newData, editData, ancillaryData, fullIsInline = false) {
 
 	const
 		Models = fixInflector(Inflector.camelize(Inflector.pluralize(model))),
@@ -843,7 +855,11 @@ export function runManagerScreenCrudTests(model, schema, newData, editData, anci
 			toFullMode(managerSelector);
 			cy.wait(500); // wait for grid to load
 
-			crudWindowedGridRecord(gridSelector, newData, editData, schema, ancillaryData);
+			if (fullIsInline) {
+				crudInlineGridRecord(gridSelector, newData, editData, schema, ancillaryData);
+			} else {
+				crudWindowedGridRecord(gridSelector, newData, editData, schema, ancillaryData);
+			}
 
 		});
 

package/src/Functions/Cypress/form_functions.js

@@ -10,6 +10,7 @@ import {
 import {
 	crudCombo,
 	crudTag,
+	crudJson,
 } from './crud_functions.js';
 import natsort from 'natsort';
 import _ from 'lodash';
@@ -88,6 +89,9 @@ export function fillForm(selector, fieldValues, schema, level = 0) {
 		} else
 		if (editorType === 'File') {
 			// setFileValue(selectors, value);
+		} else
+		if (editorType === 'Json') {
+			// do nothing for now
 		} else {
 			const editorFn = customFormFunctions.getCustomEditorSetFn(editorType);
 			if (editorFn) {