Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: move ui kit to separate repo #8104

Merged
merged 8 commits into from
Oct 19, 2023
Merged

chore: move ui kit to separate repo #8104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
51f6759
chore: move ui kit to separate repo
ashtonG Oct 10, 2023
a2491f3
re-add tooltip mock
ashtonG Oct 10, 2023
e372ee8
nix kit path component
ashtonG Oct 10, 2023
282ec9e
use consistent tagging for flaky tests
ashtonG Oct 10, 2023
125185b
ensure notes use router blocker
ashtonG Oct 11, 2023
790c7b3
fix internal exports
ashtonG Oct 16, 2023
b0cb473
clean up rebase
ashtonG Oct 17, 2023
c54daba
include icon fixes
ashtonG Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1634,7 +1634,7 @@ jobs:
- run:
command: |
MERGE_BASE="$(git merge-base upstream/main HEAD)"
DIFF_PATHS="webui/react/src/components/kit webui/react/src/pages/DesignKit.tsx webui/react/design"
DIFF_PATHS="webui/react/src/package-lock.json webui/react/src/package.json webui/react/src/pages/DesignKit.tsx webui/react/design"
if git diff --quiet $MERGE_BASE -- $DIFF_PATHS; then
echo "DesignKit not changed, halting job now."
circleci-agent step halt
Expand Down
6 changes: 2 additions & 4 deletions webui/react/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,10 @@ test:
test-ci:
VITEST_MAX_THREADS=6 VITEST_MIN_THREADS=1 npm run test:coverage -- --reporter=junit --reporter=default --outputFile.junit=junit.xml

# INCLUDE_FLAKY runs all tests even if they use flakyIt.
# By default this would run ALL tests.
# To avoid duplication, I use a filename (LogViewer) here to specify which group of tests to run.
# INCLUDE_FLAKY=true runs all tests with @flaky in the test name
.PHONY: test-ci-flaky
test-ci-flaky:
INCLUDE_FLAKY=true VITEST_MAX_THREADS=6 VITEST_MIN_THREADS=1 npm run test -- LogViewer --reporter=default
INCLUDE_FLAKY=true VITEST_MAX_THREADS=6 VITEST_MIN_THREADS=1 npm run test -- --reporter=default

.PHONY: visual-test-deps
visual-test-deps: node_modules/playwright-core/.local-browsers
Expand Down
7 changes: 3 additions & 4 deletions .../src/components/kit/__mocks__/Tooltip.tsx → ...react/__mocks__/determined-ui/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import type { TooltipProps } from 'determined-ui/Tooltip';
import React from 'react';

import type { TooltipProps } from 'components/kit/Tooltip';

const { default: OriginalTooltip } = await vi.importActual<typeof import('components/kit/Tooltip')>(
'components/kit/Tooltip',
const { default: OriginalTooltip } = await vi.importActual<typeof import('determined-ui/Tooltip')>(
'determined-ui/Tooltip',
);

const Tooltip: React.FC<TooltipProps> = (props: TooltipProps) => {
Expand Down
6 changes: 3 additions & 3 deletions webui/react/design/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { UIProvider } from 'determined-ui/Theme';
import { ConfirmationProvider } from 'determined-ui/useConfirm';
import { Loaded } from 'determined-ui/utils/loadable';
import { Map } from 'immutable';
import { observable } from 'micro-observables';
import { createRoot } from 'react-dom/client';
Expand All @@ -6,9 +9,6 @@ import { createBrowserRouter, RouterProvider } from 'react-router-dom';

import 'uplot/dist/uPlot.min.css';
import css from 'App.module.scss';
import { UIProvider } from 'components/kit/Theme';
import { ConfirmationProvider } from 'components/kit/useConfirm';
import { Loaded } from 'components/kit/utils/loadable';
import { Settings, UserSettings } from 'hooks/useSettingsProvider';
import DesignKit from 'pages/DesignKit';

Expand Down
170 changes: 104 additions & 66 deletions webui/react/package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions webui/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"core-js": "3.32",
"dayjs": "^1.11.7",
"debug": "^4.3.4",
"determined-ui": "git+https://[email protected]/determined-ai/determined-ui.git#v0.5.1",
"events": "^3.3.0",
"fp-ts": "^2.13.1",
"fuse.js": "^6.6.2",
Expand Down
Loading