Skip to content

Enable nested to-many in Workbench #6216

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
merged 15 commits into from
Apr 15, 2025
Merged

Enable nested to-many in Workbench #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f7c30e1
Enable nested to-many in Workbench
sharadsw Feb 10, 2025
f6b6562
Update test
sharadsw Feb 12, 2025
0fa6fc8
Add upload plan changes
sharadsw Feb 14, 2025
82033cd
Update tests
sharadsw Feb 14, 2025
a56c65b
Lint code with ESLint and Prettier
sharadsw Feb 14, 2025
e811142
Merge remote-tracking branch 'origin/issue-6127' into issue-2331
sharadsw Feb 26, 2025
06a4cc6
Merge branch 'issue-6127' into issue-2331
sharadsw Mar 3, 2025
f1fa36e
Merge branch 'issue-6127' into issue-2331
sharadsw Mar 3, 2025
8574c50
Merge branch 'issue-6127' into issue-2331
sharadsw Mar 6, 2025
f713380
Merge remote-tracking branch 'origin/issue-6127' into issue-2331
sharadsw Mar 28, 2025
f0822bf
Fix tests
sharadsw Mar 28, 2025
8f3891a
Lint code with ESLint and Prettier
sharadsw Mar 28, 2025
2367a75
Merge branch 'issue-6127' into issue-2331
sharadsw Apr 15, 2025
f27581b
Merge branch 'issue-6127' into issue-2331
sharadsw Apr 15, 2025
072b0dc
Lint code with ESLint and Prettier
sharadsw Apr 15, 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
2 changes: 1 addition & 1 deletion specifyweb/frontend/js_src/lib/components/BatchEdit/MissingRanks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import { batchEditText } from '../../localization/batchEdit';
import { commonText } from '../../localization/common';
import { interactionsText } from '../../localization/interactions';
import type { RA,RR } from '../../utils/types';
import type { RA, RR } from '../../utils/types';
import { H2, H3, Ul } from '../Atoms';
import { Button } from '../Atoms/Button';
import { Input, Label } from '../Atoms/Form';
Expand Down
482 changes: 242 additions & 240 deletions specifyweb/frontend/js_src/lib/components/FormSliders/IntegratedRecordSelector.tsx
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion specifyweb/frontend/js_src/lib/components/Interactions/PrepDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ export function PrepDialog({

const items = filterArray(
preparations.map((preparation, index) => {
if (selected[index] === 0 || Number.isNaN(selected[index])) return undefined;
if (selected[index] === 0 || Number.isNaN(selected[index]))
return undefined;

const result = new itemTable.Resource();
result.set(
Expand Down
6 changes: 4 additions & 2 deletions specifyweb/frontend/js_src/lib/components/Interactions/PrepDialogRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,13 @@ export function PrepDialogRow({
</td>
<td>
{preparation.taxon ? (
<Link.NewTab href={getResourceViewUrl('Taxon', preparation.taxonId)}>
<Link.NewTab
href={getResourceViewUrl('Taxon', preparation.taxonId)}
>
{localized(preparation.taxon)}
</Link.NewTab>
) : (
<span>{interactionsText.notAvailable()}</span>
<span>{interactionsText.notAvailable()}</span>
)}
</td>
<td>{preparation.prepType}</td>
Expand Down
6 changes: 3 additions & 3 deletions specifyweb/frontend/js_src/lib/components/Reports/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ function ReportRow({
</td>
<td>
<ReadOnlyContext.Provider value>
<FormattedResourceUrl
resourceUrl={entry.appResource.specifyUser}
/>
<FormattedResourceUrl
resourceUrl={entry.appResource.specifyUser}
/>
</ReadOnlyContext.Provider>
</td>
<td>
Expand Down
18 changes: 10 additions & 8 deletions specifyweb/frontend/js_src/lib/components/SearchDialog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function SearchDialog<SCHEMA extends AnySchema>(
}}
/>
) : (
<SearchForm {...props} onUseQueryBuilder={handleUseQueryBuilder}/>
<SearchForm {...props} onUseQueryBuilder={handleUseQueryBuilder} />
);
}

Expand Down Expand Up @@ -186,7 +186,7 @@ function SearchForm<SCHEMA extends AnySchema>({
onClose: handleClose,
onUseQueryBuilder: handleUseQueryBuilder,
onAdd: handleAdd,
multiple
multiple,
}: {
readonly forceCollection: number | undefined;
readonly extraFilters: RA<QueryComboBoxFilter<SCHEMA>> | undefined;
Expand All @@ -198,7 +198,7 @@ function SearchForm<SCHEMA extends AnySchema>({
readonly onAdd?:
| ((resources: RA<SpecifyResource<SCHEMA>>) => void)
| undefined;
readonly multiple?: boolean
readonly multiple?: boolean;
}): JSX.Element | null {
const templateResource = React.useMemo(
() =>
Expand Down Expand Up @@ -242,11 +242,13 @@ function SearchForm<SCHEMA extends AnySchema>({
{queryText.queryBuilder()}
</Button.Info>
</ProtectedAction>
{multiple === true && <SelectRecordSets
handleParentClose={handleClose}
table={table}
onAdd={handleAdd}
/>}
{multiple === true && (
<SelectRecordSets
handleParentClose={handleClose}
table={table}
onAdd={handleAdd}
/>
)}
<Submit.Success form={id('form')}>
{commonText.search()}
</Submit.Success>
Expand Down
Loading
Loading