@visns-studio/visns-components 5.12.11 → 5.12.13

package/package.json

@@ -87,7 +87,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.12.11",
+    "version": "5.12.13",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/DataGrid.jsx

@@ -1928,6 +1928,20 @@ const DataGrid = forwardRef(
             let iconStyle = {};
             let allow = true;
 
+            // Check role-based permissions if roles are specified
+            if (s.roles && Array.isArray(s.roles) && s.roles.length > 0) {
+                // Check if user has any of the required roles
+                const hasRequiredRole = s.roles.some((requiredRole) =>
+                    userProfile?.roles?.some(
+                        (userRole) => userRole.name === requiredRole
+                    )
+                );
+
+                if (!hasRequiredRole) {
+                    allow = false;
+                }
+            }
+
             if (s.active) {
                 // Helper function to get nested values for main active condition (searches for target value)
                 const getNestedValueForMain = (data, path, targetValue) => {
@@ -2836,7 +2850,25 @@ const DataGrid = forwardRef(
 
                     const newColumns = columns.map(renderColumn);
 
-                    if (settings.length > 0) {
+                    // Function to check if any settings would be visible for any row
+                    const hasVisibleSettings = () => {
+                        if (settings.length === 0) return false;
+                        
+                        // Check if any setting would be visible based on role permissions
+                        return settings.some(setting => {
+                            // Check role-based permissions
+                            if (setting.roles && Array.isArray(setting.roles) && setting.roles.length > 0) {
+                                const hasRequiredRole = setting.roles.some(requiredRole => 
+                                    userProfile?.roles?.some(userRole => userRole.name === requiredRole)
+                                );
+                                return hasRequiredRole;
+                            }
+                            // If no roles specified, setting is visible
+                            return true;
+                        });
+                    };
+
+                    if (hasVisibleSettings()) {
                         newColumns.push({
                             name: 'setting',
                             header: 'Action',