@onehat/ui 0.4.47 → 0.4.50

package/package.json

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

package/src/Components/Grid/Grid.js

@@ -422,18 +422,18 @@ function GridComponent(props) {
 											onView(!props.isEditorViewOnly);
 										}
 									} else {
-										if (onEdit) {
-											if (canUser && !canUser(EDIT)) { // permissions
-												return;
-											}
-											if (canRecordBeEdited && !canRecordBeEdited(selection)) { // record can be edited
-												return;
-											}
+										let canDoEdit = false,
+											canDoView = false;
+										if (onEdit && canUser && canUser(EDIT) && canRecordBeEdited && canRecordBeEdited(selection)) {
+											canDoEdit = true;
+										}
+										if (onView && canUser && canUser(VIEW)) {
+											canDoView = true;
+										}
+
+										if (canDoEdit) {
 											onEdit();
-										} else if (onView) {
-											if (canUser && !canUser(VIEW)) { // permissions
-												return;
-											}
+										} else if (canDoView) {
 											onView();
 										}
 									}

package/src/Components/Hoc/withPdfButtons.js

@@ -92,6 +92,9 @@ export default function withPdfButtons(WrappedComponent) {
 						}),
 						items = [];
 					_.each(ancillaryItemsClone, (ancillaryItem) => { // clone, as we don't want to alter the item by reference
+						if (ancillaryItem.skipInPdfButtons) {
+							return;
+						}
 						let name;
 						if (ancillaryItem.pdfModel) {
 							name = ancillaryItem.pdfModel;