diff --git a/pkg/ui/workspaces/db-console/src/app.tsx b/pkg/ui/workspaces/db-console/src/app.tsx index f614f2894097..d434728625e8 100644 --- a/pkg/ui/workspaces/db-console/src/app.tsx +++ b/pkg/ui/workspaces/db-console/src/app.tsx @@ -20,7 +20,6 @@ import { Redirect, Route, Switch } from "react-router-dom"; import "react-select/dist/react-select.css"; import { Action, Store } from "redux"; -import { TimezoneProvider } from "src/contexts/timezoneProvider"; import { AdminUIState } from "src/redux/state"; import { createLoginRoute, createLogoutRoute } from "src/routes/login"; import { RedirectToStatementDetails } from "src/routes/RedirectToStatementDetails"; @@ -115,419 +114,417 @@ export const App: React.FC = (props: AppProps) => { - - {/* Apply CRL theme twice, with ConfigProvider instance from Db Console and - imported instance from Cluster UI as it applies theme imported components only. */} - - - - {/* login */} - {createLoginRoute()} - {createLogoutRoute(store)} - - - - - - {/* overview page */} - {visualizationRoutes()} + {/* Apply CRL theme twice, with ConfigProvider instance from Db Console and + imported instance from Cluster UI as it applies theme imported components only. */} + + + + {/* login */} + {createLoginRoute()} + {createLogoutRoute(store)} + + + + + + {/* overview page */} + {visualizationRoutes()} - {/* time series metrics */} - - - - - - - + {/* time series metrics */} + + + + + + + - {/* node details */} - - - + {/* node details */} + + + - {/* events & jobs */} - - - + {/* events & jobs */} + + + - - + + - {/* databases */} - - - - + {/* databases */} + + + + - - - - + + + + - {/* data distribution */} - + {/* data distribution */} + - {/* SQL activity */} - + {/* SQL activity */} + - {/* Active executions */} - + {/* Active executions */} + - + - {/* statement statistics */} - - - - - - - - - + {/* statement statistics */} + + + + + + + + + - {/* sessions */} - - + {/* sessions */} + + - {/* transactions */} - - - + {/* transactions */} + + + - {/* Insights */} - - - + {/* Insights */} + + + - {/* debug pages */} - - - - - - - - - - - - - - - - - - + {/* debug pages */} + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - {/* Redirect old statement diagnostics route to new tabbed page */} - - {/* hot ranges */} - - {/* old route redirects */} - - - - - - - - + + + + + + + + + + + + + {/* Redirect old statement diagnostics route to new tabbed page */} + + {/* hot ranges */} + + {/* old route redirects */} + + + + + + + + - + - {/* 404 */} - - - - - - - - + {/* 404 */} + + + + + + + diff --git a/pkg/ui/workspaces/db-console/src/views/app/containers/layout/index.tsx b/pkg/ui/workspaces/db-console/src/views/app/containers/layout/index.tsx index d4f3c6a0a818..acbd2845bf2e 100644 --- a/pkg/ui/workspaces/db-console/src/views/app/containers/layout/index.tsx +++ b/pkg/ui/workspaces/db-console/src/views/app/containers/layout/index.tsx @@ -18,6 +18,7 @@ import { Text, TextTypes, } from "src/components"; +import { TimezoneProvider } from "src/contexts/timezoneProvider"; import { clusterIdSelector, clusterNameSelector, @@ -70,48 +71,50 @@ class Layout extends React.Component { const { clusterName, clusterVersion, clusterId } = this.props; return ( - - - -
-
- - - - - - - - - -
-
- - - {getDataFromServer().FeatureFlags.is_observability_service - ? "(Obs Service) " - : ""} - {clusterName || `Cluster id: ${clusterId || ""}`} - - - - -
- -
-
- + + + + +
+
+ + + + + + + + + +
+
+ + + {getDataFromServer().FeatureFlags.is_observability_service + ? "(Obs Service) " + : ""} + {clusterName || `Cluster id: ${clusterId || ""}`} + + + +
-
- - {this.props.children} - + +
+
+ +
+
+ + {this.props.children} + +
-
+
); }