linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade material-ui to 3.3.2 (#1824) 

* Upgrade material-ui to 3.3.2

* Re-add popover that was removed in #1814
This commit is contained in:
Risha Mars 2018-10-29 14:08:22 -07:00 committed by GitHub
parent 07c861e39f
commit f7ca589556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/app/js/components/util/TapUtils.jsx
View File

@ -1,6 +1,7 @@
import { podOwnerLookup, toShortResourceName } from './Utils.js';
import BaseTable from '../BaseTable.jsx';
import Popover from '../Popover.jsx';
import PropTypes from 'prop-types';
import React from 'react';
import TapLink from '../TapLink.jsx';
@ -303,11 +304,17 @@ export const srcDstColumn = (d, resourceType, ResourceLink) => {
labels = d.destinationLabels;
}
return (
let baseContent = (
<div className="src-dst-name">
{ !_.isEmpty(labels[resourceType]) ? resourceShortLink(resourceType, labels, ResourceLink) : display.str }
</div>
);
return (
<Popover
popoverContent={(popoverResourceTable(d, ResourceLink))}
baseContent={baseContent} />
);
};
export const tapLink = (d, resourceType, PrefixedLink) => {

2
web/app/package.json
View File

@ -4,7 +4,7 @@
"main": "index.js",
"license": "MIT",
"dependencies": {
"@material-ui/core": "3.3.1",
"@material-ui/core": "3.3.2",
"@material-ui/icons": "3.0.1",
"classnames": "2.2.6",
"d3": "4.11.0",

8
web/app/yarn.lock
View File

@ -107,10 +107,10 @@
lodash "^4.17.10"
to-fast-properties "^2.0.0"
"@material-ui/core@3.3.1":
version "3.3.1"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.3.1.tgz#e4ecce8b56065364d2a937e845af63d720b696e8"
integrity sha512-uXTL6L8ISAAlXK1cNX4sFpRvZFEoyHTMZPIqt3dlqJe4dZxsLA+dzSRMYGd4x3xJAUjjspMFEPAVATjzi6gp+A==
"@material-ui/core@3.3.2":
version "3.3.2"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.3.2.tgz#ca9ce331ac5a31ef8acc732305967f3e5cfe4934"
integrity sha512-3yYGrWBzML7OhzmgwBvWpQnFq9ROWj+so+ULADB+lXjpOuxbUf8IUWbR4/S4chh+8/DTNMjTGIUdpj//XeubLQ==
dependencies:
"@babel/runtime" "7.1.2"
"@types/jss" "^9.5.6"