Fix headless mode (didn't work with vertical navbar) (getredash#4977)

* Fix headless mode (didn't work with vertical navbar) * Fix header margins on public dashboard page * Fix test
Zach-77 · Jun 17, 2020 · 98a5154 · 98a5154
1 parent 4c324dd
commit 98a5154
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/client/app/assets/less/inc/base.less b/client/app/assets/less/inc/base.less
@@ -32,17 +32,6 @@ body {
   #application-root {
     padding-bottom: 15px;
   }
-
-  &.headless {
-    #application-root {
-      padding-top: 10px;
-      padding-bottom: 0;
-    }
-
-    .app-header-wrapper {
-      display: none;
-    }
-  }
 }
 
 #application-root {

diff --git a/client/app/components/ApplicationArea/ApplicationLayout/index.less b/client/app/components/ApplicationArea/ApplicationLayout/index.less
@@ -53,6 +53,17 @@ body.fixed-layout #application-root {
   }
 }
 
+body.headless #application-root {
+  .application-layout-side-menu,
+  .application-layout-top-menu {
+    display: none !important;
+  }
+
+  .application-layout-content {
+    margin-top: 0;
+  }
+}
+
 // Fixes for proper snapshots in Percy (move vertical scroll to body level
 // to capture entire page, otherwise it wll be cut by viewport)
 @media only percy {

diff --git a/client/app/pages/dashboards/PublicDashboardPage.less b/client/app/pages/dashboards/PublicDashboardPage.less
@@ -1,6 +1,12 @@
 .public-dashboard-page {
   width: 100%;
 
+  .page-header-wrapper {
+    margin-top: 0;
+    margin-left: 15px;
+    margin-right: 15px;
+  }
+
   > .container {
     min-height: calc(100vh - 95px);
   }

diff --git a/client/app/pages/queries/VisualizationEmbed.jsx b/client/app/pages/queries/VisualizationEmbed.jsx
@@ -214,7 +214,7 @@ function VisualizationEmbed({ queryId, visualizationId, apiKey, onError }) {
   }
 
   return (
-    <div className="tile m-l-10 m-r-10 p-t-10 embed__vis" data-test="VisualizationEmbed">
+    <div className="tile m-t-10 m-l-10 m-r-10 p-t-10 embed__vis" data-test="VisualizationEmbed">
       {!hideHeader && (
         <VisualizationEmbedHeader
           queryName={query.name}

diff --git a/client/cypress/integration/user/logout_spec.js b/client/cypress/integration/user/logout_spec.js
@@ -6,7 +6,11 @@ describe("Logout", () => {
 
   it("shows login page after logout", () => {
     cy.getByTestId("ProfileDropdown").click();
-    cy.getByTestId("LogOutButton").click();
+    // Wait until submenu appears and become interactive
+    cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
+    cy.getByTestId("LogOutButton")
+      .should("be.visible")
+      .click();
 
     cy.title().should("eq", "Login to Redash");
   });