Skip to content

46276 frontend [ datasets ] improvements to the dataset #207

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

Open
Maria-Lordwill wants to merge 3 commits into
base: master
Choose a base branch
from
Open

46276 frontend [ datasets ] improvements to the dataset #207

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
1a1836f
46276 feat(Dropdown): add disabled support for individual options; di…
Maria-Lordwill Apr 29, 2026
01246fd
46276 fix(datasets): use natural sort order for dataset items (1, 2, …
Maria-Lordwill Apr 29, 2026
25431ea
46276 fix(datasets): hide empty datasets from selection menu in templ…
Maria-Lordwill Apr 29, 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
4 changes: 3 additions & 1 deletion frontend/src/public/components/TemplateEdit/ExtraFields/utils/useDatasetOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export function useDatasetOptions(fields: IExtraField[]) {
}, [hasDatasetFields, isDatasetsLoaded, isDatasetsLoading, dispatch]);

return useMemo(
() => datasetsList.map((dataset) => ({ label: dataset.name, value: String(dataset.id) })),
() => datasetsList
.filter(({ itemsCount }) => itemsCount > 0)
.map(({ name, id }) => ({ label: name, value: String(id) })),
Copy link
Copy Markdown

@cursor cursor Bot Apr 29, 2026

Choose a reason for hiding this comment

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

Empty datasets filtered out instead of shown disabled

Medium Severity

The .filter(({ itemsCount }) => itemsCount > 0) call removes datasets with zero items from the options entirely, but the PR intent is to render them as disabled (visually muted, non-clickable, with aria-disabled). Filtering contradicts the stated behavior — empty datasets become invisible rather than disabled. Additionally, if a field already references a dataset whose items were later deleted, that dataset silently disappears from the dropdown, leaving the user unable to see or change the current selection.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 25431ea. Configure here.

[datasetsList],
);
}
4 changes: 2 additions & 2 deletions frontend/src/public/utils/dataset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ export function getSortedAndFilteredDatasetItems(

result.sort((a, b) => {
if (sorting === EDatasetsSorting.NameAsc) {
return a.value.localeCompare(b.value);
return a.value.localeCompare(b.value, undefined, { numeric: true });
}
if (sorting === EDatasetsSorting.NameDesc) {
return b.value.localeCompare(a.value);
return b.value.localeCompare(a.value, undefined, { numeric: true });
}
if (sorting === EDatasetsSorting.DateAsc) {
return a.order - b.order;
Expand Down