Support #35284 - Add attachments on MolecularAnalysisRun

- Added attachments relationship to the type. - Removed duplicate types and merged them into one type for each. Changed imports to use the merged version.
AAFC-BICoE · Dec 3, 2024 · 0bd8bd4 · 0bd8bd4
1 parent ca0eb9c
commit 0bd8bd4
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 65 deletions.
diff --git a/packages/dina-ui/components/molecular-analysis/useMolecularAnalysisRun.tsx b/packages/dina-ui/components/molecular-analysis/useMolecularAnalysisRun.tsx
@@ -1,5 +1,4 @@
 import { PcrBatchItem, SeqReaction } from "../../types/seqdb-api";
-import { MolecularAnalysisRunItem } from "../..//types/seqdb-api/resources/MolecularAnalysisRunItem";
 import { useEffect, useState } from "react";
 import {
   BulkGetOptions,
@@ -12,14 +11,15 @@ import {
   useStringComparator
 } from "common-ui";
 import { StorageUnitUsage } from "../../types/collection-api/resources/StorageUnitUsage";
-import { MolecularAnalysisRun } from "../../types/seqdb-api/resources/MolecularAnalysisRun";
 import { KitsuResource, PersistedResource } from "kitsu";
 import { MaterialSampleSummary } from "../../types/collection-api";
 import { useDinaIntl } from "../../intl/dina-ui-intl";
 import { ColumnDef } from "@tanstack/react-table";
 import Link from "next/link";
 import { attachGenericMolecularAnalysisItems } from "../seqdb/molecular-analysis-workflow/useGenericMolecularAnalysisRun";
 import { GenericMolecularAnalysisItem } from "packages/dina-ui/types/seqdb-api/resources/GenericMolecularAnalysisItem";
+import { MolecularAnalysisRunItem } from "packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRunItem";
+import { MolecularAnalysisRun } from "packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRun";
 
 export interface UseMolecularAnalysisRunProps {
   seqBatchId: string;

diff --git a/...-ui/components/seqdb/molecular-analysis-workflow/MolecularAnalysisSampleSelectionStep.tsx b/...-ui/components/seqdb/molecular-analysis-workflow/MolecularAnalysisSampleSelectionStep.tsx
@@ -18,7 +18,7 @@ import { SeqdbMessage } from "../../../intl/seqdb-intl";
 import { useMaterialSampleRelationshipColumns } from "../../collection/material-sample/useMaterialSampleRelationshipColumns";
 import { GenericMolecularAnalysis } from "packages/dina-ui/types/seqdb-api/resources/GenericMolecularAnalysis";
 import { GenericMolecularAnalysisItem } from "packages/dina-ui/types/seqdb-api/resources/GenericMolecularAnalysisItem";
-import { MolecularAnalysisRunItem } from "packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRunItem";
+import { MolecularAnalysisRunItem } from "packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRunItem";
 
 export interface MolecularAnalysisSampleSelectionStepProps {
   molecularAnalysisId: string;

diff --git a/...s/dina-ui/components/seqdb/molecular-analysis-workflow/useGenericMolecularAnalysisRun.tsx b/...s/dina-ui/components/seqdb/molecular-analysis-workflow/useGenericMolecularAnalysisRun.tsx
@@ -1,13 +1,13 @@
-import { MolecularAnalysisRunItem } from "packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRunItem";
 import { useEffect, useState } from "react";
 import { filterBy, SaveArgs, useApiClient, useQuery } from "common-ui";
 import { StorageUnitUsage } from "packages/dina-ui/types/collection-api/resources/StorageUnitUsage";
-import { MolecularAnalysisRun } from "packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRun";
 import { PersistedResource } from "kitsu";
 import { MaterialSampleSummary } from "packages/dina-ui/types/collection-api";
 import { useDinaIntl } from "../../../intl/dina-ui-intl";
 import { GenericMolecularAnalysisItem } from "packages/dina-ui/types/seqdb-api/resources/GenericMolecularAnalysisItem";
 import { GenericMolecularAnalysis } from "packages/dina-ui/types/seqdb-api/resources/GenericMolecularAnalysis";
+import { MolecularAnalysisRunItem } from "packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRunItem";
+import { MolecularAnalysisRun } from "packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRun";
 
 export interface UseGenericMolecularAnalysisRunProps {
   molecularAnalysis: GenericMolecularAnalysis;

diff --git a/packages/dina-ui/components/seqdb/seq-workflow/SangerSeqReactionStep.tsx b/packages/dina-ui/components/seqdb/seq-workflow/SangerSeqReactionStep.tsx
@@ -39,7 +39,7 @@ import { SeqReactionDndTable } from "./seq-reaction-step/SeqReactionDndTable";
 import { ColumnDef } from "@tanstack/react-table";
 import { useSeqReactionState } from "./seq-reaction-step/useSeqReactionState";
 import { StorageUnitUsage } from "packages/dina-ui/types/collection-api/resources/StorageUnitUsage";
-import { MolecularAnalysisRunItem } from "packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRunItem";
+import { MolecularAnalysisRunItem } from "packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRunItem";
 
 export interface SangerSeqReactionStepProps {
   seqBatch?: SeqBatch;

diff --git a/packages/dina-ui/pages/seqdb/molecular-analysis-run/list.tsx b/packages/dina-ui/pages/seqdb/molecular-analysis-run/list.tsx
@@ -1,16 +1,14 @@
 import {
   ColumnDefinition,
-  CreateButton,
   FieldHeader,
   ListPageLayout,
   dateCell,
-  descriptionCell,
   titleCell
 } from "common-ui";
 import Link from "next/link";
 import { groupCell } from "../../../components";
 import PageLayout from "../../../components/page/PageLayout";
-import { MolecularAnalysisRun } from "../../../types/seqdb-api/resources/MolecularAnalysisRun";
+import { MolecularAnalysisRun } from "../../../types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRun";
 
 const MOLECULAR_ANALYSIS_RUN_FILTER_ATTRIBUTES = ["name"];
 const MOLECULAR_ANALYSIS_RUN_TABLE_COLUMNS: ColumnDefinition<MolecularAnalysisRun>[] =

diff --git a/packages/dina-ui/pages/seqdb/molecular-analysis-run/view.tsx b/packages/dina-ui/pages/seqdb/molecular-analysis-run/view.tsx
@@ -1,11 +1,9 @@
-import { DinaForm, DeleteButton, useApiClient, Operation } from "common-ui";
+import { DinaForm } from "common-ui";
 import { ViewPageLayout } from "../../../components";
 import { MolecularAnalysisRun } from "../../../types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRun";
 import { MolecularAnalysisRunFormFields } from "../../../components/molecular-analysis/MolecularAnalysisRunFormFields";
-import { MolecularAnalysisRunItem } from "../../../types/seqdb-api/resources/MolecularAnalysisRunItem";
 
 export default function MolecularAnalysisRunViewPage() {
-  const { doOperations, apiClient } = useApiClient();
   return (
     <ViewPageLayout<MolecularAnalysisRun>
       form={(props) => (

diff --git a/packages/dina-ui/types/seqdb-api/resources/GenericMolecularAnalysisItem.ts b/packages/dina-ui/types/seqdb-api/resources/GenericMolecularAnalysisItem.ts
@@ -1,8 +1,8 @@
 import { KitsuResource } from "kitsu";
 import { ResourceIdentifierObject } from "jsonapi-typescript";
 import { GenericMolecularAnalysis } from "./GenericMolecularAnalysis";
-import { MolecularAnalysisRunItem } from "./MolecularAnalysisRunItem";
 import { StorageUnitUsage } from "../../collection-api/resources/StorageUnitUsage";
+import { MolecularAnalysisRunItem } from "./molecular-analysis/MolecularAnalysisRunItem";
 
 export interface GenericMolecularAnalysisItemAttributes {
   type: "generic-molecular-analysis-item";

diff --git a/packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisResult.ts b/packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisResult.ts
diff --git a/packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRun.ts b/packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRun.ts
diff --git a/packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRunItem.ts b/packages/dina-ui/types/seqdb-api/resources/MolecularAnalysisRunItem.ts
diff --git a/packages/dina-ui/types/seqdb-api/resources/SeqReaction.ts b/packages/dina-ui/types/seqdb-api/resources/SeqReaction.ts
@@ -3,7 +3,7 @@ import { PcrBatchItem } from "./PcrBatchItem";
 import { PcrPrimer } from "./PcrPrimer";
 import { SeqBatch } from "./SeqBatch";
 import { StorageUnitUsage } from "../../collection-api/resources/StorageUnitUsage";
-import { MolecularAnalysisRunItem } from "./MolecularAnalysisRunItem";
+import { MolecularAnalysisRunItem } from "./molecular-analysis/MolecularAnalysisRunItem";
 
 export interface SeqReactionAttributes {
   type: "seq-reaction";

diff --git a/packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRun.ts b/packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRun.ts
@@ -1,12 +1,18 @@
+import { ResourceIdentifierObject } from "jsonapi-typescript";
 import { KitsuResource } from "kitsu";
 
 export interface MolecularAnalysisRunAttributes {
   type: "molecular-analysis-run";
-  name?: string;
-  group?: string;
   createdBy?: string;
   createdOn?: string;
+  group?: string;
+  name?: string;
+}
+
+export interface MolecularAnalysisRunRelationships {
+  attachments?: ResourceIdentifierObject[];
 }
 
 export type MolecularAnalysisRun = KitsuResource &
-  MolecularAnalysisRunAttributes;
+  MolecularAnalysisRunAttributes &
+  MolecularAnalysisRunRelationships;
diff --git a/packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRunItem.ts b/packages/dina-ui/types/seqdb-api/resources/molecular-analysis/MolecularAnalysisRunItem.ts
@@ -6,10 +6,11 @@ export interface MolecularAnalysisRunItemAttributes {
   type: "molecular-analysis-run-item";
   createdBy?: string;
   createdOn?: string;
+  usageType: string;
 }
 
 export interface MolecularAnalysisRunItemRelationships {
-  run: MolecularAnalysisRun;
+  run?: MolecularAnalysisRun;
   result?: MolecularAnalysisResult;
 }