RELATED: SD-1337 Change KPIs > Dashboards, Analyze > Insights

yenkins · Jan 22, 2021 · ee20de9 · ee20de9
1 parent 6d9f2ba
commit ee20de9
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,13 @@ The REST API versions in the table are just for your information as the values a
 - Ranking filters that show the data from a set of the highest or lowest ranked values of an attribute based on the ranking criteria that you establish ([doc](https://sdk.gooddata.com/gooddata-ui/docs/ranking_filter_component.html))
 - The option to turning off data points in line charts, area charts, and combo charts ([doc](https://sdk.gooddata.com/gooddata-ui/docs/chart_config.html#configure-canvases))
 
+## 7.9.1-3
+
+### Fixed
+
+- Use latest: @gooddata/js-utils and @gooddata/goodstrap
+- Rename sass variable causing conflict: $border-color -> $gd-border-color
+
 ## 7.9.0
 
 ### Added

diff --git a/package.json b/package.json
@@ -119,8 +119,8 @@
   "dependencies": {
     "@formatjs/intl-pluralrules": "^1.3.6",
     "@gooddata/gooddata-js": "^13.2.0",
-    "@gooddata/goodstrap": "^68.22.0",
-    "@gooddata/js-utils": "^3.10.5",
+    "@gooddata/goodstrap": "^70.2.1",
+    "@gooddata/js-utils": "^3.10.17",
     "@gooddata/numberjs": "^3.2.4",
     "@gooddata/typings": "^2.27.0",
     "@types/codemirror": "^0.0.95",

diff --git a/src/components/filters/DateFilter/DateFilterBody/DateFilterBody.scss b/src/components/filters/DateFilter/DateFilterBody/DateFilterBody.scss
@@ -1,4 +1,4 @@
-// (C) 2019-2020 GoodData Corporation
+// (C) 2019-2021 GoodData Corporation
 @import "~@gooddata/goodstrap/lib/core/styles/variables.scss";
 @import "~@gooddata/goodstrap/lib/Button/styles/variables.scss";
 
@@ -60,7 +60,7 @@
         flex: 1 1 auto;
         max-height: none;
         padding: 0;
-        border-bottom: 1px solid $border-color;
+        border-bottom: 1px solid $gd-border-color;
 
         .gd-list-item:last-child {
             border-bottom-color: transparent;
@@ -69,7 +69,7 @@
 
     &-actions {
         padding: 10px;
-        border-top: 1px solid $border-color;
+        border-top: 1px solid $gd-border-color;
 
         &-buttons {
             display: flex;
@@ -135,7 +135,7 @@
     &-body .gd-date-filter-item-mobile {
         &.gd-list-item {
             flex: 0 0 auto;
-            border-bottom: 1px solid $border-color;
+            border-bottom: 1px solid $gd-border-color;
         }
 
         &.gd-filter-list-item {
@@ -151,7 +151,7 @@
             &,
             &:hover,
             &:active {
-                background-color: transparentize($border-color, 0.8);
+                background-color: transparentize($gd-border-color, 0.8);
             }
         }
     }

diff --git a/src/components/filters/DateFilter/DateFilterBody/DateFilterHeader.scss b/src/components/filters/DateFilter/DateFilterBody/DateFilterHeader.scss
@@ -1,13 +1,13 @@
-// (C) 2019-2020 GoodData Corporation
+// (C) 2019-2021 GoodData Corporation
 @import "~@gooddata/goodstrap/lib/core/styles/variables.scss";
 
 .gd-extended-date-filter-header {
     display: block;
     width: 100%;
     padding: 10px;
     border: none;
-    border-top: 1px solid $border-color;
-    border-bottom: 1px solid $border-color;
+    border-top: 1px solid $gd-border-color;
+    border-bottom: 1px solid $gd-border-color;
     font-size: nth(map-get($gd-typo, font-sizes), 4);
     text-align: left;
     font-weight: bold;

diff --git a/src/components/filters/DateFilter/DateFilterButton/DateFilterButton.scss b/src/components/filters/DateFilter/DateFilterButton/DateFilterButton.scss
@@ -67,7 +67,7 @@ $separator-icon: "data:image/svg+xml,%3Csvg width='7' height='26' viewBox='0 0 7
 
     &:hover {
         &::after {
-            border-color: $border-color;
+            border-color: $gd-border-color;
         }
 
         .edit-mode-on & {
@@ -276,8 +276,8 @@ $separator-icon: "data:image/svg+xml,%3Csvg width='7' height='26' viewBox='0 0 7
     margin: 0;
     padding: 10px;
     border-width: 1px 0;
-    border-top: 1px solid $border-color;
-    border-bottom: 1px solid $border-color;
+    border-top: 1px solid $gd-border-color;
+    border-bottom: 1px solid $gd-border-color;
     font-size: nth(map-get($gd-typo, font-sizes), 4);
     text-align: left;
     box-shadow: 0 1px 2px 0 rgba(20, 56, 93, 0.1);

diff --git a/src/components/filters/DateFilter/DateFilterFormWrapper/DateFilterFormWrapper.scss b/src/components/filters/DateFilter/DateFilterFormWrapper/DateFilterFormWrapper.scss
@@ -1,4 +1,4 @@
-// (C) 2007-2020 GoodData Corporation
+// (C) 2007-2021 GoodData Corporation
 @import "~@gooddata/goodstrap/lib/core/styles/typo-mixins.scss";
 @import "~@gooddata/goodstrap/lib/core/styles/variables.scss";
 
@@ -8,7 +8,7 @@
     font-size: nth(map-get($gd-typo, font-sizes), 4);
     margin: 0 0 0 10px;
     padding: 10px;
-    border-left: 2px dotted $border-color;
+    border-left: 2px dotted $gd-border-color;
 }
 
 .gd-date-filter-form-wrapper-inner {

diff --git a/src/components/filters/DateFilter/Separator/Separator.scss b/src/components/filters/DateFilter/Separator/Separator.scss
@@ -1,9 +1,9 @@
-// (C) 2007-2020 GoodData Corporation
+// (C) 2007-2021 GoodData Corporation
 @import "~@gooddata/goodstrap/lib/core/styles/variables.scss";
 
 .gd-separator-generic {
     height: 1px;
     margin: 0;
     border: 0;
-    background: $border-color;
+    background: $gd-border-color;
 }
diff --git a/src/components/visualizations/styles/table.scss b/src/components/visualizations/styles/table.scss
@@ -687,7 +687,7 @@ $gdc-goodstrap-basepath: "~@gooddata/goodstrap/lib/";
             max-height: 105px;
             margin: 0 -20px 10px;
             padding: 0 50px 10px 20px;
-            border-bottom: 1px solid $border-color;
+            border-bottom: 1px solid $gd-border-color;
             white-space: normal;
         }
     }

diff --git a/styles/internal/scss/config_panel.scss b/styles/internal/scss/config_panel.scss
@@ -1,4 +1,4 @@
-// (C) 2007-2020 GoodData Corporation
+// (C) 2007-2021 GoodData Corporation
 @import "~@gooddata/goodstrap/lib/core/styles/variables.scss";
 
 $color-picker-item-size: 20px;
@@ -86,7 +86,7 @@ $color-picker-spacing: 5px;
         right: 0;
         left: 0;
         height: 0;
-        border-top: 1px solid $border-color;
+        border-top: 1px solid $gd-border-color;
     }
 
     .gd-button-link {

diff --git a/styles/scss/measureNumberFormat.scss b/styles/scss/measureNumberFormat.scss
@@ -1,4 +1,4 @@
-// (C) 2020 GoodData Corporation
+// (C) 2020-2021 GoodData Corporation
 @import "~@gooddata/goodstrap/lib/core/styles/variables.scss";
 
 .gd-measure-number-format-dropdown-body {
@@ -35,7 +35,7 @@ $measure_number_format_custom_format_dialog_textarea_height: 100px;
         flex: 0 0 auto;
         padding: 10px 12px;
         background-color: $is-focused-background;
-        border-bottom: 1px solid $border-color;
+        border-bottom: 1px solid $gd-border-color;
 
         & > span {
             color: $gd-color-state-blank;
@@ -141,7 +141,7 @@ $measure_number_format_custom_format_dialog_textarea_height: 100px;
         flex: 0 0 auto;
         margin: 0 10px;
         padding: 10px 0;
-        border-top: 1px solid $border-color;
+        border-top: 1px solid $gd-border-color;
         text-align: right;
     }
 }

diff --git a/styles/scss/measureValueFilter.scss b/styles/scss/measureValueFilter.scss
@@ -1,4 +1,4 @@
-// (C) 2019-2020 GoodData Corporation
+// (C) 2019-2021 GoodData Corporation
 $gdc-goodstrap-basepath: "~@gooddata/goodstrap/lib/";
 
 @import "./_settings.scss";
@@ -45,7 +45,7 @@ $dialog_width: 250px;
     .gd-mvf-dropdown-footer {
         margin: 0 10px;
         padding: 10px 0;
-        border-top: 1px solid $border-color;
+        border-top: 1px solid $gd-border-color;
         text-align: right;
     }
 }

diff --git a/styles/scss/pivotTable.scss b/styles/scss/pivotTable.scss
@@ -4,7 +4,7 @@
 
 $ag-icons-path: "~ag-grid-community/src/styles/ag-theme-balham/icons/";
 
-$border-color: transparent;
+$gd-border-color: transparent;
 $font-size: 12px;
 $font-family: $gd-font-primary;
 $foreground-color: $gd-color-text;

diff --git a/yarn.lock b/yarn.lock
@@ -1135,13 +1135,13 @@
     rxjs "^6.3.1"
     uuid "^8.3.1"
 
-"@gooddata/goodstrap@^68.22.0":
-  version "68.22.0"
-  resolved "https://registry.yarnpkg.com/@gooddata/goodstrap/-/goodstrap-68.22.0.tgz#64622a1a1c04027cc11bad2446c73a2999e05266"
-  integrity sha512-s0T4S8iY1GrcAB69x/mdg6FUHqT9x7jh/aI6zamNoZBOjQ7iA3yONnUS5OI9buptXl/qj5LrYlwXwRo8lezC+Q==
+"@gooddata/goodstrap@^70.2.1":
+  version "70.2.1"
+  resolved "https://registry.yarnpkg.com/@gooddata/goodstrap/-/goodstrap-70.2.1.tgz#c9a13d896b1ed41adb162cb64b2b50a54bb59708"
+  integrity sha512-SOIZ/JzlY0PJPhlMG0jW2qYqDmCpPJ4LBfMK+zw5VOgskRUA96ROcs1ha73E1/RhvNFy77kwAINYwX6pltckwg==
   dependencies:
     "@babel/runtime-corejs2" "^7.0.0"
-    "@gooddata/js-utils" "^3.10.9"
+    "@gooddata/js-utils" "^3.10.17"
     classnames "^2.2.6"
     custom-event "^1.0.1"
     element-closest-polyfill "^1.0.0"
@@ -1166,12 +1166,12 @@
     rxjs "^6.3.1"
     tinycolor2 "^1.4.1"
 
-"@gooddata/js-utils@^3.10.5", "@gooddata/js-utils@^3.10.9":
-  version "3.10.9"
-  resolved "https://registry.yarnpkg.com/@gooddata/js-utils/-/js-utils-3.10.9.tgz#dd65fc86f03df45cc9cf353c1adc76d069a9f19e"
-  integrity sha512-cG+v65l9vBWTZuhcj66j1Ko439cGXDeFandMtZnHhTgiDh3bUeuZDNxrlrhcKzUy0kY7yi2QyDWmyTMWJBkJjw==
+"@gooddata/js-utils@^3.10.17":
+  version "3.10.17"
+  resolved "https://registry.yarnpkg.com/@gooddata/js-utils/-/js-utils-3.10.17.tgz#39ab2861e414b5df24ffea075bacad8b861186fb"
+  integrity sha512-NiE46H5wDqAn9K/cPVKwa5BHtWaetXZ+WPa63kzHfG5S/FZqnxcirQOqKr7br7Hc3Iofyiekvnf93vO4QzmWBg==
   dependencies:
-    "@gooddata/typings" "^2.24.9"
+    "@gooddata/typings" "^2.26.1"
     js-cookie "^2.1.4"
     lodash "^4.17.15"
 
@@ -1232,7 +1232,7 @@
     tslint-microsoft-contrib "6.1.0"
     tslint-react "3.6.0"
 
-"@gooddata/typings@^2.23.0", "@gooddata/typings@^2.24.9", "@gooddata/typings@^2.27.0":
+"@gooddata/typings@^2.23.0", "@gooddata/typings@^2.26.1", "@gooddata/typings@^2.27.0":
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/@gooddata/typings/-/typings-2.27.0.tgz#361888304d56d124cabd9625e81a3b0dae0597f8"
   integrity sha512-vB9/BQHtWHZtTl/LgO/Hsl8xr8YlmHy61kbj7A316Ana08H2wnqV8Y8ZjlVf94bHq9Hza7ViF7urhbCbfP8PFA==