Skip to content

Commit 4434904

Browse files
mcasimirmcasimir
committed
Merge remote-tracking branch 'origin/main' into 1.32-releases
2 parents 689e9fd + aeb9d72 commit 4434904

File tree

14 files changed

+226
-213
lines changed

14 files changed

+226
-213
lines changed

‎.evergreen/tasks.in.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,6 @@ tasks:
215215
compass_distribution: compass
216216
target_platform: '--platform=darwin'
217217
target_arch: '--arch=x64'
218-
- func: apply-compass-target-expansion
219-
vars:
220-
compass_distribution: compass
221-
target_platform: '--platform=darwin'
222-
target_arch: '--arch=arm64'
223218
- func: get-artifacts
224219
vars:
225220
compass_distribution: compass
@@ -239,11 +234,6 @@ tasks:
239234
compass_distribution: compass-isolated
240235
target_platform: '--platform=darwin'
241236
target_arch: '--arch=x64'
242-
- func: apply-compass-target-expansion
243-
vars:
244-
compass_distribution: compass-isolated
245-
target_platform: '--platform=darwin'
246-
target_arch: '--arch=arm64'
247237
- func: get-artifacts
248238
vars:
249239
compass_distribution: compass-isolated
@@ -263,11 +253,6 @@ tasks:
263253
compass_distribution: compass-readonly
264254
target_platform: '--platform=darwin'
265255
target_arch: '--arch=x64'
266-
- func: apply-compass-target-expansion
267-
vars:
268-
compass_distribution: compass-readonly
269-
target_platform: '--platform=darwin'
270-
target_arch: '--arch=arm64'
271256
- func: get-artifacts
272257
vars:
273258
compass_distribution: compass-readonly
@@ -287,11 +272,6 @@ tasks:
287272
compass_distribution: compass
288273
target_platform: '--platform=darwin'
289274
target_arch: '--arch=x64'
290-
- func: publish
291-
vars:
292-
compass_distribution: compass
293-
target_platform: '--platform=darwin'
294-
target_arch: '--arch=arm64'
295275

296276
- func: publish
297277
vars:
@@ -308,11 +288,6 @@ tasks:
308288
compass_distribution: compass-isolated
309289
target_platform: '--platform=darwin'
310290
target_arch: '--arch=x64'
311-
- func: publish
312-
vars:
313-
compass_distribution: compass-isolated
314-
target_platform: '--platform=darwin'
315-
target_arch: '--arch=arm64'
316291

317292
- func: publish
318293
vars:
@@ -329,11 +304,6 @@ tasks:
329304
compass_distribution: compass-readonly
330305
target_platform: '--platform=darwin'
331306
target_arch: '--arch=x64'
332-
- func: publish
333-
vars:
334-
compass_distribution: compass-readonly
335-
target_platform: '--platform=darwin'
336-
target_arch: '--arch=arm64'
337307

338308
# copied as test-packaged-app-macos due to depends_on variation
339309
<% for (const task of testPackagedAppVariations) { %>

‎.evergreen/tasks.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,6 @@ tasks:
215215
compass_distribution: compass
216216
target_platform: '--platform=darwin'
217217
target_arch: '--arch=x64'
218-
- func: apply-compass-target-expansion
219-
vars:
220-
compass_distribution: compass
221-
target_platform: '--platform=darwin'
222-
target_arch: '--arch=arm64'
223218
- func: get-artifacts
224219
vars:
225220
compass_distribution: compass
@@ -239,11 +234,6 @@ tasks:
239234
compass_distribution: compass-isolated
240235
target_platform: '--platform=darwin'
241236
target_arch: '--arch=x64'
242-
- func: apply-compass-target-expansion
243-
vars:
244-
compass_distribution: compass-isolated
245-
target_platform: '--platform=darwin'
246-
target_arch: '--arch=arm64'
247237
- func: get-artifacts
248238
vars:
249239
compass_distribution: compass-isolated
@@ -263,11 +253,6 @@ tasks:
263253
compass_distribution: compass-readonly
264254
target_platform: '--platform=darwin'
265255
target_arch: '--arch=x64'
266-
- func: apply-compass-target-expansion
267-
vars:
268-
compass_distribution: compass-readonly
269-
target_platform: '--platform=darwin'
270-
target_arch: '--arch=arm64'
271256
- func: get-artifacts
272257
vars:
273258
compass_distribution: compass-readonly
@@ -287,11 +272,6 @@ tasks:
287272
compass_distribution: compass
288273
target_platform: '--platform=darwin'
289274
target_arch: '--arch=x64'
290-
- func: publish
291-
vars:
292-
compass_distribution: compass
293-
target_platform: '--platform=darwin'
294-
target_arch: '--arch=arm64'
295275

296276
- func: publish
297277
vars:
@@ -308,11 +288,6 @@ tasks:
308288
compass_distribution: compass-isolated
309289
target_platform: '--platform=darwin'
310290
target_arch: '--arch=x64'
311-
- func: publish
312-
vars:
313-
compass_distribution: compass-isolated
314-
target_platform: '--platform=darwin'
315-
target_arch: '--arch=arm64'
316291

317292
- func: publish
318293
vars:
@@ -329,11 +304,6 @@ tasks:
329304
compass_distribution: compass-readonly
330305
target_platform: '--platform=darwin'
331306
target_arch: '--arch=x64'
332-
- func: publish
333-
vars:
334-
compass_distribution: compass-readonly
335-
target_platform: '--platform=darwin'
336-
target_arch: '--arch=arm64'
337307

338308
# copied as test-packaged-app-macos due to depends_on variation
339309

‎packages/compass-e2e-tests/helpers/selectors.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,14 +774,20 @@ export const IndexList = '[data-test-id="index-list"]';
774774
export const IndexComponent = '[data-test-id="index-list"] tr';
775775
export const IndexFieldName = '[data-test-id="index-field-name"]';
776776
export const IndexFieldType = '[data-test-id="index-field-type"]';
777+
export const IndexToggleOptions =
778+
'[data-test-id="create-index-modal-toggle-options"]';
779+
export const IndexToggleIsWildcard =
780+
'[data-test-id="wildcard-projection"] input[type="checkbox"]';
781+
export const IndexWildcardProjectionEditor =
782+
'[data-test-id="create-index-modal-options-param-wrapper-editor"] .ace_editor';
777783
export const CreateIndexButton =
778784
'[data-testid="open-create-index-modal-button"]';
779785
export const CreateIndexModal = '[data-test-id="create-index-modal"]';
780786

781787
export const CreateIndexModalFieldNameSelectInput = (idx: number): string => {
782788
return `[data-test-id="create-index-field-name-${idx}"] input`;
783789
};
784-
export const CreateIndexModalFieldTypeSelectButtont = (idx: number): string => {
790+
export const CreateIndexModalFieldTypeSelectButton = (idx: number): string => {
785791
return `[data-test-id="create-index-field-type-${idx}"] button`;
786792
};
787793
export const CreateIndexModalFieldTypeSelectMenu = (idx: number): string => {

‎packages/compass-e2e-tests/tests/collection-indexes-tab.test.ts‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('Collection indexes tab', function () {
6262
await browser.keys(['Enter']);
6363

6464
const fieldTypeSelect = await browser.$(
65-
Selectors.CreateIndexModalFieldTypeSelectButtont(0)
65+
Selectors.CreateIndexModalFieldTypeSelectButton(0)
6666
);
6767
await fieldTypeSelect.waitForDisplayed();
6868

@@ -117,12 +117,12 @@ describe('Collection indexes tab', function () {
117117
Selectors.CreateIndexModalFieldNameSelectInput(0)
118118
);
119119

120-
await browser.setValueVisible(fieldNameSelect, 'i.$**');
120+
await browser.setValueVisible(fieldNameSelect, '$**');
121121
await browser.keys(['Enter']);
122122

123123
// Select text filed type from Select.
124124
const fieldTypeSelect = await browser.$(
125-
Selectors.CreateIndexModalFieldTypeSelectButtont(0)
125+
Selectors.CreateIndexModalFieldTypeSelectButton(0)
126126
);
127127
await fieldTypeSelect.waitForDisplayed();
128128

@@ -138,19 +138,36 @@ describe('Collection indexes tab', function () {
138138
await fieldTypeSelectSpan.waitForDisplayed();
139139
await fieldTypeSelectSpan.click();
140140

141+
const indexToggleOptions = await browser.$(Selectors.IndexToggleOptions);
142+
await indexToggleOptions.click();
143+
144+
const indexToggleIsWildcard = await browser.$(
145+
Selectors.IndexToggleIsWildcard
146+
);
147+
await indexToggleIsWildcard.click();
148+
149+
// set the text in the editor
150+
await browser.setAceValue(
151+
Selectors.IndexWildcardProjectionEditor,
152+
'{ "fieldA": 1, "fieldB.fieldC": 1 }'
153+
);
154+
141155
await browser.clickVisible(Selectors.CreateIndexConfirmButton);
142156

143157
await createModal.waitForDisplayed({ reverse: true });
144158

145-
const indexComponent = await browser.$(
146-
Selectors.indexComponent('i.$**_1')
147-
);
159+
const indexComponent = await browser.$(Selectors.indexComponent('$**_1'));
148160
await indexComponent.waitForDisplayed();
149161

150162
const indexFieldTypeElement = await browser.$(
151-
`${Selectors.indexComponent('i.$**_1')} ${Selectors.IndexFieldType}`
163+
`${Selectors.indexComponent('$**_1')} ${Selectors.IndexFieldType}`
152164
);
153165
expect(await indexFieldTypeElement.getText()).to.equal('WILDCARD');
166+
167+
const indexFieldTypeDataTip = await indexFieldTypeElement.getAttribute(
168+
'data-tip'
169+
);
170+
expect(indexFieldTypeDataTip).to.include('wildcardProjection');
154171
});
155172
});
156173

@@ -175,7 +192,7 @@ describe('Collection indexes tab', function () {
175192

176193
// Select text filed type from Select.
177194
const fieldTypeSelect = await browser.$(
178-
Selectors.CreateIndexModalFieldTypeSelectButtont(0)
195+
Selectors.CreateIndexModalFieldTypeSelectButton(0)
179196
);
180197
await fieldTypeSelect.waitForDisplayed();
181198

‎packages/compass-indexes/src/components/create-index-modal/create-index-modal.jsx‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import { toggleIsTtl } from '../../modules/create-index/is-ttl';
3636
import { changeTtl } from '../../modules/create-index/ttl';
3737
import { toggleHasWildcardProjection } from '../../modules/create-index/has-wildcard-projection';
3838
import { toggleHasColumnstoreProjection } from '../../modules/create-index/has-columnstore-projection';
39-
import { changeWildcardProjection } from '../../modules/create-index/wildcard-projection';
40-
import { changeColumnstoreProjection } from '../../modules/create-index/columnstore-projection';
39+
import { wildcardProjectionChanged } from '../../modules/create-index/wildcard-projection';
40+
import { columnstoreProjectionChanged } from '../../modules/create-index/columnstore-projection';
4141
import { changePartialFilterExpression } from '../../modules/create-index/partial-filter-expression';
4242
import { toggleIsCustomCollation } from '../../modules/create-index/is-custom-collation';
4343
import { collationStringChanged } from '../../modules/create-index/collation-string';
@@ -94,8 +94,8 @@ class CreateIndexModal extends PureComponent {
9494
createIndex: PropTypes.func.isRequired,
9595
openLink: PropTypes.func.isRequired,
9696
changeTtl: PropTypes.func.isRequired,
97-
changeColumnstoreProjection: PropTypes.func.isRequired,
98-
changeWildcardProjection: PropTypes.func.isRequired,
97+
columnstoreProjectionChanged: PropTypes.func.isRequired,
98+
wildcardProjectionChanged: PropTypes.func.isRequired,
9999
changePartialFilterExpression: PropTypes.func.isRequired,
100100
changeName: PropTypes.func.isRequired,
101101
newIndexField: PropTypes.string,
@@ -243,20 +243,21 @@ class CreateIndexModal extends PureComponent {
243243
onLinkClickHandler={this.props.openLink}
244244
/>
245245
{this.renderCollation()}
246-
<ModalCheckbox
247-
name="Wildcard Projection"
248-
data-test-id="toggle-is-wildcard"
249-
titleClassName={styles['create-index-modal-options-param']}
250-
checked={this.props.hasWildcardProjection}
251-
helpUrl={getIndexHelpLink('WILDCARD')}
252-
onClickHandler={() =>
253-
this.props.toggleHasWildcardProjection(
254-
!this.props.hasWildcardProjection
255-
)
256-
}
257-
onLinkClickHandler={this.props.openLink}
258-
/>
259-
{this.renderWildcard()}
246+
<div data-test-id="wildcard-projection">
247+
<ModalCheckbox
248+
name="Wildcard Projection"
249+
titleClassName={styles['create-index-modal-options-param']}
250+
checked={this.props.hasWildcardProjection}
251+
helpUrl={getIndexHelpLink('WILDCARD')}
252+
onClickHandler={() =>
253+
this.props.toggleHasWildcardProjection(
254+
!this.props.hasWildcardProjection
255+
)
256+
}
257+
onLinkClickHandler={this.props.openLink}
258+
/>
259+
{this.renderWildcard()}
260+
</div>
260261
{hasColumnstoreIndexesSupport(this.props.serverVersion) && (
261262
<>
262263
<ModalCheckbox
@@ -296,14 +297,15 @@ class CreateIndexModal extends PureComponent {
296297
renderWildcard() {
297298
if (this.props.showOptions && this.props.hasWildcardProjection) {
298299
return (
299-
<div className={styles['create-index-modal-options-param-wrapper']}>
300-
<ModalInput
301-
id="wildcard-projection-value"
302-
name=""
303-
value={this.props.wildcardProjection}
304-
onChangeHandler={(evt) =>
305-
this.props.changeWildcardProjection(evt.target.value)
306-
}
300+
<div
301+
data-test-id="create-index-modal-options-param-wrapper-editor"
302+
className={styles['create-index-modal-options-param-wrapper']}
303+
>
304+
<Editor
305+
variant={EditorVariant.Shell}
306+
onChangeText={this.props.wildcardProjectionChanged}
307+
options={{ minLines: 10 }}
308+
name="add-index-wildcard-projection-editor"
307309
/>
308310
</div>
309311
);
@@ -313,13 +315,11 @@ class CreateIndexModal extends PureComponent {
313315
if (this.props.showOptions && this.props.hasColumnstoreProjection) {
314316
return (
315317
<div className={styles['create-index-modal-options-param-wrapper']}>
316-
<ModalInput
317-
id="columnstore-projection-value"
318-
name=""
319-
value={this.props.columnstoreProjection}
320-
onChangeHandler={(evt) =>
321-
this.props.changeColumnstoreProjection(evt.target.value)
322-
}
318+
<Editor
319+
variant={EditorVariant.Shell}
320+
onChangeText={this.props.columnstoreProjectionChanged}
321+
options={{ minLines: 10 }}
322+
name="add-index-columnstore-projection-editor"
323323
/>
324324
</div>
325325
);
@@ -412,6 +412,7 @@ class CreateIndexModal extends PureComponent {
412412
</div>
413413

414414
<button
415+
data-test-id="create-index-modal-toggle-options"
415416
className={styles['create-index-modal-toggle-bar']}
416417
onClick={this.handleToggleBarClick.bind(this)}
417418
>
@@ -525,8 +526,8 @@ const MappedCreateIndexModal = connect(mapStateToProps, {
525526
toggleIsCustomCollation,
526527
changePartialFilterExpression,
527528
changeTtl,
528-
changeWildcardProjection,
529-
changeColumnstoreProjection,
529+
wildcardProjectionChanged,
530+
columnstoreProjectionChanged,
530531
collationStringChanged,
531532
createNewIndexField,
532533
clearNewIndexField,

0 commit comments

Comments
 (0)