only order variable tree entities alphabetically (#1324)

Author: dmfalke

packages/libs/eda/src/lib/core/components/variableSelectors/VariableTree.tsx

@@ -14,6 +14,7 @@ import { ClearSelectionButton } from './VariableTreeDropdown';
 import { VariableLinkConfig } from '../VariableLink';
 import { useHistory } from 'react-router';
 import { useMemo } from 'react';
+import { orderBy } from 'lodash';
 
 export interface VariableTreeProps {
   starredVariables?: VariableDescriptor[];
@@ -44,7 +45,7 @@ export default function VariableTree({
   scope,
   asDropdown,
 }: VariableTreeProps) {
-  const entities = useStudyEntities();
+  const entities = orderBy(useStudyEntities(), 'displayName');
   const valuesMap = useValuesMap(entities);
   const flattenedFields = useFlattenedFields(entities, scope);
   const fieldsByTerm = useFlattenFieldsByTerm(flattenedFields);

packages/libs/eda/src/lib/core/utils/study-metadata.ts

@@ -13,9 +13,7 @@ import {
 import { preorder } from '@veupathdb/wdk-client/lib/Utils/TreeUtils';
 
 export function entityTreeToArray(rootEntity: StudyEntity): StudyEntity[] {
-  return Seq.from(preorder(rootEntity, (e) => e.children ?? []))
-    .orderBy((node) => node.displayName)
-    .toArray();
+  return Array.from(preorder(rootEntity, (e) => e.children ?? []));
 }
 
 export interface EntityAndVariable {