From 4b01e9ae37884598677cc40c219964016d8b7396 Mon Sep 17 00:00:00 2001 From: Sara Bee <855595+doeg@users.noreply.github.com> Date: Fri, 28 May 2021 10:37:15 -0400 Subject: [PATCH] [vtadmin-web] Move single-entity view components into subfolders Signed-off-by: Sara Bee <855595+doeg@users.noreply.github.com> --- web/vtadmin/src/components/App.tsx | 6 ++-- .../routes/{ => schema}/Schema.module.scss | 0 .../components/routes/{ => schema}/Schema.tsx | 20 ++++++------- .../routes/{ => stream}/Stream.module.scss | 0 .../components/routes/{ => stream}/Stream.tsx | 16 +++++------ .../{ => workflow}/Workflow.module.scss | 0 .../routes/{ => workflow}/Workflow.tsx | 28 +++++++++---------- 7 files changed, 35 insertions(+), 35 deletions(-) rename web/vtadmin/src/components/routes/{ => schema}/Schema.module.scss (100%) rename web/vtadmin/src/components/routes/{ => schema}/Schema.tsx (93%) rename web/vtadmin/src/components/routes/{ => stream}/Stream.module.scss (100%) rename web/vtadmin/src/components/routes/{ => stream}/Stream.tsx (84%) rename web/vtadmin/src/components/routes/{ => workflow}/Workflow.module.scss (100%) rename web/vtadmin/src/components/routes/{ => workflow}/Workflow.tsx (87%) diff --git a/web/vtadmin/src/components/App.tsx b/web/vtadmin/src/components/App.tsx index 5ff97eda7f0..553770cdaca 100644 --- a/web/vtadmin/src/components/App.tsx +++ b/web/vtadmin/src/components/App.tsx @@ -25,10 +25,10 @@ import { Clusters } from './routes/Clusters'; import { Gates } from './routes/Gates'; import { Keyspaces } from './routes/Keyspaces'; import { Schemas } from './routes/Schemas'; -import { Schema } from './routes/Schema'; -import { Stream } from './routes/Stream'; +import { Schema } from './routes/schema/Schema'; +import { Stream } from './routes/stream/Stream'; import { Workflows } from './routes/Workflows'; -import { Workflow } from './routes/Workflow'; +import { Workflow } from './routes/workflow/Workflow'; import { VTExplain } from './routes/VTExplain'; import { Keyspace } from './routes/keyspace/Keyspace'; import { Tablet } from './routes/tablet/Tablet'; diff --git a/web/vtadmin/src/components/routes/Schema.module.scss b/web/vtadmin/src/components/routes/schema/Schema.module.scss similarity index 100% rename from web/vtadmin/src/components/routes/Schema.module.scss rename to web/vtadmin/src/components/routes/schema/Schema.module.scss diff --git a/web/vtadmin/src/components/routes/Schema.tsx b/web/vtadmin/src/components/routes/schema/Schema.tsx similarity index 93% rename from web/vtadmin/src/components/routes/Schema.tsx rename to web/vtadmin/src/components/routes/schema/Schema.tsx index 2bc60f909c5..67fb3d14266 100644 --- a/web/vtadmin/src/components/routes/Schema.tsx +++ b/web/vtadmin/src/components/routes/schema/Schema.tsx @@ -17,16 +17,16 @@ import * as React from 'react'; import { Link, useParams } from 'react-router-dom'; import style from './Schema.module.scss'; -import { useSchema, useVSchema } from '../../hooks/api'; -import { Code } from '../Code'; -import { useDocumentTitle } from '../../hooks/useDocumentTitle'; -import { getVindexesForTable } from '../../util/vschemas'; -import { ContentContainer } from '../layout/ContentContainer'; -import { NavCrumbs } from '../layout/NavCrumbs'; -import { WorkspaceHeader } from '../layout/WorkspaceHeader'; -import { WorkspaceTitle } from '../layout/WorkspaceTitle'; -import { Tooltip } from '../tooltip/Tooltip'; -import { KeyspaceLink } from '../links/KeyspaceLink'; +import { useSchema, useVSchema } from '../../../hooks/api'; +import { Code } from '../../Code'; +import { useDocumentTitle } from '../../../hooks/useDocumentTitle'; +import { getVindexesForTable } from '../../../util/vschemas'; +import { ContentContainer } from '../../layout/ContentContainer'; +import { NavCrumbs } from '../../layout/NavCrumbs'; +import { WorkspaceHeader } from '../../layout/WorkspaceHeader'; +import { WorkspaceTitle } from '../../layout/WorkspaceTitle'; +import { Tooltip } from '../../tooltip/Tooltip'; +import { KeyspaceLink } from '../../links/KeyspaceLink'; interface RouteParams { clusterID: string; diff --git a/web/vtadmin/src/components/routes/Stream.module.scss b/web/vtadmin/src/components/routes/stream/Stream.module.scss similarity index 100% rename from web/vtadmin/src/components/routes/Stream.module.scss rename to web/vtadmin/src/components/routes/stream/Stream.module.scss diff --git a/web/vtadmin/src/components/routes/Stream.tsx b/web/vtadmin/src/components/routes/stream/Stream.tsx similarity index 84% rename from web/vtadmin/src/components/routes/Stream.tsx rename to web/vtadmin/src/components/routes/stream/Stream.tsx index 3c241445bf3..abe08c2582b 100644 --- a/web/vtadmin/src/components/routes/Stream.tsx +++ b/web/vtadmin/src/components/routes/stream/Stream.tsx @@ -15,14 +15,14 @@ */ import { Link, useParams } from 'react-router-dom'; -import { useWorkflow } from '../../hooks/api'; -import { useDocumentTitle } from '../../hooks/useDocumentTitle'; -import { formatStreamKey, getStreams } from '../../util/workflows'; -import { Code } from '../Code'; -import { ContentContainer } from '../layout/ContentContainer'; -import { NavCrumbs } from '../layout/NavCrumbs'; -import { WorkspaceHeader } from '../layout/WorkspaceHeader'; -import { WorkspaceTitle } from '../layout/WorkspaceTitle'; +import { useWorkflow } from '../../../hooks/api'; +import { useDocumentTitle } from '../../../hooks/useDocumentTitle'; +import { formatStreamKey, getStreams } from '../../../util/workflows'; +import { Code } from '../../Code'; +import { ContentContainer } from '../../layout/ContentContainer'; +import { NavCrumbs } from '../../layout/NavCrumbs'; +import { WorkspaceHeader } from '../../layout/WorkspaceHeader'; +import { WorkspaceTitle } from '../../layout/WorkspaceTitle'; import style from './Stream.module.scss'; interface RouteParams { diff --git a/web/vtadmin/src/components/routes/Workflow.module.scss b/web/vtadmin/src/components/routes/workflow/Workflow.module.scss similarity index 100% rename from web/vtadmin/src/components/routes/Workflow.module.scss rename to web/vtadmin/src/components/routes/workflow/Workflow.module.scss diff --git a/web/vtadmin/src/components/routes/Workflow.tsx b/web/vtadmin/src/components/routes/workflow/Workflow.tsx similarity index 87% rename from web/vtadmin/src/components/routes/Workflow.tsx rename to web/vtadmin/src/components/routes/workflow/Workflow.tsx index 8dfe6eab6a1..69b64b7fc0b 100644 --- a/web/vtadmin/src/components/routes/Workflow.tsx +++ b/web/vtadmin/src/components/routes/workflow/Workflow.tsx @@ -18,20 +18,20 @@ import { groupBy, orderBy } from 'lodash-es'; import { Link, useParams } from 'react-router-dom'; import style from './Workflow.module.scss'; -import { useWorkflow } from '../../hooks/api'; -import { formatStreamKey, getStreams, getStreamSource, getStreamTarget } from '../../util/workflows'; -import { DataCell } from '../dataTable/DataCell'; -import { DataTable } from '../dataTable/DataTable'; -import { ContentContainer } from '../layout/ContentContainer'; -import { NavCrumbs } from '../layout/NavCrumbs'; -import { WorkspaceHeader } from '../layout/WorkspaceHeader'; -import { WorkspaceTitle } from '../layout/WorkspaceTitle'; -import { StreamStatePip } from '../pips/StreamStatePip'; -import { formatAlias } from '../../util/tablets'; -import { useDocumentTitle } from '../../hooks/useDocumentTitle'; -import { formatDateTime } from '../../util/time'; -import { KeyspaceLink } from '../links/KeyspaceLink'; -import { TabletLink } from '../links/TabletLink'; +import { useWorkflow } from '../../../hooks/api'; +import { formatStreamKey, getStreams, getStreamSource, getStreamTarget } from '../../../util/workflows'; +import { DataCell } from '../../dataTable/DataCell'; +import { DataTable } from '../../dataTable/DataTable'; +import { ContentContainer } from '../../layout/ContentContainer'; +import { NavCrumbs } from '../../layout/NavCrumbs'; +import { WorkspaceHeader } from '../../layout/WorkspaceHeader'; +import { WorkspaceTitle } from '../../layout/WorkspaceTitle'; +import { StreamStatePip } from '../../pips/StreamStatePip'; +import { formatAlias } from '../../../util/tablets'; +import { useDocumentTitle } from '../../../hooks/useDocumentTitle'; +import { formatDateTime } from '../../../util/time'; +import { KeyspaceLink } from '../../links/KeyspaceLink'; +import { TabletLink } from '../../links/TabletLink'; interface RouteParams { clusterID: string;