aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Perrin <philippe.perrin@sonarsource.com>2019-10-25 17:19:07 +0200
committerSonarTech <sonartech@sonarsource.com>2019-10-28 20:21:10 +0100
commitb7e917ca856e00e7b67092f98e9532d9afc11d1e (patch)
treeaf09d331205a690d8ff9525d6db951be22fa19d4
parentcd2296809f5308f0cbf14100fcbff2846c3bf3da (diff)
downloadsonarqube-b7e917ca856e00e7b67092f98e9532d9afc11d1e.tar.gz
sonarqube-b7e917ca856e00e7b67092f98e9532d9afc11d1e.zip
Bump to sonar-ui-common@0.0.35
-rw-r--r--server/sonar-docs/package.json2
-rw-r--r--server/sonar-docs/yarn.lock8
-rw-r--r--server/sonar-web/package.json2
-rw-r--r--server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx2
-rw-r--r--server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/__snapshots__/MetricSelect-test.tsx.snap2
-rw-r--r--server/sonar-web/src/main/js/apps/quality-gates/styles.css11
-rw-r--r--server/sonar-web/yarn.lock8
7 files changed, 23 insertions, 12 deletions
diff --git a/server/sonar-docs/package.json b/server/sonar-docs/package.json
index a8e15366c60..ce0903f2a7d 100644
--- a/server/sonar-docs/package.json
+++ b/server/sonar-docs/package.json
@@ -21,7 +21,7 @@
"react-dom": "16.8.6",
"react-helmet": "5.2.0",
"react-typography": "0.16.19",
- "sonar-ui-common": "0.0.34",
+ "sonar-ui-common": "0.0.35",
"typography": "0.16.19"
},
"devDependencies": {
diff --git a/server/sonar-docs/yarn.lock b/server/sonar-docs/yarn.lock
index 9a3de15e56c..5c2e1d49f73 100644
--- a/server/sonar-docs/yarn.lock
+++ b/server/sonar-docs/yarn.lock
@@ -11122,10 +11122,10 @@ sockjs@0.3.19:
faye-websocket "^0.10.0"
uuid "^3.0.1"
-sonar-ui-common@0.0.34:
- version "0.0.34"
- resolved "https://repox.jfrog.io/repox/api/npm/npm/sonar-ui-common/-/sonar-ui-common-0.0.34.tgz#171228285a0d0fd5adf12c3882c64ff4631d4820"
- integrity sha1-FxIoKFoND9Wt8Sw4gsZP9GMdSCA=
+sonar-ui-common@0.0.35:
+ version "0.0.35"
+ resolved "https://repox.jfrog.io/repox/api/npm/npm/sonar-ui-common/-/sonar-ui-common-0.0.35.tgz#1572b8489f464a57f49e41b7f7397a366a3c0b38"
+ integrity sha1-FXK4SJ9GSlf0nkG39zl6Nmo8Czg=
dependencies:
"@types/react-select" "1.2.6"
classnames "2.2.6"
diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index 0ac9ac238f3..e8354bf8caf 100644
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -38,7 +38,7 @@
"regenerator-runtime": "0.13.2",
"remark-custom-blocks": "2.3.0",
"remark-slug": "5.1.0",
- "sonar-ui-common": "0.0.34",
+ "sonar-ui-common": "0.0.35",
"unist-util-visit": "1.4.0",
"valid-url": "1.0.9",
"whatwg-fetch": "2.0.4"
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx
index 56300e6d6ac..cfdbfbb73d7 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx
@@ -74,7 +74,7 @@ export default class MetricSelect extends React.PureComponent<Props> {
return (
<Select
- className="text-middle"
+ className="text-middle quality-gate-metric-select"
id="condition-metric"
onChange={this.handleChange}
options={optionsWithDomains}
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/__snapshots__/MetricSelect-test.tsx.snap b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/__snapshots__/MetricSelect-test.tsx.snap
index a387d03d4ed..a8e13546bde 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/__snapshots__/MetricSelect-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/__snapshots__/MetricSelect-test.tsx.snap
@@ -2,7 +2,7 @@
exports[`should render correctly 1`] = `
<Select
- className="text-middle"
+ className="text-middle quality-gate-metric-select"
id="condition-metric"
onChange={[Function]}
options={
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/styles.css b/server/sonar-web/src/main/js/apps/quality-gates/styles.css
index 7d000c62a3d..fbba6b9075a 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/styles.css
+++ b/server/sonar-web/src/main/js/apps/quality-gates/styles.css
@@ -25,3 +25,14 @@
margin-top: 10px;
padding-top: 20px;
}
+
+.quality-gate-metric-select .Select-option {
+ padding-left: calc(2 * var(--gridSize));
+}
+
+.quality-gate-metric-select .Select-option.is-disabled {
+ opacity: 1;
+ font-weight: 600;
+ color: var(--baseFontColor);
+ padding-left: var(--gridSize);
+}
diff --git a/server/sonar-web/yarn.lock b/server/sonar-web/yarn.lock
index e4f7a1e58d8..0ee5d888dd9 100644
--- a/server/sonar-web/yarn.lock
+++ b/server/sonar-web/yarn.lock
@@ -9421,10 +9421,10 @@ sockjs@0.3.19:
faye-websocket "^0.10.0"
uuid "^3.0.1"
-sonar-ui-common@0.0.34:
- version "0.0.34"
- resolved "https://repox.jfrog.io/repox/api/npm/npm/sonar-ui-common/-/sonar-ui-common-0.0.34.tgz#171228285a0d0fd5adf12c3882c64ff4631d4820"
- integrity sha1-FxIoKFoND9Wt8Sw4gsZP9GMdSCA=
+sonar-ui-common@0.0.35:
+ version "0.0.35"
+ resolved "https://repox.jfrog.io/repox/api/npm/npm/sonar-ui-common/-/sonar-ui-common-0.0.35.tgz#1572b8489f464a57f49e41b7f7397a366a3c0b38"
+ integrity sha1-FXK4SJ9GSlf0nkG39zl6Nmo8Czg=
dependencies:
"@types/react-select" "1.2.6"
classnames "2.2.6"