Skip to content

#RI-3938 - fix modal width, add ":" #1507

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

Merged
merged 2 commits into from
Dec 15, 2022
Merged

#RI-3938 - fix modal width, add ":" #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feebb52
#RI-3938 - fix modal width, add ":"
rsergeenko Dec 15, 2022
753342c
#RI-3938 - fix pr comments
rsergeenko Dec 15, 2022
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
4 changes: 3 additions & 1 deletion redisinsight/ui/src/components/import-databases-dialog/ImportDatabasesDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
} from '@elastic/eui'
import React, { useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import cx from 'classnames'
import {
fetchInstancesAction,
importInstancesSelector,
Expand All @@ -24,6 +25,7 @@ import {
} from 'uiSrc/slices/instances/instances'
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
import { Nullable } from 'uiSrc/utils'

import ResultsLog from './components/ResultsLog'

import styles from './styles.module.scss'
Expand Down Expand Up @@ -72,7 +74,7 @@ const ImportDatabasesDialog = ({ onClose }: Props) => {

const isShowForm = !loading && !data && !error
return (
<EuiModal onClose={handleOnClose} className={styles.modal} data-testid="import-dbs-dialog">
<EuiModal onClose={handleOnClose} className={cx(styles.modal, { [styles.result]: !!data })} data-testid="import-dbs-dialog">
<EuiModalHeader>
<EuiModalHeaderTitle>
<EuiTitle size="xs" data-testid="import-dbs-dialog-title">
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/components/import-databases-dialog/components/ResultsLog/ResultsLog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const ResultsLog = ({ data }: Props) => {

const CollapsibleNavTitle = ({ title, length = 0 }: { title: string, length: number }) => (
<div className={styles.collapsibleNavTitle}>
<span data-testid="nav-group-title">{title}</span>
<span data-testid="nav-group-title">{title}:</span>
<span data-testid="number-of-dbs">{length}</span>
</div>
)
Expand Down
9 changes: 9 additions & 0 deletions redisinsight/ui/src/components/import-databases-dialog/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
max-width: 700px !important;
min-height: 270px !important;

&.result {
width: 500px !important;

@media screen and (min-width: 1024px) {
width: 700px !important;
min-width: 700px !important;
}
}

:global {
.euiModalHeader {
padding: 4px 42px 20px 30px;
Expand Down