Skip to content

Remove cat number format check in interaction dialog #6306

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

Merged
CarolineDenis merged 6 commits into from
Mar 13, 2025
Merged

Remove cat number format check in interaction dialog #6306

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08bbd34
Remove cat number format check in interaction dialog
CarolineDenis Mar 7, 2025
efa337f
Remove import
CarolineDenis Mar 7, 2025
1e860bc
Check if collection has several types
CarolineDenis Mar 10, 2025
b54685d
Set error message for cat num format only for collections that have 1…
CarolineDenis Mar 10, 2025
d531830
Remove import
CarolineDenis Mar 10, 2025
c6b2ba9
Do not use parser.parser when sevral cotype
CarolineDenis Mar 12, 2025
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
29 changes: 26 additions & 3 deletions specifyweb/frontend/js_src/lib/components/Interactions/InteractionDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import type { State } from 'typesafe-reducer';

import { useAsyncState } from '../../hooks/useAsyncState';
import { useValidation } from '../../hooks/useValidation';
import { commonText } from '../../localization/common';
import { interactionsText } from '../../localization/interactions';
Expand Down Expand Up @@ -32,6 +33,7 @@ import type {
} from '../DataModel/helperTypes';
import type { SpecifyResource } from '../DataModel/legacyTypes';
import { getResourceViewUrl } from '../DataModel/resource';
import { fetchContext as fetchDomain } from '../DataModel/schema';
import type { LiteralField } from '../DataModel/specifyField';
import type { Collection, SpecifyTable } from '../DataModel/specifyTable';
import { tables } from '../DataModel/tables';
Expand Down Expand Up @@ -202,14 +204,25 @@ export function InteractionDialog({
})),
});

const [collectionHasSeveralTypes] = useAsyncState(
React.useCallback(
async () =>
fetchDomain.then(async (schema) => Object.keys(schema.collectionObjectTypeCatalogNumberFormats).length > 1),
[]
),
false
);

function handleParse(): RA<string> | undefined {
const parseResults = split(catalogNumbers).map((value) =>
parseValue(parser, inputRef.current ?? undefined, value)
);

const errorMessages = parseResults
.filter((result): result is InvalidParseResult => !result.isValid)
.map(({ reason, value }) => `${reason} (${value})`);
if (errorMessages.length > 0) {
.filter((result): result is InvalidParseResult => !result.isValid)
.map(({ reason, value }) => `${reason} (${value})`);

if (errorMessages.length > 0 && collectionHasSeveralTypes === false) {
setValidation(errorMessages);
setState({
type: 'InvalidState',
Expand All @@ -218,12 +231,22 @@ export function InteractionDialog({
return undefined;
}

if (collectionHasSeveralTypes === true) {
const parsedCatNumber = split(catalogNumbers);

setCatalogNumbers(parsedCatNumber.join('\n'));
setState({ type: 'MainState' });

return parsedCatNumber.map(String);
}

const parsed = f.unique(
(parseResults as RA<ValidParseResult>)
.filter(({ parsed }) => parsed !== null)
.map(({ parsed }) => (parsed as number | string).toString())
.sort(sortFunction(f.id))
);

setCatalogNumbers(parsed.join('\n'));

setState({ type: 'MainState' });
Expand Down