Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00
Code Issues Projects Releases Wiki Activity

fix: reset stickiness to default on variants modal close (#3455)

Browse Source 
<!-- Thanks for creating a PR! To make it easier for reviewers and
everyone else to understand what your changes relate to, please add some
relevant content to the headings below. Feel free to ignore or delete
sections that you don't think are relevant. Thank you! ❤️ -->
Expanded the onClose handler to reset stickiness to default for project
on modal close
## About the changes
<!-- Describe the changes introduced. What are they and why are they
being introduced? Feel free to also add screenshots or steps to view the
changes if they're visual. -->

<!-- Does it close an issue? Multiple? -->
Closes #

<!-- (For internal contributors): Does it relate to an issue on public
roadmap? -->
<!--
Relates to [roadmap](https://github.com/orgs/Unleash/projects/10) item:
#
-->

### Important files
<!-- PRs can contain a lot of changes, but not all changes are equally
important. Where should a reviewer start looking to get an overview of
the changes? Are any files particularly important? -->


## Discussion points
<!-- Anything about the PR you'd like to discuss before it gets merged?
Got any questions or doubts? -->

---------

Signed-off-by: andreas-unleash <andreas@getunleash.ai>
This commit is contained in:
andreas-unleash 2023-04-05 14:20:58 +03:00 committed by GitHub
parent 368b066219
commit c6ba6059cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 67 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/cypress/global.d.ts vendored
View File

@ -75,7 +75,7 @@ declare namespace Cypress {
): Chainable;
createProject_API(name: string): Chainable;
deleteProject_API(name: string): Chainable;
createFeature_API(name: string, projectName: string): Chainable;
createFeature_API(name: string, projectName?: string): Chainable;
deleteFeature_API(name: string): Chainable;
}
}

15
frontend/cypress/integration/feature/feature.spec.ts
View File

@ -1,14 +1,13 @@
///<reference path="../../global.d.ts" />
const ENTERPRISE = Boolean(Cypress.env('ENTERPRISE'));
const randomId = String(Math.random()).split('.')[1];
const featureToggleName = `unleash-e2e-${randomId}`;
const variant1 = 'variant1';
const variant2 = 'variant2';
let strategyId = '';
describe('feature', () => {
const randomId = String(Math.random()).split('.')[1];
const featureToggleName = `unleash-e2e-${randomId}`;
const variant1 = 'variant1';
const variant2 = 'variant2';
let strategyId = '';
before(() => {
cy.runBefore();
});

15
frontend/cypress/integration/groups/groups.spec.ts
View File

@ -1,16 +1,11 @@
///<reference path="../../global.d.ts" />
const baseUrl = Cypress.config().baseUrl;
const randomId = String(Math.random()).split('.')[1];
const groupName = `unleash-e2e-${randomId}`;
const userIds: any[] = [];
// Disable all active splash pages by visiting them.
const disableActiveSplashScreens = () => {
cy.visit(`/splash/operators`);
};
describe('groups', () => {
const baseUrl = Cypress.config().baseUrl;
const randomId = String(Math.random()).split('.')[1];
const groupName = `unleash-e2e-${randomId}`;
const userIds: any[] = [];
before(() => {
cy.runBefore();
cy.login_UI();

17
frontend/cypress/integration/import/import.spec.ts
View File

@ -1,18 +1,13 @@
///<reference path="../../global.d.ts" />
const baseUrl = Cypress.config().baseUrl;
const randomSeed = String(Math.random()).split('.')[1];
const randomFeatureName = `cypress-features${randomSeed}`;
const userIds: any[] = [];
// Disable all active splash pages by visiting them.
const disableActiveSplashScreens = () => {
cy.visit(`/splash/operators`);
};
describe('imports', () => {
const baseUrl = Cypress.config().baseUrl;
const randomSeed = String(Math.random()).split('.')[1];
const randomFeatureName = `cypress-features${randomSeed}`;
const userIds: any[] = [];
before(() => {
disableActiveSplashScreens();
cy.runBefore();
cy.login_UI();
for (let i = 1; i <= 2; i++) {
cy.request('POST', `${baseUrl}/api/admin/user-admin`, {

21
frontend/cypress/integration/projects/access.spec.ts
View File

@ -11,21 +11,16 @@ import {
//@ts-ignore
} from '../../../src/utils/testIds';
const baseUrl = Cypress.config().baseUrl;
const randomId = String(Math.random()).split('.')[1];
const groupAndProjectName = `group-e2e-${randomId}`;
const userName = `user-e2e-${randomId}`;
const groupIds: any[] = [];
const userIds: any[] = [];
// Disable all active splash pages by visiting them.
const disableActiveSplashScreens = () => {
cy.visit(`/splash/operators`);
};
describe('project-access', () => {
const baseUrl = Cypress.config().baseUrl;
const randomId = String(Math.random()).split('.')[1];
const groupAndProjectName = `group-e2e-${randomId}`;
const userName = `user-e2e-${randomId}`;
const groupIds: any[] = [];
const userIds: any[] = [];
before(() => {
disableActiveSplashScreens();
cy.runBefore();
cy.login_UI();
for (let i = 1; i <= 2; i++) {
const name = `${i}-${userName}`;

29
frontend/cypress/integration/projects/notifications.spec.ts
View File

@ -1,20 +1,16 @@
///<reference path="../../global.d.ts" />
import UserCredentials = Cypress.UserCredentials;
const ENTERPRISE = Boolean(Cypress.env('ENTERPRISE'));
const randomId = String(Math.random()).split('.')[1];
const featureToggleName = `notifications_test-${randomId}`;
const baseUrl = Cypress.config().baseUrl;
let strategyId = '';
let userIds: number[] = [];
let userCredentials: UserCredentials[] = [];
const userName = `notifications_user-${randomId}`;
const projectName = `default`;
const EDITOR = 2;
describe('notifications', () => {
const randomId = String(Math.random()).split('.')[1];
const featureToggleName = `notifications_test-${randomId}`;
const baseUrl = Cypress.config().baseUrl;
let userIds: number[] = [];
let userCredentials: Cypress.UserCredentials[] = [];
const userName = `notifications_user-${randomId}`;
const projectName = `default`;
before(() => {
cy.runBefore();
});
@ -45,10 +41,11 @@ describe('notifications', () => {
cy.get("[data-testid='NOTIFICATIONS_BUTTON']").click();
//then
cy.get("[data-testid='UNREAD_NOTIFICATIONS']").should('exist');
cy.get("[data-testid='NOTIFICATIONS_LIST']")
.eq(0)
.should('contain.text', `New feature ${featureToggleName}`);
// cy.get("[data-testid='UNREAD_NOTIFICATIONS']").should('exist');
cy.get("[data-testid='NOTIFICATIONS_LIST']").should(
'contain.text',
`New feature ${featureToggleName}`
);
//clean
// We need to login as admin for cleanup

13
frontend/cypress/integration/projects/overview.spec.ts
View File

@ -8,13 +8,14 @@ import {
//@ts-ignore
} from '../../../src/utils/testIds';
const randomId = String(Math.random()).split('.')[1];
const featureTogglePrefix = 'unleash-e2e-project-overview';
const featureToggleName = `${featureTogglePrefix}-${randomId}`;
const baseUrl = Cypress.config().baseUrl;
const selectAll = '[title="Toggle All Rows Selected"] input[type="checkbox"]';
describe('project overview', () => {
const randomId = String(Math.random()).split('.')[1];
const featureTogglePrefix = 'unleash-e2e-project-overview';
const featureToggleName = `${featureTogglePrefix}-${randomId}`;
const baseUrl = Cypress.config().baseUrl;
const selectAll =
'[title="Toggle All Rows Selected"] input[type="checkbox"]';
before(() => {
cy.runBefore();
});

18
frontend/cypress/integration/projects/settings.spec.ts
View File

@ -1,16 +1,14 @@
///<reference path="../../global.d.ts" />
const randomId = String(Math.random()).split('.')[1];
const baseUrl = Cypress.config().baseUrl;
let strategyId = '';
const userName = `settings-user-${randomId}`;
const projectName = `stickiness-project-${randomId}`;
const TEST_STICKINESS = 'userId';
const featureToggleName = `settings-${randomId}`;
let cleanFeature = false;
let cleanProject = false;
describe('project settings', () => {
const randomId = String(Math.random()).split('.')[1];
const baseUrl = Cypress.config().baseUrl;
const projectName = `stickiness-project-${randomId}`;
const TEST_STICKINESS = 'userId';
const featureToggleName = `settings-${randomId}`;
let cleanFeature = false;
let cleanProject = false;
before(() => {
cy.runBefore();
});

8
frontend/cypress/integration/segments/segments.spec.ts
View File

@ -1,10 +1,10 @@
///<reference path="../../global.d.ts" />
const randomId = String(Math.random()).split('.')[1];
const segmentName = `unleash-e2e-${randomId}`;
let segmentId: string;
describe('segments', () => {
const randomId = String(Math.random()).split('.')[1];
const segmentName = `unleash-e2e-${randomId}`;
let segmentId: string;
before(() => {
cy.runBefore();
});

21
frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/EnvironmentVariantsModal.tsx
View File

@ -209,7 +209,7 @@ export const EnvironmentVariantsModal = ({
stickiness:
variantsEdit?.length > 0
? variantsEdit[0].stickiness
: 'default',
: defaultStickiness,
new: true,
isValid: false,
id,
@ -307,18 +307,17 @@ export const EnvironmentVariantsModal = ({
}
}, [apiPayload.error]);
const handleClose = () => {
updateStickiness(defaultStickiness).then();
setOpen(false);
};
if (loading || stickiness === '') {
return <Loader />;
}
return (
<SidebarModal
open={open}
onClose={() => {
setOpen(false);
}}
label=""
>
<SidebarModal open={open} onClose={handleClose} label="">
<FormTemplate
modal
title=""
@ -459,11 +458,7 @@ export const EnvironmentVariantsModal = ({
? changeRequestButtonText
: 'Save variants'}
</Button>
<StyledCancelButton
onClick={() => {
setOpen(false);
}}
>
<StyledCancelButton onClick={handleClose}>
Cancel
</StyledCancelButton>
</StyledButtonContainer>