Skip to content
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.

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

35254 Add Metagenomic Workflow #1473

Merged
merged 7 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/common-ui/lib/api-client/useQuery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ export function useQuery<TData extends KitsuResponseData, TMeta = undefined>(
);
}

await onSuccess?.(response);

if (joinSpecs) {
const { data } = response;
const resources = isArray(data) ? data : [data];
Expand All @@ -104,6 +102,8 @@ export function useQuery<TData extends KitsuResponseData, TMeta = undefined>(
}
}

await onSuccess?.(response);

return response;
}

Expand Down
5 changes: 5 additions & 0 deletions packages/dina-ui/components/button-bar/nav/nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,11 @@ function NavSequenceDropdown({ formatMessage }) {
<SeqdbMessage id="libraryPrepBatchListTitle" />
</NavDropdown.Item>
</Link>
<Link href="/seqdb/metagenomics-workflow/list" passHref={true}>
<NavDropdown.Item role="menuitem">
<SeqdbMessage id="metagenomicsWorkflowTitle" />
</NavDropdown.Item>
</Link>
<Link href="/seqdb/molecular-analysis-run/list" passHref={true}>
<NavDropdown.Item role="menuitem">
<SeqdbMessage id="molecularAnalysisRunListTitle" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import { useDinaIntl } from "../../intl/dina-ui-intl";
import useVocabularyOptions from "./useVocabularyOptions";
import { IdentifierType } from "packages/dina-ui/types/collection-api/resources/IdentifierType";
import { startCase } from "lodash";
import { boolean } from "zod";

export interface VocabularySelectFieldProps extends FieldWrapperProps {
path: string;
isMulti?: boolean;
selectProps?: Partial<
CreatableProps<VocabularyOption, true, GroupBase<VocabularyOption>>
>;
isDisabled?: boolean;
}

export interface VocabularyOption {
Expand All @@ -28,6 +30,7 @@ export function VocabularySelectField({
path,
selectProps,
isMulti,
isDisabled,
...labelWrapperProps
}: VocabularySelectFieldProps) {
const { formatMessage } = useDinaIntl();
Expand Down Expand Up @@ -60,6 +63,7 @@ export function VocabularySelectField({
return (
<div className={invalid ? "is-invalid" : ""}>
<CreatableSelect<VocabularyOption, boolean>
isDisabled={isDisabled}
isClearable={true}
options={vocabOptions}
isLoading={loading}
Expand Down
Loading
Loading