From 64692d4c1f28f6422991cc25db532a566d963788 Mon Sep 17 00:00:00 2001 From: Vincent Rubinetti Date: Tue, 22 Aug 2023 18:09:10 -0400 Subject: [PATCH 01/25] fix tsconfig warning --- frontend/tsconfig.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 6c88f3ff5..129efd1bd 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -1,9 +1,5 @@ { - "extends": [ - "@vue/tsconfig/tsconfig.dom.json", - "@tsconfig/node18/tsconfig.json", - "@vue/tsconfig/tsconfig.json" - ], + "extends": ["@tsconfig/node18/tsconfig.json", "@vue/tsconfig/tsconfig.json"], "include": [ "env.d.ts", "src/**/*", @@ -19,7 +15,7 @@ "paths": { "@/*": ["./src/*"] }, - "lib": ["ESNext", "DOM"], + "lib": ["ESNext", "DOM", "DOM.Iterable"], "resolveJsonModule": true, "esModuleInterop": true, "types": ["node", "jsdom"] From 940ea70b221b02d6ff1b1a10d8983629f53b9831 Mon Sep 17 00:00:00 2001 From: Vincent Rubinetti Date: Tue, 22 Aug 2023 18:26:55 -0400 Subject: [PATCH 02/25] move casing of select labels to in-situ --- frontend/src/components/AppSelectMulti.vue | 6 +++--- frontend/src/components/AppSelectSingle.vue | 4 ++-- frontend/src/pages/explore/TabSearch.vue | 8 ++++---- frontend/src/pages/node/SectionAssociations.vue | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/AppSelectMulti.vue b/frontend/src/components/AppSelectMulti.vue index 7f9979151..5f8b2c2c5 100644 --- a/frontend/src/components/AppSelectMulti.vue +++ b/frontend/src/components/AppSelectMulti.vue @@ -30,14 +30,14 @@ > @@ -29,7 +30,10 @@ import { breadcrumbs } from "@/global/breadcrumbs"; type Props = { /** node represented by badge */ - node: Pick; + node: Pick & { + /** extra info to show in parens */ + info?: string; + }; /** whether to include icon */ icon?: boolean; /** whether to include link */ diff --git a/frontend/src/pages/node/AssociationsSummary.vue b/frontend/src/pages/node/AssociationsSummary.vue index 75d312fdc..8cb4751cf 100644 --- a/frontend/src/pages/node/AssociationsSummary.vue +++ b/frontend/src/pages/node/AssociationsSummary.vue @@ -27,6 +27,7 @@ id: item.subject, name: item.subject_label, category: item.subject_category, + info: item.subject_taxon_label, }" :link="node.id !== item.subject" /> @@ -36,6 +37,7 @@ id: item.object, name: item.object_label, category: item.object_category, + info: item.object_taxon_label, }" :link="node.id !== item.object" /> diff --git a/frontend/src/pages/node/AssociationsTable.vue b/frontend/src/pages/node/AssociationsTable.vue index 656d5de49..152183ac2 100644 --- a/frontend/src/pages/node/AssociationsTable.vue +++ b/frontend/src/pages/node/AssociationsTable.vue @@ -31,6 +31,7 @@ id: row.subject, name: row.subject_label, category: row.subject_category, + info: row.subject_taxon_label, }" :link="node.id !== row.subject" /> @@ -48,6 +49,7 @@ id: row.object, name: row.object_label, category: row.object_category, + info: row.object_taxon_label, }" :link="node.id !== row.object" /> diff --git a/frontend/src/pages/node/EvidenceViewer.vue b/frontend/src/pages/node/EvidenceViewer.vue index 7c34437ca..3ea50c832 100644 --- a/frontend/src/pages/node/EvidenceViewer.vue +++ b/frontend/src/pages/node/EvidenceViewer.vue @@ -9,13 +9,20 @@
Evidence for the selected association,
-   -       +
diff --git a/frontend/src/pages/node/SectionAssociations.vue b/frontend/src/pages/node/SectionAssociations.vue index d0dffa48d..107685e1e 100644 --- a/frontend/src/pages/node/SectionAssociations.vue +++ b/frontend/src/pages/node/SectionAssociations.vue @@ -10,7 +10,12 @@ Associations between    and From 816e8fabd9c7b412e16055dd51366fc89ff7056e Mon Sep 17 00:00:00 2001 From: Vincent Rubinetti Date: Tue, 22 Aug 2023 20:29:58 -0400 Subject: [PATCH 09/25] remove unused import --- frontend/src/components/AppTabs.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/AppTabs.vue b/frontend/src/components/AppTabs.vue index b1e354c14..fc970ef6d 100644 --- a/frontend/src/components/AppTabs.vue +++ b/frontend/src/components/AppTabs.vue @@ -40,7 +40,7 @@ diff --git a/frontend/src/pages/node/SectionHierarchy.vue b/frontend/src/pages/node/SectionHierarchy.vue index 0180259c1..3db67e23f 100644 --- a/frontend/src/pages/node/SectionHierarchy.vue +++ b/frontend/src/pages/node/SectionHierarchy.vue @@ -20,7 +20,13 @@ v-for="(_class, index) in node.node_hierarchy?.super_classes" :key="index" :node="_class" - :breadcrumb="{ node }" + :breadcrumb="{ + node, + association: { + predicate: 'is super class of', + direction: AssociationDirectionEnum.incoming, + }, + }" /> @@ -38,7 +44,10 @@ v-for="(_class, index) in node.node_hierarchy?.equivalent_classes" :key="index" :node="_class" - :breadcrumb="{ node }" + :breadcrumb="{ + node, + association: { predicate: 'is equivalent class of' }, + }" /> @@ -56,7 +65,10 @@ v-for="(_class, index) in node.node_hierarchy?.sub_classes" :key="index" :node="_class" - :breadcrumb="{ node }" + :breadcrumb="{ + node, + association: { predicate: 'is sub class of' }, + }" /> @@ -65,7 +77,7 @@ diff --git a/frontend/src/pages/about/PageAbout.vue b/frontend/src/pages/about/PageAbout.vue index 28364e732..68446239c 100644 --- a/frontend/src/pages/about/PageAbout.vue +++ b/frontend/src/pages/about/PageAbout.vue @@ -47,7 +47,7 @@ /> diff --git a/frontend/src/pages/explore/TabSearch.vue b/frontend/src/pages/explore/TabSearch.vue index 54afa795e..d798c5f45 100644 --- a/frontend/src/pages/explore/TabSearch.vue +++ b/frontend/src/pages/explore/TabSearch.vue @@ -278,6 +278,10 @@ const { facet.label === "category" ? getCategoryLabel(facet_value.label) : startCase(facet_value.label), + icon: + facet.label === "category" + ? getCategoryIcon(facet_value.label) + : "", count: facet_value.count, })) || []; } From 45480bbe219ba509a85578a6e3f04c1501c409cb Mon Sep 17 00:00:00 2001 From: Vincent Rubinetti Date: Tue, 22 Aug 2023 21:44:07 -0400 Subject: [PATCH 13/25] add beta banner for prod --- frontend/src/App.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index e3fb13bf8..cefeb7cb1 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -5,7 +5,8 @@