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.

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

add min height of topology canvas #804

Merged
merged 3 commits into from
Nov 24, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
7 changes: 6 additions & 1 deletion ui/lib/apps/ClusterInfo/components/StoreLocation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ export default function StoreLocation() {
<div>
<ErrorBar errors={[error]} />
<AnimatedSkeleton showSkeleton={isLoading}>
<StoreLocationTree dataSource={treeData} />
<StoreLocationTree
dataSource={treeData}
getMinHeight={
() => document.documentElement.clientHeight - 80 - 48 * 2 // 48 = margin of cardInner}
unbyte marked this conversation as resolved.
Show resolved Hide resolved
}
/>
</AnimatedSkeleton>
</div>
)
Expand Down
18 changes: 13 additions & 5 deletions ui/lib/apps/ClusterInfo/components/StoreLocationTree/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ import {
QuestionCircleOutlined,
} from '@ant-design/icons'
import { Space, Tooltip } from 'antd'
import { useTranslation } from 'react-i18next'

export interface IStoreLocationProps {
dataSource: any
getMinHeight?: () => number
}

const margin = { left: 60, right: 40, top: 60, bottom: 100 }
Expand All @@ -30,8 +32,12 @@ function calcHeight(root) {
return x1 - x0
}

export default function StoreLocationTree({ dataSource }: IStoreLocationProps) {
export default function StoreLocationTree({
dataSource,
getMinHeight,
}: IStoreLocationProps) {
const divRef = useRef<HTMLDivElement>(null)
const { t } = useTranslation()

useEffect(() => {
let divWidth = divRef.current?.clientWidth || 0
Expand Down Expand Up @@ -129,12 +135,14 @@ export default function StoreLocationTree({ dataSource }: IStoreLocationProps) {
root.y0 = root.y
}

const contentHeight = boundHeight + margin.top + margin.bottom

const transition = svg
.transition()
.duration(duration)
.attr('width', divWidth)
.attr('height', boundHeight + margin.top + margin.bottom)

.attr('height', Math.max(getMinHeight?.() || 0, contentHeight))
console.log(getMinHeight?.())
unbyte marked this conversation as resolved.
Show resolved Hide resolved
// update the nodes
const node = gNode.selectAll('g').data(nodes, (d: any) => d.id)

Expand Down Expand Up @@ -236,7 +244,7 @@ export default function StoreLocationTree({ dataSource }: IStoreLocationProps) {
return () => {
window.removeEventListener('resize', resizeHandler)
}
}, [dataSource])
}, [dataSource, getMinHeight])

return (
<div ref={divRef} style={{ position: 'relative' }}>
Expand All @@ -250,7 +258,7 @@ export default function StoreLocationTree({ dataSource }: IStoreLocationProps) {
<ZoomInOutlined id="slt-zoom-in" />
<ZoomOutOutlined id="slt-zoom-out" />
<ReloadOutlined id="slt-zoom-reset" />
<Tooltip title="You can also zoom in or out by pressing CTRL and scrolling mouse">
<Tooltip title={t('cluster_info.list.store_topology.tooltip')}>
<QuestionCircleOutlined />
</Tooltip>
</Space>
Expand Down
1 change: 1 addition & 0 deletions ui/lib/apps/ClusterInfo/translations/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ cluster_info:
instanceUnavailable: Host information is unknow due to instance unreachable
store_topology:
title: Store Topology
tooltip: You can also zoom in or out by pressing CTRL and scrolling mouse
error:
load: 'Load component {{comp}} error: {{cause}}'
1 change: 1 addition & 0 deletions ui/lib/apps/ClusterInfo/translations/zh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ cluster_info:
instanceUnavailable: 获取该主机信息失败:无法访问实例
store_topology:
title: 存储拓扑
tooltip: 按住 Ctrl 键并滑动鼠标滚轮可以缩放
error:
load: '加载组件 {{comp}} 失败: {{cause}}'