asab_webui_components 27.3.4 → 27.3.6

package/dist/seacat-auth/components/ButtonWithAuthz.js

@@ -67,10 +67,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 
 function ButtonWithAuthz(props) {
   var childProps = _objectSpread({}, props); // Create a new child component to have option to remove props
-  var authzObj = (0, _authz.authz)(childProps);
-  var disabled = authzObj.disabled;
-  var hide = authzObj.hide;
-  var title = authzObj.title;
+  var {
+    disabled,
+    title,
+    hide
+  } = (0, _authz.authz)(childProps);
   return hide && disabled ? null : /*#__PURE__*/_react.default.createElement(_reactstrap.Button, (0, _extends2.default)({}, childProps, {
     title: title,
     disabled: disabled

package/dist/seacat-auth/components/LinkWithAuthz.js

@@ -50,9 +50,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 
 function LinkWithAuthz(props) {
   var childProps = _objectSpread({}, props);
-  var authzObj = (0, _authz.authz)(childProps);
-  var disabled = authzObj.disabled;
-  var title = authzObj.title;
+  var {
+    disabled,
+    title
+  } = (0, _authz.authz)(childProps);
   return disabled ? /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({
     title: title
   }, childProps), childProps.children) : /*#__PURE__*/_react.default.createElement(_reactRouter.Link, childProps, childProps.children);

package/dist/seacat-auth/components/Switches/ControlledSwitchWithAuthz.js

@@ -63,10 +63,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 
 function ControlledSwitchWithAuthz(props) {
   var childProps = _objectSpread({}, props); // Create a new child component to have option to remove props
-  var authzObj = (0, _authz.authz)(childProps);
-  var disabled = authzObj.disabled;
-  var hide = authzObj.hide;
-  var title = authzObj.title;
+  var {
+    disabled,
+    title,
+    hide
+  } = (0, _authz.authz)(childProps);
   return hide && disabled ? null : /*#__PURE__*/_react.default.createElement(_ControlledSwitch.ControlledSwitch, (0, _extends2.default)({}, childProps, {
     title: title,
     disabled: disabled

package/dist/seacat-auth/components/Switches/UncontrolledSwitchWithAuthz.js

@@ -64,10 +64,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 
 function UncontrolledSwitchWithAuthz(props) {
   var childProps = _objectSpread({}, props); // Create a new child component to have option to remove props
-  var authzObj = (0, _authz.authz)(childProps);
-  var disabled = authzObj.disabled;
-  var hide = authzObj.hide;
-  var title = authzObj.title;
+  var {
+    disabled,
+    title,
+    hide
+  } = (0, _authz.authz)(childProps);
   return hide && disabled ? null : /*#__PURE__*/_react.default.createElement(_UncontrolledSwitch.UncontrolledSwitch, (0, _extends2.default)({}, childProps, {
     title: title,
     disabled: disabled

package/dist/seacat-auth/utils/authz.js

@@ -8,33 +8,51 @@ var _reactI18next = require("react-i18next");
 // Used for Button and Switches with authz
 var authz = childProps => {
   var {
-    t,
-    i18n
+    t
   } = (0, _reactI18next.useTranslation)();
-  var disabled = childProps.resources && childProps.resource ? childProps.resources.indexOf(childProps.resource) === -1 : true;
-  // If user is superuser, then button is enabled
-  if (childProps.resources && childProps.resources.indexOf('authz:superuser') !== -1) {
+  var {
+    resources,
+    resource,
+    hideOnUnauthorizedAccess,
+    disabled: disabledProp,
+    title: titleProp
+  } = childProps;
+  var disabled = true;
+
+  // Check if the user has at least one of the required resources. Also, if user has 'authz:superuser', always allow
+  var requiredResources = Array.isArray(resource) ? resource : [resource];
+
+  // superuser always allow
+  if (resources !== null && resources !== void 0 && resources.includes('authz:superuser')) {
     disabled = false;
+  } else {
+    // if at least one match is found — access is granted
+    var resourcesSet = new Set(resources);
+    disabled = !requiredResources.some(r => resourcesSet.has(r));
   }
+
   // If defined, hide the disabled button
-  var hide = childProps.hideOnUnauthorizedAccess ? true : false;
+  var hide = Boolean(hideOnUnauthorizedAccess);
+
   // Remove hideOnUnauthorized element from props to avoid react warnings
-  if (childProps.hideOnUnauthorizedAccess) {
-    delete childProps["hideOnUnauthorizedAccess"];
+  if (hideOnUnauthorizedAccess) {
+    delete childProps.hideOnUnauthorizedAccess;
   }
-  var title = childProps.title;
-  // Check on title eventually passed in the props
+
+  // Set the title for unauthorized state
+  var title = titleProp;
   if (disabled) {
-    title = t("General|You do not have access rights to perform this action");
+    title = t('General|You do not have access rights to perform this action');
   }
+
   // Check on disabled eventually passed in the props
-  if (childProps.disabled && disabled == false) {
-    disabled = childProps.disabled;
+  if (disabledProp && disabled === false) {
+    disabled = disabledProp;
   }
   return {
-    disabled: disabled,
-    hide: hide,
-    title: title
+    disabled,
+    hide,
+    title
   };
 };
 exports.authz = authz;

package/dist/utils/ErrorHandler.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ErrorHandler = ErrorHandler;
 var _reactI18next = require("react-i18next");
+// TODO: REMOVE/REWRITE THIS COMPONENT AFTER ALL DEPENDENCY ON ERRORHANDLER COMPONENT IS STRIPPED
+
 /*
 	- Component responsible for handling and displaying error messages.
 	- The 'error' prop is an object that contains the error message and any which contains a dictionary with variables, if any, in the error message.
@@ -21,8 +23,9 @@ function ErrorHandler(_ref) {
     t
   } = (0, _reactI18next.useTranslation)();
   if (error.error_dict) {
+    // Always escape the values (safety precaution), do not change this!
     error.error_dict['interpolation'] = {
-      escapeValue: false
+      escapeValue: true
     };
   }
   return t(error.error, error.error_dict);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asab_webui_components",
-	"version": "27.3.4",
+	"version": "27.3.6",
 	"license": "BSD-3-Clause",
 	"description": "TeskaLabs ASAB WebUI Components Library",
 	"contributors": [