From 0102000fae35f8d84ebd9c6744bb8fa476a1a6b7 Mon Sep 17 00:00:00 2001
From: Brian Love <bl711@georgetown.edu>
Date: Thu, 2 May 2024 17:45:23 -0400
Subject: [PATCH 1/2] Add tooltips next to column entries

Add tooltips to each (selectable) column header and in the add/remove
column dialog.  Tooltip text is TBD.

Closes #267
---
 .../src/components/AddRemoveColumnDialog.jsx  |  4 +-
 web/gui-v2/src/static_data/table_columns.js   | 54 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/web/gui-v2/src/components/AddRemoveColumnDialog.jsx b/web/gui-v2/src/components/AddRemoveColumnDialog.jsx
index 7cd4958c..ceba9343 100644
--- a/web/gui-v2/src/components/AddRemoveColumnDialog.jsx
+++ b/web/gui-v2/src/components/AddRemoveColumnDialog.jsx
@@ -19,7 +19,7 @@ const styles = {
   columnDialogContents: css`
     font-family: GTZirkonLight;
     padding: 0 0.5rem 0.5rem;
-    width: 400px;
+    width: 420px;
   `,
   columnDialogTitle: css`
     font-family: GTZirkonRegular;
@@ -103,7 +103,7 @@ const AddRemoveColumnDialog = ({
         <div css={styles.columnDialogList}>
           {
             columnDefinitions.map((colDef) => (
-              <label css={styles.plainLabel} key={colDef.key}>
+              <label css={styles.plainLabel} key={colDef.key} aria-label={colDef.title}>
                 <Checkbox
                   checked={columnsInternal[colDef.key]}
                   onChange={(evt) => {
diff --git a/web/gui-v2/src/static_data/table_columns.js b/web/gui-v2/src/static_data/table_columns.js
index be6115fc..418cb45f 100644
--- a/web/gui-v2/src/static_data/table_columns.js
+++ b/web/gui-v2/src/static_data/table_columns.js
@@ -71,7 +71,6 @@ const columnWidth = (width, isSlider=false) => {
  *    isDerived?: boolean,
  *    isGrowthStat?: boolean,
  *    isPercent?: boolean,
- *    minWidth?: number,
  *    sortable: boolean,
  *    title: string,
  *    tooltip?: string,
@@ -147,6 +146,7 @@ const columnDefinitions = [
     initialCol: true,
     dropdownWidth: 180,
     type: 'dropdown',
+    tooltip: "Zach_tktk",
   },
   {
     title: "Region",
@@ -155,6 +155,7 @@ const columnDefinitions = [
     initialCol: false,
     dropdownWidth: 170,
     type: 'dropdown',
+    tooltip: "Zach_tktk",
   },
   {
     title: "Stage",
@@ -163,13 +164,14 @@ const columnDefinitions = [
     initialCol: false,
     dropdownWidth: 120,
     type: 'dropdown',
+    tooltip: "Zach_tktk",
   },
   {
     title: "Sector",
     key: "sector",
     initialCol: false,
-    minWidth: 200,
     type: 'dropdown',
+    tooltip: "Zach_tktk",
   },
 
   {
@@ -177,6 +179,7 @@ const columnDefinitions = [
     key: "all_pubs",
     aggregateType: "median",
     ...generateSliderColDef("articles", "all_publications"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "5-year total publications",
@@ -194,12 +197,14 @@ const columnDefinitions = [
       },
     ),
     isDerived: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "Citation counts",
     key: "citations",
     aggregateType: "median",
     ...generateSliderColDef("articles", "ai_citation_counts"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "AI publications",
@@ -207,6 +212,7 @@ const columnDefinitions = [
     aggregateType: "median",
     ...generateSliderColDef("articles", "ai_publications"),
     initialCol: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "Recent AI pubs growth",
@@ -224,6 +230,7 @@ const columnDefinitions = [
       },
     ),
     isGrowthStat: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "AI publication percentage",
@@ -243,6 +250,7 @@ const columnDefinitions = [
     ),
     isDerived: true,
     isPercent: true,
+    tooltip: "Zach_tktk",
   },
   // TODO, pending clarification of intent
   // {
@@ -255,6 +263,7 @@ const columnDefinitions = [
     key: "ai_pubs_top_conf",
     aggregateType: "median",
     ...generateSliderColDef("articles", "ai_pubs_top_conf"),
+    tooltip: "Zach_tktk",
   },
   {
     title: `AI papers in last complete year (${overall.endArticleYear})`,
@@ -267,24 +276,28 @@ const columnDefinitions = [
       (val, row, extract) => <CellStat data={{ total: extract(val, row) }} />,
     ),
     isDerived: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "CV publications",
     key: "cv_publications",
     aggregateType: "median",
     ...generateSliderColDef("articles", "cv_publications"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "NLP publications",
     key: "nlp_publications",
     aggregateType: "median",
     ...generateSliderColDef("articles", "nlp_publications"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Robotics publications",
     key: "robotics_publications",
     aggregateType: "median",
     ...generateSliderColDef("articles", "robotics_publications"),
+    tooltip: "Zach_tktk",
   },
 
   {
@@ -292,6 +305,7 @@ const columnDefinitions = [
     key: "all_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "all_patents"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "5-year total patents",
@@ -309,6 +323,7 @@ const columnDefinitions = [
       },
     ),
     isDerived: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "AI patents",
@@ -316,6 +331,7 @@ const columnDefinitions = [
     aggregateType: "median",
     ...generateSliderColDef("patents", "ai_patents"),
     initialCol: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "AI patents recent growth",
@@ -333,6 +349,7 @@ const columnDefinitions = [
       },
     ),
     isGrowthStat: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "AI patent percentage",
@@ -352,186 +369,217 @@ const columnDefinitions = [
     ),
     isDerived: true,
     isPercent: true,
+    tooltip: "Zach_tktk",
   },
   {
     title: "Granted AI patents",
     key: "ai_patents_grants",
     aggregateType: "median",
     ...generateSliderColDef("patents", "ai_patents_grants"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Agricultural patents",
     key: "agri_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Agricultural"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Analytics and algorithms patents",
     key: "algorithms",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Analytics_and_Algorithms"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Banking and finance patents",
     key: "finance_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Banking_and_Finance"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Business patents",
     key: "business_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Business"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Computer vision patents",
     key: "comp_vision",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Computer_Vision"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Computing in government patents",
     key: "comp_in_gov_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Computing_in_Government"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Control patents",
     key: "control",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Control"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Distributed AI patents",
     key: "distributed_ai",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Distributed_AI"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Document management and publishing patents",
     key: "doc_mgt_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Document_Mgt_and_Publishing"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Education patents",
     key: "edu_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Education"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Energy patents",
     key: "energy_mgt_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Energy_Management"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Entertainment patents",
     key: "entertain_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Entertainment"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Industrial and manufacturing patents",
     key: "industry_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Industrial_and_Manufacturing"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Knowledge representation patents",
     key: "knowledge_rep",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Knowledge_Representation"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Language processing patents",
     key: "lang_process",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Language_Processing"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Life sciences patents",
     key: "life_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Life_Sciences"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Measuring and testing patents",
     key: "measure_test",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Measuring_and_Testing"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Military patents",
     key: "mil_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Military"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Nanotechnology patents",
     key: "nano_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Nanotechnology"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Networks patents",
     key: "network_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Networks__eg_social_IOT_etc"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Personal devices and computing patents",
     key: "personal_comp_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Personal_Devices_and_Computing"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Physical sciences and engineering patents",
     key: "phys_sci_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Physical_Sciences_and_Engineering"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Planning and scheduling patents",
     key: "plan_sched",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Planning_and_Scheduling"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Robotics patents",
     key: "robotics",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Robotics"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Security patents",
     key: "security_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Security__eg_cybersecurity"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Semiconductor patents",
     key: "semiconductor_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Semiconductors"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Speech processing patents",
     key: "speech",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Speech_Processing"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Telecommunications patents",
     key: "telecom_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Telecommunications"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Transportation patents",
     key: "transport_patents",
     aggregateType: "median",
     ...generateSliderColDef("patents", "Transportation"),
+    tooltip: "Zach_tktk",
   },
 
   {
@@ -539,6 +587,7 @@ const columnDefinitions = [
     key: "ai_jobs",
     aggregateType: "median",
     ...generateSliderColDef("other_metrics", "ai_jobs"),
+    tooltip: "Zach_tktk",
   },
   {
     title: "Tech Tier 1 jobs",
@@ -546,6 +595,7 @@ const columnDefinitions = [
     aggregateType: "median",
     ...generateSliderColDef("other_metrics", "tt1_jobs"),
     initialCol: true,
+    tooltip: "Zach_tktk",
   },
 ];
 export default columnDefinitions;

From 8f3cce5e56b49616b55e8cb5d6dae83f5d03c09d Mon Sep 17 00:00:00 2001
From: Brian Love <bl711@georgetown.edu>
Date: Fri, 3 May 2024 10:10:38 -0400
Subject: [PATCH 2/2] Increase default column width to accomodate tooltips

Increase the default width of table columns to ensure that the column
tooltips can be displayed without wrapping onto a new line by themselves.
---
 web/gui-v2/src/static_data/table_columns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/gui-v2/src/static_data/table_columns.js b/web/gui-v2/src/static_data/table_columns.js
index 418cb45f..9609611e 100644
--- a/web/gui-v2/src/static_data/table_columns.js
+++ b/web/gui-v2/src/static_data/table_columns.js
@@ -100,7 +100,7 @@ const columnWidth = (width, isSlider=false) => {
  */
 const generateSliderColDef = (dataKey, dataSubkey, extractFn, formatFn) => {
   return {
-    css: columnWidth(120, true),
+    css: columnWidth(135, true),
     dataKey,
     dataSubkey,
     extract: extractFn ?? ((_val, row) => {