Migrate Rank.Threshold to User Preferences

specifyweb/frontend/js_src/lib/components/Attachments/RecordSetAttachment.tsx

@@ -109,7 +109,8 @@ export function RecordSetAttachments<SCHEMA extends AnySchema>({
 
   const isComplete = fetchedCount.current === recordCount;
 
-  const [showCreateRecordSetDialog, setShowCreateRecordSetDialog] = React.useState(false);
+  const [showCreateRecordSetDialog, setShowCreateRecordSetDialog] =
+    React.useState(false);
 
   return (
     <>
@@ -133,16 +134,17 @@ export function RecordSetAttachments<SCHEMA extends AnySchema>({
               <Button.Info
                 title={attachmentsText.downloadAllDescription()}
                 onClick={(): void =>
-                  (recordSetId === undefined && !isComplete) ? 
-                  setShowCreateRecordSetDialog(true)
-                  :
-                  loading(
-                    downloadAllAttachments(
-                      (recordSetId !== undefined && !isComplete) ? [] : attachmentsRef.current?.attachments ?? [],
-                      name,
-                      recordSetId,
-                    )
-                  )
+                  recordSetId === undefined && !isComplete
+                    ? setShowCreateRecordSetDialog(true)
+                    : loading(
+                        downloadAllAttachments(
+                          recordSetId !== undefined && !isComplete
+                            ? []
+                            : (attachmentsRef.current?.attachments ?? []),
+                          name,
+                          recordSetId
+                        )
+                      )
                 }
               >
                 {attachmentsText.downloadAll()}
@@ -157,15 +159,15 @@ export function RecordSetAttachments<SCHEMA extends AnySchema>({
           header={
             attachmentsRef.current?.attachments === undefined
               ? attachmentsText.attachments()
-              : (isComplete ? 
-                commonText.countLine({
-                  resource: attachmentsText.attachments(),
-                  count: attachmentsRef.current.attachments.length
-                }) : 
-                commonText.countLineOrMore({
-                  resource: attachmentsText.attachments(),
-                  count: attachmentsRef.current.attachments.length
-                }))
+              : isComplete
+                ? commonText.countLine({
+                    resource: attachmentsText.attachments(),
+                    count: attachmentsRef.current.attachments.length,
+                  })
+                : commonText.countLineOrMore({
+                    resource: attachmentsText.attachments(),
+                    count: attachmentsRef.current.attachments.length,
+                  })
           }
           onClose={handleHideAttachments}
         >
@@ -215,13 +217,11 @@ function CreateRecordSetDialog({
 }): JSX.Element {
   return (
     <Dialog
-      buttons={
-          <Button.DialogClose>{commonText.close()}</Button.DialogClose>
-      }
+      buttons={<Button.DialogClose>{commonText.close()}</Button.DialogClose>}
       header={attachmentsText.downloadAll()}
       onClose={onClose}
     >
       {attachmentsText.createRecordSetToDownloadAll()}
     </Dialog>
   );
-}
+}

specifyweb/frontend/js_src/lib/components/BatchEdit/index.tsx

@@ -247,7 +247,6 @@ const containsSystemTables = (queryFieldSpec: QueryFieldSpec) => {
   return Boolean(baseIsBlocked || pathHasBlockedSystem);
 };
 
-
 const hasHierarchyBaseTable = (queryFieldSpec: QueryFieldSpec) =>
   Object.keys(schema.domainLevelIds).includes(
     queryFieldSpec.baseTable.name.toLowerCase() as 'collection'

specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts

@@ -7,7 +7,11 @@ import { softFail } from '../Errors/Crash';
 import { isTreeResource } from '../InitialContext/treeRanks';
 import type { BusinessRuleDefs } from './businessRuleDefs';
 import { businessRuleDefs } from './businessRuleDefs';
-import { backboneFieldSeparator, backendFilter, djangoLookupSeparator } from './helpers';
+import {
+  backboneFieldSeparator,
+  backendFilter,
+  djangoLookupSeparator,
+} from './helpers';
 import type {
   AnySchema,
   AnyTree,
@@ -316,10 +320,7 @@ export class BusinessRuleManager<SCHEMA extends AnySchema> {
         )
       );
 
-    const stringValuesAreEqual = (
-      left: string,
-      right: string
-    ): boolean =>
+    const stringValuesAreEqual = (left: string, right: string): boolean =>
       rule.isDatabaseConstraint
         ? left.localeCompare(right, undefined, { sensitivity: 'accent' }) === 0
         : left === right;

specifyweb/frontend/js_src/lib/components/Preferences/Renderers.tsx

@@ -24,7 +24,7 @@ import type { RA } from '../../utils/types';
 import { Input, Select, Textarea } from '../Atoms/Form';
 import { iconClassName } from '../Atoms/Icons';
 import { ReadOnlyContext } from '../Core/Contexts';
-import type { AnySchema } from '../DataModel/helperTypes';
+import type { AnySchema, AnyTree } from '../DataModel/helperTypes';
 import type { SpecifyTable } from '../DataModel/specifyTable';
 import { tables } from '../DataModel/tables';
 import type { Collection } from '../DataModel/types';
@@ -33,6 +33,7 @@ import { useMenuItems, useUserTools } from '../Header/menuItemProcessing';
 import { AttachmentPicker } from '../Molecules/AttachmentPicker';
 import { AutoComplete } from '../Molecules/AutoComplete';
 import { ListEdit } from '../Toolbar/ListEdit';
+import { getTreeDefinitions, treeRanksPromise } from '../InitialContext/treeRanks';
 import type { PreferenceItem, PreferenceRendererProps } from './types';
 import { userPreferences } from './userPreferences';
 
@@ -378,3 +379,58 @@ export function DefaultPreferenceItemRender({
     />
   );
 }
+
+type Rank = { readonly rankId: number; readonly name: string };
+
+/*
+ * This grabs the ranks from the API and displays them in a dropdown
+ * The ranks are sorted in ascending order by `rankId` so they appear in the correct order for the user
+ */
+export function ThresholdRank({
+  value,
+  onChange,
+  tableName,
+}: PreferenceRendererProps<number> & {
+  readonly tableName: AnyTree['tableName'];
+}): JSX.Element {
+  const [items, setItems] = React.useState<readonly Rank[]>([]);
+
+  React.useEffect(() => {
+    let isMounted = true;
+    treeRanksPromise
+      .then(() => {
+        const definitions = getTreeDefinitions(tableName);
+        const activeDefinition = definitions[0];
+        /**
+         * Only expose ranks from the treedef tied to the current discipline.
+         * Otherwise ranks from unrelated trees leak into the dropdown.
+         */
+        const ranks = activeDefinition?.ranks ?? [];
+        if (!isMounted) return;
+        setItems(
+          ranks
+            .map<Rank>(({ rankId, name }) => ({
+              rankId,
+              name,
+            }))
+            .sort((rankA, rankB) => rankA.rankId - rankB.rankId)
+        );
+      })
+      .catch((error: unknown) => {
+        console.error('Error fetching ThresholdRank items:', error);
+        if (isMounted) setItems([]);
+      });
+    return () => {
+      isMounted = false;
+    };
+  }, [tableName]);
+
+  return (
+    <select value={value ?? ''} onChange={e => onChange(Number(e.target.value))}>
+      <option value="">None</option>
+      {items.map(({ rankId, name }) => (
+        <option key={rankId} value={rankId}>{name}</option>
+      ))}
+    </select>
+  );
+}

specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx

@@ -50,6 +50,7 @@ import {
   defaultFont,
   FontFamilyPreferenceItem,
   HeaderItemsPreferenceItem,
+  ThresholdRank,
   WelcomePageModePreferenceItem,
 } from './Renderers';
 import type { GenericPreferences, PreferencesVisibilityContext } from './types';
@@ -1474,6 +1475,17 @@ export const userPreferenceDefinitions = {
             renderer: ColorPickerPreferenceItem,
             container: 'label',
           }),
+          rankThreshold: definePref<number>({
+            title: preferencesText.rankThreshold(),
+            description: preferencesText.rankThresholdDescription(),
+            requiresReload: true,
+            visible: true,
+            defaultValue: 0,
+            renderer: (props) => (
+              <ThresholdRank {...props} tableName="Geography" />
+            ),
+            container: 'label',
+          }),
         },
       },
       taxon: {
@@ -1502,6 +1514,15 @@ export const userPreferenceDefinitions = {
             defaultValue: true,
             type: 'java.lang.Boolean',
           }),
+          rankThreshold: definePref<number>({
+            title: preferencesText.rankThreshold(),
+            description: preferencesText.rankThresholdDescription(),
+            requiresReload: true,
+            visible: true,
+            defaultValue: 0,
+            renderer: (props) => <ThresholdRank {...props} tableName="Taxon" />,
+            container: 'label',
+          }),
         },
       },
       storage: {
@@ -1523,6 +1544,17 @@ export const userPreferenceDefinitions = {
             renderer: ColorPickerPreferenceItem,
             container: 'label',
           }),
+          rankThreshold: definePref<number>({
+            title: preferencesText.rankThreshold(),
+            description: preferencesText.rankThresholdDescription(),
+            requiresReload: true,
+            visible: true,
+            defaultValue: 0,
+            renderer: (props) => (
+              <ThresholdRank {...props} tableName="Storage" />
+            ),
+            container: 'label',
+          }),
         },
       },
       geologicTimePeriod: {
@@ -1544,6 +1576,17 @@ export const userPreferenceDefinitions = {
             renderer: ColorPickerPreferenceItem,
             container: 'label',
           }),
+          rankThreshold: definePref<number>({
+            title: preferencesText.rankThreshold(),
+            description: preferencesText.rankThresholdDescription(),
+            requiresReload: true,
+            visible: true,
+            defaultValue: 0,
+            renderer: (props) => (
+              <ThresholdRank {...props} tableName="GeologicTimePeriod" />
+            ),
+            container: 'label',
+          }),
         },
       },
       lithoStrat: {
@@ -1565,6 +1608,17 @@ export const userPreferenceDefinitions = {
             renderer: ColorPickerPreferenceItem,
             container: 'label',
           }),
+          rankThreshold: definePref<number>({
+            title: preferencesText.rankThreshold(),
+            description: preferencesText.rankThresholdDescription(),
+            requiresReload: true,
+            visible: true,
+            defaultValue: 0,
+            renderer: (props) => (
+              <ThresholdRank {...props} tableName="LithoStrat" />
+            ),
+            container: 'label',
+          }),
         },
       },
       tectonicUnit: {
@@ -1586,6 +1640,17 @@ export const userPreferenceDefinitions = {
             renderer: ColorPickerPreferenceItem,
             container: 'label',
           }),
+          rankThreshold: definePref<number>({
+            title: preferencesText.rankThreshold(),
+            description: preferencesText.rankThresholdDescription(),
+            requiresReload: true,
+            visible: true,
+            defaultValue: 0,
+            renderer: (props) => (
+              <ThresholdRank {...props} tableName="TectonicUnit" />
+            ),
+            container: 'label',
+          }),
         },
       },
     },

specifyweb/frontend/js_src/lib/components/Preferences/__tests__/ThresholdRank.test.tsx

@@ -0,0 +1,64 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+
+import { preferencesText } from '../../../localization/preferences';
+import { overrideAjax } from '../../../tests/ajax';
+import { requireContext } from '../../../tests/helpers';
+import * as treeRanks from '../../InitialContext/treeRanks';
+import { ThresholdRank } from '../Renderers';
+import type { PreferenceItem } from '../types';
+
+overrideAjax('/context/schema_localization.json', {});
+requireContext();
+
+const mockedGetTreeDefinitions = jest.spyOn(
+  treeRanks,
+  'getTreeDefinitions'
+);
+
+describe('ThresholdRank', () => {
+  beforeEach(() => {
+    mockedGetTreeDefinitions.mockReset();
+  });
+
+  test('only renders ranks from the active tree definition', async () => {
+    mockedGetTreeDefinitions.mockReturnValue([
+      {
+        definition: { id: 1 } as any,
+        ranks: [
+          { rankId: 50, name: 'Active Rank B' },
+          { rankId: 10, name: 'Active Rank A' },
+        ] as any,
+      },
+      {
+        definition: { id: 2 } as any,
+        ranks: [{ rankId: 5, name: 'Inactive Rank' }] as any,
+      },
+    ]);
+
+    const definition: PreferenceItem<number> = {
+      title: preferencesText.rankThreshold(),
+      requiresReload: false,
+      visible: true,
+      defaultValue: 0,
+      values: [],
+    };
+    render(
+      <ThresholdRank
+        category="tree"
+        definition={definition}
+        item="rankThreshold"
+        subcategory="geography"
+        tableName="Geography"
+        value={50}
+        onChange={jest.fn()}
+      />
+    );
+
+    await waitFor(() => expect(screen.getAllByRole('option')).toHaveLength(3));
+
+    const labels = screen.getAllByRole('option').map((option) => option.textContent);
+    expect(labels).toEqual(['None', 'Active Rank A', 'Active Rank B']);
+    expect(screen.queryByText('Inactive Rank')).not.toBeInTheDocument();
+  });
+});

specifyweb/frontend/js_src/lib/components/TreeView/Tree.tsx

@@ -19,7 +19,6 @@ import { idFromUrl } from '../DataModel/resource';
 import { deserializeResource } from '../DataModel/serializers';
 import { softError } from '../Errors/assert';
 import { ResourceView } from '../Forms/ResourceView';
-import { getPref } from '../InitialContext/remotePrefs';
 import { hasTablePermission } from '../Permissions/helpers';
 import { useHighContrast } from '../Preferences/Hooks';
 import { userPreferences } from '../Preferences/userPreferences';
@@ -98,9 +97,12 @@ export function Tree<
     'synonymColor'
   );
 
-  const statsThreshold = getPref(
-    `TreeEditor.Rank.Threshold.${tableName as 'Geography'}`
+  const [statsThreshold] = userPreferences.use(
+    'treeEditor',
+    treeToPref[tableName],
+    'rankThreshold'
   );
+
   const getStats = React.useCallback(
     async (nodeId: number | 'null', rankId: number): Promise<Stats> =>
       rankId >= statsThreshold