Merge pull request #19 from usegalaxy-au/dev

Fix pydantic schema to include accordion item inputs

app/labs/lab_schema.py

@@ -32,6 +32,12 @@ def html_tags(v: str) -> str:
 ]
 
 
+class ItemInput(BaseModel):
+    """An expected dataset input for a Galaxy tool."""
+    datatypes: Optional[list[str]] = []
+    label: Optional[str] = ''
+
+
 class IconEnum(str, Enum):
     """Define material icon types for buttons."""
     run = 'run'            # play_arrow
@@ -62,6 +68,7 @@ class TabItem(BaseModel):
     view_md: Optional[MarkdownStr] = None
     view_icon: Optional[IconEnum] = None
     exclude_from: Optional[list[str]] = []
+    inputs: Optional[list[ItemInput]] = None
 
     @field_validator(
         'title_md', 'description_md', 'button_md', 'view_md',
@@ -106,7 +113,7 @@ class LabSchema(BaseModel, extra='allow'):
     """Validate Galaxy Lab content."""
     site_name: str
     lab_name: str
-    nationality: str
+    nationality: Optional[str] = ''
     galaxy_base_url: str
     subdomain: str
     root_domain: str

app/labs/static/labs/css/labs.css

@@ -32,7 +32,9 @@ a:hover .lab-header {
 }
 .table-inputs td {
   padding: .5rem 1rem;
-  border: 1px solid #ddd;
+}
+.table-inputs tr:not(:last-child) {
+  border-bottom: 1px solid #ddd;
 }
 .contributor {
   margin: 0 4px;