diff --git a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index 715c2643b6..c54ac45d36 100644 --- a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -7,30 +7,30 @@ "autodeploy": "yes" }, "versions": { - "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2022.10", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.10", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2022.10", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2022.10", + "access-backend": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/access-backend:2023.02", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.02", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2023.02", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2023.02", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.10", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.10", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.10", - "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.10", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.10", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.10", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.10", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.10", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.02", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.02", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.02", + "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2023.02", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.02", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.02", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.02", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.3.0", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.10", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:0.7.0", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.10", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.10", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.10", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.02", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.02", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.02", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.02", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.02", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.10", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2022.10", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.10", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.10" + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.02", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.02", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.02", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.02" }, "google": { "enabled": "yes" @@ -40,7 +40,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.10" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.02" } }, "arborist": { @@ -52,7 +52,7 @@ "action": "export", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2022.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2023.02", "pull_policy": "Always", "env": [ { @@ -117,7 +117,7 @@ "action": "export-files", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2022.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2023.02", "pull_policy": "Always", "env": [ { @@ -187,7 +187,7 @@ "serviceAccountName": "jobs-staging-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2022.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2023.02", "pull_policy": "Always", "env": [ { @@ -228,7 +228,7 @@ "serviceAccountName": "jobs-preprod-gen3-biodatacatalyst-nhlbi-nih-gov", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2022.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2023.02", "pull_policy": "Always", "env": [ { @@ -301,9 +301,9 @@ "tier_access_limit": 50, "dispatcher_job_num": "10", "netpolicy": "on", - "dd_enabled": null, "argocd": "true", - "waf_enabled": "true" + "waf_enabled": "true", + "dd_enabled": null }, "canary": { "default": 0 diff --git a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json index 897668aa6e..eeb919230b 100644 --- a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json +++ b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2022.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2023.02", "env": { "NAMESPACE": "default", "HOSTNAME": "staging.gen3.biodatacatalyst.nhlbi.nih.gov" diff --git a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/portal/gitops.json b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/portal/gitops.json index 0e388d082f..00a14908ca 100644 --- a/staging.gen3.biodatacatalyst.nhlbi.nih.gov/portal/gitops.json +++ b/staging.gen3.biodatacatalyst.nhlbi.nih.gov/portal/gitops.json @@ -644,13 +644,33 @@ "enabled": false, "text": "Study Discovery" }, + "tagsColumn": { + "enabled": false + }, + "tagsInDescription": { + "enabled": true + }, "search": { "searchBar": { "enabled": true + }, + "tagSearchDropdown": { + "enabled": true, + "collapsibleButtonText": "Study Filters" } }, "authorization": { - "enabled": true + "enabled": true, + "supportedValues": { + "accessible": { + "enabled": true, + "menuText": "Accessible" + }, + "unaccessible": { + "enabled": true, + "menuText": "Not Accessible" + } + } } }, "aggregations": [ @@ -666,7 +686,8 @@ } ], "tagSelector": { - "title": "Tags by category" + "title": "Tags by category", + "showTagCategoryNames": true }, "studyColumns": [ { @@ -676,6 +697,8 @@ { "name": "Full Name", "field": "full_name", + "errorIfNotAvailable": false, + "valueIfNotAvailable": "", "contentType": "string" }, { @@ -688,6 +711,12 @@ { "name": "dbGaP Accession Number", "field": "study_id" + }, + { + "name": "Released", + "field": "released", + "errorIfNotAvailable": false, + "valueIfNotAvailable": "n/a" } ], "studyPreviewField": { @@ -755,6 +784,91 @@ } ] }, + "detailView": { + "headerField": "project_id", + "tabs": [ + { + "tabName": "Study", + "groups": [ + { + "header": "Study Information", + "fields": [ + { + "type": "text", + "label": "Full Name:", + "sourceField": "full_name", + "default": "Not specified" + }, + { + "type": "text", + "label": "Short Name:", + "sourceField": "short_name", + "default": "Not specified" + }, + { + "type": "text", + "label": "Number Of Subjects:", + "sourceField": "_subjects_count", + "default": "Not specified" + }, + { + "type": "text", + "label": "dbGaP Accession Number:", + "sourceField": "dbgap_accession", + "default": "Not specified" + }, + { + "type": "link", + "label": "dbGaP URL:", + "sourceField": "dbgap_url", + "default": "Not specified" + }, + { + "type": "text", + "label": "Released:", + "sourceField": "released", + "default": "Not specified" + }, + { + "type": "tags" + } + ] + }, + { + "header": "Study Description", + "fields": [ + { + "type": "block", + "sourceField": "study_description" + } + ] + } + ] + }, + { + "tabName": "Access", + "groups": [ + { + "fields": [ + { + "type": "accessDescriptor" + } + ] + }, + { + "header": "Study Access", + "fields": [ + { + "type": "text", + "sourceField": "study_data_requires_access_request", + "label": "Study Data Requires Access Request" + } + ] + } + ] + } + ] + }, "minimalFieldMapping": { "tagsListFieldName": "tags", "authzField": "authz",