SONAR-9608 Enforce fixed width on the measures page detail header

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
index 22574bd9afe0c5f254ccbfe6a1f7bc4189d3a33c..0a403474482f5bc8dd918e150764377ed891c506 100644 (file)
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
@@ -282,41 +282,43 @@ export default class MeasureContent extends React.PureComponent {
         className={classNames('no-outline', this.props.className)}
         ref={container => (this.container = container)}
         tabIndex={0}>
-        <div className="layout-page-header-panel layout-page-main-header issues-main-header">
+        <div className="layout-page-header-panel layout-page-main-header">
           <div className="layout-page-header-panel-inner layout-page-main-header-inner">
-            <Breadcrumbs
-              backToFirst={view === 'list'}
-              className="measure-breadcrumbs spacer-right text-ellipsis"
-              component={component}
-              handleSelect={this.onOpenComponent}
-              rootComponent={rootComponent}
-            />
-            {component.key !== rootComponent.key &&
-              isLoggedIn &&
-              <MeasureFavoriteContainer
-                component={component.key}
-                className="measure-favorite spacer-right"
-              />}
-            {!isFile &&
-              <MeasureViewSelect
-                className="measure-view-select"
-                metric={metric}
-                handleViewChange={this.props.updateView}
+            <div className="layout-page-main-inner">
+              <Breadcrumbs
+                backToFirst={view === 'list'}
+                className="measure-breadcrumbs spacer-right text-ellipsis"
+                component={component}
+                handleSelect={this.onOpenComponent}
+                rootComponent={rootComponent}
+              />
+              {component.key !== rootComponent.key &&
+                isLoggedIn &&
+                <MeasureFavoriteContainer
+                  component={component.key}
+                  className="measure-favorite spacer-right"
+                />}
+              {!isFile &&
+                <MeasureViewSelect
+                  className="measure-view-select"
+                  metric={metric}
+                  handleViewChange={this.props.updateView}
+                  view={view}
+                />}
+              <PageActions
+                current={selectedIdx != null && view !== 'treemap' ? selectedIdx + 1 : null}
+                loading={this.props.loading}
+                isFile={isFile}
+                paging={this.state.paging}
                 view={view}
-              />}
-            <PageActions
-              current={selectedIdx != null && view !== 'treemap' ? selectedIdx + 1 : null}
-              loading={this.props.loading}
-              isFile={isFile}
-              paging={this.state.paging}
-              view={view}
-            />
+              />
+            </div>
           </div>
         </div>
-        {metric == null && <MetricNotFound className="layout-page-main-inner" />}
+        {metric == null && <MetricNotFound className="layout-page-main-inner measure-details-content" />}
         {metric != null &&
           measure != null &&
-          <div className="layout-page-main-inner">
+          <div className="layout-page-main-inner measure-details-content">
             <MeasureHeader
               component={component}
               components={this.state.components}

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js
index 027e034545582bb22a709e8f8d6ed26079d7bd1a..59ade74dd241b2a4dd579a86d04aa641bd406777 100644 (file)
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.js
@@ -138,30 +138,32 @@ export default class MeasureOverview extends React.PureComponent {
     const isFile = isFileType(component);
     return (
       <div className={this.props.className}>
-        <div className="layout-page-header-panel layout-page-main-header issues-main-header">
+        <div className="layout-page-header-panel layout-page-main-header">
           <div className="layout-page-header-panel-inner layout-page-main-header-inner">
-            <Breadcrumbs
-              backToFirst={true}
-              className="measure-breadcrumbs spacer-right text-ellipsis"
-              component={component}
-              handleSelect={this.props.updateSelected}
-              rootComponent={rootComponent}
-            />
-            {component.key !== rootComponent.key &&
-              isLoggedIn &&
-              <MeasureFavoriteContainer
-                component={component.key}
-                className="measure-favorite spacer-right"
-              />}
-            <PageActions
-              current={this.state.components.length}
-              loading={this.props.loading}
-              isFile={isFile}
-              paging={this.state.paging}
-            />
+            <div className="layout-page-main-inner">
+              <Breadcrumbs
+                backToFirst={true}
+                className="measure-breadcrumbs spacer-right text-ellipsis"
+                component={component}
+                handleSelect={this.props.updateSelected}
+                rootComponent={rootComponent}
+              />
+              {component.key !== rootComponent.key &&
+                isLoggedIn &&
+                <MeasureFavoriteContainer
+                  component={component.key}
+                  className="measure-favorite spacer-right"
+                />}
+              <PageActions
+                current={this.state.components.length}
+                loading={this.props.loading}
+                isFile={isFile}
+                paging={this.state.paging}
+              />
+            </div>
           </div>
         </div>
-        <div className="layout-page-main-inner">
+        <div className="layout-page-main-inner measure-details-content">
           <div className="clearfix big-spacer-bottom">
             {leakPeriod != null &&
               <LeakPeriodLegend className="pull-right" component={component} period={leakPeriod} />}

diff --git a/tests/src/test/java/org/sonarqube/pageobjects/measures/MeasuresPage.java b/tests/src/test/java/org/sonarqube/pageobjects/measures/MeasuresPage.java
index d7fd6845997938e1f7008ae6df14483922652aa9..bd239267c449b89217239a41396f0a1fb2220831 100644 (file)
--- a/tests/src/test/java/org/sonarqube/pageobjects/measures/MeasuresPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/measures/MeasuresPage.java
@@ -79,7 +79,7 @@ public class MeasuresPage {
     SelenideElement sidebar = this.getSideBar();
     SelenideElement facetItem = sidebar.$("#measure-" + measure + "-name").should(exist);
     facetItem.click();
-    MeasureContent content = new MeasureContent($("#component-measures .layout-page-main-inner").should(exist));
+    MeasureContent content = new MeasureContent($("#component-measures .measure-details-content").should(exist));
     content.shouldHaveTitle(facetItem.getText());
     return content;
   }