mirror of
https://github.com/Unleash/unleash.git
synced 2025-05-31 01:16:01 +02:00
Merge branch 'master' into fix/environment-guidance
This commit is contained in:
Youssef Khedher
GitHub
commit
144dca4ba0
@ -89,7 +89,7 @@
|
||||
"redux-thunk": "2.4.1",
|
||||
"sass": "1.44.0",
|
||||
"swr": "1.0.1",
|
||||
"typescript": "4.5.2",
|
||||
"typescript": "4.5.3",
|
||||
"web-vitals": "2.1.2"
|
||||
},
|
||||
"jest": {
|
||||
|
||||
@ -278,44 +278,16 @@ exports[`renders correctly with permissions 1`] = `
|
||||
<div
|
||||
className="MuiListItemAvatar-root"
|
||||
>
|
||||
<span
|
||||
className="MuiSwitch-root"
|
||||
<svg
|
||||
aria-hidden={true}
|
||||
className="MuiSvgIcon-root"
|
||||
focusable="false"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<span
|
||||
aria-disabled={true}
|
||||
className="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-15 MuiSwitch-switchBase MuiSwitch-colorSecondary PrivateSwitchBase-disabled-17 Mui-disabled Mui-disabled Mui-disabled"
|
||||
onBlur={[Function]}
|
||||
onDragLeave={[Function]}
|
||||
onFocus={[Function]}
|
||||
onKeyDown={[Function]}
|
||||
onKeyUp={[Function]}
|
||||
onMouseDown={[Function]}
|
||||
onMouseLeave={[Function]}
|
||||
onMouseUp={[Function]}
|
||||
onTouchEnd={[Function]}
|
||||
onTouchMove={[Function]}
|
||||
onTouchStart={[Function]}
|
||||
tabIndex={-1}
|
||||
>
|
||||
<span
|
||||
className="MuiIconButton-label"
|
||||
>
|
||||
<input
|
||||
className="PrivateSwitchBase-input-18 MuiSwitch-input"
|
||||
disabled={true}
|
||||
onChange={[Function]}
|
||||
type="checkbox"
|
||||
value={true}
|
||||
/>
|
||||
<span
|
||||
className="MuiSwitch-thumb"
|
||||
/>
|
||||
</span>
|
||||
</span>
|
||||
<span
|
||||
className="MuiSwitch-track"
|
||||
<path
|
||||
d="M14.4 6l-.24-1.2c-.09-.46-.5-.8-.98-.8H6c-.55 0-1 .45-1 1v15c0 .55.45 1 1 1s1-.45 1-1v-6h5.6l.24 1.2c.09.47.5.8.98.8H19c.55 0 1-.45 1-1V7c0-.55-.45-1-1-1h-4.6z"
|
||||
/>
|
||||
</span>
|
||||
</svg>
|
||||
</div>
|
||||
<div
|
||||
className="MuiListItemText-root MuiListItemText-multiline"
|
||||
@ -348,6 +320,11 @@ exports[`renders correctly with permissions 1`] = `
|
||||
aria-hidden={true}
|
||||
className="MuiSvgIcon-root"
|
||||
focusable="false"
|
||||
style={
|
||||
Object {
|
||||
"color": "red",
|
||||
}
|
||||
}
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
@ -362,7 +339,7 @@ exports[`renders correctly with permissions 1`] = `
|
||||
className="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
|
||||
>
|
||||
<a
|
||||
href="/projects/default/create-toggle?name=ToggleB"
|
||||
href="/projects/default/create-toggle2?name=ToggleB"
|
||||
onClick={[Function]}
|
||||
>
|
||||
ToggleB
|
||||
@ -443,6 +420,11 @@ exports[`renders correctly with permissions 1`] = `
|
||||
aria-hidden={true}
|
||||
className="MuiSvgIcon-root"
|
||||
focusable="false"
|
||||
style={
|
||||
Object {
|
||||
"color": "red",
|
||||
}
|
||||
}
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
|
||||
@ -7,10 +7,9 @@ import {
|
||||
ListItem,
|
||||
ListItemText,
|
||||
ListItemAvatar,
|
||||
Switch,
|
||||
Typography,
|
||||
} from '@material-ui/core';
|
||||
import { Report, Extension, Timeline } from '@material-ui/icons';
|
||||
import { Report, Extension, Timeline, FlagRounded } from '@material-ui/icons';
|
||||
|
||||
import { shorten } from '../common';
|
||||
import {
|
||||
@ -33,7 +32,7 @@ function ApplicationView({
|
||||
show={
|
||||
<ListItem key={`not_found_${name}`}>
|
||||
<ListItemAvatar>
|
||||
<Report />
|
||||
<Report style={{color: 'red'}} />
|
||||
</ListItemAvatar>
|
||||
<ListItemText
|
||||
primary={<Link to={`${createUrl}`}>{name}</Link>}
|
||||
@ -59,19 +58,13 @@ function ApplicationView({
|
||||
const foundListItem = ({
|
||||
viewUrl,
|
||||
name,
|
||||
showSwitch,
|
||||
enabled,
|
||||
description,
|
||||
Icon,
|
||||
i,
|
||||
}) => (
|
||||
<ListItem key={`found_${name}-${i}`}>
|
||||
<ListItemAvatar>
|
||||
<ConditionallyRender
|
||||
key={`conditional_avatar_${name}`}
|
||||
condition={showSwitch}
|
||||
show={<Switch disabled value={!!enabled} />}
|
||||
elseShow={<Extension />}
|
||||
/>
|
||||
<Icon />
|
||||
</ListItemAvatar>
|
||||
<ListItemText
|
||||
primary={
|
||||
@ -91,14 +84,14 @@ function ApplicationView({
|
||||
<List>
|
||||
{seenToggles.map(
|
||||
(
|
||||
{ name, description, enabled, notFound, project },
|
||||
{ name, description, notFound, project },
|
||||
i
|
||||
) => (
|
||||
<ConditionallyRender
|
||||
key={`toggle_conditional_${name}`}
|
||||
condition={notFound}
|
||||
show={notFoundListItem({
|
||||
createUrl: `/projects/default/create-toggle?name=${name}`,
|
||||
createUrl: `/projects/default/create-toggle2?name=${name}`,
|
||||
name,
|
||||
permission: CREATE_FEATURE,
|
||||
i,
|
||||
@ -106,9 +99,8 @@ function ApplicationView({
|
||||
elseShow={foundListItem({
|
||||
viewUrl: getTogglePath(project, name),
|
||||
name,
|
||||
showSwitch: true,
|
||||
enabled,
|
||||
description,
|
||||
Icon: FlagRounded,
|
||||
i,
|
||||
})}
|
||||
/>
|
||||
@ -135,7 +127,7 @@ function ApplicationView({
|
||||
elseShow={foundListItem({
|
||||
viewUrl: '/strategies/view',
|
||||
name,
|
||||
showSwitch: false,
|
||||
Icon: Extension,
|
||||
enabled: undefined,
|
||||
description,
|
||||
i,
|
||||
|
||||
@ -12467,10 +12467,10 @@ typedarray@^0.0.6:
|
||||
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
|
||||
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
|
||||
|
||||
typescript@4.5.2:
|
||||
version "4.5.2"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998"
|
||||
integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==
|
||||
typescript@4.5.3:
|
||||
version "4.5.3"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.3.tgz#afaa858e68c7103317d89eb90c5d8906268d353c"
|
||||
integrity sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ==
|
||||
|
||||
unbox-primitive@^1.0.0:
|
||||
version "1.0.1"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user