diff --git a/.dockerignore b/.dockerignore index 7032d8f7fb..624383ab63 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,6 +7,6 @@ /.vscode !.vscode/tasks.json **/*.sw* -frontend/dist +frontend/console/dist **/.DS_Store **/target diff --git a/.gitattributes b/.gitattributes index 30471eac6c..5268ebf221 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -/frontend/src/protos/**/* linguist-generated=true +/frontend/console/src/protos/**/* linguist-generated=true go.sum linguist-generated=true go.work.sum linguist-generated=true diff --git a/.go-arch-lint.yml b/.go-arch-lint.yml index 16b0fc4452..c0ff006045 100644 --- a/.go-arch-lint.yml +++ b/.go-arch-lint.yml @@ -16,7 +16,7 @@ components: rust-runtime: { in: rust-runtime/** } runner: { in: backend/runner/** } ftl-runner-cmd: { in: cmd/ftl-runner/** } - frontend: { in: frontend/** } + frontend: { in: frontend/console/** } ftl-gen-lsp-cmd: { in: cmd/ftl-gen-lsp/** } ftl-initdb-cmd: { in: cmd/ftl-initdb/** } ftl-schema-cmd: { in: cmd/ftl-schema/** } @@ -104,4 +104,4 @@ deps: encoding: mayDependOn: - common - - internal \ No newline at end of file + - internal diff --git a/Justfile b/Justfile index 89fa06eeb4..7150092d2b 100644 --- a/Justfile +++ b/Justfile @@ -8,10 +8,11 @@ RUNNER_TEMPLATE_ZIP := "backend/controller/scaling/localscaling/template.zip" TIMESTAMP := `date +%s` SCHEMA_OUT := "backend/protos/xyz/block/ftl/v1/schema/schema.proto" ZIP_DIRS := "go-runtime/compile/build-template go-runtime/compile/external-module-template go-runtime/compile/main-work-template internal/projectinit/scaffolding go-runtime/scaffolding jvm-runtime/java/scaffolding jvm-runtime/kotlin/scaffolding" -FRONTEND_OUT := "frontend/dist/index.html" +CONSOLE_ROOT := "frontend/console" +FRONTEND_OUT := "{{CONSOLE_ROOT}}/dist/index.html" EXTENSION_OUT := "extensions/vscode/dist/extension.js" PROTOS_IN := "backend/protos/xyz/block/ftl/v1/schema/schema.proto backend/protos/xyz/block/ftl/v1/console/console.proto backend/protos/xyz/block/ftl/v1/ftl.proto backend/protos/xyz/block/ftl/v1/schema/runtime.proto" -PROTOS_OUT := "backend/protos/xyz/block/ftl/v1/console/console.pb.go backend/protos/xyz/block/ftl/v1/ftl.pb.go backend/protos/xyz/block/ftl/v1/schema/runtime.pb.go backend/protos/xyz/block/ftl/v1/schema/schema.pb.go frontend/src/protos/xyz/block/ftl/v1/console/console_pb.ts frontend/src/protos/xyz/block/ftl/v1/ftl_pb.ts frontend/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts frontend/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts" +PROTOS_OUT := "backend/protos/xyz/block/ftl/v1/console/console.pb.go backend/protos/xyz/block/ftl/v1/ftl.pb.go backend/protos/xyz/block/ftl/v1/schema/runtime.pb.go backend/protos/xyz/block/ftl/v1/schema/schema.pb.go {{CONSOLE_ROOT}}/src/protos/xyz/block/ftl/v1/console/console_pb.ts {{CONSOLE_ROOT}}/src/protos/xyz/block/ftl/v1/ftl_pb.ts {{CONSOLE_ROOT}}/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts {{CONSOLE_ROOT}}/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts" _help: @just -l @@ -83,7 +84,7 @@ build-zips: build-kt-runtime # Rebuild frontend build-frontend: pnpm-install - @mk {{FRONTEND_OUT}} : frontend/src -- "cd frontend && pnpm run build" + @mk {{FRONTEND_OUT}} : {{CONSOLE_ROOT}}/src -- "cd {{CONSOLE_ROOT}} && pnpm run build" # Rebuild VSCode extension build-extension: pnpm-install @@ -110,6 +111,10 @@ build-kt-runtime: @mkdir -p build/template/ftl && touch build/template/ftl/temp.txt @cd build/template && zip -q --symlinks -r ../../{{RUNNER_TEMPLATE_ZIP}} . +# Format console code. +format-frontend: + cd {{CONSOLE_ROOT}} && pnpm run lint:fix + # Install Node dependencies using pnpm # Retry a few times in case of network issues pnpm-install: @@ -156,14 +161,14 @@ test-scripts: scripts/tests/test-ensure-frozen-migrations.sh test-frontend: build-frontend - @cd frontend && pnpm run test + @cd {{CONSOLE_ROOT}} && pnpm run test e2e-frontend: build-frontend - @cd frontend && npx playwright install --with-deps && pnpm run e2e + @cd {{CONSOLE_ROOT}} && npx playwright install --with-deps && pnpm run e2e # Lint the frontend lint-frontend: build-frontend - @cd frontend && pnpm run lint && tsc + @cd {{CONSOLE_ROOT}} && pnpm run lint && tsc # Lint the backend lint-backend: diff --git a/backend/controller/controller.go b/backend/controller/controller.go index 592db87201..f1bc5007d7 100644 --- a/backend/controller/controller.go +++ b/backend/controller/controller.go @@ -53,7 +53,7 @@ import ( "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/frontend" + frontend "github.com/TBD54566975/ftl/frontend/console" cf "github.com/TBD54566975/ftl/internal/configuration/manager" "github.com/TBD54566975/ftl/internal/cors" "github.com/TBD54566975/ftl/internal/encryption" diff --git a/backend/protos/buf.gen.yaml b/backend/protos/buf.gen.yaml index e92c8695ea..15b176c811 100644 --- a/backend/protos/buf.gen.yaml +++ b/backend/protos/buf.gen.yaml @@ -7,8 +7,8 @@ plugins: out: . opt: paths=source_relative - plugin: es - out: ../../frontend/src/protos + out: ../../frontend/console/src/protos opt: target=ts - plugin: connect-es - out: ../../frontend/src/protos + out: ../../frontend/console/src/protos opt: target=ts diff --git a/bin/hermit.hcl b/bin/hermit.hcl index 093b81ea17..2fd9a139b6 100644 --- a/bin/hermit.hcl +++ b/bin/hermit.hcl @@ -6,6 +6,6 @@ env = { "OTEL_GRPC_PORT": "4317", "OTEL_HTTP_PORT": "4318", "OTEL_METRIC_EXPORT_INTERVAL": "5000", - "PATH": "${HERMIT_ENV}/scripts:${HERMIT_ENV}/frontend/node_modules/.bin:${HERMIT_ENV}/extensions/vscode/node_modules/.bin:${PATH}", + "PATH": "${HERMIT_ENV}/scripts:${HERMIT_ENV}/frontend/console/node_modules/.bin:${HERMIT_ENV}/extensions/vscode/node_modules/.bin:${PATH}", } sources = ["env:///bin/packages", "https://github.com/cashapp/hermit-packages.git"] diff --git a/frontend/biome.json b/frontend/console/biome.json similarity index 92% rename from frontend/biome.json rename to frontend/console/biome.json index 6e1c27b530..0fe87b11d0 100644 --- a/frontend/biome.json +++ b/frontend/console/biome.json @@ -1,5 +1,5 @@ { - "extends": ["../biome.json"], + "extends": ["../../biome.json"], "linter": { "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.js", "src/**/*.jsx", "src/**/*.cjs", "src/**/*.mjs", "tests/**/*.ts", "e2e/**/*.ts"], "ignore": ["./node_modules", "./dist", "./src/protos"] diff --git a/frontend/e2e/deployment.spec.ts b/frontend/console/e2e/deployment.spec.ts similarity index 100% rename from frontend/e2e/deployment.spec.ts rename to frontend/console/e2e/deployment.spec.ts diff --git a/frontend/e2e/deployments.spec.ts b/frontend/console/e2e/deployments.spec.ts similarity index 100% rename from frontend/e2e/deployments.spec.ts rename to frontend/console/e2e/deployments.spec.ts diff --git a/frontend/e2e/events.spec.ts b/frontend/console/e2e/events.spec.ts similarity index 100% rename from frontend/e2e/events.spec.ts rename to frontend/console/e2e/events.spec.ts diff --git a/frontend/e2e/ftl-test.ts b/frontend/console/e2e/ftl-test.ts similarity index 100% rename from frontend/e2e/ftl-test.ts rename to frontend/console/e2e/ftl-test.ts diff --git a/frontend/e2e/infrastructure.spec.ts b/frontend/console/e2e/infrastructure.spec.ts similarity index 100% rename from frontend/e2e/infrastructure.spec.ts rename to frontend/console/e2e/infrastructure.spec.ts diff --git a/frontend/e2e/verb.spec.ts b/frontend/console/e2e/verb.spec.ts similarity index 100% rename from frontend/e2e/verb.spec.ts rename to frontend/console/e2e/verb.spec.ts diff --git a/frontend/favicon.ico b/frontend/console/favicon.ico similarity index 100% rename from frontend/favicon.ico rename to frontend/console/favicon.ico diff --git a/frontend/index.html b/frontend/console/index.html similarity index 100% rename from frontend/index.html rename to frontend/console/index.html diff --git a/frontend/local.go b/frontend/console/local.go similarity index 96% rename from frontend/local.go rename to frontend/console/local.go index 3852c652cf..daa5b8ba5a 100644 --- a/frontend/local.go +++ b/frontend/console/local.go @@ -1,6 +1,6 @@ //go:build !release -package frontend +package console import ( "context" @@ -46,7 +46,7 @@ func Server(ctx context.Context, timestamp time.Time, publicURL *url.URL, allowO return nil, err } - err = exec.Command(ctx, log.Debug, path.Join(gitRoot, "frontend"), "pnpm", "run", "dev").Start() + err = exec.Command(ctx, log.Debug, path.Join(gitRoot, "frontend", "console"), "pnpm", "run", "dev").Start() if err != nil { return nil, err } diff --git a/frontend/package.json b/frontend/console/package.json similarity index 100% rename from frontend/package.json rename to frontend/console/package.json diff --git a/frontend/playwright.config.ts b/frontend/console/playwright.config.ts similarity index 100% rename from frontend/playwright.config.ts rename to frontend/console/playwright.config.ts diff --git a/frontend/release.go b/frontend/console/release.go similarity index 98% rename from frontend/release.go rename to frontend/console/release.go index 913119ab0a..782cbb12dd 100644 --- a/frontend/release.go +++ b/frontend/console/release.go @@ -1,6 +1,6 @@ //go:build release -package frontend +package console import ( "context" diff --git a/frontend/src/App.tsx b/frontend/console/src/App.tsx similarity index 100% rename from frontend/src/App.tsx rename to frontend/console/src/App.tsx diff --git a/frontend/src/api/modules/use-modules.ts b/frontend/console/src/api/modules/use-modules.ts similarity index 100% rename from frontend/src/api/modules/use-modules.ts rename to frontend/console/src/api/modules/use-modules.ts diff --git a/frontend/src/api/schema/use-schema.ts b/frontend/console/src/api/schema/use-schema.ts similarity index 100% rename from frontend/src/api/schema/use-schema.ts rename to frontend/console/src/api/schema/use-schema.ts diff --git a/frontend/src/api/status/use-status.ts b/frontend/console/src/api/status/use-status.ts similarity index 100% rename from frontend/src/api/status/use-status.ts rename to frontend/console/src/api/status/use-status.ts diff --git a/frontend/src/api/timeline/index.ts b/frontend/console/src/api/timeline/index.ts similarity index 100% rename from frontend/src/api/timeline/index.ts rename to frontend/console/src/api/timeline/index.ts diff --git a/frontend/src/api/timeline/stream-verb-calls.ts b/frontend/console/src/api/timeline/stream-verb-calls.ts similarity index 100% rename from frontend/src/api/timeline/stream-verb-calls.ts rename to frontend/console/src/api/timeline/stream-verb-calls.ts diff --git a/frontend/src/api/timeline/timeline-filters.ts b/frontend/console/src/api/timeline/timeline-filters.ts similarity index 100% rename from frontend/src/api/timeline/timeline-filters.ts rename to frontend/console/src/api/timeline/timeline-filters.ts diff --git a/frontend/src/api/timeline/use-request-calls.ts b/frontend/console/src/api/timeline/use-request-calls.ts similarity index 100% rename from frontend/src/api/timeline/use-request-calls.ts rename to frontend/console/src/api/timeline/use-request-calls.ts diff --git a/frontend/src/api/timeline/use-timeline-calls.ts b/frontend/console/src/api/timeline/use-timeline-calls.ts similarity index 100% rename from frontend/src/api/timeline/use-timeline-calls.ts rename to frontend/console/src/api/timeline/use-timeline-calls.ts diff --git a/frontend/src/api/timeline/use-timeline.ts b/frontend/console/src/api/timeline/use-timeline.ts similarity index 100% rename from frontend/src/api/timeline/use-timeline.ts rename to frontend/console/src/api/timeline/use-timeline.ts diff --git a/frontend/src/assets/react.svg b/frontend/console/src/assets/react.svg similarity index 100% rename from frontend/src/assets/react.svg rename to frontend/console/src/assets/react.svg diff --git a/frontend/src/components/AttributeBadge.test.tsx b/frontend/console/src/components/AttributeBadge.test.tsx similarity index 100% rename from frontend/src/components/AttributeBadge.test.tsx rename to frontend/console/src/components/AttributeBadge.test.tsx diff --git a/frontend/src/components/AttributeBadge.tsx b/frontend/console/src/components/AttributeBadge.tsx similarity index 100% rename from frontend/src/components/AttributeBadge.tsx rename to frontend/console/src/components/AttributeBadge.tsx diff --git a/frontend/src/components/Badge.tsx b/frontend/console/src/components/Badge.tsx similarity index 100% rename from frontend/src/components/Badge.tsx rename to frontend/console/src/components/Badge.tsx diff --git a/frontend/src/components/Card.tsx b/frontend/console/src/components/Card.tsx similarity index 100% rename from frontend/src/components/Card.tsx rename to frontend/console/src/components/Card.tsx diff --git a/frontend/src/components/Chip.tsx b/frontend/console/src/components/Chip.tsx similarity index 100% rename from frontend/src/components/Chip.tsx rename to frontend/console/src/components/Chip.tsx diff --git a/frontend/src/components/CloseButton.tsx b/frontend/console/src/components/CloseButton.tsx similarity index 100% rename from frontend/src/components/CloseButton.tsx rename to frontend/console/src/components/CloseButton.tsx diff --git a/frontend/src/components/CodeBlock.tsx b/frontend/console/src/components/CodeBlock.tsx similarity index 100% rename from frontend/src/components/CodeBlock.tsx rename to frontend/console/src/components/CodeBlock.tsx diff --git a/frontend/src/components/CodeEditor.tsx b/frontend/console/src/components/CodeEditor.tsx similarity index 100% rename from frontend/src/components/CodeEditor.tsx rename to frontend/console/src/components/CodeEditor.tsx diff --git a/frontend/src/components/CodeEditorV2.tsx b/frontend/console/src/components/CodeEditorV2.tsx similarity index 100% rename from frontend/src/components/CodeEditorV2.tsx rename to frontend/console/src/components/CodeEditorV2.tsx diff --git a/frontend/src/components/DarkModeSwitch.tsx b/frontend/console/src/components/DarkModeSwitch.tsx similarity index 100% rename from frontend/src/components/DarkModeSwitch.tsx rename to frontend/console/src/components/DarkModeSwitch.tsx diff --git a/frontend/src/components/Loader.tsx b/frontend/console/src/components/Loader.tsx similarity index 100% rename from frontend/src/components/Loader.tsx rename to frontend/console/src/components/Loader.tsx diff --git a/frontend/src/components/Pill.tsx b/frontend/console/src/components/Pill.tsx similarity index 100% rename from frontend/src/components/Pill.tsx rename to frontend/console/src/components/Pill.tsx diff --git a/frontend/src/components/ResizableHorizontalPanels.tsx b/frontend/console/src/components/ResizableHorizontalPanels.tsx similarity index 100% rename from frontend/src/components/ResizableHorizontalPanels.tsx rename to frontend/console/src/components/ResizableHorizontalPanels.tsx diff --git a/frontend/src/components/ResizablePanels.tsx b/frontend/console/src/components/ResizablePanels.tsx similarity index 100% rename from frontend/src/components/ResizablePanels.tsx rename to frontend/console/src/components/ResizablePanels.tsx diff --git a/frontend/src/components/ResizableVerticalPanels.tsx b/frontend/console/src/components/ResizableVerticalPanels.tsx similarity index 100% rename from frontend/src/components/ResizableVerticalPanels.tsx rename to frontend/console/src/components/ResizableVerticalPanels.tsx diff --git a/frontend/src/components/RightPanelAttribute.tsx b/frontend/console/src/components/RightPanelAttribute.tsx similarity index 100% rename from frontend/src/components/RightPanelAttribute.tsx rename to frontend/console/src/components/RightPanelAttribute.tsx diff --git a/frontend/src/components/Tabs.tsx b/frontend/console/src/components/Tabs.tsx similarity index 100% rename from frontend/src/components/Tabs.tsx rename to frontend/console/src/components/Tabs.tsx diff --git a/frontend/src/components/index.ts b/frontend/console/src/components/index.ts similarity index 100% rename from frontend/src/components/index.ts rename to frontend/console/src/components/index.ts diff --git a/frontend/src/features/calls/CallList.tsx b/frontend/console/src/features/calls/CallList.tsx similarity index 100% rename from frontend/src/features/calls/CallList.tsx rename to frontend/console/src/features/calls/CallList.tsx diff --git a/frontend/src/features/console/BottomPanel.tsx b/frontend/console/src/features/console/BottomPanel.tsx similarity index 100% rename from frontend/src/features/console/BottomPanel.tsx rename to frontend/console/src/features/console/BottomPanel.tsx diff --git a/frontend/src/features/console/ConsolePage.tsx b/frontend/console/src/features/console/ConsolePage.tsx similarity index 100% rename from frontend/src/features/console/ConsolePage.tsx rename to frontend/console/src/features/console/ConsolePage.tsx diff --git a/frontend/src/features/console/ExpandablePanel.tsx b/frontend/console/src/features/console/ExpandablePanel.tsx similarity index 100% rename from frontend/src/features/console/ExpandablePanel.tsx rename to frontend/console/src/features/console/ExpandablePanel.tsx diff --git a/frontend/src/features/console/right-panel/ConfigPanels.tsx b/frontend/console/src/features/console/right-panel/ConfigPanels.tsx similarity index 100% rename from frontend/src/features/console/right-panel/ConfigPanels.tsx rename to frontend/console/src/features/console/right-panel/ConfigPanels.tsx diff --git a/frontend/src/features/console/right-panel/ModulePanels.tsx b/frontend/console/src/features/console/right-panel/ModulePanels.tsx similarity index 100% rename from frontend/src/features/console/right-panel/ModulePanels.tsx rename to frontend/console/src/features/console/right-panel/ModulePanels.tsx diff --git a/frontend/src/features/console/right-panel/RightPanel.tsx b/frontend/console/src/features/console/right-panel/RightPanel.tsx similarity index 100% rename from frontend/src/features/console/right-panel/RightPanel.tsx rename to frontend/console/src/features/console/right-panel/RightPanel.tsx diff --git a/frontend/src/features/console/right-panel/RightPanelHeader.tsx b/frontend/console/src/features/console/right-panel/RightPanelHeader.tsx similarity index 100% rename from frontend/src/features/console/right-panel/RightPanelHeader.tsx rename to frontend/console/src/features/console/right-panel/RightPanelHeader.tsx diff --git a/frontend/src/features/console/right-panel/SecretPanels.tsx b/frontend/console/src/features/console/right-panel/SecretPanels.tsx similarity index 100% rename from frontend/src/features/console/right-panel/SecretPanels.tsx rename to frontend/console/src/features/console/right-panel/SecretPanels.tsx diff --git a/frontend/src/features/console/right-panel/VerbPanels.tsx b/frontend/console/src/features/console/right-panel/VerbPanels.tsx similarity index 100% rename from frontend/src/features/console/right-panel/VerbPanels.tsx rename to frontend/console/src/features/console/right-panel/VerbPanels.tsx diff --git a/frontend/src/features/deployments/DeploymentCard.tsx b/frontend/console/src/features/deployments/DeploymentCard.tsx similarity index 100% rename from frontend/src/features/deployments/DeploymentCard.tsx rename to frontend/console/src/features/deployments/DeploymentCard.tsx diff --git a/frontend/src/features/deployments/DeploymentPage.tsx b/frontend/console/src/features/deployments/DeploymentPage.tsx similarity index 100% rename from frontend/src/features/deployments/DeploymentPage.tsx rename to frontend/console/src/features/deployments/DeploymentPage.tsx diff --git a/frontend/src/features/deployments/DeploymentsPage.tsx b/frontend/console/src/features/deployments/DeploymentsPage.tsx similarity index 100% rename from frontend/src/features/deployments/DeploymentsPage.tsx rename to frontend/console/src/features/deployments/DeploymentsPage.tsx diff --git a/frontend/src/features/deployments/deployment.utils.ts b/frontend/console/src/features/deployments/deployment.utils.ts similarity index 100% rename from frontend/src/features/deployments/deployment.utils.ts rename to frontend/console/src/features/deployments/deployment.utils.ts diff --git a/frontend/src/features/graph/ConfigNode.tsx b/frontend/console/src/features/graph/ConfigNode.tsx similarity index 100% rename from frontend/src/features/graph/ConfigNode.tsx rename to frontend/console/src/features/graph/ConfigNode.tsx diff --git a/frontend/src/features/graph/GraphPane.tsx b/frontend/console/src/features/graph/GraphPane.tsx similarity index 100% rename from frontend/src/features/graph/GraphPane.tsx rename to frontend/console/src/features/graph/GraphPane.tsx diff --git a/frontend/src/features/graph/GroupNode.tsx b/frontend/console/src/features/graph/GroupNode.tsx similarity index 100% rename from frontend/src/features/graph/GroupNode.tsx rename to frontend/console/src/features/graph/GroupNode.tsx diff --git a/frontend/src/features/graph/SecretNode.tsx b/frontend/console/src/features/graph/SecretNode.tsx similarity index 100% rename from frontend/src/features/graph/SecretNode.tsx rename to frontend/console/src/features/graph/SecretNode.tsx diff --git a/frontend/src/features/graph/VerbNode.tsx b/frontend/console/src/features/graph/VerbNode.tsx similarity index 100% rename from frontend/src/features/graph/VerbNode.tsx rename to frontend/console/src/features/graph/VerbNode.tsx diff --git a/frontend/src/features/graph/create-layout.ts b/frontend/console/src/features/graph/create-layout.ts similarity index 100% rename from frontend/src/features/graph/create-layout.ts rename to frontend/console/src/features/graph/create-layout.ts diff --git a/frontend/src/features/infrastructure/ControllersList.tsx b/frontend/console/src/features/infrastructure/ControllersList.tsx similarity index 100% rename from frontend/src/features/infrastructure/ControllersList.tsx rename to frontend/console/src/features/infrastructure/ControllersList.tsx diff --git a/frontend/src/features/infrastructure/DeploymentsList.tsx b/frontend/console/src/features/infrastructure/DeploymentsList.tsx similarity index 100% rename from frontend/src/features/infrastructure/DeploymentsList.tsx rename to frontend/console/src/features/infrastructure/DeploymentsList.tsx diff --git a/frontend/src/features/infrastructure/InfrastructurePage.tsx b/frontend/console/src/features/infrastructure/InfrastructurePage.tsx similarity index 100% rename from frontend/src/features/infrastructure/InfrastructurePage.tsx rename to frontend/console/src/features/infrastructure/InfrastructurePage.tsx diff --git a/frontend/src/features/infrastructure/RoutesList.tsx b/frontend/console/src/features/infrastructure/RoutesList.tsx similarity index 100% rename from frontend/src/features/infrastructure/RoutesList.tsx rename to frontend/console/src/features/infrastructure/RoutesList.tsx diff --git a/frontend/src/features/infrastructure/RunnersList.tsx b/frontend/console/src/features/infrastructure/RunnersList.tsx similarity index 100% rename from frontend/src/features/infrastructure/RunnersList.tsx rename to frontend/console/src/features/infrastructure/RunnersList.tsx diff --git a/frontend/src/features/logs/LogLevelBadge.tsx b/frontend/console/src/features/logs/LogLevelBadge.tsx similarity index 100% rename from frontend/src/features/logs/LogLevelBadge.tsx rename to frontend/console/src/features/logs/LogLevelBadge.tsx diff --git a/frontend/src/features/logs/LogLevelBadgeSmall.tsx b/frontend/console/src/features/logs/LogLevelBadgeSmall.tsx similarity index 100% rename from frontend/src/features/logs/LogLevelBadgeSmall.tsx rename to frontend/console/src/features/logs/LogLevelBadgeSmall.tsx diff --git a/frontend/src/features/logs/log.utils.tsx b/frontend/console/src/features/logs/log.utils.tsx similarity index 100% rename from frontend/src/features/logs/log.utils.tsx rename to frontend/console/src/features/logs/log.utils.tsx diff --git a/frontend/src/features/map/Map.tsx b/frontend/console/src/features/map/Map.tsx similarity index 100% rename from frontend/src/features/map/Map.tsx rename to frontend/console/src/features/map/Map.tsx diff --git a/frontend/src/features/modules/ModulePanel.tsx b/frontend/console/src/features/modules/ModulePanel.tsx similarity index 100% rename from frontend/src/features/modules/ModulePanel.tsx rename to frontend/console/src/features/modules/ModulePanel.tsx diff --git a/frontend/src/features/modules/ModulesPage.tsx b/frontend/console/src/features/modules/ModulesPage.tsx similarity index 100% rename from frontend/src/features/modules/ModulesPage.tsx rename to frontend/console/src/features/modules/ModulesPage.tsx diff --git a/frontend/src/features/modules/ModulesTree.tsx b/frontend/console/src/features/modules/ModulesTree.tsx similarity index 100% rename from frontend/src/features/modules/ModulesTree.tsx rename to frontend/console/src/features/modules/ModulesTree.tsx diff --git a/frontend/src/features/modules/decls/DataPanel.tsx b/frontend/console/src/features/modules/decls/DataPanel.tsx similarity index 100% rename from frontend/src/features/modules/decls/DataPanel.tsx rename to frontend/console/src/features/modules/decls/DataPanel.tsx diff --git a/frontend/src/features/modules/decls/DeclPanel.tsx b/frontend/console/src/features/modules/decls/DeclPanel.tsx similarity index 100% rename from frontend/src/features/modules/decls/DeclPanel.tsx rename to frontend/console/src/features/modules/decls/DeclPanel.tsx diff --git a/frontend/src/features/modules/decls/VerbPanel.tsx b/frontend/console/src/features/modules/decls/VerbPanel.tsx similarity index 100% rename from frontend/src/features/modules/decls/VerbPanel.tsx rename to frontend/console/src/features/modules/decls/VerbPanel.tsx diff --git a/frontend/src/features/modules/decls/VerbRequestEditor.tsx b/frontend/console/src/features/modules/decls/VerbRequestEditor.tsx similarity index 100% rename from frontend/src/features/modules/decls/VerbRequestEditor.tsx rename to frontend/console/src/features/modules/decls/VerbRequestEditor.tsx diff --git a/frontend/src/features/modules/module.utils.ts b/frontend/console/src/features/modules/module.utils.ts similarity index 100% rename from frontend/src/features/modules/module.utils.ts rename to frontend/console/src/features/modules/module.utils.ts diff --git a/frontend/src/features/requests/RequestGraph.tsx b/frontend/console/src/features/requests/RequestGraph.tsx similarity index 100% rename from frontend/src/features/requests/RequestGraph.tsx rename to frontend/console/src/features/requests/RequestGraph.tsx diff --git a/frontend/src/features/timeline/Timeline.tsx b/frontend/console/src/features/timeline/Timeline.tsx similarity index 100% rename from frontend/src/features/timeline/Timeline.tsx rename to frontend/console/src/features/timeline/Timeline.tsx diff --git a/frontend/src/features/timeline/TimelineCall.tsx b/frontend/console/src/features/timeline/TimelineCall.tsx similarity index 100% rename from frontend/src/features/timeline/TimelineCall.tsx rename to frontend/console/src/features/timeline/TimelineCall.tsx diff --git a/frontend/src/features/timeline/TimelineDeploymentCreated.tsx b/frontend/console/src/features/timeline/TimelineDeploymentCreated.tsx similarity index 100% rename from frontend/src/features/timeline/TimelineDeploymentCreated.tsx rename to frontend/console/src/features/timeline/TimelineDeploymentCreated.tsx diff --git a/frontend/src/features/timeline/TimelineDeploymentUpdated.tsx b/frontend/console/src/features/timeline/TimelineDeploymentUpdated.tsx similarity index 100% rename from frontend/src/features/timeline/TimelineDeploymentUpdated.tsx rename to frontend/console/src/features/timeline/TimelineDeploymentUpdated.tsx diff --git a/frontend/src/features/timeline/TimelineIcon.tsx b/frontend/console/src/features/timeline/TimelineIcon.tsx similarity index 100% rename from frontend/src/features/timeline/TimelineIcon.tsx rename to frontend/console/src/features/timeline/TimelineIcon.tsx diff --git a/frontend/src/features/timeline/TimelineLog.tsx b/frontend/console/src/features/timeline/TimelineLog.tsx similarity index 100% rename from frontend/src/features/timeline/TimelineLog.tsx rename to frontend/console/src/features/timeline/TimelineLog.tsx diff --git a/frontend/src/features/timeline/TimelinePage.tsx b/frontend/console/src/features/timeline/TimelinePage.tsx similarity index 100% rename from frontend/src/features/timeline/TimelinePage.tsx rename to frontend/console/src/features/timeline/TimelinePage.tsx diff --git a/frontend/src/features/timeline/details/TimelineCallDetails.tsx b/frontend/console/src/features/timeline/details/TimelineCallDetails.tsx similarity index 100% rename from frontend/src/features/timeline/details/TimelineCallDetails.tsx rename to frontend/console/src/features/timeline/details/TimelineCallDetails.tsx diff --git a/frontend/src/features/timeline/details/TimelineDeploymentCreatedDetails.tsx b/frontend/console/src/features/timeline/details/TimelineDeploymentCreatedDetails.tsx similarity index 100% rename from frontend/src/features/timeline/details/TimelineDeploymentCreatedDetails.tsx rename to frontend/console/src/features/timeline/details/TimelineDeploymentCreatedDetails.tsx diff --git a/frontend/src/features/timeline/details/TimelineDeploymentUpdatedDetails.tsx b/frontend/console/src/features/timeline/details/TimelineDeploymentUpdatedDetails.tsx similarity index 100% rename from frontend/src/features/timeline/details/TimelineDeploymentUpdatedDetails.tsx rename to frontend/console/src/features/timeline/details/TimelineDeploymentUpdatedDetails.tsx diff --git a/frontend/src/features/timeline/details/TimelineLogDetails.tsx b/frontend/console/src/features/timeline/details/TimelineLogDetails.tsx similarity index 100% rename from frontend/src/features/timeline/details/TimelineLogDetails.tsx rename to frontend/console/src/features/timeline/details/TimelineLogDetails.tsx diff --git a/frontend/src/features/timeline/details/TimelineTimestamp.tsx b/frontend/console/src/features/timeline/details/TimelineTimestamp.tsx similarity index 100% rename from frontend/src/features/timeline/details/TimelineTimestamp.tsx rename to frontend/console/src/features/timeline/details/TimelineTimestamp.tsx diff --git a/frontend/src/features/timeline/filters/FilterPanelSection.tsx b/frontend/console/src/features/timeline/filters/FilterPanelSection.tsx similarity index 100% rename from frontend/src/features/timeline/filters/FilterPanelSection.tsx rename to frontend/console/src/features/timeline/filters/FilterPanelSection.tsx diff --git a/frontend/src/features/timeline/filters/LogLevelsFilter.tsx b/frontend/console/src/features/timeline/filters/LogLevelsFilter.tsx similarity index 100% rename from frontend/src/features/timeline/filters/LogLevelsFilter.tsx rename to frontend/console/src/features/timeline/filters/LogLevelsFilter.tsx diff --git a/frontend/src/features/timeline/filters/TimeFilter.tsx b/frontend/console/src/features/timeline/filters/TimeFilter.tsx similarity index 100% rename from frontend/src/features/timeline/filters/TimeFilter.tsx rename to frontend/console/src/features/timeline/filters/TimeFilter.tsx diff --git a/frontend/src/features/timeline/filters/TimelineFilterPanel.tsx b/frontend/console/src/features/timeline/filters/TimelineFilterPanel.tsx similarity index 100% rename from frontend/src/features/timeline/filters/TimelineFilterPanel.tsx rename to frontend/console/src/features/timeline/filters/TimelineFilterPanel.tsx diff --git a/frontend/src/features/timeline/filters/TimelineTimeControls.tsx b/frontend/console/src/features/timeline/filters/TimelineTimeControls.tsx similarity index 100% rename from frontend/src/features/timeline/filters/TimelineTimeControls.tsx rename to frontend/console/src/features/timeline/filters/TimelineTimeControls.tsx diff --git a/frontend/src/features/verbs/VerbFormInput.tsx b/frontend/console/src/features/verbs/VerbFormInput.tsx similarity index 100% rename from frontend/src/features/verbs/VerbFormInput.tsx rename to frontend/console/src/features/verbs/VerbFormInput.tsx diff --git a/frontend/src/features/verbs/VerbPage.tsx b/frontend/console/src/features/verbs/VerbPage.tsx similarity index 100% rename from frontend/src/features/verbs/VerbPage.tsx rename to frontend/console/src/features/verbs/VerbPage.tsx diff --git a/frontend/src/features/verbs/VerbRequestForm.tsx b/frontend/console/src/features/verbs/VerbRequestForm.tsx similarity index 100% rename from frontend/src/features/verbs/VerbRequestForm.tsx rename to frontend/console/src/features/verbs/VerbRequestForm.tsx diff --git a/frontend/src/features/verbs/VerbRightPanel.tsx b/frontend/console/src/features/verbs/VerbRightPanel.tsx similarity index 100% rename from frontend/src/features/verbs/VerbRightPanel.tsx rename to frontend/console/src/features/verbs/VerbRightPanel.tsx diff --git a/frontend/src/features/verbs/verb.utils.ts b/frontend/console/src/features/verbs/verb.utils.ts similarity index 100% rename from frontend/src/features/verbs/verb.utils.ts rename to frontend/console/src/features/verbs/verb.utils.ts diff --git a/frontend/src/hooks/use-client.ts b/frontend/console/src/hooks/use-client.ts similarity index 100% rename from frontend/src/hooks/use-client.ts rename to frontend/console/src/hooks/use-client.ts diff --git a/frontend/src/hooks/use-local-storage.ts b/frontend/console/src/hooks/use-local-storage.ts similarity index 100% rename from frontend/src/hooks/use-local-storage.ts rename to frontend/console/src/hooks/use-local-storage.ts diff --git a/frontend/src/hooks/use-visibility.ts b/frontend/console/src/hooks/use-visibility.ts similarity index 100% rename from frontend/src/hooks/use-visibility.ts rename to frontend/console/src/hooks/use-visibility.ts diff --git a/frontend/src/index.css b/frontend/console/src/index.css similarity index 100% rename from frontend/src/index.css rename to frontend/console/src/index.css diff --git a/frontend/src/index.css.d.ts b/frontend/console/src/index.css.d.ts similarity index 100% rename from frontend/src/index.css.d.ts rename to frontend/console/src/index.css.d.ts diff --git a/frontend/src/layout/Layout.tsx b/frontend/console/src/layout/Layout.tsx similarity index 100% rename from frontend/src/layout/Layout.tsx rename to frontend/console/src/layout/Layout.tsx diff --git a/frontend/src/layout/NotFoundPage.tsx b/frontend/console/src/layout/NotFoundPage.tsx similarity index 100% rename from frontend/src/layout/NotFoundPage.tsx rename to frontend/console/src/layout/NotFoundPage.tsx diff --git a/frontend/src/layout/Notification.tsx b/frontend/console/src/layout/Notification.tsx similarity index 100% rename from frontend/src/layout/Notification.tsx rename to frontend/console/src/layout/Notification.tsx diff --git a/frontend/src/layout/Page.tsx b/frontend/console/src/layout/Page.tsx similarity index 100% rename from frontend/src/layout/Page.tsx rename to frontend/console/src/layout/Page.tsx diff --git a/frontend/src/layout/SidePanel.tsx b/frontend/console/src/layout/SidePanel.tsx similarity index 100% rename from frontend/src/layout/SidePanel.tsx rename to frontend/console/src/layout/SidePanel.tsx diff --git a/frontend/src/layout/index.ts b/frontend/console/src/layout/index.ts similarity index 100% rename from frontend/src/layout/index.ts rename to frontend/console/src/layout/index.ts diff --git a/frontend/src/layout/navigation/Navigation.tsx b/frontend/console/src/layout/navigation/Navigation.tsx similarity index 100% rename from frontend/src/layout/navigation/Navigation.tsx rename to frontend/console/src/layout/navigation/Navigation.tsx diff --git a/frontend/src/layout/navigation/Version.tsx b/frontend/console/src/layout/navigation/Version.tsx similarity index 100% rename from frontend/src/layout/navigation/Version.tsx rename to frontend/console/src/layout/navigation/Version.tsx diff --git a/frontend/src/main.tsx b/frontend/console/src/main.tsx similarity index 100% rename from frontend/src/main.tsx rename to frontend/console/src/main.tsx diff --git a/frontend/src/protos/xyz/block/ftl/v1/console/console_connect.ts b/frontend/console/src/protos/xyz/block/ftl/v1/console/console_connect.ts similarity index 100% rename from frontend/src/protos/xyz/block/ftl/v1/console/console_connect.ts rename to frontend/console/src/protos/xyz/block/ftl/v1/console/console_connect.ts diff --git a/frontend/src/protos/xyz/block/ftl/v1/console/console_pb.ts b/frontend/console/src/protos/xyz/block/ftl/v1/console/console_pb.ts similarity index 100% rename from frontend/src/protos/xyz/block/ftl/v1/console/console_pb.ts rename to frontend/console/src/protos/xyz/block/ftl/v1/console/console_pb.ts diff --git a/frontend/src/protos/xyz/block/ftl/v1/ftl_connect.ts b/frontend/console/src/protos/xyz/block/ftl/v1/ftl_connect.ts similarity index 100% rename from frontend/src/protos/xyz/block/ftl/v1/ftl_connect.ts rename to frontend/console/src/protos/xyz/block/ftl/v1/ftl_connect.ts diff --git a/frontend/src/protos/xyz/block/ftl/v1/ftl_pb.ts b/frontend/console/src/protos/xyz/block/ftl/v1/ftl_pb.ts similarity index 100% rename from frontend/src/protos/xyz/block/ftl/v1/ftl_pb.ts rename to frontend/console/src/protos/xyz/block/ftl/v1/ftl_pb.ts diff --git a/frontend/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts b/frontend/console/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts similarity index 100% rename from frontend/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts rename to frontend/console/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts diff --git a/frontend/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts b/frontend/console/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts similarity index 100% rename from frontend/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts rename to frontend/console/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts diff --git a/frontend/src/providers/app-providers.tsx b/frontend/console/src/providers/app-providers.tsx similarity index 100% rename from frontend/src/providers/app-providers.tsx rename to frontend/console/src/providers/app-providers.tsx diff --git a/frontend/src/providers/notifications-provider.tsx b/frontend/console/src/providers/notifications-provider.tsx similarity index 100% rename from frontend/src/providers/notifications-provider.tsx rename to frontend/console/src/providers/notifications-provider.tsx diff --git a/frontend/src/providers/react-query-provider.tsx b/frontend/console/src/providers/react-query-provider.tsx similarity index 100% rename from frontend/src/providers/react-query-provider.tsx rename to frontend/console/src/providers/react-query-provider.tsx diff --git a/frontend/src/providers/routing-provider.tsx b/frontend/console/src/providers/routing-provider.tsx similarity index 100% rename from frontend/src/providers/routing-provider.tsx rename to frontend/console/src/providers/routing-provider.tsx diff --git a/frontend/src/providers/side-panel-provider.tsx b/frontend/console/src/providers/side-panel-provider.tsx similarity index 100% rename from frontend/src/providers/side-panel-provider.tsx rename to frontend/console/src/providers/side-panel-provider.tsx diff --git a/frontend/src/providers/user-preferences-provider.tsx b/frontend/console/src/providers/user-preferences-provider.tsx similarity index 100% rename from frontend/src/providers/user-preferences-provider.tsx rename to frontend/console/src/providers/user-preferences-provider.tsx diff --git a/frontend/src/setupTests.ts b/frontend/console/src/setupTests.ts similarity index 100% rename from frontend/src/setupTests.ts rename to frontend/console/src/setupTests.ts diff --git a/frontend/src/stories/AttributeBadge.stories.ts b/frontend/console/src/stories/AttributeBadge.stories.ts similarity index 100% rename from frontend/src/stories/AttributeBadge.stories.ts rename to frontend/console/src/stories/AttributeBadge.stories.ts diff --git a/frontend/src/stories/Badge.stories.ts b/frontend/console/src/stories/Badge.stories.ts similarity index 100% rename from frontend/src/stories/Badge.stories.ts rename to frontend/console/src/stories/Badge.stories.ts diff --git a/frontend/src/stories/Chip.stories.ts b/frontend/console/src/stories/Chip.stories.ts similarity index 100% rename from frontend/src/stories/Chip.stories.ts rename to frontend/console/src/stories/Chip.stories.ts diff --git a/frontend/src/stories/Pill.stories.ts b/frontend/console/src/stories/Pill.stories.ts similarity index 100% rename from frontend/src/stories/Pill.stories.ts rename to frontend/console/src/stories/Pill.stories.ts diff --git a/frontend/src/stories/Tabs.stories.ts b/frontend/console/src/stories/Tabs.stories.ts similarity index 100% rename from frontend/src/stories/Tabs.stories.ts rename to frontend/console/src/stories/Tabs.stories.ts diff --git a/frontend/src/stories/Welcome.mdx b/frontend/console/src/stories/Welcome.mdx similarity index 100% rename from frontend/src/stories/Welcome.mdx rename to frontend/console/src/stories/Welcome.mdx diff --git a/frontend/src/utils/date.utils.ts b/frontend/console/src/utils/date.utils.ts similarity index 100% rename from frontend/src/utils/date.utils.ts rename to frontend/console/src/utils/date.utils.ts diff --git a/frontend/src/utils/index.ts b/frontend/console/src/utils/index.ts similarity index 100% rename from frontend/src/utils/index.ts rename to frontend/console/src/utils/index.ts diff --git a/frontend/src/utils/react.utils.ts b/frontend/console/src/utils/react.utils.ts similarity index 100% rename from frontend/src/utils/react.utils.ts rename to frontend/console/src/utils/react.utils.ts diff --git a/frontend/src/utils/style.utils.ts b/frontend/console/src/utils/style.utils.ts similarity index 100% rename from frontend/src/utils/style.utils.ts rename to frontend/console/src/utils/style.utils.ts diff --git a/frontend/tailwind.config.js b/frontend/console/tailwind.config.js similarity index 100% rename from frontend/tailwind.config.js rename to frontend/console/tailwind.config.js diff --git a/frontend/tsconfig.json b/frontend/console/tsconfig.json similarity index 100% rename from frontend/tsconfig.json rename to frontend/console/tsconfig.json diff --git a/frontend/vite.config.ts b/frontend/console/vite.config.ts similarity index 100% rename from frontend/vite.config.ts rename to frontend/console/vite.config.ts diff --git a/frontend/vitest.config.ts b/frontend/console/vitest.config.ts similarity index 100% rename from frontend/vitest.config.ts rename to frontend/console/vitest.config.ts diff --git a/lefthook.yml b/lefthook.yml index 70194ed311..2457af9efb 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -9,10 +9,10 @@ pre-push: lint-backend: run: just lint-backend build-frontend: - root: frontend/ + root: frontend/console/ run: just build-frontend lint-frontend: - root: frontend/ + root: frontend/console/ run: just lint-frontend ensure-frozen-migrations: run: just ensure-frozen-migrations diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 40dc51293f..66e83a6afd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,7 +55,7 @@ importers: specifier: ^5.1.4 version: 5.1.4(webpack@5.94.0) - frontend: + frontend/console: dependencies: '@bufbuild/protobuf': specifier: ^1.1.0 @@ -11304,7 +11304,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 20.16.2 + '@types/node': 22.5.1 merge-stream: 2.0.0 supports-color: 8.1.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 25869eaf86..fe7847d7eb 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,3 @@ packages: - - 'frontend' - - 'extensions/vscode' + - "frontend/console" + - "extensions/vscode" diff --git a/renovate.json5 b/renovate.json5 index f3c4bd7a2b..bf3ecad1cb 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -44,11 +44,11 @@ { matchPackageNames: [ "@bufbuild/protobuf", // We can't update this until we update buf - "codemirror", + "codemirror", "codemirror-json-schema", ], enabled: false, - matchFileNames: ["frontend/**", "extensions/**"], + matchFileNames: ["frontend/console/**", "extensions/**"], }, { matchPackageNames: ["connectrpc.com/connect"], diff --git a/scripts/autofmt b/scripts/autofmt index 231c580eea..de66eeab7d 100755 --- a/scripts/autofmt +++ b/scripts/autofmt @@ -27,6 +27,6 @@ just pnpm-install (cd backend/protos && buf generate) echo "Formatting TypeScript..." -(cd frontend && pnpm run lint:fix) +just format-frontend git diff