From 91317251c1ab1f3bc7dbe19fcef94e6689b3955c Mon Sep 17 00:00:00 2001 From: Mary Salvi Date: Tue, 19 Mar 2024 15:55:06 -0400 Subject: [PATCH 1/2] Add homepage_website to consortia pages --- ...34bd55cf_consortia_add_homepage_website.py | 34 +++++++++++++++++++ nmdc_server/models.py | 1 + nmdc_server/schemas.py | 1 + web/src/components/TeamInfo.vue | 6 ++++ web/src/data/api.ts | 1 + 5 files changed, 43 insertions(+) create mode 100644 nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py diff --git a/nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py b/nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py new file mode 100644 index 00000000..d498932d --- /dev/null +++ b/nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py @@ -0,0 +1,34 @@ +"""consortia_add_homepage_website + +Revision ID: b4b234bd55cf +Revises: 6fbdea177f37 +Create Date: 2024-03-19 17:03:00.214065 + +""" + +from typing import Optional + +import sqlalchemy as sa +from alembic import op +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision: str = "b4b234bd55cf" +down_revision: Optional[str] = "6fbdea177f37" +branch_labels: Optional[str] = None +depends_on: Optional[str] = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column( + "study", + sa.Column("homepage_website", postgresql.JSONB(astext_type=sa.Text()), nullable=True), # type: ignore + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column("study", "homepage_website") + # ### end Alembic commands ### diff --git a/nmdc_server/models.py b/nmdc_server/models.py index ef2459aa..68590ed8 100644 --- a/nmdc_server/models.py +++ b/nmdc_server/models.py @@ -236,6 +236,7 @@ class Study(Base, AnnotatedModel): gold_study_identifiers = Column(JSONB, nullable=True) study_category = Column(String, nullable=True) + homepage_website = Column(JSONB, nullable=True) part_of = Column(JSONB, nullable=True) children = Column(JSONB, nullable=True) diff --git a/nmdc_server/schemas.py b/nmdc_server/schemas.py index b651e4cd..af99321e 100644 --- a/nmdc_server/schemas.py +++ b/nmdc_server/schemas.py @@ -235,6 +235,7 @@ class StudyBase(AnnotatedBase): relevant_protocols: Optional[List[str]] funding_sources: Optional[List[str]] gold_study_identifiers: Optional[List[str]] + homepage_website: Optional[List[str]] part_of: Optional[List[str]] study_category: Optional[str] children: Optional[List[Study]] = [] diff --git a/web/src/components/TeamInfo.vue b/web/src/components/TeamInfo.vue index 482a8639..bc3a2ee8 100644 --- a/web/src/components/TeamInfo.vue +++ b/web/src/components/TeamInfo.vue @@ -82,6 +82,12 @@ export default defineComponent({ /> +
+ Consortium Homepage: {{ item.homepage_website[0] }} +
Date: Wed, 20 Mar 2024 10:36:15 -0400 Subject: [PATCH 2/2] Check first position of homepage website --- .../versions/b4b234bd55cf_consortia_add_homepage_website.py | 6 +++++- web/src/components/TeamInfo.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py b/nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py index d498932d..bc127024 100644 --- a/nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py +++ b/nmdc_server/migrations/versions/b4b234bd55cf_consortia_add_homepage_website.py @@ -23,7 +23,11 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.add_column( "study", - sa.Column("homepage_website", postgresql.JSONB(astext_type=sa.Text()), nullable=True), # type: ignore + sa.Column( + "homepage_website", + postgresql.JSONB(astext_type=sa.Text()), # type: ignore + nullable=True, + ), ) # ### end Alembic commands ### diff --git a/web/src/components/TeamInfo.vue b/web/src/components/TeamInfo.vue index bc3a2ee8..1535790e 100644 --- a/web/src/components/TeamInfo.vue +++ b/web/src/components/TeamInfo.vue @@ -83,7 +83,7 @@ export default defineComponent({
Consortium Homepage: {{ item.homepage_website[0] }}