handleCallClicked(call)}
>
|
@@ -66,10 +65,10 @@ export const CallList = ({ calls }: { calls: CallEvent[] | undefined }) => {
|
{formatDuration(call.duration)}
|
-
+ |
{call.sourceVerbRef && verbRefString(call.sourceVerbRef)}
|
-
+ |
{call.destinationVerbRef && verbRefString(call.destinationVerbRef)}
|
diff --git a/frontend/src/features/console/right-panel/ConfigPanels.tsx b/frontend/src/features/console/right-panel/ConfigPanels.tsx
index 739ec02ecd..36f1d8eaf5 100644
--- a/frontend/src/features/console/right-panel/ConfigPanels.tsx
+++ b/frontend/src/features/console/right-panel/ConfigPanels.tsx
@@ -1,3 +1,4 @@
+import { RightPanelAttribute } from '../../../components/RightPanelAttribute'
import { Config } from '../../../protos/xyz/block/ftl/v1/console/console_pb'
import { ExpandablePanelProps } from '../ExpandablePanel'
@@ -6,14 +7,7 @@ export const configPanels = (config: Config) => {
{
title: config.config?.name,
expanded: true,
- children: (
-
- Type
-
- {config.config?.type?.value?.case}
-
-
- {s.secret?.name}
-
- {s.secret?.type?.value?.case}
-
-
- {c.config?.name}
-
- {c.config?.type?.value?.case}
-
-
- Type
-
- {secret.secret?.type?.value?.case}
-
-
@@ -100,7 +90,7 @@ export const VerbPage = () => {
}
rightPanelHeader={header}
- rightPanelPanels={panels}
+ rightPanelPanels={verbPanels(verb)}
bottomPanelContent={}
/>
diff --git a/frontend/src/features/verbs/VerbRequestForm.tsx b/frontend/src/features/verbs/VerbRequestForm.tsx
index b9541d118a..c2ee07df56 100644
--- a/frontend/src/features/verbs/VerbRequestForm.tsx
+++ b/frontend/src/features/verbs/VerbRequestForm.tsx
@@ -6,7 +6,7 @@ import { CodeEditor, InitialState } from '../../components/CodeEditor'
import { useClient } from '../../hooks/use-client'
import { VerbService } from '../../protos/xyz/block/ftl/v1/ftl_connect'
import { VerbFormInput } from './VerbFormInput'
-import { createVerbRequest, defaultRequest, httpPopulatedRequestPath, isHttpIngress, requestPath, requestType, simpleJsonSchema } from './verb.utils'
+import { createVerbRequest, defaultRequest, httpPopulatedRequestPath, isHttpIngress, fullRequestPath, requestType, simpleJsonSchema } from './verb.utils'
export const VerbRequestForm = ({ module, verb }: { module?: Module; verb?: Verb }) => {
const client = useClient(VerbService)
@@ -53,13 +53,14 @@ export const VerbRequestForm = ({ module, verb }: { module?: Module; verb?: Verb
const tabs = [
{ id: 'body', name: 'Body' },
- { id: 'jsonschema', name: 'JSONSchema' }
]
if (isHttpIngress(verb)) {
tabs.push({ id: 'headers', name: 'Headers' })
}
+ tabs.push({ id: 'verbschema', name: 'Verb Schema' }, { id: 'jsonschema', name: 'JSONSchema' })
+
const handleSubmit = async (path: string) => {
setResponse(null)
setError(null)
@@ -90,7 +91,7 @@ export const VerbRequestForm = ({ module, verb }: { module?: Module; verb?: Verb
@@ -123,12 +124,16 @@ export const VerbRequestForm = ({ module, verb }: { module?: Module; verb?: Verb
{activeTabId === 'body' && (
)}
- {activeTabId === 'headers' && (
-
+ {activeTabId === 'verbschema' && (
+
)}
{activeTabId === 'jsonschema' && (
)}
+ {activeTabId === 'headers' && (
+
+ )}
+
diff --git a/frontend/src/features/verbs/VerbRightPanel.tsx b/frontend/src/features/verbs/VerbRightPanel.tsx
new file mode 100644
index 0000000000..6d248fad11
--- /dev/null
+++ b/frontend/src/features/verbs/VerbRightPanel.tsx
@@ -0,0 +1,45 @@
+import { ArrowRightStartOnRectangleIcon } from '@heroicons/react/24/outline'
+import { RightPanelAttribute } from '../../components/RightPanelAttribute'
+import { Verb } from '../../protos/xyz/block/ftl/v1/console/console_pb'
+import { ExpandablePanelProps } from '../console/ExpandablePanel'
+import { ingress, isHttpIngress, httpRequestPath, verbCalls } from './verb.utils'
+
+export const verbPanels = (verb?: Verb) => {
+ const panels = [] as ExpandablePanelProps[]
+
+ console.log(verb?.schema)
+ if (isHttpIngress(verb)) {
+ const http = ingress(verb)
+ const path = httpRequestPath(verb)
+ panels.push({
+ title: 'HTTP Ingress',
+ expanded: true,
+ children: (
+ <>
+
+
+
+ ),
+ })
+ }
+
+ const calls = verbCalls(verb)?.map((c) => c.calls).flatMap((c) => c)
+ if (calls && calls.length > 0) {
+ panels.push({
+ title: 'Calls',
+ expanded: true,
+ children: calls?.map((c, index) => (
+
+
+ {`${c?.module}.${c?.name}`}
+
+
+ )),
+ })
+ }
+
+ return panels
+}
diff --git a/frontend/src/features/verbs/verb.utils.ts b/frontend/src/features/verbs/verb.utils.ts
index daaef223d5..b5b6fac265 100644
--- a/frontend/src/features/verbs/verb.utils.ts
+++ b/frontend/src/features/verbs/verb.utils.ts
@@ -1,6 +1,6 @@
import { JsonValue } from 'type-fest/source/basic'
import { Module, Verb } from '../../protos/xyz/block/ftl/v1/console/console_pb'
-import { MetadataCronJob, MetadataIngress, Ref } from '../../protos/xyz/block/ftl/v1/schema/schema_pb'
+import { MetadataCalls, MetadataCronJob, MetadataIngress, Ref } from '../../protos/xyz/block/ftl/v1/schema/schema_pb'
import { JSONSchemaFaker } from 'json-schema-faker'
const basePath = 'http://localhost:8892/ingress/'
@@ -69,11 +69,11 @@ export const defaultRequest = (verb?: Verb): string => {
return JSON.stringify(fake, null, 2) ?? '{}'
}
-const ingress = (verb?: Verb) => {
+export const ingress = (verb?: Verb) => {
return verb?.verb?.metadata?.find(meta => meta.value.case === 'ingress')?.value?.value as MetadataIngress || null
}
-const cron = (verb?: Verb) => {
+export const cron = (verb?: Verb) => {
return verb?.verb?.metadata?.find(meta => meta.value.case === 'cronJob')?.value?.value as MetadataCronJob || null
}
@@ -84,10 +84,10 @@ export const requestType = (verb?: Verb) => {
return ingress?.method ?? cron?.cron?.toUpperCase() ?? 'CALL'
}
-export const requestPath = (module?: Module, verb?: Verb) => {
+export const httpRequestPath = (verb?: Verb) => {
const ingress = verb?.verb?.metadata?.find(meta => meta.value.case === 'ingress')?.value?.value as MetadataIngress || null
if (ingress) {
- return basePath + ingress.path.map(p => {
+ return ingress.path.map(p => {
switch (p.value.case) {
case 'ingressPathLiteral':
return p.value.value.text
@@ -98,6 +98,13 @@ export const requestPath = (module?: Module, verb?: Verb) => {
}
}).join('/')
}
+}
+
+export const fullRequestPath = (module?: Module, verb?: Verb) => {
+ const ingress = verb?.verb?.metadata?.find(meta => meta.value.case === 'ingress')?.value?.value as MetadataIngress || null
+ if (ingress) {
+ return basePath + httpRequestPath(verb)
+ }
const cron = verb?.verb?.metadata?.find(meta => meta.value.case === 'cronJob')?.value?.value as MetadataCronJob || null
if (cron) {
return cron.cron
@@ -107,7 +114,7 @@ export const requestPath = (module?: Module, verb?: Verb) => {
}
export const httpPopulatedRequestPath = ( module?: Module, verb?: Verb) => {
- return requestPath(module, verb).replaceAll(/{([^}]*)}/g, '$1')
+ return fullRequestPath(module, verb).replaceAll(/{([^}]*)}/g, '$1')
}
export const isHttpIngress = (verb?: Verb) => {
@@ -141,3 +148,9 @@ export const createVerbRequest = (path: string, verb?: Verb, editorText?: strin
const buffer = Buffer.from(JSON.stringify(requestJson))
return new Uint8Array(buffer)
}
+
+export const verbCalls = (verb?: Verb) => {
+ return verb?.verb?.metadata
+ .filter((meta) => meta.value.case === 'calls')
+ .map((meta) => meta.value.value as MetadataCalls) ?? null
+}
|