Skip to content

Commit 7e551e6

Browse files
committed
fixed infosprinkle and calls to CreateIndexFields
1 parent 7260d02 commit 7e551e6

File tree

2 files changed

+45
-47
lines changed

2 files changed

+45
-47
lines changed

packages/compass-indexes/src/components/create-index-form/create-index-form.tsx

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,6 @@ function CreateIndexForm({
8585
const showIndexesGuidanceQueryFlow =
8686
showIndexesGuidanceVariant && currentTab === 'QueryFlow';
8787

88-
const RenderCreateIndexFields = () => {
89-
if (fields.length > 0 && !showIndexesGuidanceQueryFlow) {
90-
return (
91-
<CreateIndexFields
92-
schemaFields={schemaFieldNames}
93-
fields={fields}
94-
serverVersion={serverVersion}
95-
isRemovable={!(fields.length > 1)}
96-
onSelectFieldNameClick={onSelectFieldNameClick}
97-
onSelectFieldTypeClick={onSelectFieldTypeClick}
98-
onAddFieldClick={onAddFieldClick}
99-
onRemoveFieldClick={onRemoveFieldClick}
100-
/>
101-
);
102-
}
103-
return null;
104-
};
105-
10688
return (
10789
<>
10890
<div
@@ -133,13 +115,39 @@ function CreateIndexForm({
133115
</RadioBoxGroup>
134116
)}
135117

136-
{showIndexesGuidanceVariant && showIndexesGuidanceIndexFlow ? (
137-
<IndexFlowSection
138-
createIndexFieldsComponent={RenderCreateIndexFields()}
139-
/>
140-
) : (
141-
RenderCreateIndexFields()
142-
)}
118+
{fields.length > 0 ? (
119+
// Variant UI
120+
showIndexesGuidanceVariant && showIndexesGuidanceIndexFlow ? (
121+
<IndexFlowSection
122+
createIndexFieldsComponent={
123+
<CreateIndexFields
124+
schemaFields={schemaFieldNames}
125+
fields={fields}
126+
serverVersion={serverVersion}
127+
isRemovable={!(fields.length > 1)}
128+
onSelectFieldNameClick={onSelectFieldNameClick}
129+
onSelectFieldTypeClick={onSelectFieldTypeClick}
130+
onAddFieldClick={onAddFieldClick}
131+
onRemoveFieldClick={onRemoveFieldClick}
132+
/>
133+
}
134+
/>
135+
) : (
136+
// Control UI
137+
!showIndexesGuidanceQueryFlow && (
138+
<CreateIndexFields
139+
schemaFields={schemaFieldNames}
140+
fields={fields}
141+
serverVersion={serverVersion}
142+
isRemovable={!(fields.length > 1)}
143+
onSelectFieldNameClick={onSelectFieldNameClick}
144+
onSelectFieldTypeClick={onSelectFieldTypeClick}
145+
onAddFieldClick={onAddFieldClick}
146+
onRemoveFieldClick={onRemoveFieldClick}
147+
/>
148+
)
149+
)
150+
) : null}
143151
</div>
144152

145153
{/* TODO in CLOUDP-314036: update the accordion design */}

packages/compass-indexes/src/components/create-index-form/index-flow-section.tsx

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ import {
33
Button,
44
css,
55
cx,
6-
Icon,
76
Label,
87
Link,
98
palette,
109
spacing,
1110
Toggle,
12-
Tooltip,
1311
fontFamilies,
12+
InfoSprinkle,
1413
} from '@mongodb-js/compass-components';
1514
import React from 'react';
1615

@@ -66,9 +65,8 @@ const codeStyles = css({
6665
fontFamily: fontFamilies.code,
6766
});
6867

69-
const infoWithCircleIconStyles = css({
70-
color: palette.gray.dark1,
71-
marginLeft: spacing[200],
68+
const coveredQueriesHeaderStyles = css({
69+
marginRight: spacing[200],
7270
});
7371

7472
export type IndexFlowSectionProps = {
@@ -127,28 +125,20 @@ const IndexFlowSection = ({
127125
<div
128126
className={cx(coveredQueriesHeaderContainerStyles, flexContainerStyles)}
129127
>
130-
<Body baseFontSize={16} weight="medium">
128+
<Body
129+
baseFontSize={16}
130+
weight="medium"
131+
className={coveredQueriesHeaderStyles}
132+
>
131133
Covered Queries
132134
</Body>
133-
<Tooltip
134-
enabled={true}
135-
trigger={
136-
<span>
137-
<Icon
138-
glyph="InfoWithCircle"
139-
className={cx(infoWithCircleIconStyles, flexContainerStyles)}
140-
data-testid="index-flow-section-covered-queries-tooltip"
141-
/>
142-
</span>
143-
}
144-
triggerEvent="hover"
145-
align="top"
146-
justify="middle"
147-
>
135+
136+
<InfoSprinkle align="top" justify="middle">
137+
{' '}
148138
A covered query is a query that can be satisfied entirely using an
149139
index and does not have to examine any documents. If a query is
150140
covered, it is highly performant.
151-
</Tooltip>
141+
</InfoSprinkle>
152142
</div>
153143

154144
<div className={coveredQueriesCalloutStyles}>

0 commit comments

Comments
 (0)