@onehat/ui 0.3.343 → 0.3.345

package/package.json

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

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.$;
 
+export const WINDOWED = 'WINDOWED';
+export const INLINE = 'INLINE';
+export const SIDE = 'SIDE';
+export const FULL = 'FULL';
+
 
 // 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,12 @@ 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
-		// switch to Edit mode if necessary
+	if (whichEditor === SIDE) {
+		Cypress.log({ name: 'switch to Edit mode if necessary ' + viewerSelector});
 		clickToEditButtonIfExists(viewerSelector);
 	} else {
 		// windowed or inline editor
+		Cypress.log({ name: 'click editBtn ' + gridSelector});
 		clickEditButton(gridSelector);
 	}
 	cy.wait(1500); // allow form to build
@@ -334,7 +345,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 +359,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);
@@ -427,7 +438,7 @@ export function crudWindowedTreeRecord(treeSelector, newData, editData, schema,
 		verifyTreeRecordExistsById(treeSelector, id);
 
 		// edit
-		editWindowedTreeRecord(treeSelector, editData, schema, id);
+		editWindowedTreeRecord(treeSelector, editData, schema, id, level);
 
 		// delete
 		verifyTreeRecordExistsById(treeSelector, id);
@@ -456,7 +467,7 @@ export function crudSideTreeRecord(treeSelector, newData, editData, schema, anci
 		verifyTreeRecordExistsById(treeSelector, id);
 
 		// edit
-		editTreeRecord(treeSelector, editData, schema, id);
+		editTreeRecord(treeSelector, editData, schema, id, level, SIDE);
 
 		// delete
 		verifyTreeRecordExistsById(treeSelector, id);
@@ -546,7 +557,7 @@ export function addWindowedTreeRecord(treeSelector, fieldValues, schema, ancilla
 	cy.wait(500); // allow window to close
 	// TODO: Change this to wait until window is closed
 }
-export function editTreeRecord(treeSelector, fieldValues, schema, id, level = 0) {
+export function editTreeRecord(treeSelector, fieldValues, schema, id, level = 0, whichEditor = WINDOWED) {
 	
 	cy.then(() => {
 		Cypress.log({ name: 'editTreeRecord ' + treeSelector + ' ' + id});
@@ -559,13 +570,11 @@ export function editTreeRecord(treeSelector, fieldValues, schema, id, level = 0)
 		viewerSelector = editorSelector + '/viewer',
 		formSelector = editorSelector + '/form';
 
-	const treeName = getLastPartOfPath(treeSelector);
-	if (treeName.match(/SideTree/)) { // as opposed to 'SideA' -- we want the side editor, not particular sides of another editor
-		// side editor
-		// switch to Edit mode if necessary
+	if (whichEditor === SIDE) {
+		Cypress.log({ name: 'switch to Edit mode if necessary ' + viewerSelector});
 		clickToEditButtonIfExists(viewerSelector);
 	} else {
-		// windowed or inline editor
+		Cypress.log({ name: 'click editBtn ' + treeSelector});
 		clickEditButton(treeSelector);
 	}
 	cy.wait(1500); // allow form to build
@@ -590,7 +599,7 @@ export function editWindowedTreeRecord(treeSelector, fieldValues, schema, id, le
 		Cypress.log({ name: 'editWindowedTreeRecord ' + treeSelector + ' ' + id});
 	});
 	
-	editTreeRecord(treeSelector, fieldValues, schema, id, level);
+	editTreeRecord(treeSelector, fieldValues, schema, id, level, WINDOWED);
 
 	const formSelector = treeSelector + '/editor/form';
 	clickCloseButton(formSelector);
@@ -707,9 +716,16 @@ export function runClosureTreeControlledManagerScreenCrudTests(model, schema, ne
 	});
 
 }
-export function runClosureTreeManagerScreenCrudTests(model, schema, newData, editData, ancillaryData) {
-
-	const
+export function runClosureTreeManagerScreenCrudTests(args) {
+
+	const {
+			model,
+			schema,
+			newData,
+			editData,
+			ancillaryData,
+			skip = null,
+		} = args,
 		Models = fixInflector(Inflector.camelize(Inflector.pluralize(model))),
 		url = fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
 
@@ -730,90 +746,50 @@ export function runClosureTreeManagerScreenCrudTests(model, schema, newData, edi
 		// 	logout();
 		// });
 
-		it('CRUD in full mode', function() {
-
-			const
-				managerSelector = '/' + Models + 'Manager',
-				treeSelector = '/' + Models + 'TreeEditor';
-
-			toFullMode(managerSelector);
-			cy.wait(500); // wait for grid to load
-
-			crudWindowedTreeRecord(treeSelector, newData, editData, schema, ancillaryData);
-
-		});
-
-		it('CRUD in side mode', function() {
-
-			const
-				managerSelector = '/' + Models + 'Manager',
-				treeSelector = '/' + Models + 'TreeEditor';
-
-			toSideMode(managerSelector);
-			cy.wait(1000); // wait for grid to load
-
-			crudSideTreeRecord(treeSelector, newData, editData, schema, ancillaryData);
-
-		});
+		if (skip !== FULL) {
+			it('CRUD in full mode', function() {
 
-	});
+				const
+					managerSelector = '/' + Models + 'Manager',
+					treeSelector = '/' + Models + 'TreeEditor';
 
-}
-export function runInlineManagerScreenCrudTests(model, schema, newData, editData, ancillaryData) {
-
-	const
-		Models = fixInflector(Inflector.camelize(Inflector.pluralize(model))),
-		url = fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
+				toFullMode(managerSelector);
+				cy.wait(500); // wait for grid to load
 
-	describe(Models + 'Manager', () => {
+				crudWindowedTreeRecord(treeSelector, newData, editData, schema, ancillaryData);
 
-		beforeEach(function () {
-			login();
-			cy.restoreLocalStorage();
-			cy.url().then((currentUrl) => {
-				if (!currentUrl.endsWith(url)) {
-					navigateViaTabOrHomeButtonTo(url);
-				}
 			});
-		});
-		
-		afterEach(function () {
-			cy.saveLocalStorage();
-			logout();
-		});
-
-		it('CRUD with inline editor in full mode', function() {
-
-			const
-				managerSelector = '/' + Models + 'Manager',
-				gridSelector = '/' + Models + 'GridEditor';
-
-			toFullMode(managerSelector);
-			cy.wait(500); // wait for grid to load
-
-			crudInlineGridRecord(gridSelector, newData, editData, schema, ancillaryData);
-
-		});
+		}
 
-		it('CRUD in side mode', function() {
+		if (skip !== SIDE) {
+			it('CRUD in side mode', function() {
 
-			const
-				managerSelector = '/' + Models + 'Manager',
-				gridSelector = '/' + Models + 'GridEditor';
+				const
+					managerSelector = '/' + Models + 'Manager',
+					treeSelector = '/' + Models + 'TreeEditor';
 
-			toSideMode(managerSelector);
-			cy.wait(1000); // wait for grid to load
+				toSideMode(managerSelector);
+				cy.wait(1000); // wait for grid to load
 
-			crudSideGridRecord(gridSelector, newData, editData, schema, ancillaryData);
+				crudSideTreeRecord(treeSelector, newData, editData, schema, ancillaryData);
 
-		});
+			});
+		}
 
 	});
 
 }
-export function runManagerScreenCrudTests(model, schema, newData, editData, ancillaryData) {
-
-	const
+export function runManagerScreenCrudTests(args) {
+
+	const {
+			model,
+			schema,
+			newData,
+			editData,
+			ancillaryData,
+			fullIsInline = false,
+			skip = null,
+		} = args,
 		Models = fixInflector(Inflector.camelize(Inflector.pluralize(model))),
 		url = fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
 
@@ -834,31 +810,39 @@ export function runManagerScreenCrudTests(model, schema, newData, editData, anci
 		// 	logout();
 		// });
 
-		it('CRUD in full mode', function() {
-
-			const
-				managerSelector = '/' + Models + 'Manager',
-				gridSelector = '/' + Models + 'GridEditor';
-
-			toFullMode(managerSelector);
-			cy.wait(500); // wait for grid to load
-
-			crudWindowedGridRecord(gridSelector, newData, editData, schema, ancillaryData);
-
-		});
-
-		it('CRUD in side mode', function() {
-
-			const
-				managerSelector = '/' + Models + 'Manager',
-				gridSelector = '/' + Models + 'GridEditor';
-
-			toSideMode(managerSelector);
-			cy.wait(1000); // wait for grid to load
-
-			crudSideGridRecord(gridSelector, newData, editData, schema, ancillaryData);
+		if (skip !== FULL) {
+			it('CRUD in full mode', function() {
+	
+				const
+					managerSelector = '/' + Models + 'Manager',
+					gridSelector = '/' + Models + 'GridEditor';
+	
+				toFullMode(managerSelector);
+				cy.wait(500); // wait for grid to load
+	
+				if (fullIsInline) {
+					crudInlineGridRecord(gridSelector, newData, editData, schema, ancillaryData);
+				} else {
+					crudWindowedGridRecord(gridSelector, newData, editData, schema, ancillaryData);
+				}
+	
+			});
+		}
 
-		});
+		if (skip !== SIDE) {
+			it('CRUD in side mode', function() {
+	
+				const
+					managerSelector = '/' + Models + 'Manager',
+					gridSelector = '/' + Models + 'GridEditor';
+	
+				toSideMode(managerSelector);
+				cy.wait(1000); // wait for grid to load
+	
+				crudSideGridRecord(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) {