diff --git a/web/vtadmin/src/components/routes/VTExplain.tsx b/web/vtadmin/src/components/routes/VTExplain.tsx index f500e52939d..2c067692963 100644 --- a/web/vtadmin/src/components/routes/VTExplain.tsx +++ b/web/vtadmin/src/components/routes/VTExplain.tsx @@ -26,7 +26,6 @@ import style from './VTExplain.module.scss'; import { Code } from '../Code'; import { useDocumentTitle } from '../../hooks/useDocumentTitle'; import { Label } from '../inputs/Label'; -import JSONViewTree from '../jsonViewTree/JSONViewTree'; // TODO(doeg): persist form data in URL, error handling, loading state, um... hm. Most things still need doing. // This whole component is the hastiest prototype ever. :') @@ -108,7 +107,7 @@ export const VTExplain = () => { {error && (
- +
)} diff --git a/web/vtadmin/src/components/routes/keyspace/Keyspace.tsx b/web/vtadmin/src/components/routes/keyspace/Keyspace.tsx index ffbc99cf553..068f9cea2cd 100644 --- a/web/vtadmin/src/components/routes/keyspace/Keyspace.tsx +++ b/web/vtadmin/src/components/routes/keyspace/Keyspace.tsx @@ -32,6 +32,7 @@ import style from './Keyspace.module.scss'; import { KeyspaceShards } from './KeyspaceShards'; import { KeyspaceVSchema } from './KeyspaceVSchema'; import JSONViewTree from '../../jsonViewTree/JSONViewTree'; +import { Code } from '../../Code'; interface RouteParams { clusterID: string; @@ -94,6 +95,7 @@ export const Keyspace = () => { + @@ -110,6 +112,11 @@ export const Keyspace = () => { + + + + + diff --git a/web/vtadmin/src/components/routes/keyspace/KeyspaceVSchema.tsx b/web/vtadmin/src/components/routes/keyspace/KeyspaceVSchema.tsx index a374540feac..c99049c0f14 100644 --- a/web/vtadmin/src/components/routes/keyspace/KeyspaceVSchema.tsx +++ b/web/vtadmin/src/components/routes/keyspace/KeyspaceVSchema.tsx @@ -15,7 +15,7 @@ */ import { useVSchema } from '../../../hooks/api'; -import JSONViewTree from '../../jsonViewTree/JSONViewTree'; +import { Code } from '../../Code'; import { QueryErrorPlaceholder } from '../../placeholders/QueryErrorPlaceholder'; import { QueryLoadingPlaceholder } from '../../placeholders/QueryLoadingPlaceholder'; @@ -30,7 +30,7 @@ export const KeyspaceVSchema = ({ clusterID, name }: Props) => {
- {query.isSuccess && } + {query.isSuccess && }
); }; diff --git a/web/vtadmin/src/components/routes/shard/Shard.tsx b/web/vtadmin/src/components/routes/shard/Shard.tsx index 17bd5e46876..8f713be9b13 100644 --- a/web/vtadmin/src/components/routes/shard/Shard.tsx +++ b/web/vtadmin/src/components/routes/shard/Shard.tsx @@ -30,6 +30,7 @@ import { useKeyspace } from '../../../hooks/api'; import { ShardTablets } from './ShardTablets'; import Advanced from './Advanced'; import JSONViewTree from '../../jsonViewTree/JSONViewTree'; +import { Code } from '../../Code'; interface RouteParams { clusterID: string; @@ -114,6 +115,7 @@ export const Shard = () => { + @@ -122,7 +124,8 @@ export const Shard = () => { - {shard && } + {shard && } + {shard && } diff --git a/web/vtadmin/src/components/routes/stream/Stream.tsx b/web/vtadmin/src/components/routes/stream/Stream.tsx index aae22be6ea3..6143ac3e302 100644 --- a/web/vtadmin/src/components/routes/stream/Stream.tsx +++ b/web/vtadmin/src/components/routes/stream/Stream.tsx @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Link, useParams } from 'react-router-dom'; +import { Link, Redirect, Route, Switch, useParams, useRouteMatch } from 'react-router-dom'; import { useWorkflow } from '../../../hooks/api'; import { useDocumentTitle } from '../../../hooks/useDocumentTitle'; @@ -24,6 +24,9 @@ import { WorkspaceHeader } from '../../layout/WorkspaceHeader'; import { WorkspaceTitle } from '../../layout/WorkspaceTitle'; import style from './Stream.module.scss'; import JSONViewTree from '../../jsonViewTree/JSONViewTree'; +import { TabContainer } from '../../tabs/TabContainer'; +import { Tab } from '../../tabs/Tab'; +import { Code } from '../../Code'; interface RouteParams { clusterID: string; @@ -36,6 +39,7 @@ interface RouteParams { export const Stream = () => { const params = useParams(); + const { path, url } = useRouteMatch(); const { data: workflow } = useWorkflow({ clusterID: params.clusterID, keyspace: params.keyspace, @@ -72,7 +76,17 @@ export const Stream = () => { - + + + + + + + {stream && } + {stream && } + + + ); diff --git a/web/vtadmin/src/components/routes/tablet/Tablet.tsx b/web/vtadmin/src/components/routes/tablet/Tablet.tsx index 1747db6cb9a..f4a9ca20248 100644 --- a/web/vtadmin/src/components/routes/tablet/Tablet.tsx +++ b/web/vtadmin/src/components/routes/tablet/Tablet.tsx @@ -34,6 +34,7 @@ import { TabletCharts } from './TabletCharts'; import { env } from '../../../util/env'; import FullStatus from './FullStatus'; import JSONViewTree from '../../jsonViewTree/JSONViewTree'; +import { Code } from '../../Code'; interface RouteParams { alias: string; @@ -108,6 +109,7 @@ export const Tablet = () => { + @@ -119,6 +121,16 @@ export const Tablet = () => { +
+ + + {env().VITE_ENABLE_EXPERIMENTAL_TABLET_DEBUG_VARS && ( + + )} +
+
+ +
diff --git a/web/vtadmin/src/components/routes/workflow/Workflow.tsx b/web/vtadmin/src/components/routes/workflow/Workflow.tsx index d0c63e12749..7b3f0df32a5 100644 --- a/web/vtadmin/src/components/routes/workflow/Workflow.tsx +++ b/web/vtadmin/src/components/routes/workflow/Workflow.tsx @@ -35,6 +35,7 @@ import { WorkflowVDiff } from './WorkflowVDiff'; import { Select } from '../../inputs/Select'; import { formatDateTimeShort } from '../../../util/time'; import JSONViewTree from '../../jsonViewTree/JSONViewTree'; +import { Code } from '../../Code'; interface RouteParams { clusterID: string; @@ -168,6 +169,7 @@ export const Workflow = () => { + @@ -189,6 +191,10 @@ export const Workflow = () => { + + + +