feat(multi-org): smaller height for page headers with multi-org flag on (#5432)

Author: ChitlangeSahas

cypress/e2e/shared/dashboardsVariables.test.ts

@@ -832,7 +832,7 @@ csv.from(csv: data) |> filter(fn: (r) => r.bucket == v.bucketsCSV)`
 |> filter(fn: (r) => r["_measurement"] == "test")
 |> filter(fn: (r) => r["_field"] == "dopeness")
 |> filter(fn: (r) => r["container_name"] == v.dependent)`)
-      cy.getByTestID('save-cell--button').click()
+      cy.getByTestID('save-cell--button').click({force: true})
 
       // the default bucket selection should have no results
       cy.getByTestID('variable-dropdown--static--typeAhead-input').should(

cypress/e2e/shared/simpleTable.test.ts

@@ -53,7 +53,7 @@ describe('simple table interactions', () => {
     // verify correct number of pages
     cy.getByTestID('pagination-item')
       .last()
-      .contains('50')
+      .contains('100')
 
     // show raw data view of data with 10 pages
     cy.getByTestID(`selector-list ${simpleSmall}`).should('be.visible')
@@ -84,7 +84,7 @@ describe('simple table interactions', () => {
       .should('be.visible')
     cy.getByTestID('pagination-item')
       .last()
-      .contains('15')
+      .contains('10')
   })
 
   it('should render correctly after switching from a dataset with fewer pages to one with more', () => {
@@ -117,7 +117,7 @@ describe('simple table interactions', () => {
     // verify correct number of pages
     cy.getByTestID('pagination-item')
       .last()
-      .contains('5')
+      .contains('10')
 
     // show raw data view of data with 100 pages
     cy.getByTestID(`selector-list ${simpleLarge}`).should('be.visible')
@@ -148,7 +148,7 @@ describe('simple table interactions', () => {
       .should('be.visible')
     cy.getByTestID('pagination-item')
       .last()
-      .contains('150')
+      .contains('100')
   })
 
   it('should not duplicate records from the n-1 page on the nth page', () => {
@@ -181,7 +181,7 @@ describe('simple table interactions', () => {
     // verify correct number of pages
     cy.getByTestID('pagination-item')
       .last()
-      .contains('6')
+      .contains('11')
     // verify only record 31 is on last page
     cy.getByTestID('table-cell 30').should('not.exist')
     cy.getByTestID('table-cell 31').should('be.visible')
@@ -229,8 +229,8 @@ describe('simple table interactions', () => {
     cy.getByTestID('pagination-item')
       .eq(3)
       .click()
+    cy.getByTestID('table-cell 26').should('be.visible')
     cy.getByTestID('table-cell 27').should('be.visible')
-    cy.getByTestID('table-cell 28').should('be.visible')
     cy.getByTestID('pagination-item')
       .last()
       .click()
@@ -239,8 +239,8 @@ describe('simple table interactions', () => {
     cy.getByTestID('pagination-item')
       .eq(2)
       .click()
-    cy.getByTestID('table-cell 25').should('be.visible')
-    cy.getByTestID('table-cell 26').should('be.visible')
+    cy.getByTestID('table-cell 23').should('be.visible')
+    cy.getByTestID('table-cell 24').should('be.visible')
     cy.getByTestID('pagination-item')
       .last()
       .click()
@@ -249,8 +249,8 @@ describe('simple table interactions', () => {
     cy.getByTestID('pagination-item')
       .eq(1)
       .click()
-    cy.getByTestID('table-cell 23').should('be.visible')
-    cy.getByTestID('table-cell 24').should('be.visible')
+    cy.getByTestID('table-cell 20').should('be.visible')
+    cy.getByTestID('table-cell 21').should('be.visible')
     cy.getByTestID('pagination-item')
       .last()
       .click()

src/App.tsx

@@ -42,6 +42,9 @@ import {CLOUD} from 'src/shared/constants'
 import {shouldUseQuartzIdentity} from 'src/identity/utils/shouldUseQuartzIdentity'
 import {executeVWO} from 'src/utils/vwo'
 
+if (isFlagEnabled('multiOrg')) {
+  require('./MultiOrgOverrideStyles.scss')
+}
 // Styles
 const fullScreen = {height: '100%', width: '100%'}
 

src/MultiOrgOverrideStyles.scss

@@ -0,0 +1,5 @@
+.cf-page-header {
+  height: 45px !important;
+  flex: 0 0 45px !important;
+  margin-bottom: 12px !important;
+}

src/homepageExperience/containers/HomepageContainer.tsx

@@ -280,10 +280,20 @@ export const HomepageContainer: FC = () => {
               >
                 {CLOUD ? (
                   <UsageProvider>
-                    <Resources style={{backgroundColor: InfluxColors.Grey5}} />
+                    <Resources
+                      style={{
+                        backgroundColor: InfluxColors.Grey5,
+                        paddingRight: 0,
+                      }}
+                    />
                   </UsageProvider>
                 ) : (
-                  <Resources style={{backgroundColor: InfluxColors.Grey5}} />
+                  <Resources
+                    style={{
+                      backgroundColor: InfluxColors.Grey5,
+                      paddingRight: 0,
+                    }}
+                  />
                 )}
               </Grid.Column>
             </Grid.Row>