Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-22.1: stats charts on Statement Details page #82960

Merged
merged 2 commits into from
Jun 21, 2022
Merged

release-22.1: stats charts on Statement Details page #82960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea92cf
ui: new charts to statement details page
maryliag May 30, 2022
2bdd346
ui: fix contention chart on Statement Details page
maryliag Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/server/combined_statement_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ func getStatementDetailsPerAggregatedTs(
GROUP BY
aggregated_ts,
aggregation_interval
ORDER BY aggregated_ts ASC
LIMIT $%d`, whereClause, len(args)+1)

args = append(args, limit)
Expand Down
1 change: 1 addition & 0 deletions pkg/ui/workspaces/cluster-ui/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ DEPENDENCIES = [
"@npm//highlight.js",
"@npm//http-proxy-middleware",
"@npm//identity-obj-proxy",
"@npm//jest-canvas-mock",
"@npm//jest-environment-enzyme",
"@npm//jest-enzyme",
"@npm//jest-fetch-mock",
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/workspaces/cluster-ui/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = {
],
roots: ["<rootDir>/src"],
testEnvironment: "enzyme",
setupFilesAfterEnv: ["./enzyme.setup.js", "jest-enzyme"],
setupFilesAfterEnv: ["./enzyme.setup.js", "./src/test-utils/matchMedia.mock.js", "jest-enzyme", "jest-canvas-mock"],
transform: {
"^.+\\.tsx?$": "ts-jest",
"^.+\\.jsx?$": ['babel-jest', { configFile: path.resolve(__dirname, 'babel.config.js') }],
Expand Down
1 change: 1 addition & 0 deletions pkg/ui/workspaces/cluster-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
"http-proxy-middleware": "^1.0.5",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.5.1",
"jest-canvas-mock": "^2.4.0",
"jest-cli": "^27.5.1",
"jest-environment-enzyme": "^7.1.2",
"jest-enzyme": "^7.1.2",
Expand Down
9 changes: 6 additions & 3 deletions pkg/ui/workspaces/cluster-ui/src/graphs/bargraph/bars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { AxisUnits, AxisDomain } from "../utils/domain";
import { barTooltipPlugin } from "./plugins";

const seriesPalette = [
"#475872",
"#FFCD02",
"#003EBD",
"#2AAF44",
"#F16969",
"#4E9FD1",
"#49D990",
Expand All @@ -24,7 +24,7 @@ const seriesPalette = [
"#A3415B",
"#B59153",
"#C9DB6D",
"#203D9B",
"#475872",
"#748BF2",
"#91C8F2",
"#FF9696",
Expand Down Expand Up @@ -158,6 +158,9 @@ export const getBarChartOpts = (
x: {
range: () => [xAxisDomain.extent[0], xAxisDomain.extent[1]],
},
yAxis: {
range: () => [yAxisDomain.extent[0], yAxisDomain.extent[1]],
},
},
axes: [
{
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/workspaces/cluster-ui/src/pageConfig/pageConfig.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
margin-bottom: -10px;
margin-top: -10px;

z-index: 1;
z-index: 2;
background-color: $colors--background;

&__list {
Expand Down
11 changes: 6 additions & 5 deletions pkg/ui/workspaces/cluster-ui/src/sortedtable/sortedtable.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@
position: relative;
padding: 11px;

&:after, &:before {
&:after,
&:before {
content: "";
position: absolute;
right: 5px;
Expand Down Expand Up @@ -94,15 +95,14 @@
}
}
}

}

.break-line {
white-space:pre-wrap !important;
white-space: pre-wrap !important;
}

.cl-table-container {
padding: 18px 24px 18px 0px;
padding: 20px 24px 18px 0px;
}
.cl-table-wrapper {
padding: 9.55px 20px 17px;
Expand All @@ -116,7 +116,8 @@
align-items: center;
flex-direction: column;
padding: 50px 0;
&--title, &--description {
&--title,
&--description {
font-family: $font-family--base;
margin: 0;
}
Expand Down
Loading