projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to generate console link when required
[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
e3c3dad
..
dc092bc
100644
(file)
--- a/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
+++ b/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
@@
-31,6
+31,8
@@
import ParseMP from '../monitoring_params/monitoringParamComponents.js';
import PlacementGroupsInfo from './placementGroupsInfo.jsx';
import JobListCard from '../launchpad_card/jobListCard.jsx';
import NSVirtualLinks from '../virtual_links/nsVirtualLinks.jsx';
import PlacementGroupsInfo from './placementGroupsInfo.jsx';
import JobListCard from '../launchpad_card/jobListCard.jsx';
import NSVirtualLinks from '../virtual_links/nsVirtualLinks.jsx';
+import LaunchpadFleetStore from '../launchpadFleetStore.js';
+
export default class RecordCard extends React.Component {
constructor(props) {
super(props)
export default class RecordCard extends React.Component {
constructor(props) {
super(props)
@@
-40,7
+42,13
@@
export default class RecordCard extends React.Component {
// console.log('Selected tab is', index, 'last index is', last);
}
// console.log('Selected tab is', index, 'last index is', last);
}
+ openConsole = (url, event) => {
+ event.preventDefault();
+ LaunchpadFleetStore.getVDUConsoleLink(url);
+ }
+
render(){
render(){
+ let self = this;
let html;
let content;
let card;
let html;
let content;
let card;
@@
-62,6
+70,8
@@
export default class RecordCard extends React.Component {
let tabList = [];
let tabPanels = [];
let tabList = [];
let tabPanels = [];
+ let notice = null;
+
switch(this.props.type) {
case 'vnfr' :
cardData = this.props.data[0];
switch(this.props.type) {
case 'vnfr' :
cardData = this.props.data[0];
@@
-103,22
+113,24
@@
export default class RecordCard extends React.Component {
if (cardData['vdur']) {
cardData['vdur'].map((vdur, index) => {
if (cardData['vdur']) {
cardData['vdur'].map((vdur, index) => {
- let consoleLink = vdur['console-url'] ? 'Open VM Console' : 'None';
+ let consoleLink = vdur['console-url'] ? 'O
btain Token And O
pen VM Console' : 'None';
consoleUrlsList.push(
<li key={index}>
<h3>
{vdur['name'] + '-' + vdur.id.substr(0,4)}
</h3>
consoleUrlsList.push(
<li key={index}>
<h3>
{vdur['name'] + '-' + vdur.id.substr(0,4)}
</h3>
- <
a href={vdur['console-url']} target='_blank'
>
- {consoleLink}
- </
a
>
+ <
span className='consoleLink' onClick={self.openConsole.bind(self, vdur["console-url"])}
>
+ {consoleLink}
*
+ </
span
>
</li>
)
</li>
)
+ notice = <li className='notice'>* If a separate browser window does not open, please check if the popup was blocked and allow it.</li>
});
consoleUrlsComponent = (
<div className="consoleUrlsComponent">
<ul className="consoleUrlsList">
{consoleUrlsList}
});
consoleUrlsComponent = (
<div className="consoleUrlsComponent">
<ul className="consoleUrlsList">
{consoleUrlsList}
+ {notice}
</ul>
</div>
);
</ul>
</div>
);