Merge pull request #885 from GraysonNull/10189-respect-when

Labels, headings and bools respect when conditions
replicatedhq · Mar 27, 2019 · 50ba22a · 50ba22a
2 parents bca55d2 + f95376f
commit 50ba22a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/web/app/package.json b/web/app/package.json
@@ -10,7 +10,7 @@
     "react-dom": "^16.5.0"
   },
   "scripts": {
-    "start": "PORT=8800 react-scripts-replicated start",
+    "start": "PORT=8880 react-scripts-replicated start",
     "build": "react-scripts-replicated build",
     "test": "react-scripts-replicated test --env=jsdom",
     "eject": "react-scripts-replicated eject"

diff --git a/web/init/src/components/config_render/ConfigGroup.jsx b/web/init/src/components/config_render/ConfigGroup.jsx
@@ -60,6 +60,7 @@ export default class ConfigGroup extends React.Component {
               title={item.title}
               recommended={item.recommended}
               required={item.required}
+              hidden={item.hidden}
               name={item.name}
             />
           </div>
@@ -88,7 +89,7 @@ export default class ConfigGroup extends React.Component {
         );
       case "heading":
         return (
-          <div key={`${i}-${item.name}`} className="u-marginTop--40 u-marginBottom--15">
+          <div key={`${i}-${item.name}`} className={`u-marginTop--40 u-marginBottom--15 ${item.hidden ? "hidden" : ""}`}>
             <h3 className="header-color field-section-header">{item.title}</h3>
           </div>
         );

diff --git a/web/init/src/components/config_render/ConfigItemTitle.jsx b/web/init/src/components/config_render/ConfigItemTitle.jsx
@@ -10,7 +10,7 @@ export default class ConfigItemTitle extends React.Component {
     } = this.props;
 
     return (
-      <h4 className="sub-header-color field-section-sub-header">{title} {
+      <h4 className={`sub-header-color field-section-sub-header ${this.props.hidden ? "hidden" : ""}`}>{title} {
         required ? 
           <span className="field-label required">Required</span> :
           recommended ? 

diff --git a/web/init/src/scss/components/shared/StepNumbers.scss b/web/init/src/scss/components/shared/StepNumbers.scss
@@ -38,10 +38,6 @@
   .progress-base {
     background-color: #dfdfdf;
   }
-
-  .numbers-wrapper {
-    margin: 0;
-  }
 }
 
 .step-number {