Merge pull request #1473 from AAFC-BICoE/35254-Add-Metagenomic-Workflow

35254 Add Metagenomic Workflow
AAFC-BICoE · Dec 4, 2024 · 246e0ad · 246e0ad
2 parents acfd79e + 7c660d0
commit 246e0ad
Show file tree

Hide file tree

Showing 22 changed files with 2,616 additions and 16 deletions.
diff --git a/packages/common-ui/lib/api-client/useQuery.tsx b/packages/common-ui/lib/api-client/useQuery.tsx
@@ -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];
@@ -104,6 +102,8 @@ export function useQuery<TData extends KitsuResponseData, TMeta = undefined>(
       }
     }
 
+    await onSuccess?.(response);
+
     return response;
   }
 

diff --git a/packages/dina-ui/components/button-bar/nav/nav.tsx b/packages/dina-ui/components/button-bar/nav/nav.tsx
@@ -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" />

diff --git a/packages/dina-ui/components/collection/VocabularySelectField.tsx b/packages/dina-ui/components/collection/VocabularySelectField.tsx
@@ -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 {
@@ -28,6 +30,7 @@ export function VocabularySelectField({
   path,
   selectProps,
   isMulti,
+  isDisabled,
   ...labelWrapperProps
 }: VocabularySelectFieldProps) {
   const { formatMessage } = useDinaIntl();
@@ -60,6 +63,7 @@ export function VocabularySelectField({
         return (
           <div className={invalid ? "is-invalid" : ""}>
             <CreatableSelect<VocabularyOption, boolean>
+              isDisabled={isDisabled}
               isClearable={true}
               options={vocabOptions}
               isLoading={loading}