History

Policies tab in local + multiplex portless across apps (#470)

* policies: port Policies tab to local * dev: multiplex portless across all apps, drop --no-tls

Rhys Sullivan committed 6 months ago

Commit e89354e1 parent 0ae749d6 files · +41 −3Browse files

Unified · Split

6 files
  1. apps/cloud/package.json +1 −1
  2. apps/local/package.json +3 −1
  3. apps/local/src/routeTree.gen.ts +21 −0
  4. apps/local/src/routes/policies.tsx +6 −0
  5. apps/local/src/web/shell.tsx +7 −0
  6. apps/marketing/package.json +3 −1
apps/cloud/package.json+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 "type": "module",
66 "scripts": {
77 "dev": "bun run dev:proxy && concurrently -n db,vite -c blue,green \"bun run dev:db\" \"bun run dev:vite\"",
8− "dev:proxy": "portless proxy start --multiplex --port 1355 --no-tls || true",
8+ "dev:proxy": "portless proxy start --multiplex --port 1355 || true",
99 "dev:db": "bun run scripts/dev-db.ts",
1010 "dev:vite": "EXECUTOR_DIRECT_DATABASE_URL=true CLOUDFLARE_INCLUDE_PROCESS_ENV=true op run --env-file=.env.op -- portless --name executor-cloud vite dev",
1111 "db:schema": "node --import jiti/register ../../packages/core/cli/src/index.ts generate --config ./executor.config.ts --output ./src/services/executor-schema.ts",
apps/local/package.json+3−1
@@ -7,7 +7,9 @@ · 6 unmodified lines
77 ".": "./src/index.ts"
88 },
99 "scripts": {
10− "dev": "portless --name executor-local bunx --bun vite dev",
10+ "dev": "bun run dev:proxy && bun run dev:vite",
11+ "dev:proxy": "portless proxy start --multiplex --port 1355 || true",
12+ "dev:vite": "portless --name executor-local bunx --bun vite dev",
1113 "build": "bunx --bun vite build",
1214 "start": "bun run src/serve.ts",
1315 "db:schema": "node --import jiti/register ../../packages/core/cli/src/index.ts generate --config ./executor.config.ts --output ./src/server/executor-schema.ts",
apps/local/src/routeTree.gen.ts+21−0
@@ -11,6 +11,7 @@ · 10 unmodified lines
1111 import { Route as rootRouteImport } from './routes/__root'
1212 import { Route as ToolsRouteImport } from './routes/tools'
1313 import { Route as SecretsRouteImport } from './routes/secrets'
14+import { Route as PoliciesRouteImport } from './routes/policies'
1415 import { Route as ConnectionsRouteImport } from './routes/connections'
1516 import { Route as IndexRouteImport } from './routes/index'
1617 import { Route as SourcesNamespaceRouteImport } from './routes/sources.$namespace'
@@ -26,6 +27,11 @@ const SecretsRoute = SecretsRouteImport.update({ · 9 unmodified lines
2627 path: '/secrets',
2728 getParentRoute: () => rootRouteImport,
2829 } as any)
30+const PoliciesRoute = PoliciesRouteImport.update({
31+ id: '/policies',
32+ path: '/policies',
33+ getParentRoute: () => rootRouteImport,
34+} as any)
2935 const ConnectionsRoute = ConnectionsRouteImport.update({
3036 id: '/connections',
3137 path: '/connections',
@@ -50,6 +56,7 @@ const SourcesAddPluginKeyRoute = SourcesAddPluginKeyRouteImport.update({ · 18 unmodified lines
5056 export interface FileRoutesByFullPath {
5157 '/': typeof IndexRoute
5258 '/connections': typeof ConnectionsRoute
59+ '/policies': typeof PoliciesRoute
5360 '/secrets': typeof SecretsRoute
5461 '/tools': typeof ToolsRoute
5562 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -58,6 +65,7 @@ export interface FileRoutesByFullPath { · 2 unmodified lines
5865 export interface FileRoutesByTo {
5966 '/': typeof IndexRoute
6067 '/connections': typeof ConnectionsRoute
68+ '/policies': typeof PoliciesRoute
6169 '/secrets': typeof SecretsRoute
6270 '/tools': typeof ToolsRoute
6371 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -67,6 +75,7 @@ export interface FileRoutesById { · 3 unmodified lines
6775 __root__: typeof rootRouteImport
6876 '/': typeof IndexRoute
6977 '/connections': typeof ConnectionsRoute
78+ '/policies': typeof PoliciesRoute
7079 '/secrets': typeof SecretsRoute
7180 '/tools': typeof ToolsRoute
7281 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -77,6 +86,7 @@ export interface FileRouteTypes { · 4 unmodified lines
7786 fullPaths:
7887 | '/'
7988 | '/connections'
89+ | '/policies'
8090 | '/secrets'
8191 | '/tools'
8292 | '/sources/$namespace'
@@ -85,6 +95,7 @@ export interface FileRouteTypes { · 2 unmodified lines
8595 to:
8696 | '/'
8797 | '/connections'
98+ | '/policies'
8899 | '/secrets'
89100 | '/tools'
90101 | '/sources/$namespace'
@@ -93,6 +104,7 @@ export interface FileRouteTypes { · 2 unmodified lines
93104 | '__root__'
94105 | '/'
95106 | '/connections'
107+ | '/policies'
96108 | '/secrets'
97109 | '/tools'
98110 | '/sources/$namespace'
@@ -102,6 +114,7 @@ export interface FileRouteTypes { · 3 unmodified lines
102114 export interface RootRouteChildren {
103115 IndexRoute: typeof IndexRoute
104116 ConnectionsRoute: typeof ConnectionsRoute
117+ PoliciesRoute: typeof PoliciesRoute
105118 SecretsRoute: typeof SecretsRoute
106119 ToolsRoute: typeof ToolsRoute
107120 SourcesNamespaceRoute: typeof SourcesNamespaceRoute
@@ -124,6 +137,13 @@ declare module '@tanstack/react-router' { · 16 unmodified lines
124137 preLoaderRoute: typeof SecretsRouteImport
125138 parentRoute: typeof rootRouteImport
126139 }
140+ '/policies': {
141+ id: '/policies'
142+ path: '/policies'
143+ fullPath: '/policies'
144+ preLoaderRoute: typeof PoliciesRouteImport
145+ parentRoute: typeof rootRouteImport
146+ }
127147 '/connections': {
128148 id: '/connections'
129149 path: '/connections'
@@ -158,6 +178,7 @@ declare module '@tanstack/react-router' { · 28 unmodified lines
158178 const rootRouteChildren: RootRouteChildren = {
159179 IndexRoute: IndexRoute,
160180 ConnectionsRoute: ConnectionsRoute,
181+ PoliciesRoute: PoliciesRoute,
161182 SecretsRoute: SecretsRoute,
162183 ToolsRoute: ToolsRoute,
163184 SourcesNamespaceRoute: SourcesNamespaceRoute,
apps/local/src/routes/policies.tsx+6−0
@@ -0,0 +1,6 @@
1+import { createFileRoute } from "@tanstack/react-router";
2+import { PoliciesPage } from "@executor-js/react/pages/policies";
3+
4+export const Route = createFileRoute("/policies")({
5+ component: () => <PoliciesPage />,
6+});
apps/local/src/web/shell.tsx+7−0
@@ -305,6 +305,7 @@ function SidebarContent(props: { · 304 unmodified lines
305305 const isHome = props.pathname === "/";
306306 const isSecrets = props.pathname === "/secrets";
307307 const isConnections = props.pathname === "/connections";
308+ const isPolicies = props.pathname === "/policies";
308309
309310 return (
310311 <>
@@ -326,6 +327,12 @@ function SidebarContent(props: { · 15 unmodified lines
326327 onNavigate={props.onNavigate}
327328 />
328329 <NavItem to="/secrets" label="Secrets" active={isSecrets} onNavigate={props.onNavigate} />
330+ <NavItem
331+ to="/policies"
332+ label="Policies"
333+ active={isPolicies}
334+ onNavigate={props.onNavigate}
335+ />
329336
330337 {/* Sources list */}
331338 <div className="mt-5 mb-1 px-2.5 text-xs font-medium uppercase tracking-widest text-muted-foreground">
apps/marketing/package.json+3−1
@@ -3,7 +3,9 @@ · 2 unmodified lines
33 "version": "0.0.5",
44 "type": "module",
55 "scripts": {
6− "dev": "portless --name executor-marketing astro dev",
6+ "dev": "bun run dev:proxy && bun run dev:vite",
7+ "dev:proxy": "portless proxy start --multiplex --port 1355 || true",
8+ "dev:vite": "portless --name executor-marketing astro dev",
79 "build": "astro build",
810 "preview": "astro preview",
911 "deploy": "astro build && npx wrangler deploy --config dist/server/wrangler.json",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t