@onehat/ui 0.3.366 → 0.3.369

package/package.json

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

package/src/Components/Hoc/withData.js

@@ -93,7 +93,7 @@ export default function withData(WrappedComponent) {
 			})();
 
 			return () => {
-				if (repositoryId) {
+				if (repositoryId && !oneHatData.isDestroyed) {
 					oneHatData.deleteRepository(repositoryId);
 				}
 			}

package/src/Components/Hoc/withPermissions.js

@@ -13,6 +13,73 @@ import {
 import UiGlobals from '../../UiGlobals.js';
 import _ from 'lodash';
 
+/**
+ * checkPermission
+ * @param {string} permission like 'view_pm_events'
+ * @returns {boolean} - Whether permission is permitted
+ */
+export function checkPermission(permission) {
+	const
+		reduxState = UiGlobals.redux?.getState(),
+		permissions = reduxState?.app?.permissions;
+	if (!permissions) {
+		return false;
+	}
+	return inArray(permission, permissions);
+}
+
+/**
+ * Check if user has permission to perform an action
+ * 
+ * Example usages:
+ * canUser('view') // check if user can perform 'view' action on the default model
+ * canUser('add', 'PmEvents') // check if user can perform 'add' action on a specific model
+ * canUser('do_something_else) // check if user has a custom permission
+ * 
+ * @param {string} permission - The permission to check for.
+ * @param {string} modelToCheck - The model to check for the permission on.
+ * @returns {boolean} - Whether user has permission
+ */
+export function canUser(permission, modelToCheck = null) {
+
+	// deal with special cases that refer to other permissions
+	switch(permission) {
+		case PRINT:
+			permission = VIEW;
+			break;
+		case COPY:
+		case DUPLICATE: {
+			// user must have ADD _and_ EDIT permissions, so check both
+			const
+				hasAddPermission = canUser(ADD, modelToCheck),
+				hasEditPermission = canUser(EDIT, modelToCheck);
+			return hasAddPermission && hasEditPermission;
+		}
+		case UPLOAD_DOWNLOAD: {
+			// user must have VIEW, ADD, EDIT, and DELETE permissions, so check all of them
+			const
+				hasViewPermission = canUser(VIEW, modelToCheck),
+				hasAddPermission = canUser(ADD, modelToCheck),
+				hasEditPermission = canUser(EDIT, modelToCheck),
+				hasDeletePermission = canUser(DELETE, modelToCheck);
+			return hasViewPermission && hasAddPermission && hasEditPermission && hasDeletePermission;
+		}
+		default:
+			// do nothing
+			break;
+	}
+
+	// standard CRUD permissions
+	if (inArray(permission, [VIEW, ADD, EDIT, DELETE])) {
+		if (!modelToCheck) {
+			modelToCheck = model; // use default model if none supplied
+		}
+		modelToCheck = Inflector.underscore(modelToCheck); // 'PmEvents' -> 'pm_events'
+		permission += '_' + modelToCheck; // e.g. 'view_pm_events'
+	}
+
+	return checkPermission(permission);
+}
 
 export default function withPermissions(WrappedComponent, forceUsePermissions = false) {
 	return (props) => {
@@ -29,16 +96,6 @@ export default function withPermissions(WrappedComponent, forceUsePermissions =
 				Repository,
 			} = props,
 			model = Repository?.schema?.permissionsModel || Repository?.schema?.name, // so we can use an alternate model for permissions if needed
-			checkPermission = (permission) => {
-				const
-					reduxState = UiGlobals.redux?.getState(),
-					permissions = reduxState?.app?.permissions;
-				if (!permissions) {
-					return false;
-				}
-				return inArray(permission, permissions);
-			},
-
 			showPermissionsError = (permission, modelForAlert = null) => {
 				if (!modelForAlert) {
 					modelForAlert = model; // use default model if none supplied
@@ -46,59 +103,6 @@ export default function withPermissions(WrappedComponent, forceUsePermissions =
 				modelForAlert = Inflector.humanize(Inflector.underscore(modelForAlert)); // 'PmEvents' -> 'pm events'
 			
 				alert(`You are not authorized to ${permission} ${modelForAlert}.`);
-			},
-
-			/**
-			 * Check if user has permission to perform an action
-			 * 
-			 * Example usages:
-			 * canUser('view') // check if user can perform 'view' action on the default model
-			 * canUser('add', 'PmEvents') // check if user can perform 'add' action on a specific model
-			 * canUser('do_something_else) // check if user has a custom permission
-			 * 
-			 * @param {string} permission - The permission to check for.
-			 * @param {string} modelToCheck - The model to check for the permission on.
-			 * @returns {boolean} - Whether user has permission
-			 */
-			canUser = (permission, modelToCheck = null) => {
-
-				// deal with special cases that refer to other permissions
-				switch(permission) {
-					case PRINT:
-						permission = VIEW;
-						break;
-					case COPY:
-					case DUPLICATE: {
-						// user must have ADD _and_ EDIT permissions, so check both
-						const
-							hasAddPermission = canUser(ADD, modelToCheck),
-							hasEditPermission = canUser(EDIT, modelToCheck);
-						return hasAddPermission && hasEditPermission;
-					}
-					case UPLOAD_DOWNLOAD: {
-						// user must have VIEW, ADD, EDIT, and DELETE permissions, so check all of them
-						const
-							hasViewPermission = canUser(VIEW, modelToCheck),
-							hasAddPermission = canUser(ADD, modelToCheck),
-							hasEditPermission = canUser(EDIT, modelToCheck),
-							hasDeletePermission = canUser(DELETE, modelToCheck);
-						return hasViewPermission && hasAddPermission && hasEditPermission && hasDeletePermission;
-					}
-					default:
-						// do nothing
-						break;
-				}
-
-				// standard CRUD permissions
-				if (inArray(permission, [VIEW, ADD, EDIT, DELETE])) {
-					if (!modelToCheck) {
-						modelToCheck = model; // use default model if none supplied
-					}
-					modelToCheck = Inflector.underscore(modelToCheck); // 'PmEvents' -> 'pm_events'
-					permission += '_' + modelToCheck; // e.g. 'view_pm_events'
-				}
-
-				return checkPermission(permission);
 			};
 
 		return <WrappedComponent

package/src/Components/Tree/Tree.js

@@ -879,6 +879,11 @@ function TreeComponent(props) {
 											return;
 										}
 										onEdit();
+									} else if (onView) {
+										if (canUser && !canUser(VIEW)) { // permissions
+											return;
+										}
+										onView();
 									}
 									break;
 								case 3: // triple click