mirror of https://github.com/linkerd/linkerd2.git
web: Apply yarn upgrade to address CVE-2020-28168 (#5480)
Updates all web dependencies.
This commit is contained in:
parent
93f43ff462
commit
cb6328a502
|
@ -137,7 +137,6 @@ class ConfigureProfilesMsg extends React.Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const disableDownloadButton = _isEmpty(query.service) || _isEmpty(query.namespace) ||
|
const disableDownloadButton = _isEmpty(query.service) || _isEmpty(query.namespace) ||
|
||||||
error.service || error.namespace;
|
error.service || error.namespace;
|
||||||
const downloadButton = (
|
const downloadButton = (
|
||||||
|
|
|
@ -191,7 +191,6 @@ class ErrorModal extends React.Component {
|
||||||
}
|
}
|
||||||
{this.renderPodErrors(errorData.byPodAndContainer)}
|
{this.renderPodErrors(errorData.byPodAndContainer)}
|
||||||
|
|
||||||
|
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
|
|
||||||
<DialogActions>
|
<DialogActions>
|
||||||
|
|
|
@ -26,7 +26,6 @@ const JaegerLink = ({ PrefixedLink, name, namespace, resource }) => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
JaegerLink.propTypes = {
|
JaegerLink.propTypes = {
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
namespace: PropTypes.string,
|
namespace: PropTypes.string,
|
||||||
|
|
|
@ -202,7 +202,6 @@ const columnDefinitions = (resource, showNamespaceColumn, showNameColumn, Prefix
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const jaegerColumn = {
|
const jaegerColumn = {
|
||||||
title: <Trans>columnTitleJaeger</Trans>,
|
title: <Trans>columnTitleJaeger</Trans>,
|
||||||
key: 'JaegerDashboard',
|
key: 'JaegerDashboard',
|
||||||
|
@ -286,7 +285,6 @@ const columnDefinitions = (resource, showNamespaceColumn, showNameColumn, Prefix
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const preprocessMetrics = metrics => {
|
const preprocessMetrics = metrics => {
|
||||||
const tableData = _cloneDeep(metrics);
|
const tableData = _cloneDeep(metrics);
|
||||||
|
|
||||||
|
|
|
@ -455,7 +455,6 @@ class NavigationBase extends React.Component {
|
||||||
</Typography>
|
</Typography>
|
||||||
{ this.menuItem('/namespaces', <Trans>menuItemNamespaces</Trans>, namespaceIcon) }
|
{ this.menuItem('/namespaces', <Trans>menuItemNamespaces</Trans>, namespaceIcon) }
|
||||||
|
|
||||||
|
|
||||||
{ this.menuItem('/controlplane', <Trans>menuItemControlPlane</Trans>,
|
{ this.menuItem('/controlplane', <Trans>menuItemControlPlane</Trans>,
|
||||||
<FontAwesomeIcon icon={faCloud} className={classes.shrinkCloudIcon} />) }
|
<FontAwesomeIcon icon={faCloud} className={classes.shrinkCloudIcon} />) }
|
||||||
|
|
||||||
|
|
|
@ -325,7 +325,6 @@ class Octopus extends React.Component {
|
||||||
{this.renderArrowCol(numUpstreams, false)}
|
{this.renderArrowCol(numUpstreams, false)}
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
|
||||||
<Grid item xs={3}>
|
<Grid item xs={3}>
|
||||||
{this.renderResourceCard(resource, 'main')}
|
{this.renderResourceCard(resource, 'main')}
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
|
@ -27,7 +27,6 @@ class ClickablePopover extends React.Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
handleClose = () => {
|
handleClose = () => {
|
||||||
this.setState({ anchorEl: null });
|
this.setState({ anchorEl: null });
|
||||||
};
|
};
|
||||||
|
|
|
@ -175,7 +175,6 @@ const responseEndSection = d => _isEmpty(d.responseEnd) ? null : (
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
// hide verbose information
|
// hide verbose information
|
||||||
const expandedRowRender = (d, expandedWrapStyle) => {
|
const expandedRowRender = (d, expandedWrapStyle) => {
|
||||||
return (
|
return (
|
||||||
|
|
|
@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { faMicroscope } from '@fortawesome/free-solid-svg-icons/faMicroscope';
|
import { faMicroscope } from '@fortawesome/free-solid-svg-icons/faMicroscope';
|
||||||
|
|
||||||
|
|
||||||
const TapLink = ({ PrefixedLink, namespace, resource, toNamespace, toResource, path, disabled }) => {
|
const TapLink = ({ PrefixedLink, namespace, resource, toNamespace, toResource, path, disabled }) => {
|
||||||
if (disabled || namespace === '') {
|
if (disabled || namespace === '') {
|
||||||
return <FontAwesomeIcon icon={faMicroscope} className="tapGrayed" />;
|
return <FontAwesomeIcon icon={faMicroscope} className="tapGrayed" />;
|
||||||
|
|
|
@ -40,7 +40,6 @@ import _uniq from 'lodash/uniq';
|
||||||
import _values from 'lodash/values';
|
import _values from 'lodash/values';
|
||||||
import { withStyles } from '@material-ui/core/styles';
|
import { withStyles } from '@material-ui/core/styles';
|
||||||
|
|
||||||
|
|
||||||
const getResourceList = (resourcesByNs, ns) => {
|
const getResourceList = (resourcesByNs, ns) => {
|
||||||
return resourcesByNs[ns] || _uniq(_flatten(_values(resourcesByNs)));
|
return resourcesByNs[ns] || _uniq(_flatten(_values(resourcesByNs)));
|
||||||
};
|
};
|
||||||
|
@ -94,7 +93,6 @@ const styles = theme => ({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
class TapQueryForm extends React.Component {
|
class TapQueryForm extends React.Component {
|
||||||
static getDerivedStateFromProps(props, state) {
|
static getDerivedStateFromProps(props, state) {
|
||||||
if (!_isEqual(props.resourcesByNs, state.resourcesByNs)) {
|
if (!_isEqual(props.resourcesByNs, state.resourcesByNs)) {
|
||||||
|
|
|
@ -72,7 +72,6 @@ class TopRoutes extends React.Component {
|
||||||
to_namespace: '',
|
to_namespace: '',
|
||||||
}, _pick(props.query, Object.keys(topRoutesQueryProps)));
|
}, _pick(props.query, Object.keys(topRoutesQueryProps)));
|
||||||
|
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
query,
|
query,
|
||||||
error: null,
|
error: null,
|
||||||
|
@ -319,7 +318,6 @@ class TopRoutes extends React.Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { query, requestInProgress, error } = this.state;
|
const { query, requestInProgress, error } = this.state;
|
||||||
const emptyQuery = _isEmpty(query.resource_type);
|
const emptyQuery = _isEmpty(query.resource_type);
|
||||||
|
|
|
@ -7,7 +7,6 @@ const topRoutesDisplayOrder = query => _compact([
|
||||||
_isNil(query.to_type) ? null : 'toNamespace',
|
_isNil(query.to_type) ? null : 'toNamespace',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
||||||
const tapDisplayOrder = query => _compact([
|
const tapDisplayOrder = query => _compact([
|
||||||
_isNil(query.resource) ? null : query.resource.indexOf('namespace') === 0 ? null : 'namespace',
|
_isNil(query.resource) ? null : query.resource.indexOf('namespace') === 0 ? null : 'namespace',
|
||||||
'toResource',
|
'toResource',
|
||||||
|
|
|
@ -38,7 +38,6 @@ export const dashboardTheme = {
|
||||||
status,
|
status,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
export const statusClassNames = theme => {
|
export const statusClassNames = theme => {
|
||||||
theme.status = theme.status || status; // tests don't inject custom variables
|
theme.status = theme.status || status; // tests don't inject custom variables
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
|
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
|
||||||
"chai": "4.2.0",
|
"chai": "4.2.0",
|
||||||
"chai-webdriverio": "1.0.0",
|
"chai-webdriverio": "1.0.0",
|
||||||
"chromedriver": "81.0.0",
|
"chromedriver": "87.0.5",
|
||||||
"clean-webpack-plugin": "3.0.0",
|
"clean-webpack-plugin": "3.0.0",
|
||||||
"css-loader": "3.5.2",
|
"css-loader": "3.5.2",
|
||||||
"enzyme": "3.11.0",
|
"enzyme": "3.11.0",
|
||||||
|
|
4255
web/app/yarn.lock
4255
web/app/yarn.lock
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue