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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { Button } from 'twenty-ui/input';
import { Card, Section } from 'twenty-ui/layout';
import { SettingsAIMCP } from './components/SettingsAIMCP';
import { SettingsAIModelsTab } from './components/SettingsAIModelsTab';
import { SettingsSkillsTable } from './components/SettingsSkillsTable';
import { SettingsAgentSkills } from './components/SettingsAgentSkills';
import { SettingsToolsTable } from './components/SettingsToolsTable';
import { SETTINGS_AI_TABS } from './constants/SettingsAiTabs';

Expand Down Expand Up @@ -84,7 +84,7 @@ export const SettingsAI = () => {
componentInstanceId={SETTINGS_AI_TABS.COMPONENT_INSTANCE_ID}
/>
{isModelsTab && <SettingsAIModelsTab />}
{isSkillsTab && <SettingsSkillsTable />}
{isSkillsTab && <SettingsAgentSkills />}
{isToolsTab && <SettingsToolsTable />}
{isMoreTab && (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useState } from 'react';

import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
Expand All @@ -12,13 +11,8 @@ import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import {
IconChevronRight,
IconFilter,
IconSearch,
IconSettingsAutomation,
} from 'twenty-ui/display';
import { Button } from 'twenty-ui/input';
import { IconChevronRight, IconSettingsAutomation } from 'twenty-ui/display';
import { SearchInput } from 'twenty-ui/input';
import { MenuItemToggle } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SETTINGS_AI_AGENT_TABLE_METADATA } from '~/pages/settings/ai/constants/SettingsAiAgentTableMetadata';
Expand All @@ -33,15 +27,8 @@ import {
SettingsAIAgentTableRow,
} from './SettingsAIAgentTableRow';

const StyledSearchAndFilterContainer = styled.div`
display: flex;
gap: ${themeCssVariables.spacing[2]};
const StyledSearchContainer = styled.div`
margin-bottom: ${themeCssVariables.spacing[2]};
width: 100%;
`;

const StyledSearchInputContainer = styled.div`
flex: 1;
`;

const StyledTableContainer = styled.div`
Expand Down Expand Up @@ -79,47 +66,36 @@ export const SettingsAIAgentsTable = () => {

return (
<>
<StyledSearchAndFilterContainer>
<StyledSearchInputContainer>
<SettingsTextInput
instanceId="settings-ai-agents-search"
LeftIcon={IconSearch}
placeholder={t`Search an agent...`}
value={searchTerm}
onChange={setSearchTerm}
fullWidth
/>
</StyledSearchInputContainer>
<Dropdown
dropdownId="settings-ai-agents-filter-dropdown"
dropdownPlacement="bottom-end"
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={
<Button
Icon={IconFilter}
size="medium"
variant="secondary"
accent="default"
ariaLabel={t`Filter`}
<StyledSearchContainer>
<SearchInput
placeholder={t`Search an agent...`}
value={searchTerm}
onChange={setSearchTerm}
filterDropdown={(filterButton) => (
<Dropdown
dropdownId="settings-ai-agents-filter-dropdown"
dropdownPlacement="bottom-end"
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
<DropdownContent>
<DropdownMenuItemsContainer>
<MenuItemToggle
LeftIcon={IconSettingsAutomation}
onToggleChange={() =>
setShowWorkflowAgents(!showWorkflowAgents)
}
toggled={showWorkflowAgents}
text={t`Workflow agents`}
toggleSize="small"
/>
</DropdownMenuItemsContainer>
</DropdownContent>
}
/>
}
dropdownComponents={
<DropdownContent>
<DropdownMenuItemsContainer>
<MenuItemToggle
LeftIcon={IconSettingsAutomation}
onToggleChange={() =>
setShowWorkflowAgents(!showWorkflowAgents)
}
toggled={showWorkflowAgents}
text={t`Workflow agents`}
toggleSize="small"
/>
</DropdownMenuItemsContainer>
</DropdownContent>
}
)}
/>
</StyledSearchAndFilterContainer>
</StyledSearchContainer>

<StyledTableContainer>
<Table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,11 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsO
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { Select } from '@/ui/input/components/Select';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
import {
H2Title,
IconBolt,
IconSearch,
IconTwentyStar,
} from 'twenty-ui/display';
import { H2Title, IconBolt, IconTwentyStar } from 'twenty-ui/display';
import { SearchInput } from 'twenty-ui/input';
import { Card, Section } from 'twenty-ui/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation } from '@apollo/client/react';
Expand Down Expand Up @@ -278,13 +273,10 @@ export const SettingsAIModelsTab = () => {
/>

<StyledSearchContainer>
<SettingsTextInput
instanceId="model-table-search"
LeftIcon={IconSearch}
<SearchInput
placeholder={t`Search a model...`}
value={searchQuery}
onChange={setSearchQuery}
fullWidth
/>
</StyledSearchContainer>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useMemo, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { H2Title, IconArchive, IconPlus } from 'twenty-ui/display';
import { Button, SearchInput } from 'twenty-ui/input';
import { MenuItemToggle, UndecoratedLink } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';

import { useMutation, useQuery } from '@apollo/client/react';
import { Section } from 'twenty-ui/layout';
import {
ActivateSkillDocument,
DeleteSkillDocument,
FindManySkillsDocument,
} from '~/generated-metadata/graphql';
import { SETTINGS_SKILL_TABLE_METADATA } from '~/pages/settings/ai/constants/SettingsSkillTableMetadata';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
import { SettingsAgentSkillsTable } from './SettingsAgentSkillsTable';

const StyledCoverImage = styled.div`
background-size: cover;
height: 160px;
overflow: hidden;
`;

const StyledFooterContainer = styled.div`
align-items: center;
display: flex;
justify-content: flex-end;
margin-top: ${themeCssVariables.spacing[4]};
`;

const StyledSearchInput = styled(SearchInput)`
margin-bottom: ${themeCssVariables.spacing[4]};
`;

export const SettingsAgentSkills = () => {
const { t } = useLingui();
const { colorScheme } = useContext(ThemeContext);
const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();

const { data, loading, refetch } = useQuery(FindManySkillsDocument);
const [activateSkill] = useMutation(ActivateSkillDocument);
const [deleteSkill] = useMutation(DeleteSkillDocument);

const [searchTerm, setSearchTerm] = useState('');
const [showDeactivated, setShowDeactivated] = useState(true);

const skills = data?.skills ?? [];

const sortedSkills = useSortedArray(skills, SETTINGS_SKILL_TABLE_METADATA);

const filteredSkills = useMemo(
() =>
sortedSkills.filter((skill) => {
const searchNormalized = normalizeSearchText(searchTerm);
const matchesSearch =
normalizeSearchText(skill.name).includes(searchNormalized) ||
Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Use a single search field for custom-object filtering instead of matching both name and label.

(Based on your team's feedback about keeping custom-object search vectors single-field.)

View Feedback

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkills.tsx, line 65:

<comment>Use a single search field for custom-object filtering instead of matching both `name` and `label`.

(Based on your team's feedback about keeping custom-object search vectors single-field.) </comment>

<file context>
@@ -0,0 +1,162 @@
+      sortedSkills.filter((skill) => {
+        const searchNormalized = normalizeSearchText(searchTerm);
+        const matchesSearch =
+          normalizeSearchText(skill.name).includes(searchNormalized) ||
+          normalizeSearchText(skill.label).includes(searchNormalized);
+
</file context>
Fix with Cubic

normalizeSearchText(skill.label).includes(searchNormalized);

if (!matchesSearch) {
return false;
}

if (!skill.isActive && !showDeactivated) {
return false;
}

return true;
}),
[sortedSkills, searchTerm, showDeactivated],
);

const handleActivate = async (skillId: string) => {
try {
await activateSkill({ variables: { id: skillId } });
enqueueSuccessSnackBar({ message: t`Skill activated` });
refetch();
} catch {
enqueueErrorSnackBar({ message: t`Failed to activate skill` });
}
};

const handleDelete = async (skillId: string) => {
try {
await deleteSkill({ variables: { id: skillId } });
enqueueSuccessSnackBar({ message: t`Skill deleted` });
refetch();
} catch {
enqueueErrorSnackBar({ message: t`Failed to delete skill` });
}
};

const coverImage =
colorScheme === 'light'
? '/images/ai/ai-skills-cover-light.png'
: '/images/ai/ai-skills-cover-dark.png';

return (
<>
<StyledCoverImage style={{ backgroundImage: `url('${coverImage}')` }} />
<Section>
<H2Title
title={t`Skills`}
description={t`Use filter to see existing tools or create your own`}
/>

<StyledSearchInput
placeholder={t`Search a skill...`}
value={searchTerm}
onChange={setSearchTerm}
filterDropdown={(filterButton) => (
<Dropdown
dropdownId="settings-skills-filter-dropdown"
dropdownPlacement="bottom-end"
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={filterButton}
dropdownComponents={
<DropdownContent>
<DropdownMenuItemsContainer>
<MenuItemToggle
LeftIcon={IconArchive}
onToggleChange={() =>
setShowDeactivated(!showDeactivated)
}
toggled={showDeactivated}
text={t`Deactivated`}
toggleSize="small"
/>
</DropdownMenuItemsContainer>
</DropdownContent>
}
/>
)}
/>
<SettingsAgentSkillsTable
skills={filteredSkills}
loading={loading}
onActivate={handleActivate}
onDelete={handleDelete}
/>
<StyledFooterContainer>
<UndecoratedLink to={getSettingsPath(SettingsPath.AINewSkill)}>
<Button
Icon={IconPlus}
title={t`New Skill`}
size="small"
variant="secondary"
/>
</UndecoratedLink>
</StyledFooterContainer>
</Section>
</>
);
};
Loading
Loading