From 90296bed82e2b4b8fd0c58602967adf18f66d949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20G=C3=B3is?= Date: Tue, 24 Oct 2023 09:57:01 +0100 Subject: [PATCH] refactor: slight clean up after GAing multiple roles (#5133) Follow up cleanup to https://github.com/Unleash/unleash/pull/5109 Based on https://github.com/Unleash/unleash/pull/5109#pullrequestreview-1689535863 --- .../cypress/integration/projects/access.spec.ts | 13 ------------- .../ProjectAccessAssign/ProjectAccessAssign.tsx | 1 - frontend/src/interfaces/uiConfig.ts | 1 - 3 files changed, 15 deletions(-) diff --git a/frontend/cypress/integration/projects/access.spec.ts b/frontend/cypress/integration/projects/access.spec.ts index d3d3f53b40..dc6c541248 100644 --- a/frontend/cypress/integration/projects/access.spec.ts +++ b/frontend/cypress/integration/projects/access.spec.ts @@ -66,19 +66,6 @@ describe('project-access', () => { beforeEach(() => { cy.login_UI(); - cy.intercept('GET', `${baseUrl}/api/admin/ui-config`, (req) => { - req.headers['cache-control'] = - 'no-cache, no-store, must-revalidate'; - req.on('response', (res) => { - if (res.body) { - res.body.flags = { - ...res.body.flags, - multipleRoles: true, - }; - } - }); - }); - cy.visit(`/projects/${groupAndProjectName}/settings/access`); if (document.querySelector("[data-testid='CLOSE_SPLASH']")) { cy.get("[data-testid='CLOSE_SPLASH']").click(); diff --git a/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx b/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx index d1c3eeb0c4..bc98de20d7 100644 --- a/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx +++ b/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx @@ -36,7 +36,6 @@ import { import { caseInsensitiveSearch } from 'utils/search'; import { IServiceAccount } from 'interfaces/service-account'; import { MultipleRoleSelect } from 'component/common/MultipleRoleSelect/MultipleRoleSelect'; -import { RoleSelect } from 'component/common/RoleSelect/RoleSelect'; const StyledForm = styled('form')(() => ({ display: 'flex', diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 2b6087eb2f..9f4d31ff7d 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -61,7 +61,6 @@ export type UiFlags = { customRootRolesKillSwitch?: boolean; strategyVariant?: boolean; lastSeenByEnvironment?: boolean; - multipleRoles?: boolean; featureNamingPattern?: boolean; doraMetrics?: boolean; variantTypeNumber?: boolean;