@onehat/ui 0.3.306 → 0.3.308

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.306",
+	"version": "0.3.308",
 	"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/crud_functions.js

@@ -622,7 +622,7 @@ export function runClosureTreeControlledManagerScreenCrudTests(model, schema, ne
 
 	const
 		Models = Inflector.camelize(Inflector.pluralize(model)),
-		url = '/' + Inflector.dasherize(Inflector.underscore(Models));
+		url = Inflector.dasherize(Inflector.underscore(Models));
 
 	describe(Models + 'Manager', () => {
 
@@ -711,7 +711,7 @@ export function runClosureTreeManagerScreenCrudTests(model, schema, newData, edi
 
 	const
 		Models = fixInflector(Inflector.camelize(Inflector.pluralize(model))),
-		url = '/' + fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
+		url = fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
 
 	describe(Models + 'Manager', () => {
 
@@ -763,7 +763,7 @@ export function runInlineManagerScreenCrudTests(model, schema, newData, editData
 
 	const
 		Models = fixInflector(Inflector.camelize(Inflector.pluralize(model))),
-		url = '/' + fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
+		url = fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
 
 	describe(Models + 'Manager', () => {
 
@@ -815,7 +815,7 @@ export function runManagerScreenCrudTests(model, schema, newData, editData, anci
 
 	const
 		Models = fixInflector(Inflector.camelize(Inflector.pluralize(model))),
-		url = '/' + fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
+		url = fixInflector(Inflector.dasherize(Inflector.underscore(Models)));
 
 	describe(Models + 'Manager', () => {
 
@@ -865,7 +865,7 @@ export function runManagerScreenCrudTests(model, schema, newData, editData, anci
 }
 export function runReportsManagerTests(reportData) {
 
-	const url = '/reports';
+	const url = 'reports';
 
 	describe('ReportsManager', () => {
 

package/src/Functions/Cypress/navigation_functions.js

@@ -49,7 +49,8 @@ export function logout() {
 export function navigateViaTabOrHomeButtonTo(url) {
 	// i.e. If we're on home screen, press the button.
 	// If we have a tab navigation, press the tab's button
-	getDomNode(url).click(); // i.e. the DomNode's data-testid is the url
+	const baseDir = Cypress.env('baseDir');
+	getDomNode(baseDir + url).click(); // i.e. the DomNode's data-testid is the url
 	cy.url().should('include', url);
 }
 export function navigateToHome() {