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
5 "type": "module",5 "type": "module",
6 "scripts": {6 "scripts": {
7 "dev": "bun run dev:proxy && concurrently -n db,vite -c blue,green \"bun run dev:db\" \"bun run dev:vite\"",7 "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",
9 "dev:db": "bun run scripts/dev-db.ts",9 "dev:db": "bun run scripts/dev-db.ts",
10 "dev:vite": "EXECUTOR_DIRECT_DATABASE_URL=true CLOUDFLARE_INCLUDE_PROCESS_ENV=true op run --env-file=.env.op -- portless --name executor-cloud vite dev",10 "dev:vite": "EXECUTOR_DIRECT_DATABASE_URL=true CLOUDFLARE_INCLUDE_PROCESS_ENV=true op run --env-file=.env.op -- portless --name executor-cloud vite dev",
11 "db:schema": "node --import jiti/register ../../packages/core/cli/src/index.ts generate --config ./executor.config.ts --output ./src/services/executor-schema.ts",11 "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
7 ".": "./src/index.ts"7 ".": "./src/index.ts"
8 },8 },
9 "scripts": {9 "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",
11 "build": "bunx --bun vite build",13 "build": "bunx --bun vite build",
12 "start": "bun run src/serve.ts",14 "start": "bun run src/serve.ts",
13 "db:schema": "node --import jiti/register ../../packages/core/cli/src/index.ts generate --config ./executor.config.ts --output ./src/server/executor-schema.ts",15 "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
11import { Route as rootRouteImport } from './routes/__root'11import { Route as rootRouteImport } from './routes/__root'
12import { Route as ToolsRouteImport } from './routes/tools'12import { Route as ToolsRouteImport } from './routes/tools'
13import { Route as SecretsRouteImport } from './routes/secrets'13import { Route as SecretsRouteImport } from './routes/secrets'
14import { Route as PoliciesRouteImport } from './routes/policies'
14import { Route as ConnectionsRouteImport } from './routes/connections'15import { Route as ConnectionsRouteImport } from './routes/connections'
15import { Route as IndexRouteImport } from './routes/index'16import { Route as IndexRouteImport } from './routes/index'
16import { Route as SourcesNamespaceRouteImport } from './routes/sources.$namespace'17import { Route as SourcesNamespaceRouteImport } from './routes/sources.$namespace'
@@ -26,6 +27,11 @@ const SecretsRoute = SecretsRouteImport.update({ · 9 unmodified lines
26 path: '/secrets',27 path: '/secrets',
27 getParentRoute: () => rootRouteImport,28 getParentRoute: () => rootRouteImport,
28} as any)29} as any)
30const PoliciesRoute = PoliciesRouteImport.update({
31 id: '/policies',
32 path: '/policies',
33 getParentRoute: () => rootRouteImport,
34} as any)
29const ConnectionsRoute = ConnectionsRouteImport.update({35const ConnectionsRoute = ConnectionsRouteImport.update({
30 id: '/connections',36 id: '/connections',
31 path: '/connections',37 path: '/connections',
@@ -50,6 +56,7 @@ const SourcesAddPluginKeyRoute = SourcesAddPluginKeyRouteImport.update({ · 18 unmodified lines
50export interface FileRoutesByFullPath {56export interface FileRoutesByFullPath {
51 '/': typeof IndexRoute57 '/': typeof IndexRoute
52 '/connections': typeof ConnectionsRoute58 '/connections': typeof ConnectionsRoute
59 '/policies': typeof PoliciesRoute
53 '/secrets': typeof SecretsRoute60 '/secrets': typeof SecretsRoute
54 '/tools': typeof ToolsRoute61 '/tools': typeof ToolsRoute
55 '/sources/$namespace': typeof SourcesNamespaceRoute62 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -58,6 +65,7 @@ export interface FileRoutesByFullPath { · 2 unmodified lines
58export interface FileRoutesByTo {65export interface FileRoutesByTo {
59 '/': typeof IndexRoute66 '/': typeof IndexRoute
60 '/connections': typeof ConnectionsRoute67 '/connections': typeof ConnectionsRoute
68 '/policies': typeof PoliciesRoute
61 '/secrets': typeof SecretsRoute69 '/secrets': typeof SecretsRoute
62 '/tools': typeof ToolsRoute70 '/tools': typeof ToolsRoute
63 '/sources/$namespace': typeof SourcesNamespaceRoute71 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -67,6 +75,7 @@ export interface FileRoutesById { · 3 unmodified lines
67 __root__: typeof rootRouteImport75 __root__: typeof rootRouteImport
68 '/': typeof IndexRoute76 '/': typeof IndexRoute
69 '/connections': typeof ConnectionsRoute77 '/connections': typeof ConnectionsRoute
78 '/policies': typeof PoliciesRoute
70 '/secrets': typeof SecretsRoute79 '/secrets': typeof SecretsRoute
71 '/tools': typeof ToolsRoute80 '/tools': typeof ToolsRoute
72 '/sources/$namespace': typeof SourcesNamespaceRoute81 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -77,6 +86,7 @@ export interface FileRouteTypes { · 4 unmodified lines
77 fullPaths:86 fullPaths:
78 | '/'87 | '/'
79 | '/connections'88 | '/connections'
89 | '/policies'
80 | '/secrets'90 | '/secrets'
81 | '/tools'91 | '/tools'
82 | '/sources/$namespace'92 | '/sources/$namespace'
@@ -85,6 +95,7 @@ export interface FileRouteTypes { · 2 unmodified lines
85 to:95 to:
86 | '/'96 | '/'
87 | '/connections'97 | '/connections'
98 | '/policies'
88 | '/secrets'99 | '/secrets'
89 | '/tools'100 | '/tools'
90 | '/sources/$namespace'101 | '/sources/$namespace'
@@ -93,6 +104,7 @@ export interface FileRouteTypes { · 2 unmodified lines
93 | '__root__'104 | '__root__'
94 | '/'105 | '/'
95 | '/connections'106 | '/connections'
107 | '/policies'
96 | '/secrets'108 | '/secrets'
97 | '/tools'109 | '/tools'
98 | '/sources/$namespace'110 | '/sources/$namespace'
@@ -102,6 +114,7 @@ export interface FileRouteTypes { · 3 unmodified lines
102export interface RootRouteChildren {114export interface RootRouteChildren {
103 IndexRoute: typeof IndexRoute115 IndexRoute: typeof IndexRoute
104 ConnectionsRoute: typeof ConnectionsRoute116 ConnectionsRoute: typeof ConnectionsRoute
117 PoliciesRoute: typeof PoliciesRoute
105 SecretsRoute: typeof SecretsRoute118 SecretsRoute: typeof SecretsRoute
106 ToolsRoute: typeof ToolsRoute119 ToolsRoute: typeof ToolsRoute
107 SourcesNamespaceRoute: typeof SourcesNamespaceRoute120 SourcesNamespaceRoute: typeof SourcesNamespaceRoute
@@ -124,6 +137,13 @@ declare module '@tanstack/react-router' { · 16 unmodified lines
124 preLoaderRoute: typeof SecretsRouteImport137 preLoaderRoute: typeof SecretsRouteImport
125 parentRoute: typeof rootRouteImport138 parentRoute: typeof rootRouteImport
126 }139 }
140 '/policies': {
141 id: '/policies'
142 path: '/policies'
143 fullPath: '/policies'
144 preLoaderRoute: typeof PoliciesRouteImport
145 parentRoute: typeof rootRouteImport
146 }
127 '/connections': {147 '/connections': {
128 id: '/connections'148 id: '/connections'
129 path: '/connections'149 path: '/connections'
@@ -158,6 +178,7 @@ declare module '@tanstack/react-router' { · 28 unmodified lines
158const rootRouteChildren: RootRouteChildren = {178const rootRouteChildren: RootRouteChildren = {
159 IndexRoute: IndexRoute,179 IndexRoute: IndexRoute,
160 ConnectionsRoute: ConnectionsRoute,180 ConnectionsRoute: ConnectionsRoute,
181 PoliciesRoute: PoliciesRoute,
161 SecretsRoute: SecretsRoute,182 SecretsRoute: SecretsRoute,
162 ToolsRoute: ToolsRoute,183 ToolsRoute: ToolsRoute,
163 SourcesNamespaceRoute: SourcesNamespaceRoute,184 SourcesNamespaceRoute: SourcesNamespaceRoute,
apps/local/src/routes/policies.tsx+6−0
@@ -0,0 +1,6 @@
1import { createFileRoute } from "@tanstack/react-router";
2import { PoliciesPage } from "@executor-js/react/pages/policies";
3
4export 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
305 const isHome = props.pathname === "/";305 const isHome = props.pathname === "/";
306 const isSecrets = props.pathname === "/secrets";306 const isSecrets = props.pathname === "/secrets";
307 const isConnections = props.pathname === "/connections";307 const isConnections = props.pathname === "/connections";
308 const isPolicies = props.pathname === "/policies";
308 309
309 return (310 return (
310 <>311 <>
@@ -326,6 +327,12 @@ function SidebarContent(props: { · 15 unmodified lines
326 onNavigate={props.onNavigate}327 onNavigate={props.onNavigate}
327 />328 />
328 <NavItem to="/secrets" label="Secrets" active={isSecrets} onNavigate={props.onNavigate} />329 <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 />
329 336
330 {/* Sources list */}337 {/* Sources list */}
331 <div className="mt-5 mb-1 px-2.5 text-xs font-medium uppercase tracking-widest text-muted-foreground">338 <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
3 "version": "0.0.5",3 "version": "0.0.5",
4 "type": "module",4 "type": "module",
5 "scripts": {5 "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",
7 "build": "astro build",9 "build": "astro build",
8 "preview": "astro preview",10 "preview": "astro preview",
9 "deploy": "astro build && npx wrangler deploy --config dist/server/wrangler.json",11 "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