Merge pull request #27845 from awanlin/topic/add-missing-scaffolder-permission-to-router

Added missing scaffolder management permission
This commit is contained in:
Andre Wanlin
2024-12-09 06:15:00 -08:00
committed by GitHub
5 changed files with 23 additions and 8 deletions
@@ -904,7 +904,7 @@ describe('createPermissionIntegrationRouter', () => {
const response = await request(
express().use(
createPermissionIntegrationRouter({
permissions: [aPermission],
permissions: [aPermission, testPermission],
resources: [
{
resourceType: 'test-resource',
@@ -328,11 +328,16 @@ export function createPermissionIntegrationRouter<
>
).rules || [],
);
const allPermissions = [
...((options as { permissions: Permission[] }).permissions || []),
...(optionsWithResources.resources?.flatMap(o => o.permissions || []) ||
[]),
];
const allPermissions = Array.from(
new Map(
[
...((options as { permissions: Permission[] }).permissions || []),
...(optionsWithResources.resources?.flatMap(o => o.permissions || []) ||
[]),
].map(i => [i.name, i]),
).values(),
);
const allResourceTypes = allOptions.reduce((acc, option) => {
if (