Skip to content

Allow editing tag:value in TagSelector #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmattheis merged 3 commits into from
Feb 1, 2026
Merged

Allow editing tag:value in TagSelector #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b1658a
feat: click to edit, ctrl+click to delete
sf1tzp Jan 25, 2026
f7006db
fix: preserve value part when creating a new tag
sf1tzp Jan 25, 2026
442acc1
fix: show tag selector errors in dashboard entry edit dialog
jmattheis Feb 1, 2026
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 ui/src/common/TagChip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const useStyles = makeStyles((theme: Theme) => ({
interface TagChipProps {
label: string;
color: string;
onClick?: () => void;
onClick?: (e: React.MouseEvent) => void;
}

export const TagChip: React.FC<TagChipProps> = ({color, label, onClick}) => {
Expand Down
1 change: 0 additions & 1 deletion ui/src/dashboard/Entry/DashboardEntryForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ export const DashboardEntryForm: React.FC<EditPopupProps> = ({entry, onChange: s
}}
createTags={false}
onlySelectKeys
removeWhenClicked
/>

<FormTagSelector
Expand Down
33 changes: 23 additions & 10 deletions ui/src/tag/TagSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export interface TagSelectorProps {
createTags?: boolean;
allowDuplicateKeys?: boolean;
onlySelectKeys?: boolean;
removeWhenClicked?: boolean;
}

export const TagSelector: React.FC<TagSelectorProps> = ({
Expand All @@ -48,7 +47,6 @@ export const TagSelector: React.FC<TagSelectorProps> = ({
createTags = true,
allowDuplicateKeys = false,
onlySelectKeys = false,
removeWhenClicked = false,
}) => {
const classes = useStyles();
const [tooltipErrorActive, tooltipError, showTooltipError] = useError(4000);
Expand Down Expand Up @@ -127,14 +125,21 @@ export const TagSelector: React.FC<TagSelectorProps> = ({
return;
};

const onTagClicked = (entry: TagSelectorEntry) => {
if (!removeWhenClicked) {
const onTagClicked = (entry: TagSelectorEntry, edit: boolean) => {
// Prevent overwriting text that's already being edited
if (currentValue && edit) {
showTooltipError('Input is not empty. Use ctrl+click to delete tag without editing.');
return;
}
const tagIndex = selectedEntries.indexOf(entry);
selectedEntries.splice(tagIndex, 1);

setSelectedEntries(selectedEntries);
setSelectedEntries(selectedEntries.filter((selected) => selected !== entry));

if (edit) {
setCurrentValueInternal(itemLabel(entry, onlySelectKeys));
setOpen(true);
}

focusInput();
};

const onKeyDown = (event: React.KeyboardEvent) => {
Expand Down Expand Up @@ -177,6 +182,7 @@ export const TagSelector: React.FC<TagSelectorProps> = ({
disableHoverListener
disableTouchListener
open={tooltipErrorActive}
PopperProps={{style: {zIndex: 100000}}}
placement={'top'}
title={
<Typography color="inherit" style={{whiteSpace: 'pre-line'}}>
Expand Down Expand Up @@ -217,7 +223,10 @@ export const TagSelector: React.FC<TagSelectorProps> = ({
) : null}
{addDialogOpen && (
<AddTagDialog
onAdded={(tag) => trySubmit({tag, value: ''})}
onAdded={(tag) => {
const valuePart = currentValue.split(':')[1] || '';
trySubmit({tag, value: valuePart});
}}
open={true}
initialName={currentValue.split(':')[0]}
close={() => {
Expand Down Expand Up @@ -254,13 +263,17 @@ const Item: React.FC<ItemProps> = ({entry, selected, onlySelectKeys, onClick}) =
);
};

const toChips = (entries: TagSelectorEntry[], onlySelectKeys: boolean, onClick: (entry: TagSelectorEntry) => void) => {
const toChips = (
entries: TagSelectorEntry[],
onlySelectKeys: boolean,
onClick: (entry: TagSelectorEntry, edit: boolean) => void
) => {
return entries.map((entry) => (
<TagChip
key={itemLabel(entry, onlySelectKeys)}
label={itemLabel(entry, onlySelectKeys)}
color={entry.tag.color}
onClick={() => onClick(entry)}
onClick={(e) => onClick(entry, !e.ctrlKey)}
/>
));
};
Loading