Skip to content

refactor(organization): optimize feature access logic for role mappings #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nevil-mathew merged 2 commits into from
Oct 28, 2025
Merged

refactor(organization): optimize feature access logic for role mappings #858

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c72510a
refactor(organization): optimize feature access logic for role mappings
nevil-mathew Oct 28, 2025
3150b66
refactor(organization): clarify comment on feature access logic for r…
nevil-mathew Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions src/services/organization-feature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,19 +332,15 @@ module.exports = class organizationFeatureHelper {
})

// For each role, determine accessible features
// If role has mappings in current org, use those; otherwise use default org mappings
// Union features from both default org and current org role mappings
const accessibleFeatureCodes = new Set()
roleTitles.forEach((role) => {
const currentOrgFeatures = currentOrgRoleFeatureMap.get(role)
if (currentOrgFeatures?.size > 0) {
// Current org has explicit mappings for this role - use only those
currentOrgFeatures.forEach((feature) => accessibleFeatureCodes.add(feature))
} else {
// No current org mappings for this role - fall back to default org
const defaultOrgFeatures = defaultOrgRoleFeatureMap.get(role)
defaultOrgFeatures?.forEach((feature) => accessibleFeatureCodes.add(feature))
}
})

for (const role of roleTitles) {
const defSet = defaultOrgRoleFeatureMap.get(role)
const curSet = currentOrgRoleFeatureMap.get(role)
defSet?.forEach((code) => accessibleFeatureCodes.add(code))
curSet?.forEach((code) => accessibleFeatureCodes.add(code))
}

// Filter to only accessible features
organizationFeatures = organizationFeatures.filter((feature) =>
Expand Down