Skip to content

Commit e782a35

Browse files
committed
#RI-6602 - fix scroll
1 parent 3ab06f4 commit e782a35

File tree

8 files changed

+61
-51
lines changed

8 files changed

+61
-51
lines changed

redisinsight/ui/src/pages/home/components/add-database-screen/AddDatabaseScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ const AddDatabaseScreen = (props: Props) => {
9898
})
9999

100100
return (
101-
<div>
101+
<div className="eui-yScroll">
102102
<EuiForm
103103
component="form"
104104
onSubmit={formik.handleSubmit}

redisinsight/ui/src/pages/home/components/cloud-connection/cloud-connection-form/CloudConnectionForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ const CloudConnectionForm = (props: Props) => {
220220
)
221221

222222
return (
223-
<div className="getStartedForm">
223+
<div className="getStartedForm eui-yScroll">
224224
<FeatureFlagComponent name={FeatureFlags.cloudSso}>
225225
<EuiFlexGroup direction="column" gutterSize="s">
226226
<EuiFlexItem><EuiText color="subdued" size="s">Connect with:</EuiText></EuiFlexItem>

redisinsight/ui/src/pages/home/components/cluster-connection/cluster-connection-form/ClusterConnectionForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ const ClusterConnectionForm = (props: Props) => {
225225
}
226226

227227
return (
228-
<div className="getStartedForm" data-testid="add-db_cluster">
228+
<div className="getStartedForm eui-yScroll" data-testid="add-db_cluster">
229229
<MessageEnterpriceSoftware />
230230
<br />
231231

redisinsight/ui/src/pages/home/components/database-panel-dialog/styles.module.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
}
88

99
.formWrapper {
10-
@include eui.scrollBar;
1110
flex-grow: 1;
12-
overflow-y: auto;
1311
padding: 16px 24px;
12+
height: 100%;
1413

1514
.softwareTypes {
1615
display: flex;

redisinsight/ui/src/pages/home/components/manual-connection/manual-connection-form/ManualConnectionForm.tsx

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -229,24 +229,26 @@ const ManualConnectionForm = (props: Props) => {
229229
)
230230

231231
return (
232-
<div className="relative" data-testid="add-db_manual">
232+
<div className="relative" data-testid="add-db_manual" style={{ height: '100%' }}>
233233
{isEditMode && !isCloneMode && server?.buildType !== BuildType.RedisStack && (
234234
<CloneConnection id={id} setIsCloneMode={setIsCloneMode} />
235235
)}
236-
<div className="getStartedForm" ref={formRef}>
236+
<div className={cx('getStartedForm', styles.content)} ref={formRef}>
237237
{!isEditMode && !isFromCloud && (
238238
<>
239239
<Tabs />
240240
<EuiSpacer />
241-
<AddConnection
242-
activeTab={activeTab}
243-
formik={formik}
244-
onKeyDown={onKeyDown}
245-
onHostNamePaste={onHostNamePaste}
246-
certificates={certificates}
247-
caCertificates={caCertificates}
248-
buildType={buildType}
249-
/>
241+
<div className="eui-yScroll">
242+
<AddConnection
243+
activeTab={activeTab}
244+
formik={formik}
245+
onKeyDown={onKeyDown}
246+
onHostNamePaste={onHostNamePaste}
247+
certificates={certificates}
248+
caCertificates={caCertificates}
249+
buildType={buildType}
250+
/>
251+
</div>
250252
</>
251253
)}
252254
{(isEditMode || isCloneMode || isFromCloud) && connectionType !== ConnectionType.Sentinel && (
@@ -268,18 +270,20 @@ const ManualConnectionForm = (props: Props) => {
268270
)}
269271
<Tabs />
270272
<EuiSpacer />
271-
<EditConnection
272-
activeTab={activeTab}
273-
isCloneMode={isCloneMode}
274-
isEditMode={isEditMode}
275-
isFromCloud={isFromCloud}
276-
formik={formik}
277-
onKeyDown={onKeyDown}
278-
onHostNamePaste={onHostNamePaste}
279-
certificates={certificates}
280-
caCertificates={caCertificates}
281-
buildType={buildType}
282-
/>
273+
<div className="eui-yScroll">
274+
<EditConnection
275+
activeTab={activeTab}
276+
isCloneMode={isCloneMode}
277+
isEditMode={isEditMode}
278+
isFromCloud={isFromCloud}
279+
formik={formik}
280+
onKeyDown={onKeyDown}
281+
onHostNamePaste={onHostNamePaste}
282+
certificates={certificates}
283+
caCertificates={caCertificates}
284+
buildType={buildType}
285+
/>
286+
</div>
283287
</>
284288
)}
285289
{(isEditMode || isCloneMode) && connectionType === ConnectionType.Sentinel && (
@@ -298,16 +302,18 @@ const ManualConnectionForm = (props: Props) => {
298302
)}
299303
<Tabs />
300304
<EuiSpacer />
301-
<EditSentinelConnection
302-
activeTab={activeTab}
303-
isCloneMode={isCloneMode}
304-
formik={formik}
305-
onKeyDown={onKeyDown}
306-
onHostNamePaste={onHostNamePaste}
307-
certificates={certificates}
308-
caCertificates={caCertificates}
309-
db={db}
310-
/>
305+
<div className="eui-yScroll">
306+
<EditSentinelConnection
307+
activeTab={activeTab}
308+
isCloneMode={isCloneMode}
309+
formik={formik}
310+
onKeyDown={onKeyDown}
311+
onHostNamePaste={onHostNamePaste}
312+
certificates={certificates}
313+
caCertificates={caCertificates}
314+
db={db}
315+
/>
316+
</div>
311317
</>
312318
)}
313319
</div>

redisinsight/ui/src/pages/home/components/manual-connection/manual-connection-form/styles.module.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,10 @@
99
border-bottom-color: transparent !important;
1010
}
1111
}
12+
13+
.content {
14+
display: flex;
15+
flex-direction: column;
16+
height: 100%;
17+
overflow: hidden;
18+
}

redisinsight/ui/src/pages/home/components/sentinel-connection/SentinelConnectionWrapper.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,15 @@ const SentinelConnectionWrapper = (props: Props) => {
106106
)
107107

108108
return (
109-
<div>
110-
<SentinelConnectionForm
111-
initialValues={initialValues}
112-
loading={loading}
113-
onSubmit={handleConnectionFormSubmit}
114-
onClose={onClose}
115-
onHostNamePaste={handlePostHostName}
116-
certificates={certificates}
117-
caCertificates={caCertificates}
118-
/>
119-
</div>
109+
<SentinelConnectionForm
110+
initialValues={initialValues}
111+
loading={loading}
112+
onSubmit={handleConnectionFormSubmit}
113+
onClose={onClose}
114+
onHostNamePaste={handlePostHostName}
115+
certificates={certificates}
116+
caCertificates={caCertificates}
117+
/>
120118
)
121119
}
122120

redisinsight/ui/src/pages/home/components/sentinel-connection/sentinel-connection-form/SentinelConnectionForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ const SentinelConnectionForm = (props: Props) => {
145145
}
146146

147147
return (
148-
<div className="relative" data-testid="add-db_sentinel">
149-
<div className="getStartedForm" ref={formRef}>
148+
<div className="relative" data-testid="add-db_sentinel" style={{ height: '100%' }}>
149+
<div className="getStartedForm eui-yScroll" ref={formRef}>
150150
<MessageSentinel />
151151
<br />
152152
<EuiForm

0 commit comments

Comments
 (0)