Skip to content

Commit 662ee58

Browse files
authored
RI-7073 replace eui title
* Add Title.tsx * "Refactor: Replace EuiTitle with a custom Title component
1 parent 1469bda commit 662ee58

File tree

74 files changed

+361
-435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+361
-435
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import React from 'react'
2+
import { Typography } from '@redis-ui/components'
3+
4+
export type TitleProps = React.ComponentProps<typeof Typography.Heading> & {}
5+
export type TitleSize = TitleProps['size']
6+
export const Title = (props: TitleProps) => <Typography.Heading {...props} />

redisinsight/ui/src/components/consents-settings/ConsentsNotifications/ConsentsNotifications.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import React, { useEffect, useState } from 'react'
22
import { useDispatch, useSelector } from 'react-redux'
33
import { useFormik } from 'formik'
44
import { has } from 'lodash'
5-
import { EuiForm, EuiTitle } from '@elastic/eui'
5+
import { EuiForm } from '@elastic/eui'
66

77
import { compareConsents } from 'uiSrc/utils'
88
import {
99
updateUserConfigSettingsAction,
1010
userSettingsSelector,
1111
} from 'uiSrc/slices/user/user-settings'
1212
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
13+
import { Title } from 'uiSrc/components/base/text/Title'
1314
import ConsentOption from '../ConsentOption'
1415
import { IConsent, ConsentCategories } from '../ConsentsSettings'
1516

@@ -94,9 +95,7 @@ const ConsentsNotifications = () => {
9495
data-testid="consents-settings-form"
9596
>
9697
<div className={styles.consentsWrapper}>
97-
<EuiTitle size="xs">
98-
<h4>Notifications</h4>
99-
</EuiTitle>
98+
<Title size="XS">Notifications</Title>
10099
{notificationConsents.map((consent: IConsent) => (
101100
<ConsentOption
102101
consent={consent}

redisinsight/ui/src/components/consents-settings/ConsentsPrivacy/ConsentsPrivacy.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import React, { useEffect, useState } from 'react'
22
import { useDispatch, useSelector } from 'react-redux'
33
import { useFormik } from 'formik'
44
import { has } from 'lodash'
5-
import { EuiForm, EuiTitle } from '@elastic/eui'
5+
import { EuiForm } from '@elastic/eui'
66

77
import { compareConsents } from 'uiSrc/utils'
88
import {
99
updateUserConfigSettingsAction,
1010
userSettingsSelector,
1111
} from 'uiSrc/slices/user/user-settings'
1212
import { Spacer } from 'uiSrc/components/base/layout/spacer'
13+
import { Title } from 'uiSrc/components/base/text/Title'
1314
import { Text } from 'uiSrc/components/base/text'
1415
import ConsentOption from '../ConsentOption'
1516
import { ConsentCategories, IConsent } from '../ConsentsSettings'
@@ -88,9 +89,7 @@ const ConsentsPrivacy = () => {
8889
To optimize your experience, Redis Insight uses third-party tools.
8990
</Text>
9091
<Spacer />
91-
<EuiTitle size="xs">
92-
<h4>Usage Data</h4>
93-
</EuiTitle>
92+
<Title size="XS">Usage Data</Title>
9493
{privacyConsents.map((consent: IConsent) => (
9594
<ConsentOption
9695
consent={consent}

redisinsight/ui/src/components/consents-settings/ConsentsSettings.tsx

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ import React, { useEffect, useState } from 'react'
22
import { useDispatch, useSelector } from 'react-redux'
33
import { FormikErrors, useFormik } from 'formik'
44
import { isEmpty, forEach } from 'lodash'
5-
import { EuiSwitch, EuiTitle, EuiToolTip, EuiForm, EuiLink } from '@elastic/eui'
5+
import {
6+
EuiSwitch,
7+
EuiToolTip,
8+
EuiForm,
9+
EuiLink,
10+
} from '@elastic/eui'
611
import { EuiSwitchEvent } from '@elastic/eui/src/components/form/switch'
712
import cx from 'classnames'
813

@@ -17,6 +22,7 @@ import { FlexItem, Row } from 'uiSrc/components/base/layout/flex'
1722
import { Spacer } from 'uiSrc/components/base/layout/spacer'
1823
import { PrimaryButton } from 'uiSrc/components/base/forms/buttons'
1924
import { InfoIcon } from 'uiSrc/components/base/icons'
25+
import { Title } from 'uiSrc/components/base/text/Title'
2026
import { CallOut } from 'uiSrc/components/base/display/call-out/CallOut'
2127
import { Text } from 'uiSrc/components/base/text'
2228
import ConsentOption from './ConsentOption'
@@ -264,9 +270,9 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
264270
{!!privacyConsents.length && (
265271
<>
266272
<Spacer />
267-
<EuiTitle size="m">
268-
<h1 className={styles.title}>Privacy Settings</h1>
269-
</EuiTitle>
273+
<Title size="M" className={styles.title}>
274+
Privacy Settings
275+
</Title>
270276
<Spacer size="m" />
271277
<Text className={styles.smallText} size="s" color="subdued">
272278
To optimize your experience, Redis Insight uses third-party tools.
@@ -285,9 +291,9 @@ const ConsentsSettings = ({ onSubmitted }: Props) => {
285291
{!!notificationConsents.length && (
286292
<>
287293
<Spacer size="m" />
288-
<EuiTitle size="m">
289-
<h1 className={styles.title}>Notifications</h1>
290-
</EuiTitle>
294+
<Title size="M" className={styles.title}>
295+
Notifications
296+
</Title>
291297
<Spacer size="m" />
292298
</>
293299
)}

redisinsight/ui/src/components/consents-settings/ConsentsSettingsPopup/ConsentsSettingsPopup.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
EuiModalBody,
66
EuiModalHeader,
77
EuiIcon,
8-
EuiTitle,
98
} from '@elastic/eui'
109
import { useSelector } from 'react-redux'
1110
import { useHistory } from 'react-router-dom'
@@ -20,6 +19,7 @@ import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
2019
import Logo from 'uiSrc/assets/img/logo.svg'
2120

2221
import { FlexItem, Row } from 'uiSrc/components/base/layout/flex'
22+
import { Title } from 'uiSrc/components/base/text/Title'
2323
import styles from '../styles.module.scss'
2424

2525
const ConsentsSettingsPopup = () => {
@@ -58,11 +58,9 @@ const ConsentsSettingsPopup = () => {
5858
<EuiModalHeader className={styles.modalHeader}>
5959
<Row justify="between">
6060
<FlexItem>
61-
<EuiTitle size="s">
62-
<h3 className={styles.consentsPopupTitle}>
63-
EULA and Privacy Settings
64-
</h3>
65-
</EuiTitle>
61+
<Title size="L" className={styles.consentsPopupTitle}>
62+
EULA and Privacy Settings
63+
</Title>
6664
</FlexItem>
6765
<FlexItem>
6866
<EuiIcon

redisinsight/ui/src/components/explore-guides/ExploreGuides.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { EuiIcon, EuiTitle } from '@elastic/eui'
2+
import { EuiIcon } from '@elastic/eui'
33
import { useDispatch, useSelector } from 'react-redux'
44
import { useHistory, useParams } from 'react-router-dom'
55
import { guideLinksSelector } from 'uiSrc/slices/content/guide-links'
@@ -11,6 +11,7 @@ import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
1111
import { openTutorialByPath } from 'uiSrc/slices/panels/sidePanels'
1212
import { findTutorialPath } from 'uiSrc/utils'
1313
import { Spacer } from 'uiSrc/components/base/layout/spacer'
14+
import { Title } from 'uiSrc/components/base/text/Title'
1415
import { Text } from 'uiSrc/components/base/text'
1516
import styles from './styles.module.scss'
1617

@@ -40,9 +41,9 @@ const ExploreGuides = () => {
4041

4142
return (
4243
<div data-testid="explore-guides">
43-
<EuiTitle size="xs">
44+
<Title size="XS">
4445
<span>Here&apos;s a good starting point</span>
45-
</EuiTitle>
46+
</Title>
4647
<Text>
4748
Explore the amazing world of Redis Stack with our interactive guides
4849
</Text>

redisinsight/ui/src/components/import-file-modal/ImportFileModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
EuiModalFooter,
88
EuiModalHeader,
99
EuiModalHeaderTitle,
10-
EuiTitle,
1110
} from '@elastic/eui'
1211
import cx from 'classnames'
1312
import React from 'react'
@@ -20,6 +19,7 @@ import {
2019
PrimaryButton,
2120
SecondaryButton,
2221
} from 'uiSrc/components/base/forms/buttons'
22+
import { Title } from 'uiSrc/components/base/text/Title'
2323
import { ColorText, Text } from 'uiSrc/components/base/text'
2424
import styles from './styles.module.scss'
2525

@@ -71,11 +71,11 @@ const ImportFileModal = <T,>({
7171
>
7272
<EuiModalHeader>
7373
<EuiModalHeaderTitle>
74-
<EuiTitle size="xs" data-testid="import-file-modal-title">
74+
<Title size="XS" data-testid="import-file-modal-title">
7575
<span>
7676
{!data && !error ? title : resultsTitle || 'Import Results'}
7777
</span>
78-
</EuiTitle>
78+
</Title>
7979
</EuiModalHeaderTitle>
8080
</EuiModalHeader>
8181

redisinsight/ui/src/components/markdown/CodeButtonBlock/CodeButtonBlock.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EuiPopover, EuiTitle, EuiToolTip } from '@elastic/eui'
1+
import { EuiPopover, EuiToolTip } from '@elastic/eui'
22
import cx from 'classnames'
33
import React, { useEffect, useState } from 'react'
44
import { monaco } from 'react-monaco-editor'
@@ -29,6 +29,7 @@ import { FlexItem, Row } from 'uiSrc/components/base/layout/flex'
2929
import { Spacer } from 'uiSrc/components/base/layout/spacer'
3030
import { EmptyButton } from 'uiSrc/components/base/forms/buttons'
3131
import { PlayIcon, CheckBoldIcon, CopyIcon } from 'uiSrc/components/base/icons'
32+
import { Title } from 'uiSrc/components/base/text/Title'
3233
import { AdditionalRedisModule } from 'apiSrc/modules/database/models/additional.redis.module'
3334

3435
import { RunConfirmationPopover } from './components'
@@ -159,13 +160,13 @@ const CodeButtonBlock = (props: Props) => {
159160
<Row>
160161
<FlexItem grow>
161162
{!!label && (
162-
<EuiTitle
163-
size="xxxs"
163+
<Title
164+
size="XS"
164165
className={styles.label}
165166
data-testid="code-button-block-label"
166167
>
167-
<span>{truncateText(label, 86)}</span>
168-
</EuiTitle>
168+
{truncateText(label, 86)}
169+
</Title>
169170
)}
170171
</FlexItem>
171172
<FlexItem className={styles.actions}>

redisinsight/ui/src/components/markdown/CodeButtonBlock/components/RunConfirmationPopover.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { EuiTitle } from '@elastic/eui'
21
import React, { useState } from 'react'
32
import { useHistory, useParams } from 'react-router-dom'
43
import { FeatureFlags, Pages } from 'uiSrc/constants'
@@ -12,6 +11,7 @@ import {
1211
PrimaryButton,
1312
SecondaryButton,
1413
} from 'uiSrc/components/base/forms/buttons'
14+
import { Title } from 'uiSrc/components/base/text/Title'
1515
import { Text } from 'uiSrc/components/base/text'
1616
import { Checkbox } from 'uiSrc/components/base/forms/checkbox/Checkbox'
1717
import styles from '../styles.module.scss'
@@ -49,9 +49,7 @@ const RunConfirmationPopover = ({ onApply }: Props) => {
4949

5050
return (
5151
<>
52-
<EuiTitle size="xxs">
53-
<span>Run commands</span>
54-
</EuiTitle>
52+
<Title size="XS">Run commands</Title>
5553
<Spacer size="s" />
5654
<Text size="s">
5755
This tutorial will change data in your database, are you sure you want

redisinsight/ui/src/components/messages/database-not-opened/DatabaseNotOpened.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import React from 'react'
2-
import { EuiTitle } from '@elastic/eui'
2+
33
import { ExternalLink, OAuthSsoHandlerDialog } from 'uiSrc/components'
44
import { getUtmExternalLink } from 'uiSrc/utils/links'
55
import { EXTERNAL_LINKS, UTM_CAMPAINGS } from 'uiSrc/constants/links'
66
import TelescopeImg from 'uiSrc/assets/img/telescope-dark.svg'
77
import { OAuthSocialAction, OAuthSocialSource } from 'uiSrc/slices/interfaces'
88

99
import { Spacer } from 'uiSrc/components/base/layout/spacer'
10+
import { Title } from 'uiSrc/components/base/text/Title'
1011
import { Text } from 'uiSrc/components/base/text'
1112
import styles from './styles.module.scss'
1213

@@ -21,9 +22,9 @@ const DatabaseNotOpened = (props: Props) => {
2122
return (
2223
<div className={styles.wrapper} data-testid="database-not-opened-popover">
2324
<div>
24-
<EuiTitle size="xxs" className={styles.title}>
25-
<h5>Open a database</h5>
26-
</EuiTitle>
25+
<Title size="S" className={styles.title}>
26+
Open a database
27+
</Title>
2728
<Spacer size="s" />
2829
<>
2930
<Text color="subdued" size="s">

0 commit comments

Comments
 (0)