Skip to content

Fix custom ordering in metadata #1558

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
Arnei wants to merge 1 commit into
base: r/19.x
Choose a base branch
from
Open

Fix custom ordering in metadata #1558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 4 additions & 11 deletions src/components/shared/DropDown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
dropDownStyle,
} from "../../utils/componentStyles";
import { GroupBase, MenuListProps, Props, SelectInstance } from "react-select";
import { isJson } from "../../utils/utils";
import { ParseKeys } from "i18next";
import { FixedSizeList, ListChildComponentProps } from "react-window";
import AsyncSelect from "react-select/async";
Expand Down Expand Up @@ -102,29 +101,23 @@ const DropDown = <T, >({
unformattedOptions.push({
value: "",
label: `-- ${t("SELECT_NO_OPTION_SELECTED")} --`,
order: 0,
});
}

// Sort
/**
* This is used to determine whether any entry of the passed `unformattedOptions`
* This is used to determine whether every entry of the passed `unformattedOptions`
* contains an `order` field, indicating that a custom ordering for that list
* exists and the list therefore should not be ordered alphabetically.
*/
const hasCustomOrder = unformattedOptions.every(item => {
if (!isJson(item.label)) {
return false;
}
// TODO: Handle JSON parsing errors
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const parsed = JSON.parse(item.label);
return parsed && typeof parsed === "object" && "order" in parsed;
return item.order !== undefined;
});

if (hasCustomOrder) {
// Apply custom ordering.
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
unformattedOptions.sort((a, b) => JSON.parse(a.label).order - JSON.parse(b.label).order);
unformattedOptions.sort((a, b) => a.order! - b.order!);
} else {
// Apply alphabetical ordering.
unformattedOptions.sort((a, b) => a.label.localeCompare(b.label));
Expand Down
Loading