Skip to content

Commit

Permalink
Merging staging branch into prod branch
Browse files Browse the repository at this point in the history
atarashansky committed Jun 7, 2024
2 parents 9b22df7 + 0c2e50e commit c45c291
Showing 3 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .happy/terraform/modules/schema_migration/main.tf
Original file line number Diff line number Diff line change
@@ -498,7 +498,7 @@ resource aws_sfn_state_machine sfn_schema_migration {
}
},
"Next": "CollectionPublish",
"MaxConcurrency": 32,
"MaxConcurrency": 10,
"Catch": [
{
"ErrorEquals": [
@@ -527,7 +527,7 @@ resource aws_sfn_state_machine sfn_schema_migration {
"Key.$": "$.key_name"
}
},
"MaxConcurrency": 40,
"MaxConcurrency": 10,
"Next": "report",
"Catch": [
{
8 changes: 6 additions & 2 deletions backend/common/census_cube/data/ontology_labels.py
Original file line number Diff line number Diff line change
@@ -18,8 +18,12 @@ def ontology_term_label(ontology_term_id: str) -> Optional[str]:
Returns the label for an ontology term, given its id. This excludes gene ontology term, which are handled
separately by gene_gene_term_label(). Return None if ontology term id is invalid.
"""

return ontology_parser.get_term_label(ontology_term_id)
try:
return ontology_parser.get_term_label(ontology_term_id)
# If the ontology term id is invalid, return the ontology term id itself
# This is useful for cases like publication citation.
except ValueError:
return ontology_term_id


def gene_term_label(gene_ontology_term_id: str) -> Optional[str]:
Original file line number Diff line number Diff line change
@@ -18,6 +18,12 @@ export const ButtonsRow = styled.div`
& > div {
margin-right: ${spacesXl}px;
}
button {
height: 35px;
max-height: 35px;
line-height: 1.2;
}
`;

export const StyledButton = styled(Button)`

0 comments on commit c45c291

Please sign in to comment.