Merge #71522 #71567

71522: ui: update ui-components version r=maryliag a=maryliag Update ui-components version to include a fix on scrolling on pages with tooltip Release note: None 71567: ui: fix default value of filter to All r=maryliag a=maryliag A recent commit changed the default value of filter to be an empty string, but we do have transactions that have no associated app names to it, so All and empty string should be treated as different cases. This commit reverse that changes and use All Release note (bug fix): Show All statements when filter All is selected and not only the ones with empty string Co-authored-by: Marylia Gutierrez <[email protected]>
cockroachdb · Oct 14, 2021 · acc7306 · acc7306
3 parents 1013cdb + 9b8cb26 + fd09940
commit acc7306
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/pkg/ui/workspaces/cluster-ui/package.json b/pkg/ui/workspaces/cluster-ui/package.json
@@ -42,7 +42,7 @@
     "@cockroachlabs/crdb-protobuf-client": "link:../db-console/src/js",
     "@cockroachlabs/eslint-config": "^0.1.11",
     "@cockroachlabs/icons": "0.3.0",
-    "@cockroachlabs/ui-components": "0.2.19-alpha.11",
+    "@cockroachlabs/ui-components": "0.2.20",
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "^1.5.0",
     "@storybook/addon-actions": "^6.1.21",

diff --git a/pkg/ui/workspaces/cluster-ui/src/queryFilter/filter.tsx b/pkg/ui/workspaces/cluster-ui/src/queryFilter/filter.tsx
@@ -69,7 +69,7 @@ const timeUnit = [
 ];
 
 export const defaultFilters: Filters = {
-  app: "",
+  app: "All",
   timeNumber: "0",
   timeUnit: "seconds",
   fullScan: false,
@@ -116,7 +116,7 @@ export const getFiltersFromQueryString = (
  * we want to consider 0 active Filters
  */
 export const inactiveFiltersState: Filters = {
-  app: "",
+  app: "All",
   timeNumber: "0",
   fullScan: false,
   sqlType: "",

diff --git a/pkg/ui/yarn-vendor b/pkg/ui/yarn-vendor
diff --git a/pkg/ui/yarn.lock b/pkg/ui/yarn.lock
@@ -1392,7 +1392,7 @@
     minimist "^1.2.0"
 
 "@cockroachlabs/cluster-ui@link:workspaces/cluster-ui":
-  version "21.2.0-prerelease-3"
+  version "22.1.0-prerelease-1"
   dependencies:
     "@babel/runtime" "^7.12.13"
 
@@ -1416,20 +1416,20 @@
   resolved "https://registry.yarnpkg.com/@cockroachlabs/icons/-/icons-0.3.0.tgz#160573074396f266e92fcbe5e520c5ba1d8750f9"
   integrity sha512-GJxhlXy8Z3/PYFb9C3iM1dvU9wajGoaA/+VCj0an2ipfbkI2fhToq+h0b33vu7JuZ3dS4QMRjfVE4uhlyIUH2Q==
 
-"@cockroachlabs/icons@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@cockroachlabs/icons/-/icons-0.4.1.tgz#5772f94ce625279a4789f8e48c9b4e903c5bc5d7"
-  integrity sha512-JaiYFDhqhvGPqAFkHGCnEYiBe6Gas2HjqhLOQa4T5FRRMJ07liswOPARXyX120hTPwqEUaQyaHLxzqYDFwfdzQ==
+"@cockroachlabs/icons@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@cockroachlabs/icons/-/icons-0.4.3.tgz#cf42bd0398a71c3d70ff83f631689310e42091fb"
+  integrity sha512-PLbsDsZmgj9p/2fZkWQ+MENvxEPpdWhJBm6AqiWIYQ4A1X7+F6sfgXeHBE19qceu299MjxsjLDK+UlyU0uvlMA==
 
-"@cockroachlabs/[email protected].19-alpha.11":
-  version "0.2.19-alpha.11"
-  resolved "https://registry.yarnpkg.com/@cockroachlabs/ui-components/-/ui-components-0.2.19-alpha.11.tgz#41e285d65e1d1bb20000c43e473f05ba84e050b3"
-  integrity sha512-HoSNnpxiWa7ZBamexRf/ihV6NDN+e+OsWZha7Bt3v9TBqXznY+nCdTNGperJAK+RXTBM/WhpmiLtlgC8MRWuxQ==
+"@cockroachlabs/[email protected].20":
+  version "0.2.20"
+  resolved "https://registry.yarnpkg.com/@cockroachlabs/ui-components/-/ui-components-0.2.20.tgz#7b4102f5063683aed625c4399fb1fec149a5c5e5"
+  integrity sha512-MXjcDrFVoP2/EKwe7pixol9l2+5r6hb4/FXvbNU0NW5wkufYBLp26CX3GjMbxobwy8NG+AkSZ3X0Vkhh9O9OXw==
   dependencies:
-    "@cockroachlabs/icons" "^0.4.1"
-    "@popperjs/core" "^2.4.3"
+    "@cockroachlabs/icons" "^0.4.3"
+    "@popperjs/core" "^2.9.2"
     npm-run-all "^4.1.5"
-    react-popper "^2.2.3"
+    react-popper "^2.2.5"
 
 "@cypress/listr-verbose-renderer@^0.4.1":
   version "0.4.1"
@@ -2057,11 +2057,16 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
-"@popperjs/core@^2.4.0", "@popperjs/core@^2.4.3", "@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0":
+"@popperjs/core@^2.4.0", "@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0":
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
   integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
 
+"@popperjs/core@^2.9.2":
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590"
+  integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==
+
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -14635,7 +14640,7 @@ react-popper-tooltip@^3.1.1:
     "@popperjs/core" "^2.5.4"
     react-popper "^2.2.4"
 
-react-popper@^2.2.3, react-popper@^2.2.4:
+react-popper@^2.2.3, react-popper@^2.2.4, react-popper@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96"
   integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==
+ −		@cockroachlabs-icons-0.4.3.tgz
+ −		@cockroachlabs-ui-components-0.2.20.tgz
+ −		@popperjs-core-2.10.2.tgz