Merge branch 'main'

Kanaries · Apr 24, 2023 · c299d51 · c299d51 · vercel · Apr 24, 2023
2 parents 598c3eb + 6ffaa8a
commit c299d51
Show file tree

Hide file tree

Showing 60 changed files with 3,521 additions and 264 deletions.
diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml
@@ -1,9 +1,9 @@
 name: Rath Auto Build
 on:
   push:
-    branches: [master, dev]
+    branches: [main, dev]
   pull_request:
-    branches: [master, dev]
+    branches: [main, dev]
 jobs:
   auto-build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/prod-publish.yml b/.github/workflows/prod-publish.yml
diff --git a/package.json b/package.json
@@ -4,7 +4,11 @@
   "version": "1.1.0",
   "description": "![](https://img.shields.io/github/license/Kanaries/Rath)",
   "scripts": {
-    "build": "yarn workspace rath-client build",
+    "build:utils": "yarn workspace @kanaries/rath-utils build",
+    "build:scenegraph": "yarn workspace vega-scenegraph build",
+    "build:renderer": "yarn workspace vega-painter-renderer build",
+    "build:client": "yarn workspace rath-client build",
+    "build": "npm run build:utils && npm run build:scenegraph && npm run build:renderer && npm run build:client",
     "test": "yarn workspace rath-client test",
     "ui": "npm run test && npm run build && node start.js",
     "devfront": "yarn workspace rath-client start",

diff --git a/packages/rath-client/package.json b/packages/rath-client/package.json
@@ -23,7 +23,7 @@
     "@kanaries/loa": "^0.0.16",
     "@kanaries/web-data-loader": "0.1.7",
     "@material-ui/core": "^5.0.0-beta.5",
-    "@vercel/analytics": "^0.1.8",
+    "@vercel/analytics": "^1.0.0",
     "@zip.js/zip.js": "^2.6.60",
     "airtable": "^0.11.4",
     "ali-react-table": "^2.6.1",
@@ -49,6 +49,7 @@
     "vega": "^5.22.1",
     "vega-embed": "^6.21.0",
     "vega-lite": "^5.6.0",
+    "vega-painter-renderer": "*",
     "vega-scenegraph": "4.10.1-kanaries-patch",
     "visual-insights": "^0.12.3",
     "web-vitals": "^0.2.4",
@@ -78,9 +79,12 @@
     "typescript": "^4.7.4"
   },
   "scripts": {
+    "build:utils": "yarn workspace @kanaries/rath-utils build",
+    "build:scenegraph": "yarn workspace vega-scenegraph build",
+    "build:renderer": "yarn workspace vega-painter-renderer build",
     "start": "react-app-rewired start",
-    "build": "GENERATE_SOURCEMAP=false react-app-rewired --max_old_space_size=8000 build",
-    "build2": "GENERATE_SOURCEMAP=false react-app-rewired --max_old_space_size=8000 build",
+    "build": "npm run build:utils && npm run build:scenegraph && npm run build:renderer && npm run build:client",
+    "build:client": "GENERATE_SOURCEMAP=false react-app-rewired --max_old_space_size=8000 build",
     "buildForAnalysis": "react-app-rewired build",
     "test": "jest -c ./jest.config.js --passWithNoTests --no-cache",
     "eject": "react-app-rewired eject",

diff --git a/packages/rath-client/src/components/appNav.tsx b/packages/rath-client/src/components/appNav.tsx
@@ -202,7 +202,7 @@ const AppNav: React.FC<AppNavProps> = (props) => {
         <NavContainer>
             <LogoBar>
                 <a
-                    href={`${window.location.protocol}//rath.${window.location.host.split('.').slice(-2).join('.')}/`}
+                    href={`${window.location.protocol}//${window.location.host.split('.').slice(-2).join('.')}/`}
                     target="_blank"
                     rel="noreferrer"
                 >

diff --git a/packages/rath-client/src/pages/dataSource/baseActions/mainActionButton.tsx b/packages/rath-client/src/pages/dataSource/baseActions/mainActionButton.tsx
@@ -4,6 +4,7 @@ import React, { useCallback, useMemo } from 'react';
 import intl from 'react-intl-universal';
 import { Menu, MenuButtonProps, MenuItem, MenuList, MenuPopover, MenuTrigger, SplitButton } from '@fluentui/react-components';
 import { Poll24Regular } from '@fluentui/react-icons';
+import va from '@vercel/analytics';
 import { EXPLORE_MODE, PIVOT_KEYS } from '../../../constants';
 import { useGlobalStore } from '../../../store';
 
@@ -86,14 +87,21 @@ export const useActionModes = function () {
 
 const MainActionButton: React.FC = () => {
     const { satisfyAnalysisCondition, startMode, analysisOptions } = useActionModes();
+    const { userStore } = useGlobalStore();
+
+    const startHandler = useCallback(() => {
+        startMode.onClick && startMode.onClick()
+        va.track('start_analysis', { userName: userStore.userName, mode: startMode.key })
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [startMode]);
 
     return (
         <Menu positioning="below-end">
             <MenuTrigger disableButtonEnhancement>
                 {(triggerProps: MenuButtonProps) => (
                     <SplitButton
                         disabled={!satisfyAnalysisCondition}
-                        primaryActionButton={{ onClick: () => startMode.onClick && startMode.onClick() }}
+                        primaryActionButton={{ onClick: startHandler }}
                         menuButton={triggerProps}
                         appearance="primary"
                         icon={<Poll24Regular />}