Skip to content
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

Jump to bottom

OS-81/project-permissions-render-on-tabhide #49

Merged
merged 3 commits into from Apr 1, 2021
Merged

OS-81/project-permissions-render-on-tabhide #49

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9d7172
Granular
brentguf Mar 29, 2021
100b2d8
RenderOnTabHideCondition for all permissions tabs
brentguf Mar 31, 2021
f5c0b59
Merge branch 'master' of https://github.com/CitizenLabDotCo/citizenla…
brentguf Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion front/app/modules/commercial/granular_permissions/index.tsx
View file
Open in desktop
Expand Up @@ -9,6 +9,10 @@ type RenderOnFeatureFlagProps = {
children: ReactNode;
};

type RenderOnTabHideConditionProps = {
children: ReactNode;
};

const RenderOnFeatureFlag = ({ children }: RenderOnFeatureFlagProps) => {
const isGranularPermissionsEnabled = useFeatureFlag('granular_permissions');
if (isGranularPermissionsEnabled) {
Expand All @@ -17,6 +21,16 @@ const RenderOnFeatureFlag = ({ children }: RenderOnFeatureFlagProps) => {
return null;
};

const RenderOnTabHideCondition = ({ children }: RenderOnTabHideConditionProps) => {
// currently the same as RenderOnFeatureFlag, but wanted to make clear
// there's a difference and RenderOnTabHideCondition might diverge from RenderOnFeatureFlag
const isGranularPermissionsEnabled = useFeatureFlag('granular_permissions');
if (isGranularPermissionsEnabled) {
return <>{children}</>;
}
return null;
};

const configuration: ModuleConfiguration = {
routes: {
'admin.initiatives': [
Expand All @@ -40,7 +54,9 @@ const configuration: ModuleConfiguration = {
'app.containers.Admin.projects.edit': (props) => {
return (
<RenderOnFeatureFlag>
<ProjectSettingsTab {...props} />
<RenderOnTabHideCondition>
<ProjectSettingsTab {...props} />
</RenderOnTabHideCondition>
</RenderOnFeatureFlag>
);
},
Expand Down