Allow widget visibility functions to be used #69
Conversation
src/Routes/Default/Default.tsx
Outdated
| for (const key of Object.keys(mapping)) { | ||
| const widgetConfig = mapping[key].config; | ||
| if (widgetConfig && widgetConfig.permissions && !(await checkPermissions(widgetConfig.permissions as WidgetPermission[]))) { | ||
| delete mapping[key]; // remove widget from mapping if user does not have permissions for it | ||
| } | ||
| } |
There was a problem hiding this comment.
No need to use for with nested for. It's a bit more elegant with reduce function, moreover the checkPermissions function returns Promise and Boolean(Promise) == true. We'd not really filter out the values.
Object.entries(mapping).reduce(async (acc, [key, value]) => {
// calculate visibility
if (await isVisible) {
acc[key] = value;
}
return acc;
}, {});
src/Routes/Default/Default.tsx
Outdated
| console.log('Checking permissions: ', permissions); | ||
| for (const permission of permissions) { | ||
| if (permission.method === 'permissions' && permission.args && !(await visibilityFunctions.hasPermissions(permission.args))) { | ||
| return false; | ||
| } | ||
|
|
||
| if (permission.method === 'loosePermissions' && permission.args && !(await visibilityFunctions.loosePermissions(permission.args))) { | ||
| return false; | ||
| } | ||
|
|
||
| if (permission.method === 'isOrgAdmin' && !(await visibilityFunctions.isOrgAdmin())) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; |
There was a problem hiding this comment.
This for loop only allows 3 methods. We want all of those available in chrome. This PR exports the type RedHatInsights/frontend-components#1999 Also, it might be better to use every, without it we'd only check for one permission.
const resolved = Promise.all(permissions.map(async ({ method, args }) => (method && await (visibilityFunctions[method] as any))(...(args || [])))).every(Boolean)
|
@karelhala This is working for |
src/Routes/Default/Default.tsx
Outdated
| const checkPermissions = async (permissions: WidgetPermission[]): Promise<boolean> => { | ||
| const permissionResults = await Promise.all( | ||
| permissions.map(async (permission) => { | ||
| const { method, args } = permission; |
There was a problem hiding this comment.
Might want to wrap the inner map function with try ... catch and return false from the catch branch.
There was a problem hiding this comment.
Good idea! Added this in.
There was a problem hiding this comment.
Looking really good! As pointed out by @Hyperkid123 we might want to wrap the inner part of the map function with try ... catch
Description
Check the permissions defined in the backend widget configuration using chrome's
visibilityFunctions. Remove widgets from the layout and widget drawer that the user does not have permissions to use.RHCLOUD-32312
Checklist ☑️