Chore/update 0.10.67 (#30)

* updates to 0.10.67 which adds aggregation for Discovery charts * fix duplicate experimental in next.config.js * add charts to Discovery page * remove datalibrary
uc-cdis · Dec 20, 2024 · f4bafdc · f4bafdc
1 parent e7eca89
commit f4bafdc
Show file tree

Hide file tree

Showing 13 changed files with 1,498 additions and 843 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@
 # misc
 .DS_Store
 *.pem
+.idea
 
 # debug
 npm-debug.log*

diff --git a/config/gen3/discovery.json b/config/gen3/discovery.json
@@ -110,6 +110,29 @@
               "menuText": "Not Available"
             }
           }
+        },
+        "chartsSection": {
+          "title": "Charts",
+          "enabled": true,
+          "showLegends" : {
+            "enabled" : true
+          },
+          "charts": {
+            "subject_ethnicity": {
+              "chartType": "fullPie",
+              "title": "Ethnicity"
+            },
+            "subject_cancer_grade": {
+              "chartType": "fullPie",
+              "title": "Cancer Grade"
+
+            },
+            "subject_gender": {
+              "chartType": "fullPie",
+              "title": "Gender"
+
+            }
+          }
         }
       },
       "aggregations": [

diff --git a/config/gen3/footer.json b/config/gen3/footer.json
@@ -1,6 +1,6 @@
 {
   "classNames": {
-    "root": "bg-base-darker",
+    "root": "bg-base-darkest",
     "layout": "flex items-center justify-end"
   },
   "rightSection": {
@@ -9,7 +9,7 @@
         "rows": [
           {
             "Icon": {
-              "logo": "/icons/gen3.png",
+              "logo": "/images/gen3.png",
               "width": 132,
               "height": 60,
               "description": "Gen3 Logo"
@@ -21,13 +21,25 @@
         "rows": [
           {
             "Icon": {
-              "logo": "/icons/createdby.png",
+              "logo": "/images/createdby.png",
               "width": 170,
               "height": 60,
               "description": "Created by CTDS"
             }
           }
         ]
+      },
+      {
+        "rows": [
+          {
+            "Icon": {
+              "logo": "/images/OCC.png",
+              "width": 150,
+              "height": 60,
+              "description": "OCC"
+            }
+          }
+        ]
       }
     ]
   }

diff --git a/config/gen3/login.json b/config/gen3/login.json
@@ -17,5 +17,5 @@
     }
   ],
   "image": "images/gene_side_texture.svg",
-  "showCredentialsLogin" : true
+  "showCredentialsLogin" : false
 }
diff --git a/config/gen3/navigation.json b/config/gen3/navigation.json
@@ -35,12 +35,6 @@
         "href": "/Profile",
         "name": "Profile",
         "tooltip": "Create API keys for programmatic data access, and review your authorization privileges to datasets and services."
-      },
-      {
-        "icon": "gen3:profile",
-        "href": "/DataLibrary",
-        "name": "Data Library",
-        "tooltip": "library of data"
       }
     ]
   },
@@ -51,6 +45,6 @@
         "name": "Documentation"
       }
     ],
-    "loginButtonVisibility": "visible"
+    "loginButtonVisibility": "hidden"
   }
 }
diff --git a/config/gen3/themeColors.json b/config/gen3/themeColors.json
@@ -1,39 +1,39 @@
 {
   "primary": {
-    "max": "#eaeaee",
-    "lightest": "#babac7",
-    "lighter": "#8b8ba1",
-    "light": "#5b5b7a",
-    "DEFAULT": "#2C2C54",
-    "vivid": "#26265a",
-    "dark": "#222241",
-    "darker": "#18182e",
-    "darkest": "#0e0e1b",
-    "min": "#040408"
+    "max": "#eaf3fa",
+    "lightest": "#bcd7ed",
+    "lighter": "#8ebbe1",
+    "light": "#609fd4",
+    "DEFAULT": "#3283C8",
+    "vivid": "#2584d4",
+    "dark": "#27669b",
+    "darker": "#1c486e",
+    "darkest": "#102b41",
+    "min": "#050d14"
   },
   "primary-contrast": {
     "max": "#111111",
     "lightest": "#111111",
     "lighter": "#111111",
-    "light": "#fefefe",
-    "DEFAULT": "#fefefe",
-    "vivid": "#fefefe",
+    "light": "#111111",
+    "DEFAULT": "#111111",
+    "vivid": "#111111",
     "dark": "#fefefe",
     "darker": "#fefefe",
     "darkest": "#fefefe",
     "min": "#fefefe"
   },
   "secondary": {
-    "max": "#f7f7f8",
-    "lightest": "#e3e4e8",
-    "lighter": "#d0d1d8",
-    "light": "#bdbec8",
-    "DEFAULT": "#AAABB8",
-    "vivid": "#a2a4c0",
-    "dark": "#84858f",
-    "darker": "#5e5e65",
-    "darkest": "#37383c",
-    "min": "#111112"
+    "max": "#eaf3fa",
+    "lightest": "#bcd7ed",
+    "lighter": "#8ebbe1",
+    "light": "#609fd4",
+    "DEFAULT": "#3283C8",
+    "vivid": "#2584d4",
+    "dark": "#27669b",
+    "darker": "#1c486e",
+    "darkest": "#102b41",
+    "min": "#050d14"
   },
   "secondary-contrast": {
     "max": "#111111",
@@ -42,28 +42,28 @@
     "light": "#111111",
     "DEFAULT": "#111111",
     "vivid": "#111111",
-    "dark": "#111111",
+    "dark": "#fefefe",
     "darker": "#fefefe",
     "darkest": "#fefefe",
     "min": "#fefefe"
   },
   "accent": {
-    "max": "#ededf3",
-    "lightest": "#c3c3d8",
-    "lighter": "#9a9abd",
-    "light": "#7070a2",
-    "DEFAULT": "#474787",
-    "vivid": "#3d3d91",
-    "dark": "#373769",
-    "darker": "#27274a",
-    "darkest": "#17172c",
-    "min": "#07070d"
+    "max": "#f8eee7",
+    "lightest": "#e8c6b2",
+    "lighter": "#d79f7d",
+    "light": "#c77848",
+    "DEFAULT": "#b75113",
+    "vivid": "#c14f09",
+    "dark": "#8e3f0f",
+    "darker": "#652d0a",
+    "darkest": "#3b1a06",
+    "min": "#120802"
   },
   "accent-contrast": {
     "max": "#111111",
     "lightest": "#111111",
     "lighter": "#111111",
-    "light": "#fefefe",
+    "light": "#111111",
     "DEFAULT": "#fefefe",
     "vivid": "#fefefe",
     "dark": "#fefefe",
@@ -72,64 +72,64 @@
     "min": "#fefefe"
   },
   "accent-warm": {
-    "max": "#f3e9e8",
-    "lightest": "#d9b7b3",
-    "lighter": "#be857e",
-    "light": "#a4534a",
-    "DEFAULT": "#892115",
-    "vivid": "#911b0d",
-    "dark": "#6a1a10",
-    "darker": "#4b120c",
-    "darkest": "#2d0b07",
-    "min": "#0e0302"
+    "max": "#e9f3f5",
+    "lightest": "#b8d8df",
+    "lighter": "#87bcc8",
+    "light": "#56a1b2",
+    "DEFAULT": "#25869b",
+    "vivid": "#1b8ca5",
+    "dark": "#1d6878",
+    "darker": "#144a55",
+    "darkest": "#0c2c32",
+    "min": "#040d0f"
   },
   "accent-warm-contrast": {
     "max": "#111111",
     "lightest": "#111111",
     "lighter": "#111111",
-    "light": "#fefefe",
-    "DEFAULT": "#fefefe",
-    "vivid": "#fefefe",
+    "light": "#111111",
+    "DEFAULT": "#000000",
+    "vivid": "#111111",
     "dark": "#fefefe",
     "darker": "#fefefe",
     "darkest": "#fefefe",
     "min": "#fefefe"
   },
   "accent-cool": {
-    "max": "#e9eef4",
-    "lightest": "#b8c9db",
-    "lighter": "#87a4c2",
-    "light": "#567ea9",
-    "DEFAULT": "#255990",
-    "vivid": "#1c5999",
-    "dark": "#1d4570",
-    "darker": "#14314f",
-    "darkest": "#0c1d2f",
-    "min": "#04090e"
+    "max": "#e9f3f5",
+    "lightest": "#b6d7df",
+    "lighter": "#84bbc8",
+    "light": "#519fb2",
+    "DEFAULT": "#1f839b",
+    "vivid": "#1689a4",
+    "dark": "#186678",
+    "darker": "#114855",
+    "darkest": "#0a2b32",
+    "min": "#030d0f"
   },
   "accent-cool-contrast": {
     "max": "#111111",
     "lightest": "#111111",
     "lighter": "#111111",
-    "light": "#000000",
-    "DEFAULT": "#fefefe",
-    "vivid": "#fefefe",
+    "light": "#111111",
+    "DEFAULT": "#000000",
+    "vivid": "#111111",
     "dark": "#fefefe",
     "darker": "#fefefe",
     "darkest": "#fefefe",
     "min": "#fefefe"
   },
   "base": {
-    "max": "#fdfdfd",
-    "lightest": "#f9f9f9",
-    "lighter": "#f5f5f5",
-    "light": "#f0f0f0",
-    "DEFAULT": "#ECECEC",
-    "vivid": "#eeeaea",
-    "dark": "#b7b7b7",
-    "darker": "#828282",
-    "darkest": "#4d4d4d",
-    "min": "#181818"
+    "max": "#f9f9f9",
+    "lightest": "#ebebeb",
+    "lighter": "#dcdcdc",
+    "light": "#cecece",
+    "DEFAULT": "#c0c0c0",
+    "vivid": "#c6baba",
+    "dark": "#959595",
+    "darker": "#6a6a6a",
+    "darkest": "#3e3e3e",
+    "min": "#131313"
   },
   "base-contrast": {
     "max": "#111111",
@@ -139,7 +139,7 @@
     "DEFAULT": "#111111",
     "vivid": "#111111",
     "dark": "#111111",
-    "darker": "#111111",
+    "darker": "#fefefe",
     "darkest": "#fefefe",
     "min": "#fefefe"
   },
@@ -192,36 +192,27 @@
     "min": "#fefefe"
   },
   "table": {
-    "max": "#ffffff",
-    "lightest": "#ffffff",
-    "lighter": "#ffffff",
-    "light": "#ffffff",
-    "DEFAULT": "#ffffff",
-    "vivid": "#ffffff",
-    "dark": "#c6c6c6",
-    "darker": "#8c8c8c",
-    "darkest": "#535353",
-    "min": "#191919"
-  },
-  "table-contrast": {
+    "max": "#f9f9f9",
+    "lightest": "#ebebeb",
+    "lighter": "#dcdcdc",
+    "light": "#cecece",
+    "DEFAULT": "#c0c0c0",
+    "vivid": "#c6baba",
+    "dark": "#959595",
+    "darker": "#6a6a6a",
+    "darkest": "#3e3e3e",
+    "min": "#131313"
+  },
+  "tablePallet-contrast": {
     "max": "#111111",
     "lightest": "#111111",
     "lighter": "#111111",
     "light": "#111111",
     "DEFAULT": "#111111",
     "vivid": "#111111",
     "dark": "#111111",
-    "darker": "#111111",
+    "darker": "#fefefe",
     "darkest": "#fefefe",
     "min": "#fefefe"
-  },
-  "navigation": {
-    "footer": "#373A3C",
-    "topbar_hover": "#FFFFFF",
-    "light": "#111111",
-    "DEFAULT": "#111111",
-    "dark": "#111111",
-    "darker": "#111111",
-    "darkest": "#111111",
-    "min": "#111111"}
+  }
 }
diff --git a/config/icons/comparison.svg b/config/icons/comparison.svg
diff --git a/config/icons/open_in_modal.svg b/config/icons/open_in_modal.svg
diff --git a/next.config.js b/next.config.js
@@ -19,11 +19,7 @@ const withMDX = require('@next/mdx')({
 
 // Next configuration with support for rewrting API to existing common services
 const nextConfig = {
-  output: 'standalone',
   reactStrictMode: true,
-  experimental: {
-    instrumentationHook: true,
-  },
   pageExtensions: ['mdx', 'md', 'jsx', 'js', 'tsx', 'ts'],
   basePath: process.env.BASE_PATH || '',
   transpilePackages: ['@gen3/core', '@gen3/frontend'],
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ @@
     # misc
     .DS_Store
     *.pem
+    .idea
     # debug
     npm-debug.log*
@@ Expand Down @@