Skip to content

Commit

Permalink
fix/shared deps (#971)
Browse files Browse the repository at this point in the history
  • Loading branch information
DimaAmega authored Feb 2, 2024
1 parent a8c66c8 commit 10e1e95
Show file tree
Hide file tree
Showing 28 changed files with 77 additions and 113 deletions.
70 changes: 35 additions & 35 deletions src/evidently/nbextension/static/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/evidently/ui/ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
content="Evidently - ML Monitoring Demo. Hosted example to monitor the performance of a demand forecasting model on a toy dataset."
/>
<title>Evidently - ML Monitoring Demo</title>
<script type="module" crossorigin src="/static/js/index-d8313774.js"></script>
<script type="module" crossorigin src="/static/js/index-f9b00732.js"></script>
<link rel="modulepreload" crossorigin href="/static/js/vendor-953b2265.js">
<link rel="stylesheet" href="/static/css/index.css">
</head>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions ui/packages/evidently-ui-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,12 @@
}
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@material-table/core": "^6.2.11",
"@mui/icons-material": "^5.14.12",
"@mui/material": "^5.14.12",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"dependencies": {
"@mui/icons-material": "^5.14.12",
"@mui/material": "^5.14.12",
"@hookform/resolvers": "^3.3.1",
"@material-table/core": "^6.2.11",
"@mui/x-date-pickers": "^6.16.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ export const useIsCorrectTimeInterval = ({ dataRanges }: DashboardDateFilterProp
const date_to = dayjs(dateTo || dataRanges.maxDate)

const isCorrectTimeInterval =
date_from.isValid() && date_to.isValid() && (date_from.isSame(date_to) || date_from.isBefore(date_to))
date_from.isValid() &&
date_to.isValid() &&
(date_from.isSame(date_to) || date_from.isBefore(date_to))

return { isCorrectTimeInterval, date_from, date_to, setSearchParams }
}
Expand Down Expand Up @@ -77,7 +79,6 @@ export const DashboardDateFilter = ({ dataRanges }: DashboardDateFilterProps) =>
container
padding={1}
zIndex={1}
// my={3}
gap={2}
justifyContent="flex-end"
justifyItems={'center'}
Expand Down
5 changes: 0 additions & 5 deletions ui/packages/evidently-ui-lib/src/components/ProjectCard.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import React, { useEffect, useState } from 'react'

import { Form, Link as RouterLink, useNavigation, useSubmit } from 'react-router-dom'

import { Box, Button, Fade, IconButton, Link, Paper, TextField, Typography } from '@mui/material'

import EditIcon from '@mui/icons-material/Edit'

import { useHover } from '@uidotdev/usehooks'

import { ProjectInfo } from '~/api'
import { z } from 'zod'
import { useForm } from 'react-hook-form'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '@mui/icons-material'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '@mui/material'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from 'react-hook-form'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from 'react-router-dom'
2 changes: 2 additions & 0 deletions ui/packages/evidently-ui-lib/src/shared-dependencies/zod.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { zodResolver } from '@hookform/resolvers/zod'
export * from 'zod'
35 changes: 2 additions & 33 deletions ui/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 5 additions & 9 deletions ui/service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,22 @@
},
"dependencies": {
"evidently-ui-lib": "workspace:*",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.12",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.16.0"
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "^1.41.0",
"wait-on": "^7.1.0",
"@playwright/test": "^1.41.0",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"vite": "^4.4.5",
"@vitejs/plugin-react-swc": "^3.3.2",
"vite-tsconfig-paths": "^4.2.1",
"eslint": "^8.45.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"typescript": "^5.0.2",
"vite": "^4.4.5",
"vite-tsconfig-paths": "^4.2.1"
"typescript": "^5.0.2"
}
}
4 changes: 2 additions & 2 deletions ui/service/src/Routes/NotFound/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box, Typography } from '@mui/material'
import { RouteObject } from 'react-router-dom'
import { Box, Typography } from 'evidently-ui-lib/shared-dependencies/mui-material'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'

export default {
path: '*',
Expand Down
2 changes: 1 addition & 1 deletion ui/service/src/Routes/home/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouteObject } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { injectAPI } from 'evidently-ui-lib/routes-components/home/data'
import { api } from 'api/RemoteApi'

Expand Down
5 changes: 4 additions & 1 deletion ui/service/src/Routes/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { RouteObject, createBrowserRouter } from 'react-router-dom'
import {
RouteObject,
createBrowserRouter
} from 'evidently-ui-lib/shared-dependencies/react-router-dom'

import HomeRoute from './home'
import ProjectsRoute from './projects/projectId'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouteObject } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { injectAPI } from 'evidently-ui-lib/routes-components/snapshotId/data'
import { api } from 'api/RemoteApi'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouteObject } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { injectAPI } from 'evidently-ui-lib/routes-components/dashboard/data'
import { api } from 'api/RemoteApi'

Expand Down
2 changes: 1 addition & 1 deletion ui/service/src/Routes/projects/projectId/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouteObject } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { injectAPI } from 'evidently-ui-lib/routes-components/projectId/data'
import { api } from 'api/RemoteApi'

Expand Down
2 changes: 1 addition & 1 deletion ui/service/src/Routes/projects/projectId/reports/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouteObject } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { injectReportsAPI } from 'evidently-ui-lib/routes-components/snapshots/data'
import { api } from 'api/RemoteApi'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouteObject } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { injectTestSuitesAPI } from 'evidently-ui-lib/routes-components/snapshots/data'
import { api } from 'api/RemoteApi'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RouteObject } from 'react-router-dom'
import { redirect } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { redirect } from 'evidently-ui-lib/shared-dependencies/react-router-dom'

export default {
path: 'test_suites/*',
Expand Down
2 changes: 1 addition & 1 deletion ui/service/src/Routes/projectsList/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouteObject } from 'react-router-dom'
import { RouteObject } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { injectAPI } from 'evidently-ui-lib/routes-components/projectsList/data'
import { api } from 'api/RemoteApi'

Expand Down
4 changes: 2 additions & 2 deletions ui/service/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import ReactDOM from 'react-dom/client'

import { RouterProvider } from 'react-router-dom'
import { ThemeProvider } from '@mui/material'
import { RouterProvider } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
import { ThemeProvider } from 'evidently-ui-lib/shared-dependencies/mui-material'
import { theme } from 'evidently-ui-lib/theme/v1'
import { router } from 'Routes'
import './index.css'
Expand Down
3 changes: 2 additions & 1 deletion ui/service/tests/visual.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ const ReviewsDemoProjectName = 'Demo project - Reviews'
/// Home
/////////////////////

test(`Home`, async ({ page }) => {
// skip due to reordering projects on home page
test.skip(`Home`, async ({ page }) => {
await page.goto('/')
await page.waitForLoadState('networkidle')
await expect(page).toHaveScreenshot({ fullPage: true, maxDiffPixels: 150 })
Expand Down
4 changes: 0 additions & 4 deletions ui/standalone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
"preview": "vite preview"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.12",
"@mui/material": "^5.14.12",
"evidently-ui-lib": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions ui/standalone/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import ReactDOM from 'react-dom/client'
import { AdditionalGraphInfo, DashboardInfo } from 'evidently-ui-lib/api'
import ApiContext from 'evidently-ui-lib/contexts/ApiContext'
import LocalApi from 'evidently-ui-lib/api/LocalApi'
import { ThemeProvider } from 'evidently-ui-lib/shared-dependencies/mui-material'
import { theme } from 'evidently-ui-lib/theme/v1'
import { ProjectReport } from 'evidently-ui-lib/standalone/app'

import { ThemeProvider } from '@mui/material/styles'
import { ProjectReport } from 'evidently-ui-lib/standalone/app'

export function drawDashboard(
dashboard: DashboardInfo,
Expand Down

0 comments on commit 10e1e95

Please sign in to comment.