Updating colors for json theme. (#2807)

Co-authored-by: phix <peter.hicks@astronomer.io>
MarquezProject · May 1, 2024 · b29be3d · b29be3d
1 parent 6576fb3
commit b29be3d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -30,7 +30,7 @@
     "@types/jest": "^29.5.2",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-syntax-highlighter": "^15.5.6",
-    "@uiw/react-json-view": "^2.0.0-alpha.11",
+    "@uiw/react-json-view": "^2.0.0-alpha.24",
     "@visx/responsive": "3.10.2",
     "autoprefixer": "^10.4.14",
     "copy-webpack-plugin": "^10.2.4",

diff --git a/web/src/components/core/json-view/MqJsonView.tsx b/web/src/components/core/json-view/MqJsonView.tsx
@@ -1,28 +1,39 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Box } from '@mui/system'
-import { darkTheme } from '@uiw/react-json-view/dark'
-import { theme } from '../../../helpers/theme'
+import { THEME_EXTRA, theme } from '../../../helpers/theme'
+import { githubDarkTheme } from '@uiw/react-json-view/githubDark'
 import JsonView from '@uiw/react-json-view'
 import React from 'react'
 
 interface OwnProps {
   data: object
-  searchable?: boolean
-  placeholder?: string
 }
 
 type JsonViewProps = OwnProps
 
-darkTheme.background = theme.palette.background.default
-darkTheme.backgroundColor = theme.palette.background.default
-darkTheme.borderLeftWidth = 2
-darkTheme.borderLeftColor = theme.palette.grey[500]
-darkTheme.borderLeftStyle = 'dashed'
+githubDarkTheme.background = theme.palette.background.default
+githubDarkTheme.backgroundColor = theme.palette.background.default
+githubDarkTheme.borderLeftWidth = 2
+githubDarkTheme.borderLeftColor = theme.palette.grey[500]
+githubDarkTheme.borderLeftStyle = 'dashed'
+
+const mqTheme = {
+  ...githubDarkTheme,
+  '--w-rjv-info-color': THEME_EXTRA.typography.subdued,
+  '--w-rjv-type-null-color': theme.palette.warning.main,
+  '--w-rjv-type-boolean-color': theme.palette.error.main,
+  '--w-rjv-copied-color': theme.palette.primary.main,
+  '--w-rjv-key-string': theme.palette.common.white,
+  '--w-rjv-type-string-color': theme.palette.info.main,
+  '--w-rjv-ellipsis-color': theme.palette.info.main,
+  '--w-rjv-key-number': theme.palette.primary.main,
+  '--w-rjv-type-float-color': theme.palette.primary.main,
+}
 
 const MqJsonView: React.FC<JsonViewProps> = ({ data }) => {
   return (
     <Box my={2}>
-      <JsonView style={darkTheme} collapsed={2} value={data} />
+      <JsonView style={mqTheme} collapsed={2} value={data} />
     </Box>
   )
 }

diff --git a/web/src/components/jobs/RunInfo.tsx b/web/src/components/jobs/RunInfo.tsx
@@ -50,7 +50,7 @@ const RunInfo: FunctionComponent<RunInfoProps> = (props) => {
   )
 
   return (
-    <Box mt={2}>
+    <Box>
       {<MqCode code={(jobFacets?.sql as SqlFacet)?.query} language={'sql'} />}
       {run.facets && (
         <Box mt={2}>
@@ -61,7 +61,6 @@ const RunInfo: FunctionComponent<RunInfoProps> = (props) => {
             data={run.facets}
             aria-label={i18next.t('jobs.facets_subhead_aria')}
             aria-required='true'
-            placeholder={i18next.t('jobs.search')}
           />
         </Box>
       )}