projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "enable packages" into v2.0
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
src
/
recordViewer
/
recordCard.jsx
diff --git
a/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
b/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
index
88ff709
..
f9a400b
100644
(file)
--- a/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
+++ b/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
@@
-32,7
+32,7
@@
import PlacementGroupsInfo from './placementGroupsInfo.jsx';
import JobListCard from '../launchpad_card/jobListCard.jsx';
import NSVirtualLinks from '../virtual_links/nsVirtualLinks.jsx';
import LaunchpadFleetStore from '../launchpadFleetStore.js';
import JobListCard from '../launchpad_card/jobListCard.jsx';
import NSVirtualLinks from '../virtual_links/nsVirtualLinks.jsx';
import LaunchpadFleetStore from '../launchpadFleetStore.js';
-
+import _forEach from 'lodash/forEach';
import Prism from 'prismjs';
import 'prismjs/themes/prism.css';
import Prism from 'prismjs';
import 'prismjs/themes/prism.css';
@@
-142,12
+142,12
@@
export default class RecordCard extends React.Component {
// </pre>
function buildProperties(obj) {
let p = [];
// </pre>
function buildProperties(obj) {
let p = [];
- _
.
forEach(obj, function(v, k) {
+ _forEach(obj, function(v, k) {
p.push(
p.push(
- <div style={{margin: '0.5rem 0.5rem'}} key={k + vi}>
+ <div style={{margin: '0.5rem 0.5rem'}} key={k +
'-' +
vi}>
<div style={{margin: '0 0.5rem',
fontWeight: 'bold', textTransform: 'uppercase', color: '#5b5b5b'}}>{k}</div>
<div style={{margin: '0 0.5rem',
fontWeight: 'bold', textTransform: 'uppercase', color: '#5b5b5b'}}>{k}</div>
- <div style={{margin: '0 0.5rem'}}>{
v.constructor.name != 'Object'
? v : buildProperties(v)}</div>
+ <div style={{margin: '0 0.5rem'}}>{
(v.constructor.name == 'String' || v.constructor.name == 'Number')
? v : buildProperties(v)}</div>
</div>
)
});
</div>
)
});
@@
-266,7
+266,7
@@
export default class RecordCard extends React.Component {
if(this.props.isLoading) {
html = <DashboardCard className="loading" showHeader={true} title={cardData["short-name"]}><LoadingIndicator size={10} show={true} /></DashboardCard>
} else {
if(this.props.isLoading) {
html = <DashboardCard className="loading" showHeader={true} title={cardData["short-name"]}><LoadingIndicator size={10} show={true} /></DashboardCard>
} else {
- let glyphValue = (
this.props.mmm
recordDetailsToggleValue) ? "chevron-left" : "chevron-right";
+ let glyphValue = (
!this.props.
recordDetailsToggleValue) ? "chevron-left" : "chevron-right";
if (this.props.type == 'nsr') {
tabList.push(
if (this.props.type == 'nsr') {
tabList.push(
@@
-369,11
+369,11
@@
export default class RecordCard extends React.Component {
consoleUrlsTabTitle = 'VDU Console Links';
tabList.push(
consoleUrlsTabTitle = 'VDU Console Links';
tabList.push(
- <Tab key={cardData.id + '-
cp
'}>{consoleUrlsTabTitle}</Tab>
+ <Tab key={cardData.id + '-
vducl
'}>{consoleUrlsTabTitle}</Tab>
);
tabPanels.push(
);
tabPanels.push(
- <TabPanel key={cardData.id + '-
cp
-panel'}>
+ <TabPanel key={cardData.id + '-
vducl
-panel'}>
<div className="consoleUrls">
{consoleUrlsComponent}
</div>
<div className="consoleUrls">
{consoleUrlsComponent}
</div>