Merge branch 'master' of github.com:grai-io/grai-core into feature/gr…

…a-900-server-side-api-capabilities
grai-io · Nov 1, 2023 · 1a436d2 · 1a436d2
2 parents c1fe5ff + 432eb73
commit 1a436d2
Show file tree

Hide file tree

Showing 104 changed files with 3,120 additions and 1,165 deletions.
diff --git a/grai-frontend/index.html b/grai-frontend/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -33,5 +33,12 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <script type="module" src="/src/index.tsx"></script>
+    <script
+      type="text/javascript"
+      id="hs-script-loader"
+      async
+      defer
+      src="//js.hs-scripts.com/23214137.js"
+    ></script>
   </body>
 </html>
diff --git a/grai-frontend/package-lock.json b/grai-frontend/package-lock.json
diff --git a/grai-frontend/package.json b/grai-frontend/package.json
@@ -5,6 +5,7 @@
   "dependencies": {
     "@algolia/autocomplete-js": "^1.8.3",
     "@apollo/client": "^3.7.2",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@graphql-tools/mock": "^9.0.0",

diff --git a/grai-frontend/src/App.tsx b/grai-frontend/src/App.tsx
@@ -16,22 +16,22 @@ import {
   useLocation,
   useNavigationType,
 } from "react-router-dom"
-import { ShepherdTour } from "react-shepherd"
+// import { ShepherdTour } from "react-shepherd"
 import PosthogProvider from "components/PosthogProvider"
 import BackendProvider from "./providers/BackendProvider"
 import Routes from "./Routes"
-import steps from "./steps"
+// import steps from "./steps"
 import theme from "./theme"
 import "posthog"
 
-const tourOptions = {
-  defaultStepOptions: {
-    cancelIcon: {
-      enabled: true,
-    },
-  },
-  useModalOverlay: true,
-}
+// const tourOptions = {
+//   defaultStepOptions: {
+//     cancelIcon: {
+//       enabled: true,
+//     },
+//   },
+//   useModalOverlay: true,
+// }
 
 const App: React.FC = () => {
   if (process.env.REACT_APP_SENTRY_DSN)
@@ -72,31 +72,31 @@ const App: React.FC = () => {
         </Helmet>
         <ThemeProvider theme={theme}>
           <LocalizationProvider dateAdapter={AdapterLuxon}>
-            <ShepherdTour steps={steps} tourOptions={tourOptions}>
-              <BackendProvider>
-                <ConfirmProvider
-                  defaultOptions={{
-                    confirmationButtonProps: { autoFocus: true },
-                  }}
+            {/* <ShepherdTour steps={steps} tourOptions={tourOptions}> */}
+            <BackendProvider>
+              <ConfirmProvider
+                defaultOptions={{
+                  confirmationButtonProps: { autoFocus: true },
+                }}
+              >
+                <SnackbarProvider
+                  ref={notistackRef}
+                  maxSnack={3}
+                  hideIconVariant
+                  action={key => (
+                    <IconButton onClick={onClickDismiss(key)}>
+                      <Close />
+                    </IconButton>
+                  )}
                 >
-                  <SnackbarProvider
-                    ref={notistackRef}
-                    maxSnack={3}
-                    hideIconVariant
-                    action={key => (
-                      <IconButton onClick={onClickDismiss(key)}>
-                        <Close />
-                      </IconButton>
-                    )}
-                  >
-                    <BrowserRouter>
-                      <PosthogProvider />
-                      <Routes />
-                    </BrowserRouter>
-                  </SnackbarProvider>
-                </ConfirmProvider>
-              </BackendProvider>
-            </ShepherdTour>
+                  <BrowserRouter>
+                    <PosthogProvider />
+                    <Routes />
+                  </BrowserRouter>
+                </SnackbarProvider>
+              </ConfirmProvider>
+            </BackendProvider>
+            {/* </ShepherdTour> */}
           </LocalizationProvider>
         </ThemeProvider>
       </HelmetProvider>

diff --git a/grai-frontend/src/client.ts b/grai-frontend/src/client.ts
@@ -1,5 +1,5 @@
 /* istanbul ignore file */
-import { ApolloClient, from, InMemoryCache } from "@apollo/client"
+import { ApolloClient, from, InMemoryCache, TypePolicies } from "@apollo/client"
 import { onError } from "@apollo/client/link/error"
 import DebounceLink from "apollo-link-debounce"
 import { createUploadLink } from "apollo-upload-client"
@@ -12,7 +12,26 @@ declare global {
 
 const DEFAULT_DEBOUNCE_TIMEOUT = 100
 
-export const cache = new InMemoryCache()
+export const typePolicies: TypePolicies = {
+  Query: {
+    fields: {
+      workspace: {
+        merge: true,
+      },
+    },
+  },
+  Workspace: {
+    fields: {
+      runs: {
+        merge: true,
+      },
+    },
+  },
+}
+
+export const cache = new InMemoryCache({
+  typePolicies,
+})
 
 export const baseURL =
   window._env_?.REACT_APP_SERVER_URL ??

diff --git a/grai-frontend/src/components/PosthogProvider.tsx b/grai-frontend/src/components/PosthogProvider.tsx
@@ -1,4 +1,5 @@
 import React from "react"
+import hubspot from "hubspot"
 import posthog from "posthog-js"
 import { useLocation } from "react-router-dom"
 
@@ -7,6 +8,8 @@ const PosthogProvider: React.FC = () => {
 
   React.useEffect(() => {
     posthog.capture("$pageview")
+    hubspot.push(["setPath", location.pathname + location.search])
+    hubspot.push(["trackPageView"])
   }, [location])
 
   return null

diff --git a/grai-frontend/src/components/auth/login/LoginForm.tsx b/grai-frontend/src/components/auth/login/LoginForm.tsx
@@ -2,6 +2,7 @@ import React, { useState } from "react"
 import { gql, useMutation } from "@apollo/client"
 import { LoadingButton } from "@mui/lab"
 import { Box, InputLabel, Link, TextField, styled } from "@mui/material"
+import hubspot from "hubspot"
 import posthog from "posthog"
 import { Link as RouterLink } from "react-router-dom"
 import Form from "components/form/Form"
@@ -62,6 +63,7 @@ const LoginForm: React.FC<LoginFormProps> = ({ onDeviceRequest }) => {
 
         if (res.__typename === "User") {
           posthog.identify(res.id, { email: res.username })
+          hubspot.push(["identify", { email: res.username }])
           setLoggedIn(true)
           return
         }

diff --git a/grai-frontend/src/components/auth/login/TokenForm.tsx b/grai-frontend/src/components/auth/login/TokenForm.tsx
@@ -9,6 +9,7 @@ import {
   TextField,
   Typography,
 } from "@mui/material"
+import hubspot from "hubspot"
 import posthog from "posthog"
 import Form from "components/form/Form"
 import GraphError from "components/utils/GraphError"
@@ -83,6 +84,7 @@ const TokenForm: React.FC<TokenFormProps> = ({
           if (!res) return
 
           posthog.identify(res.id, { email: res.username })
+          hubspot.push(["identify", { email: res.username }])
           setLoggedIn(true)
         })
         .catch(() => {})

diff --git a/grai-frontend/src/components/auth/register/RegisterForm.tsx b/grai-frontend/src/components/auth/register/RegisterForm.tsx
@@ -2,6 +2,7 @@ import React, { useState } from "react"
 import { gql, useMutation } from "@apollo/client"
 import { LoadingButton } from "@mui/lab"
 import { InputLabel, TextField, styled } from "@mui/material"
+import hubspot from "hubspot"
 import posthog from "posthog"
 import Form from "components/form/Form"
 import GraphError from "components/utils/GraphError"
@@ -49,7 +50,11 @@ const RegisterForm: React.FC = () => {
   const handleSubmit = async () =>
     register({ variables: values })
       .then(data => data.data?.register)
-      .then(user => user && posthog.identify(user.id, { email: user.username }))
+      .then(user => {
+        if (!user) return
+        posthog.identify(user.id, { email: user.username })
+        hubspot.push(["identify", { email: user.username }])
+      })
       .then(() => setLoggedIn(true))
       .catch(() => {})