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

chore: allow CR selection when no envs are enabled (#7183)

Browse Source 
This PR allows you to configure change requests for all environments
when no environments are enabled explicitly. This is the default state
of the form and makes it so that you can configure CRs even if you want
all envs enabled.

Additionally, it preserves the case where you configure CRs for an
environment and then disable all envs.

This is logic only. It's not available in the UI yet.
This commit is contained in:
Thomas Heartman 2024-05-28 11:35:06 +02:00 committed by GitHub
parent cea64dc21d
commit c8fa7e477a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
frontend/src/component/project/Project/hooks/useProjectForm.test.ts
View File

@ -1,39 +1,70 @@
import { renderHook } from '@testing-library/react-hooks';
import useProjectForm from './useProjectForm';
test('setting project environments removes any change request envs that are not in the new project env list', () => {
const { result } = renderHook(() => useProjectForm());
describe('configuring change requests', () => {
test('setting project environments removes any change request envs that are not in the new project env list', () => {
const { result } = renderHook(() => useProjectForm());
result.current.setProjectEnvironments(new Set(['dev', 'prod']));
result.current.updateProjectChangeRequestConfig.enableChangeRequests(
'prod',
5,
);
result.current.setProjectEnvironments(new Set(['dev', 'prod']));
result.current.updateProjectChangeRequestConfig.enableChangeRequests(
'prod',
5,
);
expect(result.current.projectChangeRequestConfiguration).toMatchObject({
prod: { requiredApprovals: 5 },
expect(result.current.projectChangeRequestConfiguration).toMatchObject({
prod: { requiredApprovals: 5 },
});
result.current.setProjectEnvironments(new Set(['dev']));
expect(
'prod' in result.current.projectChangeRequestConfiguration,
).toBeFalsy();
});
result.current.setProjectEnvironments(new Set(['dev']));
test('setting project environments to an empty set preserves change request configuration', () => {
const { result } = renderHook(() => useProjectForm());
expect(
'prod' in result.current.projectChangeRequestConfiguration,
).toBeFalsy();
});
result.current.setProjectEnvironments(new Set(['dev', 'prod']));
result.current.updateProjectChangeRequestConfig.enableChangeRequests(
'prod',
5,
);
test(`adding a change request config for an env not in the project envs doesn't work and the change request envs is not changed`, () => {
const { result } = renderHook(() => useProjectForm());
result.current.setProjectEnvironments(new Set([]));
result.current.setProjectEnvironments(new Set(['prod']));
expect(result.current.projectChangeRequestConfiguration).toMatchObject({
prod: { requiredApprovals: 5 },
});
});
result.current.updateProjectChangeRequestConfig.enableChangeRequests(
'dev',
5,
);
test(`if specific project envs are selected, adding a change request config for an env not in the project envs doesn't work and the change request envs is not changed`, () => {
const { result } = renderHook(() => useProjectForm());
expect(
'dev' in result.current.projectChangeRequestConfiguration,
).toBeFalsy();
result.current.setProjectEnvironments(new Set(['prod']));
result.current.updateProjectChangeRequestConfig.enableChangeRequests(
'dev',
5,
);
expect(
'dev' in result.current.projectChangeRequestConfiguration,
).toBeFalsy();
});
test(`if no project envs are selected, you can add a change request for any env you want`, () => {
const { result } = renderHook(() => useProjectForm());
result.current.updateProjectChangeRequestConfig.enableChangeRequests(
'dev',
5,
);
expect(
'dev' in result.current.projectChangeRequestConfiguration,
).toBeTruthy();
});
});
describe('payload generation', () => {

20
frontend/src/component/project/Project/hooks/useProjectForm.ts
View File

@ -38,13 +38,16 @@ const useProjectForm = (
] = useState(initialProjectChangeRequestConfiguration);
const updateProjectEnvironments = (newState: Set<string>) => {
const filteredChangeRequestEnvs = Object.fromEntries(
Object.entries(projectChangeRequestConfiguration).filter(([env]) =>
newState.has(env),
),
);
if (newState.size !== 0) {
const filteredChangeRequestEnvs = Object.fromEntries(
Object.entries(projectChangeRequestConfiguration).filter(
([env]) => newState.has(env),
),
);
setProjectChangeRequestConfiguration(filteredChangeRequestEnvs);
}
setProjectChangeRequestConfiguration(filteredChangeRequestEnvs);
setProjectEnvironments(newState);
};
@ -57,7 +60,10 @@ const useProjectForm = (
},
enableChangeRequests: (env: string, approvals: number) => {
if (projectEnvironments.has(env)) {
if (
projectEnvironments.has(env) ||
projectEnvironments.size === 0
) {
setProjectChangeRequestConfiguration((previousState) => ({
...previousState,
[env]: { requiredApprovals: approvals },