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
1 change: 1 addition & 0 deletions ui/desktop/src/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ vi.mock('react-router-dom', () => ({
HashRouter: ({ children }: { children: React.ReactNode }) => <>{children}</>,
Routes: ({ children }: { children: React.ReactNode }) => <>{children}</>,
Route: ({ element }: { element: React.ReactNode }) => element,
Navigate: () => null,
useNavigate: () => mockNavigate,
useLocation: () => ({ state: null, pathname: '/' }),
useSearchParams: () => [mockSearchParams, mockSetSearchParams],
Expand Down
4 changes: 2 additions & 2 deletions ui/desktop/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useEffect, useState, useRef } from 'react';
import { IpcRendererEvent } from 'electron';
import {
HashRouter,
Navigate,
Routes,
Route,
useNavigate,
Expand Down Expand Up @@ -45,7 +46,6 @@ import PermissionSettingsView from './components/settings/permission/PermissionS
import ExtensionsView, { ExtensionsViewOptions } from './components/extensions/ExtensionsView';
import RecipesView from './components/recipes/RecipesView';
import SkillsView from './components/skills/SkillsView';
import AppsView from './components/apps/AppsView';
import StandaloneAppView from './components/apps/StandaloneAppView';
import { View, ViewOptions } from './utils/navigationUtils';

Expand Down Expand Up @@ -691,7 +691,7 @@ export function AppInner() {
</ChatProvider>
}
/>
<Route path="apps" element={<AppsView />} />
<Route path="apps" element={<Navigate to="/" replace />} />
<Route path="sessions" element={<SessionsRoute />} />
<Route path="schedules" element={<SchedulesRoute />} />
<Route path="recipes" element={<RecipesRoute />} />
Expand Down
25 changes: 11 additions & 14 deletions ui/desktop/src/components/BaseChat.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import { AppEvents } from '../constants/events';
import React, {
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from 'react';
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { defineMessages, useIntl } from '../i18n';
import { useLocation, useNavigate } from 'react-router-dom';
import { SearchView } from './conversation/SearchView';
Expand Down Expand Up @@ -54,7 +48,7 @@ const i18n = defineMessages({
},
recipeCreatedTitle: {
id: 'baseChat.recipeCreatedTitle',
defaultMessage: 'Recipe created successfully!',
defaultMessage: 'Workflow created successfully!',
},
recipeCreatedMessage: {
id: 'baseChat.recipeCreatedMessage',
Expand Down Expand Up @@ -199,7 +193,11 @@ export default function BaseChat({
const latestInference = useMemo(() => {
for (let i = messages.length - 1; i >= 0; i--) {
const message = messages[i];
if (message.role === 'assistant' && message.metadata.userVisible && message.metadata.inference) {
if (
message.role === 'assistant' &&
message.metadata.userVisible &&
message.metadata.inference
) {
return message.metadata.inference;
}
}
Expand Down Expand Up @@ -373,7 +371,9 @@ export default function BaseChat({
<div className="flex-1 bg-background-primary rounded-b-2xl flex items-center justify-center">
<div className="flex flex-col items-center justify-center p-8">
<div className="text-red-700 dark:text-red-300 bg-red-400/50 p-4 rounded-lg mb-4 max-w-md">
<h3 className="font-semibold mb-2">{intl.formatMessage(i18n.failedToLoadSession)}</h3>
<h3 className="font-semibold mb-2">
{intl.formatMessage(i18n.failedToLoadSession)}
</h3>
<p className="text-sm">{sessionLoadError}</p>
</div>
<button
Expand Down Expand Up @@ -497,14 +497,11 @@ export default function BaseChat({
accumulatedOutputTokens={
tokenState?.accumulatedOutputTokens ?? session?.accumulated_output_tokens ?? undefined
}
accumulatedCost={
tokenState?.accumulatedCost ?? session?.accumulated_cost ?? undefined
}
accumulatedCost={tokenState?.accumulatedCost ?? session?.accumulated_cost ?? undefined}
droppedFiles={droppedFiles}
onFilesProcessed={() => setDroppedFiles([])} // Clear dropped files after processing
messages={messages}
disableAnimation={disableAnimation}

recipe={recipe}
recipeAccepted={!hasNotAcceptedRecipe}
initialPrompt={initialPrompt}
Expand Down
8 changes: 3 additions & 5 deletions ui/desktop/src/components/ChatInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ const turndown = new TurndownService({
turndown.addRule('complexLinks', {
filter: (node) => {
return (
node.nodeName === 'A' &&
!!node.getAttribute('href') &&
/\n/.test(node.textContent || '')
node.nodeName === 'A' && !!node.getAttribute('href') && /\n/.test(node.textContent || '')
);
},
replacement: (content, node) => {
Expand Down Expand Up @@ -168,11 +166,11 @@ const i18n = defineMessages({
},
viewEditRecipe: {
id: 'chatInput.viewEditRecipe',
defaultMessage: 'View/Edit Recipe',
defaultMessage: 'View/Edit Workflow',
},
createRecipeFromSession: {
id: 'chatInput.createRecipeFromSession',
defaultMessage: 'Create Recipe from Session',
defaultMessage: 'Create Workflow from Session',
},
});

Expand Down
15 changes: 10 additions & 5 deletions ui/desktop/src/components/Layout/NavigationContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ export interface NavigationPreferences {
enabledItems: string[];
}

export const HIDDEN_NAV_ITEM_IDS = ['apps'];

export const DEFAULT_ITEM_ORDER = [
'home',
'chat',
'recipes',
'skills',
'apps',
'scheduler',
'extensions',
'settings',
Expand Down Expand Up @@ -103,12 +104,16 @@ export const NavigationProvider: React.FC<NavigationProviderProps> = ({ children
// Only backfill truly new default IDs (not previously known to the user).
// Using itemOrder as the source of truth ensures items the user
// intentionally disabled stay disabled.
const newIds = DEFAULT_ITEM_ORDER.filter(
(id) => !parsed.itemOrder?.includes(id)
const itemOrder = (parsed.itemOrder ?? []).filter(
(id: string) => !HIDDEN_NAV_ITEM_IDS.includes(id)
);
const enabledItems = (parsed.enabledItems ?? []).filter(
(id: string) => !HIDDEN_NAV_ITEM_IDS.includes(id)
);
const newIds = DEFAULT_ITEM_ORDER.filter((id) => !itemOrder.includes(id));
return {
itemOrder: [...(parsed.itemOrder ?? []), ...newIds],
enabledItems: [...(parsed.enabledItems ?? []), ...newIds],
itemOrder: [...itemOrder, ...newIds],
enabledItems: [...enabledItems, ...newIds],
};
} catch {
console.error('Failed to parse navigation preferences');
Expand Down
12 changes: 7 additions & 5 deletions ui/desktop/src/components/ParameterInputModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { defineMessages, useIntl } from '../i18n';
const i18n = defineMessages({
cancelRecipeSetup: {
id: 'parameterInputModal.cancelRecipeSetup',
defaultMessage: 'Cancel Recipe Setup',
defaultMessage: 'Cancel Workflow Setup',
},
whatToDo: {
id: 'parameterInputModal.whatToDo',
Expand All @@ -19,11 +19,11 @@ const i18n = defineMessages({
},
startNewChat: {
id: 'parameterInputModal.startNewChat',
defaultMessage: 'Start New Chat (No Recipe)',
defaultMessage: 'Start New Chat (No Workflow)',
},
recipeParameters: {
id: 'parameterInputModal.recipeParameters',
defaultMessage: 'Recipe Parameters',
defaultMessage: 'Workflow Parameters',
},
selectOption: {
id: 'parameterInputModal.selectOption',
Expand Down Expand Up @@ -51,7 +51,7 @@ const i18n = defineMessages({
},
startRecipe: {
id: 'parameterInputModal.startRecipe',
defaultMessage: 'Start Recipe',
defaultMessage: 'Start Workflow',
},
});

Expand Down Expand Up @@ -228,7 +228,9 @@ const ParameterInputModal: React.FC<ParameterInputModalProps> = ({
? 'border-red-500 focus:ring-red-500'
: 'border-border-primary focus:ring-border-secondary'
}`}
placeholder={param.default || intl.formatMessage(i18n.enterValue, { key: param.key })}
placeholder={
param.default || intl.formatMessage(i18n.enterValue, { key: param.key })
}
/>
)}

Expand Down
2 changes: 1 addition & 1 deletion ui/desktop/src/components/RecipeHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defineMessages, useIntl } from '../i18n';
const i18n = defineMessages({
recipeLabel: {
id: 'recipeHeader.recipeLabel',
defaultMessage: 'Recipe',
defaultMessage: 'Workflow',
},
});

Expand Down
38 changes: 24 additions & 14 deletions ui/desktop/src/components/recipes/CreateEditRecipeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ import { defineMessages, useIntl } from '../../i18n';
const i18n = defineMessages({
createRecipeTitle: {
id: 'createEditRecipe.createRecipeTitle',
defaultMessage: 'Create Recipe',
defaultMessage: 'Create Workflow',
},
viewEditRecipeTitle: {
id: 'createEditRecipe.viewEditRecipeTitle',
defaultMessage: 'View/edit recipe',
defaultMessage: 'View/edit workflow',
},
createSubtitle: {
id: 'createEditRecipe.createSubtitle',
defaultMessage: 'Create a new recipe to define agent behavior and capabilities for reusable chat sessions.',
defaultMessage:
'Create a new workflow to define agent behavior and capabilities for reusable chat sessions.',
},
editSubtitle: {
id: 'createEditRecipe.editSubtitle',
defaultMessage: "You can edit the recipe below to change the agent's behavior in a new session.",
defaultMessage:
"You can edit the workflow below to change the agent's behavior in a new session.",
},
learnMore: {
id: 'createEditRecipe.learnMore',
Expand Down Expand Up @@ -66,11 +68,11 @@ const i18n = defineMessages({
},
saveRecipe: {
id: 'createEditRecipe.saveRecipe',
defaultMessage: 'Save Recipe',
defaultMessage: 'Save Workflow',
},
saveAndRunRecipe: {
id: 'createEditRecipe.saveAndRunRecipe',
defaultMessage: 'Save & Run Recipe',
defaultMessage: 'Save & Run Workflow',
},
validationFailed: {
id: 'createEditRecipe.validationFailed',
Expand All @@ -82,27 +84,27 @@ const i18n = defineMessages({
},
recipeSavedMsg: {
id: 'createEditRecipe.recipeSavedMsg',
defaultMessage: 'Recipe saved successfully',
defaultMessage: 'Workflow saved successfully',
},
saveFailed: {
id: 'createEditRecipe.saveFailed',
defaultMessage: 'Save Failed',
},
saveFailedMsg: {
id: 'createEditRecipe.saveFailedMsg',
defaultMessage: 'Failed to save recipe: {error}',
defaultMessage: 'Failed to save workflow: {error}',
},
recipeSavedAndLaunchedMsg: {
id: 'createEditRecipe.recipeSavedAndLaunchedMsg',
defaultMessage: 'Recipe saved and launched successfully',
defaultMessage: 'Workflow saved and launched successfully',
},
saveAndRunFailed: {
id: 'createEditRecipe.saveAndRunFailed',
defaultMessage: 'Save and Run Failed',
},
saveAndRunFailedMsg: {
id: 'createEditRecipe.saveAndRunFailedMsg',
defaultMessage: 'Failed to save and run recipe: {error}',
defaultMessage: 'Failed to save and run workflow: {error}',
},
});

Expand Down Expand Up @@ -433,7 +435,9 @@ export default function CreateEditRecipeModal({

toastError({
title: intl.formatMessage(i18n.saveFailed),
msg: intl.formatMessage(i18n.saveFailedMsg, { error: errorMessage(error, 'Unknown error') }),
msg: intl.formatMessage(i18n.saveFailedMsg, {
error: errorMessage(error, 'Unknown error'),
}),
traceback: errorMessage(error),
});
} finally {
Expand Down Expand Up @@ -469,7 +473,9 @@ export default function CreateEditRecipeModal({

toastError({
title: intl.formatMessage(i18n.saveAndRunFailed),
msg: intl.formatMessage(i18n.saveAndRunFailedMsg, { error: errorMessage(error, 'Unknown error') }),
msg: intl.formatMessage(i18n.saveAndRunFailedMsg, {
error: errorMessage(error, 'Unknown error'),
}),
traceback: errorMessage(error),
});
} finally {
Expand All @@ -490,7 +496,9 @@ export default function CreateEditRecipeModal({
</div>
<div>
<h1 className="text-xl font-medium text-text-primary">
{isCreateMode ? intl.formatMessage(i18n.createRecipeTitle) : intl.formatMessage(i18n.viewEditRecipeTitle)}
{isCreateMode
? intl.formatMessage(i18n.createRecipeTitle)
: intl.formatMessage(i18n.viewEditRecipeTitle)}
</h1>
<p className="text-text-secondary text-sm">
{isCreateMode
Expand Down Expand Up @@ -589,7 +597,9 @@ export default function CreateEditRecipeModal({
className="inline-flex items-center justify-center gap-2 px-4 py-2"
>
<Play className="w-4 h-4" />
{isSaving ? intl.formatMessage(i18n.saving) : intl.formatMessage(i18n.saveAndRunRecipe)}
{isSaving
? intl.formatMessage(i18n.saving)
: intl.formatMessage(i18n.saveAndRunRecipe)}
</Button>
</div>
</div>
Expand Down
Loading
Loading