add min height of topology canvas (#804)

* add min height and i18n * resolve comments * remove useless code
pingcap · Nov 24, 2020 · 07742d6 · 07742d6
1 parent a99a643
commit 07742d6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/ui/lib/apps/ClusterInfo/components/StoreLocation.tsx b/ui/lib/apps/ClusterInfo/components/StoreLocation.tsx
@@ -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
+          }
+        />
       </AnimatedSkeleton>
     </div>
   )

diff --git a/ui/lib/apps/ClusterInfo/components/StoreLocationTree/index.tsx b/ui/lib/apps/ClusterInfo/components/StoreLocationTree/index.tsx
@@ -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 }
@@ -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
@@ -129,11 +135,13 @@ 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))
 
       // update the nodes
       const node = gNode.selectAll('g').data(nodes, (d: any) => d.id)
@@ -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' }}>
@@ -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>

diff --git a/ui/lib/apps/ClusterInfo/translations/en.yaml b/ui/lib/apps/ClusterInfo/translations/en.yaml
@@ -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}}'
diff --git a/ui/lib/apps/ClusterInfo/translations/zh.yaml b/ui/lib/apps/ClusterInfo/translations/zh.yaml
@@ -28,5 +28,6 @@ cluster_info:
       instanceUnavailable: 获取该主机信息失败：无法访问实例
     store_topology:
       title: 存储拓扑
+      tooltip: 按住 Ctrl 键并滑动鼠标滚轮可以缩放
   error:
     load: '加载组件 {{comp}} 失败: {{cause}}'