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

Upgrade ant-design to v5.x #1907

Merged
merged 8 commits into from
Oct 24, 2023
Merged

Upgrade ant-design to v5.x #1907

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
fb3d685
upgrade to v5.0.0
anshgoyalevil Oct 23, 2023
0283dd2
replace less variables
anshgoyalevil Oct 24, 2023
b745ad1
fix tests and snapshots
anshgoyalevil Oct 24, 2023
4602370
Merge branch 'main' into 7antd
anshgoyalevil Oct 24, 2023
f1b2558
nit: make diff object for theme
anshgoyalevil Oct 24, 2023
6b2eabe
Merge branch '7antd' of https://github.com/anshgoyalevil/jaeger-ui in…
anshgoyalevil Oct 24, 2023
d3d2bcf
fix lint
anshgoyalevil Oct 24, 2023
d1b5957
make css changes
anshgoyalevil Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/jaeger-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@babel/preset-typescript": "^7.21.0",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@types/react": "18.2.31",
"@types/react": "16.14.35",
"@types/react-window": "^1.8.0",
"@types/redux-form": "^8.3.5",
"@types/rollup-plugin-visualizer": "^4.2.1",
Expand All @@ -41,6 +41,7 @@
"vite-plugin-imp": "^2.3.1"
},
"dependencies": {
"@ant-design/compatible": "^5.1.2",
"@jaegertracing/plexus": "0.2.0",
"@pyroscope/flamegraph": "0.21.4",
"@types/deep-freeze": "^0.1.1",
Expand All @@ -49,7 +50,7 @@
"@types/react-helmet": "^6.1.5",
"@types/react-router-dom": "^5.1.0",
"@types/redux-actions": "2.2.1",
"antd": "4.24.14",
"antd": "^5.10.2",
"chance": "^1.0.10",
"classnames": "^2.2.5",
"combokeys": "^3.0.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/jaeger-ui/src/components/App/TopNav.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ limitations under the License.
.Dropdown--icon-container .Dropdown--icon {
margin-left: 5px;
}

.Menu--item {
color: white;
}
3 changes: 2 additions & 1 deletion packages/jaeger-ui/src/components/App/TopNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export function TopNavImpl(props: Props) {
theme="dark"
mode="horizontal"
selectable={false}
className="ub-right"
className="ub-right Menu--item"
disabledOverflow
selectedKeys={[pathname]}
items={itemsGlobalRight}
Expand All @@ -156,6 +156,7 @@ export function TopNavImpl(props: Props) {
return { key, label: <Link to={url}>{text}</Link> };
})
)}
className="Menu--item"
mode="horizontal"
selectable={false}
selectedKeys={[pathname]}
Expand Down
237 changes: 139 additions & 98 deletions packages/jaeger-ui/src/components/App/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,58 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`JaegerUIApp does not explode 1`] = `
<Provider
store={
<ConfigProvider
theme={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
"components": Object {
"Layout": Object {
"bodyBg": "#fff",
"footerBg": "#fff",
"footerPadding": "24 50",
"headerBg": "#404040",
"headerHeight": 48,
"headerPadding": "0 50",
"siderBg": "#404040",
"triggerBg": "tint(#fff, 20%)",
"triggerHeight": 48,
"zeroTriggerHeight": 42,
"zeroTriggerWidth": 36,
},
"Menu": Object {
"activeBarWidth": 3,
"darkItemBg": "#151515",
"itemBorderRadius": 0,
"itemHoverBg": "transparent",
"itemHoverColor": "#1890ff",
"itemMarginInline": 0,
"itemSelectedBg": "#e6f7ff",
"itemSelectedColor": "#1890ff",
"subMenuItemBorderRadius": 0,
},
"Table": Object {
"rowHoverBg": "#e5f2f2",
},
},
"token": Object {
"borderRadius": 2,
"colorPrimary": "#199",
"wireframe": true,
},
}
}
>
<HistoryProvider
history={
<Provider
store={
Object {
"action": "POP",
"back": [Function],
"block": [Function],
"createHref": [Function],
"forward": [Function],
"go": [Function],
"goBack": [Function],
"goForward": [Function],
"length": 1,
"listen": [Function],
"listenObject": false,
"location": Object {
"hash": "",
"pathname": "/",
"search": "",
"state": undefined,
},
"push": [Function],
"replace": [Function],
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
}
}
>
<Router
<HistoryProvider
history={
Object {
"action": "POP",
Expand All @@ -62,73 +77,99 @@ exports[`JaegerUIApp does not explode 1`] = `
}
}
>
<Memo(Connect(WithRouteProps))>
<Switch>
<Route
path="/search"
>
<WithRouteProps />
</Route>
<Route
path="/trace/:a?\\\\.\\\\.\\\\.:b?"
>
<WithRouteProps />
</Route>
<Route
path="/trace/:id"
>
<WithRouteProps />
</Route>
<Route
path="/dependencies"
>
<WithRouteProps />
</Route>
<Route
path="/deep-dependencies"
>
<WithRouteProps />
</Route>
<Route
path="/quality-metrics"
>
<WithRouteProps />
</Route>
<Route
path="/monitor"
>
<MonitorATMPage />
</Route>
<Route
exact={true}
path="/"
>
<Redirect
to="/search"
/>
</Route>
<Route
exact={true}
path=""
>
<Redirect
to="/search"
/>
</Route>
<Route
exact={true}
path="/"
>
<Redirect
to="/search"
/>
</Route>
<Route>
<NotFound />
</Route>
</Switch>
</Memo(Connect(WithRouteProps))>
</Router>
</HistoryProvider>
</Provider>
<Router
history={
Object {
"action": "POP",
"back": [Function],
"block": [Function],
"createHref": [Function],
"forward": [Function],
"go": [Function],
"goBack": [Function],
"goForward": [Function],
"length": 1,
"listen": [Function],
"listenObject": false,
"location": Object {
"hash": "",
"pathname": "/",
"search": "",
"state": undefined,
},
"push": [Function],
"replace": [Function],
}
}
>
<Memo(Connect(WithRouteProps))>
<Switch>
<Route
path="/search"
>
<WithRouteProps />
</Route>
<Route
path="/trace/:a?\\\\.\\\\.\\\\.:b?"
>
<WithRouteProps />
</Route>
<Route
path="/trace/:id"
>
<WithRouteProps />
</Route>
<Route
path="/dependencies"
>
<WithRouteProps />
</Route>
<Route
path="/deep-dependencies"
>
<WithRouteProps />
</Route>
<Route
path="/quality-metrics"
>
<WithRouteProps />
</Route>
<Route
path="/monitor"
>
<MonitorATMPage />
</Route>
<Route
exact={true}
path="/"
>
<Redirect
to="/search"
/>
</Route>
<Route
exact={true}
path=""
>
<Redirect
to="/search"
/>
</Route>
<Route
exact={true}
path="/"
>
<Redirect
to="/search"
/>
</Route>
<Route>
<NotFound />
</Route>
</Switch>
</Memo(Connect(WithRouteProps))>
</Router>
</HistoryProvider>
</Provider>
</ConfigProvider>
`;
Loading