Skip to content

Commit

Permalink
Merge branch 'main' into row-styles-followup
Browse files Browse the repository at this point in the history
  • Loading branch information
julieg18 authored Sep 11, 2022
2 parents 85a76a1 + 37191b7 commit 29e6fc9
Show file tree
Hide file tree
Showing 7 changed files with 373 additions and 441 deletions.
4 changes: 2 additions & 2 deletions extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1638,8 +1638,8 @@
"clean-webpack-plugin": "4.0.0",
"copy-webpack-plugin": "11.0.0",
"fork-ts-checker-webpack-plugin": "7.2.13",
"jest": "29.0.1",
"jest-environment-node": "29.0.1",
"jest": "29.0.2",
"jest-environment-node": "29.0.2",
"lint-staged": "13.0.3",
"mocha": "10.0.0",
"mock-require": "3.0.3",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
"eslint-plugin-testing-library": "5.6.0",
"eslint-plugin-unicorn": "43.0.2",
"husky": "8.0.1",
"jest": "29.0.1",
"jest": "29.0.2",
"lint-staged": "13.0.3",
"npm-run-all": "4.1.5",
"nyc": "15.1.0",
"prettier": "2.7.1",
"prettier-config-standard": "5.0.0",
"ts-node": "10.9.1",
"turbo": "1.4.4",
"turbo": "1.4.5",
"typescript": "4.8.2"
},
"resolutions": {
Expand Down
6 changes: 3 additions & 3 deletions webview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
"@types/react-virtualized": "9.21.21",
"@types/webpack": "5.28.0",
"@welldone-software/why-did-you-render": "7.0.1",
"chromatic": "6.8.1",
"chromatic": "6.9.0",
"clean-webpack-plugin": "4.0.0",
"css-loader": "6.7.1",
"file-loader": "6.2.0",
"fork-ts-checker-webpack-plugin": "7.2.13",
"identity-obj-proxy": "3.0.0",
"jest": "29.0.1",
"jest": "29.0.2",
"jest-canvas-mock": "2.4.0",
"jest-environment-jsdom": "29.0.1",
"jest-environment-jsdom": "29.0.2",
"lint-staged": "13.0.3",
"raw-loader": "4.0.2",
"sass": "1.54.8",
Expand Down
12 changes: 12 additions & 0 deletions webview/src/experiments/components/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,18 @@ describe('App', () => {
expect(noColumnsState).toBeInTheDocument()
})

it('should not show the no columns selected empty state when only the timestamp column is provided', () => {
renderTable({
...tableDataFixture,
columns: tableDataFixture.columns.filter(
({ label }) => label === 'Created'
)
})

const noColumnsState = screen.queryByText('No Columns Selected.')
expect(noColumnsState).not.toBeInTheDocument()
})

it('should show the no experiments empty state when only the workspace is provided', () => {
renderTableWithWorkspaceRowOnly()

Expand Down
2 changes: 1 addition & 1 deletion webview/src/experiments/components/Experiments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const ExperimentsTable: React.FC = () => {
toggleAllRowsExpanded()
}, [toggleAllRowsExpanded])

const hasOnlyDefaultColumns = columns.length <= 2
const hasOnlyDefaultColumns = columns.length <= 1
const hasOnlyWorkspace = data.length <= 1
if (hasOnlyDefaultColumns || hasOnlyWorkspace) {
return (
Expand Down
8 changes: 7 additions & 1 deletion webview/src/plots/components/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,15 @@ $gap: 20px;
width: 80vw;
height: calc(80vh - 100px);

:global(.chart-wrapper) {
width: 100%;
height: 100%;
}

svg {
background-color: transparent !important;
max-width: 100%;
width: 100%;
height: 100%;
}
}

Expand Down
Loading

0 comments on commit 29e6fc9

Please sign in to comment.