Skip to content

Commit 6abfded

Browse files
committed
fix(Tenant): fix layout after moving tabs
1 parent d8b7a1b commit 6abfded

File tree

3 files changed

+27
-73
lines changed

3 files changed

+27
-73
lines changed

src/containers/Tenant/QueryEditor/QueryEditor.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
flex: 1 1 auto;
88
flex-direction: column;
99

10-
height: calc(100% - 56px);
10+
height: 100%;
1111

1212
@include query-data-table;
1313

src/containers/Tenant/Tenant.scss

+2-50
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,7 @@
1111
overflow: initial;
1212
}
1313

14-
&__loader {
15-
display: flex;
16-
flex: 1 1 auto;
17-
justify-content: center;
18-
align-items: center;
19-
}
20-
21-
&__content {
22-
overflow: auto;
23-
@include flex-container();
24-
}
25-
26-
&__storage {
27-
overflow: auto;
28-
29-
height: 100%;
30-
padding-left: 20px;
31-
}
32-
33-
&__row {
34-
display: flex;
35-
align-items: flex-start;
36-
37-
&_schema {
38-
height: 100%;
39-
}
40-
41-
&_schema-tags {
42-
align-items: center;
43-
}
44-
}
45-
46-
&__schema-wrapper {
47-
overflow: auto;
48-
49-
min-width: 300px;
50-
height: 100%;
51-
padding-top: 15px;
52-
padding-left: 8px;
53-
}
54-
55-
&__schema-tabs-wrapper {
56-
overflow: auto;
57-
58-
width: 100%;
59-
height: 100%;
60-
padding: 15px 0 0 15px;
61-
62-
border-left: 1px solid rgba(0, 0, 0, 0.07);
63-
@include flex-container();
14+
&__tab-content {
15+
height: calc(100% - 56px); // general tabs height
6416
}
6517
}

src/containers/Tenant/Tenant.tsx

+24-22
Original file line numberDiff line numberDiff line change
@@ -134,28 +134,30 @@ function Tenant(props: TenantProps) {
134134
) : (
135135
<>
136136
<ObjectGeneralTabs />
137-
<SplitPane
138-
defaultSizePaneKey={DEFAULT_SIZE_TENANT_KEY}
139-
defaultSizes={[25, 75]}
140-
triggerCollapse={summaryVisibilityState.triggerCollapse}
141-
triggerExpand={summaryVisibilityState.triggerExpand}
142-
minSize={[36, 200]}
143-
onSplitStartDragAdditional={onSplitStartDragAdditional}
144-
>
145-
<ObjectSummary
146-
type={currentPathType}
147-
subType={currentPathSubType}
148-
onCollapseSummary={onCollapseSummaryHandler}
149-
onExpandSummary={onExpandSummaryHandler}
150-
isCollapsed={summaryVisibilityState.collapsed}
151-
additionalTenantInfo={props.additionalTenantInfo}
152-
/>
153-
<ObjectGeneral
154-
type={currentPathType}
155-
additionalTenantInfo={props.additionalTenantInfo}
156-
additionalNodesInfo={props.additionalNodesInfo}
157-
/>
158-
</SplitPane>
137+
<div className={b('tab-content')}>
138+
<SplitPane
139+
defaultSizePaneKey={DEFAULT_SIZE_TENANT_KEY}
140+
defaultSizes={[25, 75]}
141+
triggerCollapse={summaryVisibilityState.triggerCollapse}
142+
triggerExpand={summaryVisibilityState.triggerExpand}
143+
minSize={[36, 200]}
144+
onSplitStartDragAdditional={onSplitStartDragAdditional}
145+
>
146+
<ObjectSummary
147+
type={currentPathType}
148+
subType={currentPathSubType}
149+
onCollapseSummary={onCollapseSummaryHandler}
150+
onExpandSummary={onExpandSummaryHandler}
151+
isCollapsed={summaryVisibilityState.collapsed}
152+
additionalTenantInfo={props.additionalTenantInfo}
153+
/>
154+
<ObjectGeneral
155+
type={currentPathType}
156+
additionalTenantInfo={props.additionalTenantInfo}
157+
additionalNodesInfo={props.additionalNodesInfo}
158+
/>
159+
</SplitPane>
160+
</div>
159161
</>
160162
)}
161163
</div>

0 commit comments

Comments
 (0)