disable resolve refs check when no resolvable refs

matt-deboer · Nov 1, 2017 · 8a162dc · 8a162dc
1 parent c7ff7bc
commit 8a162dc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/pkg/ui/src/components/TerminalViewer.js b/pkg/ui/src/components/TerminalViewer.js
@@ -328,7 +328,7 @@ class TerminalViewer extends React.Component {
           }}>
           <IconButton
             hoveredStyle={{backgroundColor: grey300, fill: grey800}}
-            iconStyle={{width: '30%', height: '30%'}}
+            iconStyle={{width: '20%', height: '20%'}}
             style={{
               backgroundColor: 'rgb(158, 158, 158)',
               margin: '0 auto', 

diff --git a/pkg/ui/src/components/configuration-pane/ContainerPanel.css b/pkg/ui/src/components/configuration-pane/ContainerPanel.css
@@ -55,3 +55,7 @@ pre.quoted-string {
   .item-array:after {
     content: "]";
     color: black; }
+
+.resolve-env-refs-check.disabled svg, .resolve-env-refs-check.disabled label {
+  fill: rgba(0, 0, 0, 0.2) !important;
+  color: rgba(0, 0, 0, 0.2) !important; }
diff --git a/pkg/ui/src/components/configuration-pane/ContainerPanel.scss b/pkg/ui/src/components/configuration-pane/ContainerPanel.scss
@@ -69,4 +69,11 @@ pre.quoted-string {
     content: "]";
     color: rgb(0,0,0);
   }
+}
+
+.resolve-env-refs-check.disabled {
+  svg, label {
+      fill: rgba(0, 0, 0, 0.2) !important;
+      color: rgba(0, 0, 0, 0.2) !important;
+  }
 }
diff --git a/pkg/ui/src/components/configuration-pane/EnvironmentExpander.js b/pkg/ui/src/components/configuration-pane/EnvironmentExpander.js
@@ -10,7 +10,6 @@ import Checkbox from 'material-ui/Checkbox'
 import { Link } from 'react-router-dom'
 import { connect } from 'react-redux'
 import GenericExpanderButton from './GenericExpanderButton'
-import './ContainerPanel.css'
 
 const rowHeight = 22
 const styles = {
@@ -137,12 +136,14 @@ class StringArrayExpander extends React.PureComponent {
 
     let { props } = this
     let { data, title, linkGenerator, resources } = props
+    let resolveRefsDisabled = (data.filter(env=>!!env.valueFrom && !env.valueFrom.fieldRef).length === 0)
 
     return (
         <GenericExpanderButton
           title={<div>
             {title}<Checkbox
-              className={`resolve-env-refs-check`}
+              className={`resolve-env-refs-check${resolveRefsDisabled ? ' disabled':''}`}
+              disabled={resolveRefsDisabled}
               label="resolve refs"
               checked={this.state.resolveRefs}
               onCheck={this.toggleResolveRefs}

diff --git a/pkg/ui/src/components/configuration-pane/GenericExpander.js b/pkg/ui/src/components/configuration-pane/GenericExpander.js
@@ -7,6 +7,7 @@ const styles = {
   popover: {
     border: '1px solid rgba(0,0,0,0.3)',
     backgroundColor: 'rgb(240,240,240)',
+    margin: 20,
   },
   popoverTitle: {
     color: 'rgb(0,0,0)',
@@ -73,13 +74,14 @@ export default class GenericExpander extends React.Component {
           background: 'transparent',
           fontSize: 13,
           overflow: 'hidden',
+
           }}
           zDepth={3}>
           <Subheader style={styles.popoverTitle}>{title}</Subheader>
           <div style={{
             overflow: 'auto',
-            maxHeight: 'calc(100vh - 295px)',
-            maxWidth: 'calc(100vw - 100px)',
+            maxHeight: 'calc(100vh - 300px)',
+            maxWidth: 'calc(100vw - 200px)',
             padding: 16,
           }}>
             {contents}