Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cli/cloudformation/outputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function parseGatewayOutputs(
const gatewayNames = Object.keys(gatewaySpecs);
const gatewayIdMap = new Map(gatewayNames.map(name => [toPascalId(name), name]));

// Match pattern: Gateway{Name}{Type}Output
// Match pattern: Gateway{Name}{Type}Output{Hash}
const outputPattern = /^Gateway(.+?)(Id|Arn|Url)Output/;

for (const [key, value] of Object.entries(outputs)) {
Expand Down
9 changes: 3 additions & 6 deletions src/cli/tui/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { LayoutProvider } from './context';
import { MissingProjectMessage, WrongDirectoryMessage, getProjectRootMismatch, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
import { AddFlow } from './screens/add/AddFlow';
import { CreateScreen } from './screens/create';
import { DeployScreen } from './screens/deploy/DeployScreen';
Expand All @@ -17,7 +16,7 @@ import { RunEvalFlow, RunScreen } from './screens/run-eval';
import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import { getCommandsForUI } from './utils/commands';
import { useApp } from 'ink';
import React, { useState } from 'react';

Expand All @@ -27,7 +26,6 @@ const cwd = getWorkingDirectory();
type Route =
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
| { name: 'deploy' }
| { name: 'invoke' }
Expand Down Expand Up @@ -102,8 +100,6 @@ function AppContent() {
setRoute({ name: 'package' });
} else if (id === 'update') {
setRoute({ name: 'update' });
} else {
setRoute({ name: 'command', command: cmd });
}
};

Expand Down Expand Up @@ -243,7 +239,8 @@ function AppContent() {
return <UpdateScreen isInteractive={true} onExit={() => setRoute({ name: 'help' })} />;
}

return <PlaceholderScreen command={route.command} onBack={() => setRoute({ name: 'help' })} />;
// All visible commands are handled above; this is unreachable.
return null;
}

export function App() {
Expand Down
21 changes: 0 additions & 21 deletions src/cli/tui/screens/PlaceholderScreen.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/cli/tui/screens/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export { PlaceholderScreen } from './PlaceholderScreen';
export { DevScreen } from './dev';
export { InvokeScreen } from './invoke';
export { StatusScreen } from './status';
Expand Down
9 changes: 7 additions & 2 deletions src/cli/tui/screens/mcp/AddGatewayScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ export function AddGatewayScreen({
const headerContent = <StepIndicator steps={wizard.steps} currentStep={wizard.step} labels={GATEWAY_STEP_LABELS} />;

return (
<Screen title="Add Gateway" onExit={onExit} helpText={helpText} headerContent={headerContent}>
<Screen title="Add Gateway" onExit={onExit} helpText={helpText} headerContent={headerContent} exitEnabled={false}>
<Panel>
{isNameStep && (
<TextInput
Expand Down Expand Up @@ -345,7 +345,12 @@ export function AddGatewayScreen({
fields={[
{ label: 'Name', value: wizard.config.name },
{ label: 'Description', value: wizard.config.description },
{ label: 'Authorizer', value: wizard.config.authorizerType },
{
label: 'Authorizer',
value:
AUTHORIZER_TYPE_OPTIONS.find(o => o.id === wizard.config.authorizerType)?.title ??
wizard.config.authorizerType,
},
...(wizard.config.authorizerType === 'CUSTOM_JWT' && wizard.config.jwtConfig
? [
{ label: 'Discovery URL', value: wizard.config.jwtConfig.discoveryUrl },
Expand Down
Loading