@onehat/ui 0.3.307 → 0.3.309

package/package.json

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

package/src/Components/Hoc/Secondary/withSecondaryEditor.js

@@ -111,6 +111,15 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 			secondaryDoAdd = async (e, values) => {
 				let addValues = values;
 
+				if (SecondaryRepository?.isLoading) {
+					// NOTE: This is a hack to prevent adding a new record while the repository is still loading.
+					// This can happen when the repository is still loading, and the user clicks the 'Add' button.
+					setTimeout(() => {
+						doAdd(e, values);
+					}, 500);
+					return;
+				}
+
 				if (!values) {
 					// you can either:
 					// 1. directlty submit 'values' to use in secondaryDoAdd(), or

package/src/Components/Hoc/withEditor.js

@@ -110,6 +110,15 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			doAdd = async (e, values) => {
 				let addValues = values;
 
+				if (Repository?.isLoading) {
+					// NOTE: This is a hack to prevent adding a new record while the repository is still loading.
+					// This can happen when the repository is still loading, and the user clicks the 'Add' button.
+					setTimeout(() => {
+						doAdd(e, values);
+					}, 500);
+					return;
+				}
+
 				if (!values) {
 					// you can either:
 					// 1. directlty submit 'values' to use in doAdd(), or

package/src/Functions/Cypress/dom_functions.js

@@ -7,8 +7,8 @@
  * e.g. ['parent', 'child'] will be converted to '[data-testid="parent"] [data-testid="child"]'
  * @return Cypress chainer
  */
-export function getDomNode(selectors) {
-	return cy.get(getTestIdSelectors(selectors, true));
+export function getDomNode(selectors, options = {}) {
+	return cy.get(getTestIdSelectors(selectors, true), options);
 }
 
 /**
@@ -18,8 +18,8 @@ export function getDomNode(selectors) {
  * e.g. ['parent', 'child'] will be converted to '[data-testid="parent"] [data-testid="child"]'
  * @return Cypress chainer
  */
-export function getDomNodes(selectors) {
-	return cy.get(getTestIdSelectors(selectors));
+export function getDomNodes(selectors, options = {}) {
+	return cy.get(getTestIdSelectors(selectors), options);
 }
 
 /**

package/src/Functions/Cypress/form_functions.js

@@ -128,10 +128,13 @@ export function setComboValue(selectors, value) {
 	getDomNode([...selectors, 'input']).then((field) => {
 		cy.get(field).clear({ force: true });
 		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(1000) // allow time to load dropdown
-
+				.wait('@getWaiter'); // allow dropdown to load
+				
+			cy.get(field)
+				.wait(1000) // render
 				.type('{downarrow}')
 				.wait(250) // allow time for selection
 
@@ -166,12 +169,15 @@ 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(1000) // allow time to load dropdown
-	
+					.wait('@getWaiter'); // allow dropdown to load
+					
+				cy.get(field)
+					.wait(1000) // render
 					.type('{downarrow}')
-					.wait(250); // allow time for selection
+					.wait(500); // allow time for selection
 			});
 
 			// press trigger to hide dropdown