Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-03-23 00:16:25 +01:00
Code Issues Projects Releases Wiki Activity

feat: update dependency permission (#4910)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2023-10-04 09:27:14 +02:00 committed by GitHub
parent b319cec5f0
commit 296cc9a9f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/DependencyRow.tsx
View File

@ -1,6 +1,4 @@
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { Button } from '@mui/material';
import { Add } from '@mui/icons-material';
import { AddDependencyDialogue } from 'component/feature/Dependencies/AddDependencyDialogue';
import { IFeatureToggle } from 'interfaces/featureToggle';
import { FC, useState } from 'react';
@ -9,6 +7,9 @@ import { DependencyActions } from './DependencyActions';
import { useDependentFeaturesApi } from 'hooks/api/actions/useDependentFeaturesApi/useDependentFeaturesApi';
import { useFeature } from 'hooks/api/getters/useFeature/useFeature';
import { ChildrenTooltip } from './ChildrenTooltip';
import PermissionButton from 'component/common/PermissionButton/PermissionButton';
import { UPDATE_FEATURE_DEPENDENCY } from 'component/providers/AccessProvider/permissions';
import { useCheckProjectPermissions } from 'hooks/useHasAccess';
export const DependencyRow: FC<{ feature: IFeatureToggle }> = ({ feature }) => {
const { removeDependencies } = useDependentFeaturesApi(feature.project);
@ -21,6 +22,7 @@ export const DependencyRow: FC<{ feature: IFeatureToggle }> = ({ feature }) => {
const hasParentDependency =
Boolean(feature.project) && Boolean(feature.dependencies.length > 0);
const hasChildren = Boolean(feature.project) && feature.children.length > 0;
const checkAccess = useCheckProjectPermissions(feature.project);
return (
<>
@ -30,14 +32,16 @@ export const DependencyRow: FC<{ feature: IFeatureToggle }> = ({ feature }) => {
<FlexRow>
<StyledDetail>
<StyledLabel>Dependency:</StyledLabel>
<Button
startIcon={<Add />}
<PermissionButton
permission={UPDATE_FEATURE_DEPENDENCY}
projectId={feature.project}
variant='text'
onClick={() => {
setShowDependencyDialogue(true);
}}
>
Add parent feature
</Button>
</PermissionButton>
</StyledDetail>
</FlexRow>
}
@ -54,13 +58,20 @@ export const DependencyRow: FC<{ feature: IFeatureToggle }> = ({ feature }) => {
{feature.dependencies[0]?.feature}
</StyledLink>
</StyledDetail>
<DependencyActions
feature={feature.name}
onEdit={() => setShowDependencyDialogue(true)}
onDelete={async () => {
await removeDependencies(feature.name);
await refetchFeature();
}}
<ConditionallyRender
condition={checkAccess(UPDATE_FEATURE_DEPENDENCY)}
show={
<DependencyActions
feature={feature.name}
onEdit={() =>
setShowDependencyDialogue(true)
}
onDelete={async () => {
await removeDependencies(feature.name);
await refetchFeature();
}}
/>
}
/>
</FlexRow>
}

15
frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewSidePanel/FeatureOverviewSidePanelDetails/FeatureOverviewSidePanelDetails.test.tsx
View File

@ -38,6 +38,11 @@ test('show dependency dialogue', async () => {
}
header={''}
/>,
{
permissions: [
{ permission: 'UPDATE_FEATURE_DEPENDENCY', project: 'default' },
],
},
);
const addParentButton = await screen.findByText('Add parent feature');
@ -100,6 +105,11 @@ test('delete dependency', async () => {
}
header={''}
/>,
{
permissions: [
{ permission: 'UPDATE_FEATURE_DEPENDENCY', project: 'default' },
],
},
);
await screen.findByText('Dependency:');
@ -127,6 +137,11 @@ test('edit dependency', async () => {
}
header={''}
/>,
{
permissions: [
{ permission: 'UPDATE_FEATURE_DEPENDENCY', project: 'default' },
],
},
);
await screen.findByText('Dependency:');

1
frontend/src/component/providers/AccessProvider/permissions.ts
View File

@ -1,6 +1,7 @@
export const ADMIN = 'ADMIN';
export const CREATE_FEATURE = 'CREATE_FEATURE';
export const UPDATE_FEATURE = 'UPDATE_FEATURE';
export const UPDATE_FEATURE_DEPENDENCY = 'UPDATE_FEATURE_DEPENDENCY';
export const DELETE_FEATURE = 'DELETE_FEATURE';
export const CREATE_STRATEGY = 'CREATE_STRATEGY';
export const UPDATE_STRATEGY = 'UPDATE_STRATEGY';

8
src/lib/features/dependent-features/dependent-features-controller.ts
View File

@ -6,7 +6,7 @@ import {
IUnleashConfig,
IUnleashServices,
NONE,
UPDATE_FEATURE,
UPDATE_FEATURE_DEPENDENCY,
} from '../../types';
import { Logger } from '../../logger';
import {
@ -88,7 +88,7 @@ export default class DependentFeaturesController extends Controller {
method: 'post',
path: PATH_DEPENDENCIES,
handler: this.addFeatureDependency,
permission: UPDATE_FEATURE,
permission: UPDATE_FEATURE_DEPENDENCY,
middleware: [
openApiService.validPath({
tags: ['Features'],
@ -111,7 +111,7 @@ export default class DependentFeaturesController extends Controller {
method: 'delete',
path: PATH_DEPENDENCY,
handler: this.deleteFeatureDependency,
permission: UPDATE_FEATURE,
permission: UPDATE_FEATURE_DEPENDENCY,
acceptAnyContentType: true,
middleware: [
openApiService.validPath({
@ -131,7 +131,7 @@ export default class DependentFeaturesController extends Controller {
method: 'delete',
path: PATH_DEPENDENCIES,
handler: this.deleteFeatureDependencies,
permission: UPDATE_FEATURE,
permission: UPDATE_FEATURE_DEPENDENCY,
acceptAnyContentType: true,
middleware: [
openApiService.validPath({

1
src/lib/types/permissions.ts
View File

@ -43,6 +43,7 @@ export const DELETE_TAG_TYPE = 'DELETE_TAG_TYPE';
// Project
export const CREATE_FEATURE = 'CREATE_FEATURE';
export const UPDATE_FEATURE = 'UPDATE_FEATURE';
export const UPDATE_FEATURE_DEPENDENCY = 'UPDATE_FEATURE_DEPENDENCY';
export const DELETE_FEATURE = 'DELETE_FEATURE';
export const UPDATE_PROJECT = 'UPDATE_PROJECT';
export const DELETE_PROJECT = 'DELETE_PROJECT';

19
src/migrations/20231002122426-update-dependency-permission.js Normal file
View File

@ -0,0 +1,19 @@
exports.up = function (db, cb) {
db.runSql(
`
INSERT INTO permissions (permission, display_name, type) VALUES ('UPDATE_FEATURE_DEPENDENCY', 'Update feature dependency', 'project');
SELECT assign_unleash_permission_to_role('UPDATE_FEATURE_DEPENDENCY', 'Member');
SELECT assign_unleash_permission_to_role('UPDATE_FEATURE_DEPENDENCY', 'Owner');
`,
cb
);
};
exports.down = function (db, cb) {
db.runSql(
`
DELETE FROM permissions WHERE permission = 'UPDATE_FEATURE_DEPENDENCY';
`,
cb
);
};