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

Merge branch 'main' into fix/ui-consistency

Browse Source
This commit is contained in:
Youssef Khedher 2022-02-23 14:03:25 +01:00 committed by GitHub
commit c3cf238110
5 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/package.json
View File

@ -47,7 +47,7 @@
"@testing-library/user-event": "13.5.0", "@testing-library/user-event": "13.5.0",
"@types/debounce": "1.2.1", "@types/debounce": "1.2.1",
"@types/deep-diff": "1.0.1", "@types/deep-diff": "1.0.1",
"@types/jest": "27.4.0", "@types/jest": "27.4.1",
"@types/lodash.clonedeep": "4.5.6", "@types/lodash.clonedeep": "4.5.6",
"@types/node": "14.18.12", "@types/node": "14.18.12",
"@types/react": "17.0.39", "@types/react": "17.0.39",

6
frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx
View File

@ -19,6 +19,8 @@ import EnvironmentListItem from './EnvironmentListItem/EnvironmentListItem';
import { mutate } from 'swr'; import { mutate } from 'swr';
import EnvironmentToggleConfirm from './EnvironmentToggleConfirm/EnvironmentToggleConfirm'; import EnvironmentToggleConfirm from './EnvironmentToggleConfirm/EnvironmentToggleConfirm';
import useProjectRolePermissions from '../../../hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions'; import useProjectRolePermissions from '../../../hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions';
import { ADMIN } from 'component/providers/AccessProvider/permissions';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
const EnvironmentList = () => { const EnvironmentList = () => {
const defaultEnv = { const defaultEnv = {
@ -30,6 +32,7 @@ const EnvironmentList = () => {
protected: false, protected: false,
}; };
const { environments, refetch } = useEnvironments(); const { environments, refetch } = useEnvironments();
const { uiConfig } = useUiConfig();
const { refetch: refetchProjectRolePermissions } = const { refetch: refetchProjectRolePermissions } =
useProjectRolePermissions(); useProjectRolePermissions();
@ -161,7 +164,6 @@ const EnvironmentList = () => {
const navigateToCreateEnvironment = () => { const navigateToCreateEnvironment = () => {
history.push('/environments/create'); history.push('/environments/create');
}; };
return ( return (
<PageContent <PageContent
headerContent={ headerContent={
@ -173,6 +175,8 @@ const EnvironmentList = () => {
onClick={navigateToCreateEnvironment} onClick={navigateToCreateEnvironment}
maxWidth="700px" maxWidth="700px"
Icon={Add} Icon={Add}
permission={ADMIN}
disabled={!Boolean(uiConfig.flags.EEA)}
> >
New Environment New Environment
</ResponsiveButton> </ResponsiveButton>

2
frontend/src/hooks/api/getters/useUiConfig/defaultValue.ts
View File

@ -5,7 +5,7 @@ export const defaultValue = {
version: '3.x', version: '3.x',
environment: '', environment: '',
slogan: 'The enterprise ready feature toggle service.', slogan: 'The enterprise ready feature toggle service.',
flags: { P: false, C: false, E: false, RE: false }, flags: { P: false, C: false, E: false, RE: false, EEA: false },
links: [ links: [
{ {
value: 'Documentation', value: 'Documentation',

2
frontend/src/interfaces/uiConfig.ts
View File

@ -24,6 +24,8 @@ export interface IFlags {
P: boolean; P: boolean;
E: boolean; E: boolean;
RE: boolean; RE: boolean;
EEA?: boolean;
OIDC?: boolean;
} }
export interface IVersionInfo { export interface IVersionInfo {

61
frontend/yarn.lock
View File

@ -2052,12 +2052,12 @@
jest-diff "^26.0.0" jest-diff "^26.0.0"
pretty-format "^26.0.0" pretty-format "^26.0.0"
"@types/jest@27.4.0": "@types/jest@27.4.1":
version "27.4.0" version "27.4.1"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.0.tgz#037ab8b872067cae842a320841693080f9cb84ed" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.1.tgz#185cbe2926eaaf9662d340cc02e548ce9e11ab6d"
integrity sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ== integrity sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==
dependencies: dependencies:
jest-diff "^27.0.0" jest-matcher-utils "^27.0.0"
pretty-format "^27.0.0" pretty-format "^27.0.0"
"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": "@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
@ -4785,10 +4785,10 @@ diff-sequences@^26.6.2:
resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz" resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz"
integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
diff-sequences@^27.0.6: diff-sequences@^27.5.1:
version "27.0.6" version "27.5.1"
resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
diffie-hellman@^5.0.0: diffie-hellman@^5.0.0:
version "5.0.3" version "5.0.3"
@ -7215,15 +7215,15 @@ jest-diff@^26.0.0, jest-diff@^26.6.2:
jest-get-type "^26.3.0" jest-get-type "^26.3.0"
pretty-format "^26.6.2" pretty-format "^26.6.2"
jest-diff@^27.0.0: jest-diff@^27.5.1:
version "27.2.4" version "27.5.1"
resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.4.tgz" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
integrity sha512-bLAVlDSCR3gqUPGv+4nzVpEXGsHh98HjUL7Vb2hVyyuBDoQmja8eJb0imUABsuxBeUVmf47taJSAd9nDrwWKEg== integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
dependencies: dependencies:
chalk "^4.0.0" chalk "^4.0.0"
diff-sequences "^27.0.6" diff-sequences "^27.5.1"
jest-get-type "^27.0.6" jest-get-type "^27.5.1"
pretty-format "^27.2.4" pretty-format "^27.5.1"
jest-docblock@^26.0.0: jest-docblock@^26.0.0:
version "26.0.0" version "26.0.0"
@ -7273,10 +7273,10 @@ jest-get-type@^26.3.0:
resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz" resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"
integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
jest-get-type@^27.0.6: jest-get-type@^27.5.1:
version "27.0.6" version "27.5.1"
resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg== integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
jest-haste-map@^26.6.2: jest-haste-map@^26.6.2:
version "26.6.2" version "26.6.2"
@ -7341,6 +7341,16 @@ jest-matcher-utils@^26.6.0, jest-matcher-utils@^26.6.2:
jest-get-type "^26.3.0" jest-get-type "^26.3.0"
pretty-format "^26.6.2" pretty-format "^26.6.2"
jest-matcher-utils@^27.0.0:
version "27.5.1"
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
dependencies:
chalk "^4.0.0"
jest-diff "^27.5.1"
jest-get-type "^27.5.1"
pretty-format "^27.5.1"
jest-message-util@^26.6.0, jest-message-util@^26.6.2: jest-message-util@^26.6.0, jest-message-util@^26.6.2:
version "26.6.2" version "26.6.2"
resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz" resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz"
@ -9933,7 +9943,7 @@ pretty-format@^26.0.0, pretty-format@^26.6.0, pretty-format@^26.6.2:
ansi-styles "^4.0.0" ansi-styles "^4.0.0"
react-is "^17.0.1" react-is "^17.0.1"
pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.4: pretty-format@^27.0.0, pretty-format@^27.0.2:
version "27.2.4" version "27.2.4"
resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.4.tgz" resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.4.tgz"
integrity sha512-NUjw22WJHldzxyps2YjLZkUj6q1HvjqFezkB9Y2cklN8NtVZN/kZEXGZdFw4uny3oENzV5EEMESrkI0YDUH8vg== integrity sha512-NUjw22WJHldzxyps2YjLZkUj6q1HvjqFezkB9Y2cklN8NtVZN/kZEXGZdFw4uny3oENzV5EEMESrkI0YDUH8vg==
@ -9943,6 +9953,15 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.4:
ansi-styles "^5.0.0" ansi-styles "^5.0.0"
react-is "^17.0.1" react-is "^17.0.1"
pretty-format@^27.5.1:
version "27.5.1"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
dependencies:
ansi-regex "^5.0.1"
ansi-styles "^5.0.0"
react-is "^17.0.1"
process-nextick-args@~2.0.0: process-nextick-args@~2.0.0:
version "2.0.1" version "2.0.1"
resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz" resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"