From 2b55cf3acf7cff080767fe70f20f321319ea9aa1 Mon Sep 17 00:00:00 2001
From: Kyle Knight <kyle@kolide.co>
Date: Thu, 19 Jan 2017 11:24:01 -0600
Subject: [PATCH] Remove all signs of Import osquery config page (#1015)

---
 .../ConfirmationPage/ConfirmationPage.jsx     | 25 ++++++++++++++-----
 .../SiteNavSidePanel/SiteNavSidePanel.jsx     |  5 +++-
 .../side_panels/SiteNavSidePanel/_styles.scss |  8 ++++++
 .../side_panels/SiteNavSidePanel/navItems.js  | 19 +-------------
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx
index 1ea6a26e06..df09cd6e07 100644
--- a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx
+++ b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx
@@ -15,7 +15,25 @@ class ConfirmationPage extends Component {
     handleSubmit: PropTypes.func,
   };
 
+  importOsqueryConfig = () => {
+    const disableImport = true;
+
+    if (disableImport) {
+      return false;
+    }
+
+    return (
+      <div className={`${baseClass}__import`}>
+        <Checkbox name="import-install">
+          <p>I am migrating an existing <strong>osquery</strong> installation.</p>
+          <p>Take me to the <strong>Import Configuration</strong> page.</p>
+        </Checkbox>
+      </div>
+    );
+  }
+
   render () {
+    const { importOsqueryConfig } = this;
     const {
       className,
       handleSubmit,
@@ -55,12 +73,7 @@ class ConfirmationPage extends Component {
             </tbody>
           </table>
 
-          <div className={`${baseClass}__import`}>
-            <Checkbox name="import-install">
-              <p>I am migrating an existing <strong>osquery</strong> installation.</p>
-              <p>Take me to the <strong>Import Configuration</strong> page.</p>
-            </Checkbox>
-          </div>
+          {importOsqueryConfig()}
         </div>
 
         <Button type="submit" variant="gradient" className={`${baseClass}__submit`} autofocus>
diff --git a/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx b/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx
index c14851680b..caa11f5836 100644
--- a/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx
+++ b/frontend/components/side_panels/SiteNavSidePanel/SiteNavSidePanel.jsx
@@ -56,7 +56,10 @@ class SiteNavSidePanel extends Component {
 
     const navItemClasses = classnames(
       `${navItemBaseClass}`,
-      { [`${navItemBaseClass}--active`]: active }
+      {
+        [`${navItemBaseClass}--active`]: active,
+        [`${navItemBaseClass}--single`]: subItems.length === 0,
+      }
     );
 
     return (
diff --git a/frontend/components/side_panels/SiteNavSidePanel/_styles.scss b/frontend/components/side_panels/SiteNavSidePanel/_styles.scss
index 1fbc6f05ba..d6e9241f7a 100644
--- a/frontend/components/side_panels/SiteNavSidePanel/_styles.scss
+++ b/frontend/components/side_panels/SiteNavSidePanel/_styles.scss
@@ -83,6 +83,14 @@
         @include transform(translate(-2px, 3px));
       }
     }
+
+    &.site-nav-item--single {
+      .site-nav-item__button {
+        &::before {
+          height: 41px;
+        }
+      }
+    }
   }
 
   &:last-child {
diff --git a/frontend/components/side_panels/SiteNavSidePanel/navItems.js b/frontend/components/side_panels/SiteNavSidePanel/navItems.js
index 75aab49a01..f891c8add5 100644
--- a/frontend/components/side_panels/SiteNavSidePanel/navItems.js
+++ b/frontend/components/side_panels/SiteNavSidePanel/navItems.js
@@ -114,24 +114,7 @@ export default (admin) => {
         regex: /^\/config/,
         pathname: '/config/options',
       },
-      subItems: [
-        {
-          icon: 'config',
-          name: 'Osquery Options',
-          location: {
-            regex: /\/config\/options/,
-            pathname: '/config/options',
-          },
-        },
-        {
-          icon: 'import',
-          name: 'Import Config',
-          location: {
-            regex: /\/config\/import/,
-            pathname: '/config/import',
-          },
-        },
-      ],
+      subItems: [],
     },
     {
       icon: 'help',