From c6c00aec2ff7945636f1d1e14910d0ebd38c1018 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 22 Dec 2025 13:49:00 -0500
Subject: [PATCH] Fix client linting.

---
 client/src/api/schema/schema.ts                           | 5 +++++
 client/src/components/Form/Elements/FormData/FormData.vue | 6 +++++-
 lib/galaxy/schema/schema.py                               | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 3ac30ca03e2..065fcd4970e 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -9392,6 +9392,11 @@ export interface components {
              * @description The type of the collection, can be `list`, `paired`, or define subcollections using `:` as separator like `list:paired` or `list:list`.
              */
             collection_type: string;
+            /**
+             * Column Definitions
+             * @description Column definitions for sample sheet collections.
+             */
+            column_definitions?: components["schemas"]["SampleSheetColumnDefinition"][] | null;
             /** Contents Url */
             contents_url?: string | null;
             /**
diff --git a/client/src/components/Form/Elements/FormData/FormData.vue b/client/src/components/Form/Elements/FormData/FormData.vue
index 9b7d9462341..70315011d02 100644
--- a/client/src/components/Form/Elements/FormData/FormData.vue
+++ b/client/src/components/Form/Elements/FormData/FormData.vue
@@ -564,7 +564,11 @@ function getElementAttributes(element: HistoryOrCollectionItem): {
             // we already know it is a collection element by this point
             if (isCollectionElement(element)) {
                 collectionType = element.object.collection_type;
-                columnDefinitions = element.object.column_definitions;
+                // Cast needed: schema has two structurally identical SampleSheetColumnDefinition types
+                columnDefinitions = element.object.column_definitions as
+                    | SampleSheetColumnDefinition[]
+                    | null
+                    | undefined;
             }
         }
     } else {
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index f12aff95340..2ae11577aea 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -1067,6 +1067,9 @@ class DCObject(Model, WithModelClass):
     elements_datatypes: set[str] = Field(
         ..., description="A set containing all the different element datatypes in the collection."
     )
+    column_definitions: Optional[SampleSheetColumnDefinitions] = Field(
+        None, description="Column definitions for sample sheet collections."
+    )
 
 
 class DCESummary(Model, WithModelClass):