Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
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
26 changes: 9 additions & 17 deletions Composer/packages/lib/code-editor/src/lu/InsertEntityButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,18 @@ export const InsertEntityButton = React.memo((props: Props) => {
[onInsertEntity]
);

const { menuProps, noEntities } = useLabelingMenuProps(labelingMenuVisible ? 'disable' : 'none', luFile, itemClick, {
menuHeaderText: labelingMenuVisible ? formatMessage('Tag entity') : undefined,
});
const { menuProps, noEntities } = useLabelingMenuProps(labelingMenuVisible ? 'disable' : 'none', luFile, itemClick);

const mode = React.useMemo(() => (labelingMenuVisible ? 'tag' : 'insert'), [labelingMenuVisible]);
const disabled = React.useMemo(
() => noEntities || (mode === 'tag' && tagEntityDisabled) || (mode === 'insert' && insertEntityDisabled),
[mode, noEntities, insertEntityDisabled, tagEntityDisabled]
);
const disabled = React.useMemo(() => noEntities || insertEntityDisabled || labelingMenuVisible, [
noEntities,
insertEntityDisabled,
tagEntityDisabled,
labelingMenuVisible,
]);

const { iconName, text } = React.useMemo(
() => getLuToolbarItemTextAndIcon(labelingMenuVisible ? 'tagEntity' : 'useEntity'),
[labelingMenuVisible]
);
const { iconName, text } = React.useMemo(() => getLuToolbarItemTextAndIcon('useEntity'), []);

const CommandBarButton = React.useMemo(
() =>
getCommandBarButton(labelingMenuVisible ? formatMessage('Tag entity') : formatMessage('Insert defined entity')),
[labelingMenuVisible]
);
const CommandBarButton = React.useMemo(() => getCommandBarButton(formatMessage('Insert defined entity')), []);

return (
<CommandBarButton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const LuLabelingMenu = ({ editor, luFile, onMenuToggled, onInsertEntity }
);

const { menuProps, noEntities } = useLabelingMenuProps('filter', luFile, itemClick, {
menuHeaderText: formatMessage('Tag entity'),
menuHeaderText: formatMessage('Label entity'),
});

return menuTargetElm && !noEntities ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,29 +88,4 @@ describe('<InsertEntityButton />', () => {

expect((await screen.findAllByText(/.*target.*/)).length).toBe(1);
});

it('Should disable non-ml entities when labeling menu is visible', async () => {
const container = render(
<InsertEntityButton
insertEntityDisabled
labelingMenuVisible
luFile={luFile}
tagEntityDisabled={false}
onInsertEntity={jest.fn()}
/>
);

fireEvent.click(screen.getByTestId('menuButton'));
const elms = container.getAllByText('Prebuilt entity');

const allDisabled = elms.reduce((acc, elm) => {
if (!elm.closest('button')?.classList.contains('is-disabled')) {
acc = false;
}

return acc;
}, true);

expect(allDisabled).toBeTruthy();
});
});
4 changes: 0 additions & 4 deletions Composer/packages/lib/code-editor/src/lu/iconUtils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,5 @@ export const getLuToolbarItemTextAndIcon = (kind: LuToolbarButtonKind): { iconNa
case 'useEntity': {
return { iconName: 'Insert', text: formatMessage('Insert entity') };
}

case 'tagEntity': {
return { iconName: 'Highlight', text: formatMessage('Tag entity') };
}
}
};
2 changes: 1 addition & 1 deletion Composer/packages/lib/code-editor/src/lu/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

export const toolbarSupportedLuEntityTypes = ['prebuilt', 'ml', 'list', 'composite', 'regex'] as const;
export type ToolbarLuEntityType = typeof toolbarSupportedLuEntityTypes[number];
export type LuToolbarButtonKind = 'useEntity' | 'defineEntity' | 'tagEntity';
export type LuToolbarButtonKind = 'useEntity' | 'defineEntity';