From: Laurence Maultsby Date: Thu, 20 Apr 2017 20:27:51 +0000 (-0400) Subject: Launchpad readonly components X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=bea72768204db1ffe569b06277623beb9dd231d6;p=osm%2FUI.git Launchpad readonly components Signed-off-by: Laurence Maultsby --- diff --git a/skyquake/plugins/launchpad/src/launchpad_card/launchpadCard.jsx b/skyquake/plugins/launchpad/src/launchpad_card/launchpadCard.jsx index b4ebb8163..f7b47d5d9 100644 --- a/skyquake/plugins/launchpad/src/launchpad_card/launchpadCard.jsx +++ b/skyquake/plugins/launchpad/src/launchpad_card/launchpadCard.jsx @@ -98,12 +98,10 @@ class LaunchpadCard extends React.Component { ); - if (this.props.hasAccess) { - closeButton = null; - } + html = ( - + { deleting ?
diff --git a/skyquake/plugins/launchpad/src/launchpad_card/launchpadHeader.jsx b/skyquake/plugins/launchpad/src/launchpad_card/launchpadHeader.jsx index 9ee7ec403..0c05497ea 100644 --- a/skyquake/plugins/launchpad/src/launchpad_card/launchpadHeader.jsx +++ b/skyquake/plugins/launchpad/src/launchpad_card/launchpadHeader.jsx @@ -163,11 +163,15 @@ class LaunchpadHeader extends React.Component { {toggleStatus} -

- - - -

+ {this.props.hasAccess ? + ( +

+ + + +

+ ) + : null}
diff --git a/skyquake/plugins/launchpad/src/launchpad_card/nsrConfigPrimitives.jsx b/skyquake/plugins/launchpad/src/launchpad_card/nsrConfigPrimitives.jsx index 9d0cdbae7..acafdd08e 100644 --- a/skyquake/plugins/launchpad/src/launchpad_card/nsrConfigPrimitives.jsx +++ b/skyquake/plugins/launchpad/src/launchpad_card/nsrConfigPrimitives.jsx @@ -1,6 +1,6 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -162,6 +162,7 @@ class NsrConfigPrimitives extends React.Component { } constructConfigPrimitiveTabs = (tabList, tabPanels) => { let self = this; + const hasAccess = self.props.hasAccess; let defaultFromRpc = ''; //coded here for dev purposes let mandatoryFieldValue = 'true'; @@ -307,7 +308,11 @@ class NsrConfigPrimitives extends React.Component {
) })} -