admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Improve handling of trailing 'Trigger' in NodeCreator search (#14612)

Browse Source
This commit is contained in:
Charlie Kolb
2025-04-16 13:43:14 +02:00
committed by GitHub
parent a8fee9a4f3
commit 8b3b4749ea
4 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.test.ts
View File

@@ -1,5 +1,10 @@
import type { SectionCreateElement } from '@/Interface';
import { formatTriggerActionName, groupItemsInSections, sortNodeCreateElements } from './utils';
import {
formatTriggerActionName,
groupItemsInSections,
removeTrailingTrigger,
sortNodeCreateElements,
} from './utils';
import {
mockActionCreateElement,
mockNodeCreateElement,
@@ -77,4 +82,25 @@ describe('NodeCreator - utils', () => {
expect(formatTriggerActionName(actionName)).toEqual(expected);
});
});
describe('removeTrailingTrigger', () => {
test.each([
['Telegram Trigger', 'Telegram'],
['Trigger Telegram', 'Trigger Telegram'],
['Telegram Tri', 'Telegram'],
['Telegram Bot', 'Telegram Bot'],
['Tri', 'Tri'],
['Trigger', 'Trigger'],
['Telegram', 'Telegram'],
['Telegram Trigger Bot', 'Telegram Trigger Bot'],
['Telegram Trig', 'Telegram'],
['Telegram Bot trigger', 'Telegram Bot'],
['Telegram TRIGGER', 'Telegram'],
['', ''],
['Telegram　Trigger', 'Telegram　Trigger'], // full-width space,
['Telegram Trigger ', 'Telegram Trigger'],
['Telegram Trigger', 'Telegram'],
])('should transform "%s" to "%s"', (input, expected) => {
expect(removeTrailingTrigger(input)).toEqual(expected);
});
});
});

30
packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.ts
View File

@@ -90,22 +90,34 @@ export function sortNodeCreateElements(nodes: INodeCreateElement[]) {
});
}
// We remove `Trigger` from e.g. `Telegram Trigger` to show it as part of the `Telegram` group,
// but still want to show matching results when the user types `Telegram Tri` or `Telegram Trigger`
// Ideally this would be handled via metadata, but that is a larger refactor.
export function removeTrailingTrigger(searchFilter: string) {
const parts = searchFilter.split(' ');
if (parts.length > 1 && 'trigger'.startsWith(parts.slice(-1)[0].toLowerCase())) {
return parts
.slice(0, -1)
.filter((x) => x)
.join(' ')
.trimEnd();
}
return searchFilter;
}
export function searchNodes(searchFilter: string, items: INodeCreateElement[]) {
const askAiEnabled = useSettingsStore().isAskAiEnabled;
if (!askAiEnabled) {
items = items.filter((item) => item.key !== AI_TRANSFORM_NODE_TYPE);
}
// In order to support the old search we need to remove the 'trigger' part
const trimmedFilter = searchFilter.toLowerCase().replace('trigger', '').trimEnd();
const trimmedFilter = removeTrailingTrigger(searchFilter).toLowerCase();
// We have a snapshot of this call in sublimeSearch.test.ts to assert practical order for some cases
// Please kindly update the test call if you modify the weights here, and ideally regenerate the snapshot as described in its file.
const result = (
sublimeSearch<INodeCreateElement>(trimmedFilter, items, [
{ key: 'properties.displayName', weight: 1.3 },
{ key: 'properties.codex.alias', weight: 1 },
]) || []
).map(({ item }) => item);
// Please update the snapshots per the README next to the the snapshots if you modify items significantly.
const result = (sublimeSearch<INodeCreateElement>(trimmedFilter, items) || []).map(
({ item }) => item,
);
return result;
}