From ace3a325ccf273a477d87953cb512ef93a59547b Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:08:53 -0400 Subject: [PATCH 1/6] [BI-1375] - Make GIDs clickable links --- src/components/germplasm/GermplasmLink.vue | 46 ++++++++++++++++++++++ src/views/germplasm/GermplasmTable.vue | 19 +++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 src/components/germplasm/GermplasmLink.vue diff --git a/src/components/germplasm/GermplasmLink.vue b/src/components/germplasm/GermplasmLink.vue new file mode 100644 index 000000000..f82faacba --- /dev/null +++ b/src/components/germplasm/GermplasmLink.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/germplasm/GermplasmTable.vue b/src/views/germplasm/GermplasmTable.vue index f78aeefa6..16ca064fa 100644 --- a/src/views/germplasm/GermplasmTable.vue +++ b/src/views/germplasm/GermplasmTable.vue @@ -14,7 +14,11 @@ v-on:sort="paginationController.updateSort($event)" > - {{ props.row.data.accessionNumber }} + + {{ props.row.data.defaultDisplayName }} @@ -26,10 +30,16 @@ {{ props.row.data.seedSource }} - {{ Pedigree.parsePedigreeString(props.row.data.pedigree).femaleParent }} + - {{ Pedigree.parsePedigreeString(props.row.data.pedigree).maleParent }} + {{ props.row.data.additionalInfo.createdDate }} @@ -69,10 +79,11 @@ import ExpandableTable from "@/components/tables/expandableTable/ExpandableTable import {PaginationController} from "@/breeding-insight/model/view_models/PaginationController"; import {Pedigree} from "@/breeding-insight/model/import/germplasm/Pedigree"; import {ExternalReferences} from "@/breeding-insight/brapi/model/externalReferences"; +import GermplasmLink from '@/components/germplasm/GermplasmLink.vue' @Component({ mixins: [validationMixin], - components: {ReportTable, ExpandableTable}, + components: {GermplasmLink, ReportTable, ExpandableTable}, computed: { ...mapGetters([ 'activeProgram' From 87bc2196549e46c937796f52b1a9011ca896abfd Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:08:53 -0400 Subject: [PATCH 2/6] [BI-1375] - Make GIDs clickable links --- src/components/germplasm/GermplasmLink.vue | 46 ++++++++++++++++++++++ src/views/germplasm/GermplasmTable.vue | 19 +++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 src/components/germplasm/GermplasmLink.vue diff --git a/src/components/germplasm/GermplasmLink.vue b/src/components/germplasm/GermplasmLink.vue new file mode 100644 index 000000000..f82faacba --- /dev/null +++ b/src/components/germplasm/GermplasmLink.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/germplasm/GermplasmTable.vue b/src/views/germplasm/GermplasmTable.vue index 8c7d0f771..7b41712e7 100644 --- a/src/views/germplasm/GermplasmTable.vue +++ b/src/views/germplasm/GermplasmTable.vue @@ -14,7 +14,11 @@ v-on:sort="paginationController.updateSort($event)" > - {{ props.row.data.accessionNumber }} + + {{ props.row.data.defaultDisplayName }} @@ -26,10 +30,16 @@ {{ props.row.data.seedSource }} - {{ Pedigree.parsePedigreeString(props.row.data.pedigree).femaleParent }} + - {{ Pedigree.parsePedigreeString(props.row.data.pedigree).maleParent }} + {{ props.row.data.additionalInfo.createdDate }} @@ -68,11 +78,12 @@ import {Pagination} from "@/breeding-insight/model/BiResponse"; import ExpandableTable from "@/components/tables/expandableTable/ExpandableTable.vue"; import {PaginationController} from "@/breeding-insight/model/view_models/PaginationController"; import {Pedigree} from "@/breeding-insight/model/import/germplasm/Pedigree"; +import GermplasmLink from '@/components/germplasm/GermplasmLink.vue' import {GermplasmUtils} from '@/breeding-insight/utils/GermplasmUtils'; @Component({ mixins: [validationMixin], - components: {ReportTable, ExpandableTable}, + components: {GermplasmLink, ReportTable, ExpandableTable}, computed: { ...mapGetters([ 'activeProgram' From c544c2c39f8916290024982a9b9a6f6112079229 Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Thu, 14 Apr 2022 12:42:47 -0400 Subject: [PATCH 3/6] Germplasm Details Parent GID Links --- .env.development | 2 +- src/views/germplasm/GermplasmDetails.vue | 26 +++++++++++++++++++----- src/views/germplasm/GermplasmTable.vue | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index 6535555d4..9fabf4eb6 100644 --- a/.env.development +++ b/.env.development @@ -14,4 +14,4 @@ VUE_APP_BI_API_ROOT=${API_BASE_URL} VUE_APP_LOG_LEVEL=${WEB_LOG_LEVEL} # The reference source -VUE_APP_BI_REFERENCE_SOURCE=breeding-insight.org +VUE_APP_BI_REFERENCE_SOURCE=breedinginsight.org diff --git a/src/views/germplasm/GermplasmDetails.vue b/src/views/germplasm/GermplasmDetails.vue index cc65b6bd5..cfb253dd8 100644 --- a/src/views/germplasm/GermplasmDetails.vue +++ b/src/views/germplasm/GermplasmDetails.vue @@ -35,7 +35,18 @@
  • Breeding Method: {{ germplasm.additionalInfo.breedingMethod }}
  • Source: {{ germplasm.seedSource }}
  • Pedigree: {{ germplasm.additionalInfo.pedigreeByName }}
    • -
  • Pedigree GID(s): {{ germplasm.pedigree }}
    • +
  • Pedigree GID(s): + + +
    • @@ -93,29 +104,34 @@ import {Program} from "@/breeding-insight/model/Program"; import GermplasmBase from "@/components/germplasm/GermplasmBase.vue"; import {Germplasm} from "@/breeding-insight/brapi/model/germplasm"; import {GermplasmService} from "@/breeding-insight/service/GermplasmService"; +import GermplasmLink from '@/components/germplasm/GermplasmLink.vue' +import {Pedigree} from "@/breeding-insight/model/import/germplasm/Pedigree"; import {GermplasmUtils} from '@/breeding-insight/utils/GermplasmUtils'; import { Result } from '@/breeding-insight/model/Result'; @Component({ - components: {}, + components: {GermplasmLink}, computed: { ...mapGetters([ 'activeProgram' - ]) + ]), + germplasmUUID: function () { + return this.$route.params.germplasmId; + } }, - data: () => ({GermplasmUtils}) + data: () => ({Pedigree, GermplasmUtils}) }) export default class GermplasmDetails extends GermplasmBase { private activeProgram?: Program; private germplasm?: Germplasm; private germplasmLoading: boolean = true; - private germplasmUUID: string = this.$route.params.germplasmId; mounted() { this.getGermplasm(); } + @Watch('$route') async getGermplasm() { this.germplasmLoading = true; try { diff --git a/src/views/germplasm/GermplasmTable.vue b/src/views/germplasm/GermplasmTable.vue index 7b41712e7..e9c7a9164 100644 --- a/src/views/germplasm/GermplasmTable.vue +++ b/src/views/germplasm/GermplasmTable.vue @@ -15,7 +15,7 @@ > From 88da05c6172814d1f01629a5f0000062c3f3bc05 Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Fri, 15 Apr 2022 11:42:47 -0400 Subject: [PATCH 4/6] Small fixes --- src/components/germplasm/GermplasmLink.vue | 2 +- src/views/germplasm/GermplasmTable.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/germplasm/GermplasmLink.vue b/src/components/germplasm/GermplasmLink.vue index f82faacba..304c68cf0 100644 --- a/src/components/germplasm/GermplasmLink.vue +++ b/src/components/germplasm/GermplasmLink.vue @@ -16,7 +16,7 @@ --> diff --git a/src/views/germplasm/GermplasmTable.vue b/src/views/germplasm/GermplasmTable.vue index e9c7a9164..8f0260a37 100644 --- a/src/views/germplasm/GermplasmTable.vue +++ b/src/views/germplasm/GermplasmTable.vue @@ -47,7 +47,7 @@ {{ props.row.data.additionalInfo.createdBy.userName }} - + Show Details From cace7e515fa408c00cccfff66d2cebe9b8a32c6f Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Fri, 15 Apr 2022 13:38:22 -0400 Subject: [PATCH 5/6] Unit test fix --- src/views/germplasm/GermplasmDetails.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/germplasm/GermplasmDetails.vue b/src/views/germplasm/GermplasmDetails.vue index cfb253dd8..84450ff07 100644 --- a/src/views/germplasm/GermplasmDetails.vue +++ b/src/views/germplasm/GermplasmDetails.vue @@ -114,10 +114,7 @@ import { Result } from '@/breeding-insight/model/Result'; computed: { ...mapGetters([ 'activeProgram' - ]), - germplasmUUID: function () { - return this.$route.params.germplasmId; - } + ]) }, data: () => ({Pedigree, GermplasmUtils}) }) @@ -131,6 +128,10 @@ export default class GermplasmDetails extends GermplasmBase { this.getGermplasm(); } + get germplasmUUID(): string { + return this.$route.params.germplasmId; + } + @Watch('$route') async getGermplasm() { this.germplasmLoading = true; From 3802cb23b74fdf9face66bf34abe2726945286f8 Mon Sep 17 00:00:00 2001 From: HMS17 <84345306+HMS17@users.noreply.github.com> Date: Tue, 3 May 2022 11:04:13 -0400 Subject: [PATCH 6/6] [BI-1339] [BI-1375] QA fix and Code review fix --- .env.development | 2 +- src/components/germplasm/GermplasmLink.vue | 3 +++ src/views/germplasm/GermplasmTable.vue | 2 +- vue.config.js | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 9fabf4eb6..873a8c7dc 100644 --- a/.env.development +++ b/.env.development @@ -14,4 +14,4 @@ VUE_APP_BI_API_ROOT=${API_BASE_URL} VUE_APP_LOG_LEVEL=${WEB_LOG_LEVEL} # The reference source -VUE_APP_BI_REFERENCE_SOURCE=breedinginsight.org +VUE_APP_BI_REFERENCE_SOURCE=${BRAPI_REFERENCE_SOURCE} diff --git a/src/components/germplasm/GermplasmLink.vue b/src/components/germplasm/GermplasmLink.vue index 304c68cf0..a2ad619ed 100644 --- a/src/components/germplasm/GermplasmLink.vue +++ b/src/components/germplasm/GermplasmLink.vue @@ -19,6 +19,9 @@ {{ this.germplasmGID }} +
    + {{ this.germplasmGID }} +