-
- edit
-
+
{connectDragSource(
@@ -62,13 +57,11 @@ const StrategyCardHeader = ({
onClick={removeStrategy}
disabled={disableDelete}
>
-
- delete
-
+ />
@@ -76,13 +69,11 @@ const StrategyCardHeader = ({
elseShow={
-
- delete
-
+ />
}
diff --git a/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInput/StrategyConstraintInput.jsx b/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInput/StrategyConstraintInput.jsx
index d12785c2e4..f977349557 100644
--- a/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInput/StrategyConstraintInput.jsx
+++ b/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInput/StrategyConstraintInput.jsx
@@ -1,6 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { Tooltip, Icon, Typography } from '@material-ui/core';
+import { Tooltip, Typography } from '@material-ui/core';
+import { Info } from '@material-ui/icons';
+
import StrategyConstraintInputField from '../StrategyConstraintInputField';
import { useCommonStyles } from '../../../../../common.styles';
@@ -56,9 +58,7 @@ const StrategyConstraintInput = ({
{'Constraints '}
-
- info
-
+
diff --git a/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInputField/StrategyConstraintInputField.jsx b/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInputField/StrategyConstraintInputField.jsx
index 9a67115bbb..1671b20409 100644
--- a/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInputField/StrategyConstraintInputField.jsx
+++ b/frontend/src/component/feature/strategy/StrategyConstraint/StrategyConstraintInputField/StrategyConstraintInputField.jsx
@@ -1,7 +1,9 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
-import { Icon, IconButton, TextField } from '@material-ui/core';
+import { IconButton, TextField } from '@material-ui/core';
import { Autocomplete } from '@material-ui/lab';
+import { Delete } from '@material-ui/icons';
+
import MySelect from '../../../../common/select';
import InputListField from '../../../../common/input-list-field';
import ConditionallyRender from '../../../../common/ConditionallyRender/ConditionallyRender';
@@ -130,7 +132,7 @@ const StrategyConstraintInputField = ({
- delete
+
|
diff --git a/frontend/src/component/feature/strategy/strategies-add.jsx b/frontend/src/component/feature/strategy/strategies-add.jsx
index 8bcedd1796..5a2ca42b12 100644
--- a/frontend/src/component/feature/strategy/strategies-add.jsx
+++ b/frontend/src/component/feature/strategy/strategies-add.jsx
@@ -1,8 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { MenuItem } from '@material-ui/core';
-import DropdownMenu from '../../common/DropdownMenu/DropdownMenu';
+import { Add } from '@material-ui/icons';
+import DropdownMenu from '../../common/DropdownMenu/DropdownMenu';
import styles from './strategy.module.scss';
function resolveDefaultParamVale(name, featureToggleName) {
@@ -69,7 +70,7 @@ class AddStrategy extends React.Component {
id="strategies-add"
renderOptions={addStrategiesOptions}
label="Add strategy"
- icon="add"
+ icon={}
className={styles.addStrategyButton}
color="secondary"
variant="contained"
diff --git a/frontend/src/component/feature/variant/AddVariant/AddVariant.jsx b/frontend/src/component/feature/variant/AddVariant/AddVariant.jsx
index 785ae3ba45..ece66d3af8 100644
--- a/frontend/src/component/feature/variant/AddVariant/AddVariant.jsx
+++ b/frontend/src/component/feature/variant/AddVariant/AddVariant.jsx
@@ -4,12 +4,12 @@ import {
FormControl,
FormControlLabel,
Grid,
- Icon,
Switch,
TextField,
InputAdornment,
Button,
} from '@material-ui/core';
+import { Info } from '@material-ui/icons';
import Dialog from '../../../common/Dialogue';
import MySelect from '../../../common/select';
import { modalStyles, trim } from '../../../common/util';
@@ -243,10 +243,7 @@ const AddVariant = ({
Payload
-
+
@@ -277,10 +274,7 @@ const AddVariant = ({
show={
Overrides
-
+
}
/>
diff --git a/frontend/src/component/feature/variant/AddVariant/OverrideConfig/OverrideConfig.jsx b/frontend/src/component/feature/variant/AddVariant/OverrideConfig/OverrideConfig.jsx
index fc65f47c72..c72eb9677f 100644
--- a/frontend/src/component/feature/variant/AddVariant/OverrideConfig/OverrideConfig.jsx
+++ b/frontend/src/component/feature/variant/AddVariant/OverrideConfig/OverrideConfig.jsx
@@ -2,7 +2,8 @@ import { connect } from 'react-redux';
import classnames from 'classnames';
import PropTypes from 'prop-types';
-import { Grid, IconButton, Icon, TextField } from '@material-ui/core';
+import { Grid, IconButton, TextField } from '@material-ui/core';
+import { Delete } from '@material-ui/icons';
import MySelect from '../../../../common/select';
import InputListField from '../../../../common/input-list-field';
import ConditionallyRender from '../../../../common/ConditionallyRender/ConditionallyRender';
@@ -92,7 +93,7 @@ const OverrideConfig = ({
- delete
+
diff --git a/frontend/src/component/feature/variant/__tests__/__snapshots__/update-variant-component-test.jsx.snap b/frontend/src/component/feature/variant/__tests__/__snapshots__/update-variant-component-test.jsx.snap
index d181ae49b1..261185d422 100644
--- a/frontend/src/component/feature/variant/__tests__/__snapshots__/update-variant-component-test.jsx.snap
+++ b/frontend/src/component/feature/variant/__tests__/__snapshots__/update-variant-component-test.jsx.snap
@@ -146,12 +146,16 @@ exports[`renders correctly with with variants 1`] = `
-
- edit
-
+
+
@@ -242,12 +250,16 @@ exports[`renders correctly with with variants 1`] = `
-
- edit
-
+
+
@@ -350,12 +366,16 @@ exports[`renders correctly with with variants 1`] = `
-
- edit
-
+
+
diff --git a/frontend/src/component/feature/variant/variant-view-component.jsx b/frontend/src/component/feature/variant/variant-view-component.jsx
index 87cf128c98..c4310f5085 100644
--- a/frontend/src/component/feature/variant/variant-view-component.jsx
+++ b/frontend/src/component/feature/variant/variant-view-component.jsx
@@ -1,20 +1,32 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { IconButton, Chip, Icon, TableCell, TableRow } from '@material-ui/core';
+import { IconButton, Chip, TableCell, TableRow } from '@material-ui/core';
+import { Edit, Delete } from '@material-ui/icons';
+
import { weightTypes } from './enums';
import ConditionallyRender from '../../common/ConditionallyRender/ConditionallyRender';
import styles from './variant.module.scss';
-function VariantViewComponent({ variant, editVariant, removeVariant, editable }) {
+function VariantViewComponent({
+ variant,
+ editVariant,
+ removeVariant,
+ editable,
+}) {
const { FIX } = weightTypes;
return (
{variant.name}
- } />
0}
+ condition={variant.payload}
+ show={}
+ />
+ 0
+ }
show={
{variant.weight / 10.0} %
- {variant.weightType === FIX ? 'Fix' : 'Variable'}
+
+ {variant.weightType === FIX ? 'Fix' : 'Variable'}
+
- edit
+
- delete
+
diff --git a/frontend/src/component/feature/view/__tests__/__snapshots__/view-component-test.jsx.snap b/frontend/src/component/feature/view/__tests__/__snapshots__/view-component-test.jsx.snap
index e51bd7b382..740f5d2533 100644
--- a/frontend/src/component/feature/view/__tests__/__snapshots__/view-component-test.jsx.snap
+++ b/frontend/src/component/feature/view/__tests__/__snapshots__/view-component-test.jsx.snap
@@ -279,7 +279,16 @@ exports[`renders correctly with one feature 1`] = `
aria-hidden={true}
className="material-icons MuiIcon-root"
>
- arrow_drop_down
+
diff --git a/frontend/src/component/feature/view/metric-component.jsx b/frontend/src/component/feature/view/metric-component.jsx
index 08ae96543a..0616394d63 100644
--- a/frontend/src/component/feature/view/metric-component.jsx
+++ b/frontend/src/component/feature/view/metric-component.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { Icon, Chip, Grid } from '@material-ui/core';
-import LinkIcon from '@material-ui/icons/Link';
+import { Chip, Grid } from '@material-ui/core';
+import { ReportProblem, Link as LinkIcon } from '@material-ui/icons';
import { Link } from 'react-router-dom';
import { AppsLinkList, calc } from '../../common';
@@ -123,12 +123,10 @@ export default class MetricComponent extends React.Component {
}
elseShow={
-
- report problem
-
+ />
diff --git a/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap
index 0aea06effd..f26d38664e 100644
--- a/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap
+++ b/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap
@@ -4,7 +4,14 @@ exports[`returns all baseRoutes 1`] = `
Array [
Object {
"component": [Function],
- "icon": "list",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/features",
"title": "Feature Toggles",
@@ -12,7 +19,14 @@ Array [
},
Object {
"component": [Function],
- "icon": "extension",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/strategies",
"title": "Strategies",
@@ -20,7 +34,14 @@ Array [
},
Object {
"component": [Function],
- "icon": "history",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/history",
"title": "Event History",
@@ -28,7 +49,14 @@ Array [
},
Object {
"component": [Function],
- "icon": "archive",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/archive",
"title": "Archived Toggles",
@@ -36,7 +64,14 @@ Array [
},
Object {
"component": [Function],
- "icon": "apps",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/applications",
"title": "Applications",
@@ -45,7 +80,14 @@ Array [
Object {
"component": [Function],
"flag": "C",
- "icon": "album",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/context",
"title": "Context Fields",
@@ -54,7 +96,14 @@ Array [
Object {
"component": [Function],
"flag": "P",
- "icon": "folder_open",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/projects",
"title": "Projects",
@@ -62,7 +111,14 @@ Array [
},
Object {
"component": [Function],
- "icon": "label",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/tag-types",
"title": "Tag types",
@@ -71,7 +127,14 @@ Array [
Object {
"component": [Function],
"hidden": false,
- "icon": "device_hub",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/addons",
"title": "Addons",
@@ -79,7 +142,14 @@ Array [
},
Object {
"component": [Function],
- "icon": "report",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/reporting",
"title": "Reporting",
@@ -88,7 +158,14 @@ Array [
Object {
"component": [Function],
"hidden": false,
- "icon": "album",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/admin",
"title": "Admin",
@@ -96,7 +173,14 @@ Array [
},
Object {
"component": [Function],
- "icon": "exit_to_app",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"layout": "main",
"path": "/logout",
"title": "Sign out",
diff --git a/frontend/src/component/menu/drawer.jsx b/frontend/src/component/menu/drawer.jsx
index 3736209ca2..caeee32547 100644
--- a/frontend/src/component/menu/drawer.jsx
+++ b/frontend/src/component/menu/drawer.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Divider, Drawer, List, Icon } from '@material-ui/core';
import { NavLink } from 'react-router-dom';
import classnames from 'classnames';
@@ -17,8 +16,8 @@ const filterByFlags = flags => r => {
return true;
};
-function getIcon(name) {
- if (name === 'c_github') {
+function getIcon(IconComponent) {
+ if (IconComponent === 'c_github') {
return (
);
+ } else if (IconComponent === 'library_books') {
+ return library_books;
} else {
- return {name};
+ return ;
}
}
diff --git a/frontend/src/component/menu/routes.js b/frontend/src/component/menu/routes.js
index 7deaacd9c3..9d41a61ae9 100644
--- a/frontend/src/component/menu/routes.js
+++ b/frontend/src/component/menu/routes.js
@@ -40,6 +40,22 @@ import NewUser from '../user/NewUser';
import ResetPassword from '../user/ResetPassword/ResetPassword';
import ForgottenPassword from '../user/ForgottenPassword/ForgottenPassword';
+import {
+ List,
+ Extension,
+ History,
+ Archive as ArchiveIcon,
+ Apps,
+ Label,
+ DeviceHub,
+ Album,
+ ExitToApp,
+ FolderOpen,
+ Report,
+ Money,
+ Person,
+} from '@material-ui/icons';
+
export const routes = [
// Features
{
@@ -69,7 +85,7 @@ export const routes = [
{
path: '/features',
title: 'Feature Toggles',
- icon: 'list',
+ icon: List,
component: Features,
type: 'protected',
layout: 'main',
@@ -95,7 +111,7 @@ export const routes = [
{
path: '/strategies',
title: 'Strategies',
- icon: 'extension',
+ icon: Extension,
component: Strategies,
type: 'protected',
layout: 'main',
@@ -113,7 +129,7 @@ export const routes = [
{
path: '/history',
title: 'Event History',
- icon: 'history',
+ icon: History,
component: HistoryPage,
type: 'protected',
layout: 'main',
@@ -131,7 +147,7 @@ export const routes = [
{
path: '/archive',
title: 'Archived Toggles',
- icon: 'archive',
+ icon: ArchiveIcon,
component: Archive,
type: 'protected',
layout: 'main',
@@ -149,7 +165,7 @@ export const routes = [
{
path: '/applications',
title: 'Applications',
- icon: 'apps',
+ icon: Apps,
component: Applications,
type: 'protected',
layout: 'main',
@@ -175,7 +191,7 @@ export const routes = [
{
path: '/context',
title: 'Context Fields',
- icon: 'album',
+ icon: Album,
component: ContextFields,
type: 'protected',
flag: C,
@@ -219,7 +235,7 @@ export const routes = [
{
path: '/projects',
title: 'Projects',
- icon: 'folder_open',
+ icon: FolderOpen,
component: ListProjects,
flag: P,
type: 'protected',
@@ -245,7 +261,7 @@ export const routes = [
{
path: '/tag-types',
title: 'Tag types',
- icon: 'label',
+ icon: Label,
component: ListTagTypes,
type: 'protected',
layout: 'main',
@@ -262,7 +278,7 @@ export const routes = [
{
path: '/tags',
title: 'Tags',
- icon: 'label',
+ icon: Label,
component: ListTags,
hidden: true,
type: 'protected',
@@ -289,7 +305,7 @@ export const routes = [
{
path: '/addons',
title: 'Addons',
- icon: 'device_hub',
+ icon: DeviceHub,
component: Addons,
hidden: false,
type: 'protected',
@@ -298,7 +314,7 @@ export const routes = [
{
path: '/reporting',
title: 'Reporting',
- icon: 'report',
+ icon: Report,
component: Reporting,
type: 'protected',
layout: 'main',
@@ -331,7 +347,7 @@ export const routes = [
{
path: '/admin-invoices',
title: 'Invoices',
- icon: 'money',
+ icon: Money,
component: AdminInvoice,
hidden: true,
type: 'protected',
@@ -340,7 +356,7 @@ export const routes = [
{
path: '/admin',
title: 'Admin',
- icon: 'album',
+ icon: Album,
component: Admin,
hidden: false,
type: 'protected',
@@ -349,7 +365,7 @@ export const routes = [
{
path: '/logout',
title: 'Sign out',
- icon: 'exit_to_app',
+ icon: ExitToApp,
component: LogoutFeatures,
type: 'unprotected',
layout: 'main',
@@ -357,7 +373,7 @@ export const routes = [
{
path: '/login',
title: 'Log in',
- icon: 'user',
+ icon: Person,
component: Login,
type: 'unprotected',
hidden: true,
diff --git a/frontend/src/component/project/ProjectList/ProjectList.jsx b/frontend/src/component/project/ProjectList/ProjectList.jsx
index a9e1d26f02..e6a2f1d919 100644
--- a/frontend/src/component/project/ProjectList/ProjectList.jsx
+++ b/frontend/src/component/project/ProjectList/ProjectList.jsx
@@ -8,7 +8,6 @@ import {
UPDATE_PROJECT,
} from '../../AccessProvider/permissions';
import {
- Icon,
IconButton,
List,
ListItem,
@@ -18,6 +17,13 @@ import {
Button,
useMediaQuery,
} from '@material-ui/core';
+import {
+ Add,
+ SupervisedUserCircle,
+ Delete,
+ FolderOpen,
+} from '@material-ui/icons';
+
import { Link } from 'react-router-dom';
import ConfirmDialogue from '../../common/Dialogue';
import PageContent from '../../common/PageContent/PageContent';
@@ -45,7 +51,7 @@ const ProjectList = ({ projects, fetchProjects, removeProject, history }) => {
history.push('/projects/create')}
>
- add
+
}
@@ -76,7 +82,7 @@ const ProjectList = ({ projects, fetchProjects, removeProject, history }) => {
style={{ color: 'black' }}
>
- supervised_user_circle
+
@@ -91,7 +97,7 @@ const ProjectList = ({ projects, fetchProjects, removeProject, history }) => {
setShowDelDialogue(true);
}}
>
- delete
+
);
@@ -100,7 +106,7 @@ const ProjectList = ({ projects, fetchProjects, removeProject, history }) => {
projects.map(project => (
- folder_open
+
- search
+
),
endAdornment: (
diff --git a/frontend/src/component/project/access-component.js b/frontend/src/component/project/access-component.js
index 495b626351..f626accf46 100644
--- a/frontend/src/component/project/access-component.js
+++ b/frontend/src/component/project/access-component.js
@@ -9,7 +9,6 @@ import {
DialogContentText,
DialogTitle,
InputLabel,
- Icon,
IconButton,
List,
ListItem,
@@ -20,6 +19,7 @@ import {
Select,
FormControl,
} from '@material-ui/core';
+import { Delete } from '@material-ui/icons';
import AddUserComponent from './access-add-user';
@@ -197,7 +197,7 @@ function AccessComponent({ projectId, project }) {
title="Remove access"
onClick={removeAccess(user.id, user.roleId)}
>
- delete
+
diff --git a/frontend/src/component/strategies/CreateStrategy/CreateStrategy.jsx b/frontend/src/component/strategies/CreateStrategy/CreateStrategy.jsx
index 711083281b..10ea940c41 100644
--- a/frontend/src/component/strategies/CreateStrategy/CreateStrategy.jsx
+++ b/frontend/src/component/strategies/CreateStrategy/CreateStrategy.jsx
@@ -1,6 +1,7 @@
import PropTypes from 'prop-types';
-import { Typography, TextField, Button, Icon } from '@material-ui/core';
+import { Typography, TextField, Button } from '@material-ui/core';
+import { Add } from '@material-ui/icons';
import PageContent from '../../common/PageContent/PageContent';
import ConditionallyRender from '../../common/ConditionallyRender/ConditionallyRender';
@@ -83,7 +84,7 @@ const CreateStrategy = ({
e.preventDefault();
appParameter();
}}
- startIcon={add}
+ startIcon={}
>
Add parameter
diff --git a/frontend/src/component/strategies/StrategiesList/StrategiesList.jsx b/frontend/src/component/strategies/StrategiesList/StrategiesList.jsx
index 6ef53722d3..822d96fa2e 100644
--- a/frontend/src/component/strategies/StrategiesList/StrategiesList.jsx
+++ b/frontend/src/component/strategies/StrategiesList/StrategiesList.jsx
@@ -9,11 +9,18 @@ import {
ListItem,
ListItemAvatar,
IconButton,
- Icon,
ListItemText,
Button,
Tooltip,
} from '@material-ui/core';
+import {
+ Add,
+ Visibility,
+ VisibilityOff,
+ Delete,
+ Extension,
+} from '@material-ui/icons';
+
import {
CREATE_STRATEGY,
DELETE_STRATEGY,
@@ -58,7 +65,7 @@ const StrategiesList = ({
history.push('/strategies/create')
}
>
- add
+
}
@@ -97,7 +104,7 @@ const StrategiesList = ({
})
}
>
- visibility
+
);
@@ -109,7 +116,7 @@ const StrategiesList = ({
- visibility_off
+
@@ -127,7 +134,7 @@ const StrategiesList = ({
})
}
>
- visibility_off
+
@@ -149,7 +156,7 @@ const StrategiesList = ({
})
}
>
-
delete
+
}
@@ -157,7 +164,7 @@ const StrategiesList = ({
- delete
+
@@ -176,7 +183,7 @@ const StrategiesList = ({
}}
>
- extension
+
-
- extension
-
+
+
-
- visibility_off
-
+
+
-
- extension
-
+
+
-
- visibility_off
-
+
+
-
- delete
-
+
+
diff --git a/frontend/src/component/strategies/__tests__/__snapshots__/strategy-details-component-test.jsx.snap b/frontend/src/component/strategies/__tests__/__snapshots__/strategy-details-component-test.jsx.snap
index 93ad6d319c..cbeacf9060 100644
--- a/frontend/src/component/strategies/__tests__/__snapshots__/strategy-details-component-test.jsx.snap
+++ b/frontend/src/component/strategies/__tests__/__snapshots__/strategy-details-component-test.jsx.snap
@@ -70,12 +70,16 @@ exports[`renders correctly with one strategy 1`] = `
onTouchStart={[Function]}
title="Required"
>
-
- add
-
+
+
- add
+
}
elseShow={
- radio_button_unchecked
+
}
diff --git a/frontend/src/component/strategies/toggles-link-list.jsx b/frontend/src/component/strategies/toggles-link-list.jsx
index 7ff0ce5fd5..c3fc70222b 100644
--- a/frontend/src/component/strategies/toggles-link-list.jsx
+++ b/frontend/src/component/strategies/toggles-link-list.jsx
@@ -1,4 +1,12 @@
-import { Icon, List, ListItem, ListItemAvatar, ListItemText, Tooltip } from '@material-ui/core';
+import {
+ List,
+ ListItem,
+ ListItemAvatar,
+ ListItemText,
+ Tooltip,
+} from '@material-ui/core';
+import { PlayArrow, Pause } from '@material-ui/icons';
+
import styles from '../common/common.module.scss';
import { Link } from 'react-router-dom';
import PropTypes from 'prop-types';
@@ -9,11 +17,11 @@ export const TogglesLinkList = ({ toggles }) => (
0}
- show={toggles.map(({ name, description = '-', enabled, icon = enabled ? 'play_arrow' : 'pause' }) => (
+ show={toggles.map(({ name, description = '-', enabled }) => (
- {icon}
+ {enabled ? : }
{
history.push('/tag-types/create')
}
>
- add
+
}
@@ -91,7 +92,7 @@ const TagTypeList = ({ tagTypes, fetchTagTypes, removeTagType }) => {
})
}
>
- delete
+
);
@@ -101,7 +102,7 @@ const TagTypeList = ({ tagTypes, fetchTagTypes, removeTagType }) => {
classes={{ root: styles.tagListItem }}
>
- label
+
-
- label
-
+
+
-
- delete
-
+
+
{
className={styles.tagListItem}
>
- label
+
{
remove({ type: tagType, value: tagValue }, e)}
>
- delete
+
);
@@ -79,14 +80,14 @@ const TagList = ({ tags, fetchTags, removeTag }) => {
aria-label="add tag"
onClick={() => history.push('/tags/create')}
>
- add
+
}
elseShow={
);
diff --git a/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx b/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx
index 79f87b83bb..cf791b93fe 100644
--- a/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx
+++ b/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx
@@ -3,9 +3,9 @@ import {
TableCell,
Avatar,
IconButton,
- Icon,
Typography,
} from '@material-ui/core';
+import { Edit, Lock, Delete } from '@material-ui/icons';
import { SyntheticEvent, useContext } from 'react';
import { ADMIN } from '../../../../../component/AccessProvider/permissions';
import ConditionallyRender from '../../../../../component/common/ConditionallyRender';
@@ -78,7 +78,7 @@ const UserListItem = ({
title="Edit"
onClick={openUpdateDialog(user)}
>
- edit
+
- lock
+
- delete
+
}
diff --git a/frontend/src/store/ui-config/__tests__/__snapshots__/ui-config-store.test.js.snap b/frontend/src/store/ui-config/__tests__/__snapshots__/ui-config-store.test.js.snap
index ad585c9125..86708e8a53 100644
--- a/frontend/src/store/ui-config/__tests__/__snapshots__/ui-config-store.test.js.snap
+++ b/frontend/src/store/ui-config/__tests__/__snapshots__/ui-config-store.test.js.snap
@@ -8,7 +8,14 @@ Object {
"links": Array [
Object {
"href": "https://docs.getunleash.io/docs?source=oss",
- "icon": "library_books",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"title": "User documentation",
"value": "Documentation",
},
@@ -33,7 +40,14 @@ Object {
"links": Array [
Object {
"href": "https://docs.getunleash.io/docs?source=oss",
- "icon": "library_books",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"title": "User documentation",
"value": "Documentation",
},
@@ -58,7 +72,14 @@ Object {
"links": Array [
Object {
"href": "https://docs.getunleash.io/docs?source=oss",
- "icon": "library_books",
+ "icon": Object {
+ "$$typeof": Symbol(react.memo),
+ "compare": null,
+ "type": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "render": [Function],
+ },
+ },
"title": "User documentation",
"value": "Documentation",
},
diff --git a/frontend/src/store/ui-config/index.js b/frontend/src/store/ui-config/index.js
index f5bd7ebf65..221e52ebf8 100644
--- a/frontend/src/store/ui-config/index.js
+++ b/frontend/src/store/ui-config/index.js
@@ -1,14 +1,15 @@
import { Map as $Map } from 'immutable';
+import { LibraryBooks } from '@material-ui/icons';
import { RECEIVE_CONFIG } from './actions';
-import { getBasePath } from '../../utils/format-path';
+import { getBasePath } from '../../utils/format-path';
const localStorage = window.localStorage || {
setItem: () => {},
getItem: () => {},
};
-const basePath = getBasePath();
+const basePath = getBasePath();
const UI_CONFIG = `${basePath}:ui_config`;
const DEFAULT = new $Map({
@@ -21,7 +22,7 @@ const DEFAULT = new $Map({
links: [
{
value: 'Documentation',
- icon: 'library_books',
+ icon: LibraryBooks,
href: 'https://docs.getunleash.io/docs?source=oss',
title: 'User documentation',
},
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index c170d71474..c01d4861be 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -12709,4 +12709,4 @@ yargs@^15.4.1:
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
- integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+ integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
\ No newline at end of file