diff --git a/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx b/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx index 044bbd9fc25..78e891d0dff 100644 --- a/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx +++ b/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx @@ -65,9 +65,10 @@ const isDarkMode = ({ }: PreferencesVisibilityContext): boolean => isDarkMode || isRedirecting; // Navigator may not be defined in some environments, like non-browser environments -const altKeyName = typeof navigator !== 'undefined' && navigator?.userAgent?.includes('Mac') - ? 'Option' - : 'Alt'; +const altKeyName = + typeof navigator !== 'undefined' && navigator?.userAgent?.includes('Mac') + ? 'Option' + : 'Alt'; /** * Have to be careful as preferences may be used before schema is loaded diff --git a/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx b/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx index 830978533b7..5d9b16c42dd 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx +++ b/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx @@ -264,29 +264,32 @@ export function QueryComboBox({ (typeof typeSearch === 'object' ? typeSearch?.table : undefined) ?? field.relatedTable; - const [fetchedTreeDefinition] = useAsyncState( - React.useCallback(async () => { - if (resource?.specifyTable === tables.Determination) { - return resource.collection?.related?.specifyTable === tables.CollectionObject - ? (resource.collection?.related as SpecifyResource) - .rgetPromise('collectionObjectType') - .then( - ( - collectionObjectType: - | SpecifyResource - | undefined - ) => collectionObjectType?.get('taxonTreeDef') - ) - : undefined; - } else if (resource?.specifyTable === tables.Taxon) { - const definition = resource.get('definition') - const parentDefinition = (resource?.independentResources?.parent as SpecifyResource)?.get?.('definition'); - return definition || parentDefinition; + const [fetchedTreeDefinition] = useAsyncState( + React.useCallback(async () => { + if (resource?.specifyTable === tables.Determination) { + return resource.collection?.related?.specifyTable === + tables.CollectionObject + ? (resource.collection?.related as SpecifyResource) + .rgetPromise('collectionObjectType') + .then( + ( + collectionObjectType: + | SpecifyResource + | undefined + ) => collectionObjectType?.get('taxonTreeDef') + ) + : undefined; + } else if (resource?.specifyTable === tables.Taxon) { + const definition = resource.get('definition'); + const parentDefinition = ( + resource?.independentResources?.parent as SpecifyResource + )?.get?.('definition'); + return definition || parentDefinition; } - return undefined; - }, [resource, resource?.collection?.related?.get('collectionObjectType')]), - false - ); + return undefined; + }, [resource, resource?.collection?.related?.get('collectionObjectType')]), + false + ); // Tree Definition passed by a parent QCBX in the component tree const parentTreeDefinition = React.useContext(TreeDefinitionContext); diff --git a/specifyweb/frontend/js_src/lib/components/RouterCommands/SwitchCollection.tsx b/specifyweb/frontend/js_src/lib/components/RouterCommands/SwitchCollection.tsx index aeb54a2407e..ef201ec09d8 100644 --- a/specifyweb/frontend/js_src/lib/components/RouterCommands/SwitchCollection.tsx +++ b/specifyweb/frontend/js_src/lib/components/RouterCommands/SwitchCollection.tsx @@ -42,8 +42,8 @@ export function SwitchCollectionCommand(): null { body: collectionId!.toString(), errorMode: 'dismissible', }) - .then(clearAllCache) - .then(() => globalThis.location.replace(nextUrl)), + .then(clearAllCache) + .then(() => globalThis.location.replace(nextUrl)), [collectionId, nextUrl] ), true diff --git a/specifyweb/frontend/js_src/lib/components/SearchDialog/index.tsx b/specifyweb/frontend/js_src/lib/components/SearchDialog/index.tsx index 645028f5b00..c6633066a53 100644 --- a/specifyweb/frontend/js_src/lib/components/SearchDialog/index.tsx +++ b/specifyweb/frontend/js_src/lib/components/SearchDialog/index.tsx @@ -158,7 +158,7 @@ function testFilter( ? // Cast numbers to strings values.some((value) => { const fieldValue = resource.get(field); - // eslint-disable-next-line eqeqeq + return isRelationship ? value == strictIdFromUrl(fieldValue!).toString() : value == fieldValue;