Skip to content

Commit dd08d3b

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents f57d660 + 32f7985 commit dd08d3b

File tree

3 files changed

+207
-13
lines changed

3 files changed

+207
-13
lines changed

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 118 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ This document was automatically generated on Thu Feb 22 2024.
309309
| **[inherits](#3eafa9bfb872baf192e837ab771da2e95e983ee682371a2b1c579e518e96f7b4)** | 2.0.4 | ISC |
310310
| **[ini](#2269ab4bd2e1fa90571f520780ab5499f6d49da3b7daee9b9dfdad9e93c33a18)** | 1.3.8 | ISC |
311311
| **[interruptor](#d6fd68c71b18a07f39270565100f4a6c1351ecdeca77766cde73da8315ff695a)** | 1.0.1 | Apache-2.0 |
312-
| **[ip](#33b800e533214fc453224c9f9638baadd7f665810f85320b60145d7348a69e58)** | 2.0.0 | MIT |
312+
| **[ip-address](#8de6e89459554be8a933663b25ae1d1ffee71458028fa8cbe5d68b349438a8c8)** | 9.0.5 | MIT |
313313
| **[ipaddr.js](#38a5a1606dbc89a9c65a28d1e9ebe3c8d323e107a77c495a56dbf522211676d2)** | 1.9.1 | MIT |
314314
| **[ipaddr.js](#d8a1c47a5dc5581d8d9e84268efa779a5140196540c2a4425e8317c1eeb93fb7)** | 2.1.0 | MIT |
315315
| **[ipv6-normalize](#7a4346dbf206011966449898fcd37178a9be89acf6dff120b676d4c4d0dec203)** | 1.0.1 | MIT |
@@ -329,6 +329,7 @@ This document was automatically generated on Thu Feb 22 2024.
329329
| **[js-tokens](#f4371f095c6f087cf41433031f8c612e21a4258b18cb4e847ffae73905e146d4)** | 4.0.0 | MIT |
330330
| **[js-yaml](#c82a34a38ab0debe302cf958caa7a51b455f5fb8a32a3ce6b9b4cab3f500c60a)** | 3.14.1 | MIT |
331331
| **[js-yaml](#b7325d630b0ab313450fcd188788f6ee374aadd75df4969a9e3c48507ef88bdf)** | 4.1.0 | MIT |
332+
| **[jsbn](#936d5c89291f7b505f688e45ff8261d3f225f96e0e981fd0366a9efda9e0e7f2)** | 1.1.0 | MIT |
332333
| **[jsesc](#253e8a44fc188759c5ce35330e4f20aacf1d0253d7e8d7dffd4a1f884a10ce1e)** | 2.5.2 | MIT |
333334
| **[json5](#16281c6ea25e0cec4bc0bb8c01d1759d66992776381bf9c5af6959bec47d2f77)** | 2.2.3 | MIT |
334335
| **[jsondiffpatch](#2cc3b990f6692cd23f883319a727b42a76a3a9d6675d1ebd8a05241eb7edc4ac)** | 0.5.0 | MIT |
@@ -528,13 +529,14 @@ This document was automatically generated on Thu Feb 22 2024.
528529
| **[simple-concat](#7e08f893385d0a6d7059029da3885e8346ad01eb58d6e4561612d2fb653c15ec)** | 1.0.1 | MIT |
529530
| **[simple-get](#c2c12990b6319daff653bdf953cadfa368185f0edc671124fb1028f6979df829)** | 4.0.1 | MIT |
530531
| **[smart-buffer](#bc8fbee089eb9cddf673c4c9dbc15edd13839063c27e2814009b6a0448065875)** | 4.2.0 | MIT |
531-
| **[socks](#16837d081453b731932951f203fc17778642c71f7cdc0c4557bc2dbd68a6fd1d)** | 2.7.1 | MIT |
532+
| **[socks](#541393e678793f3a0579e0108e39aa91dac4670ed34be0b0989712a70f93ff9f)** | 2.7.3 | MIT |
532533
| **[socksv5](#7fe2878958377e116b47633a29a33a2c0b11fcff7afb3d54a4c7223d562a7aca)** | 0.0.6 | MIT |
533534
| **[sort-keys-length](#af13db706339ff49fba434ce0fbda036b99f3dc30e66a530b64374afd5a1eec1)** | 1.0.1 | MIT |
534535
| **[sort-keys](#714faeb378f5373d2aa5f80825d02c9f7ab2cacb699db02c84e675d193a6bfa8)** | 1.1.2 | MIT |
535536
| **[source-code-pro](#0496fbae8c99eac4b7354b7eb0a394806e547de30fd2acbdf14f2ac77079e643)** | 2.38.0 | OFL-1.1 |
536537
| **[source-map](#40ab158a4f9c7e0cb2e7fc113cfd0df14cabf73f76ff90e255227d216f5ce28c)** | 0.5.7 | BSD-3-Clause |
537538
| **[sparse-bitfield](#0cbcf2cac3ff859d288ae5ffc2c793bbd2430b120f5930bd09b6dba7259086d7)** | 3.0.3 | MIT |
539+
| **[sprintf-js](#d8b6ff1ba6436283de681a756ad453428005e61986c5113a3a8088ced2b36eb7)** | 1.1.3 | BSD-3-Clause |
538540
| **[sprintf](#c63a6bebfa83da6f3839f612c84417ced9cf8c00fbd6a4ca387a7e546f569deb)** | 0.1.3 | BSD-3-Clause |
539541
| **[ssh2](#caa88a7f6fedc946b33fe4cdcd84104598cca8b841b593d1ffb031578cd3d8c9)** | 1.15.0 | MIT |
540542
| **[statuses](#a347e5a1994ef74647a2af80f58030a572f71173d5c1dfc0ce6eb55f4005b17d)** | 2.0.1 | MIT |
@@ -23331,12 +23333,36 @@ License files:
2333123333
See the License for the specific language governing permissions and
2333223334
limitations under the License.
2333323335

23334-
<a id="33b800e533214fc453224c9f9638baadd7f665810f85320b60145d7348a69e58"></a>
23336+
<a id="8de6e89459554be8a933663b25ae1d1ffee71458028fa8cbe5d68b349438a8c8"></a>
2333523337

23336-
### [ip](https://www.npmjs.com/package/ip) (version 2.0.0)
23338+
### [ip-address](https://www.npmjs.com/package/ip-address) (version 9.0.5)
2333723339

2333823340
License tags: MIT
2333923341

23342+
License files:
23343+
23344+
- LICENSE:
23345+
23346+
Copyright (C) 2011 by Beau Gunderson
23347+
23348+
Permission is hereby granted, free of charge, to any person obtaining a copy
23349+
of this software and associated documentation files (the "Software"), to deal
23350+
in the Software without restriction, including without limitation the rights
23351+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
23352+
copies of the Software, and to permit persons to whom the Software is
23353+
furnished to do so, subject to the following conditions:
23354+
23355+
The above copyright notice and this permission notice shall be included in
23356+
all copies or substantial portions of the Software.
23357+
23358+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
23359+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23360+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23361+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23362+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23363+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23364+
THE SOFTWARE.
23365+
2334023366
<a id="38a5a1606dbc89a9c65a28d1e9ebe3c8d323e107a77c495a56dbf522211676d2"></a>
2334123367

2334223368
### [ipaddr.js](https://www.npmjs.com/package/ipaddr.js) (version 1.9.1)
@@ -23797,6 +23823,57 @@ License files:
2379723823
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2379823824
THE SOFTWARE.
2379923825

23826+
<a id="936d5c89291f7b505f688e45ff8261d3f225f96e0e981fd0366a9efda9e0e7f2"></a>
23827+
23828+
### [jsbn](https://www.npmjs.com/package/jsbn) (version 1.1.0)
23829+
23830+
License tags: MIT
23831+
23832+
License files:
23833+
23834+
- LICENSE:
23835+
23836+
Licensing
23837+
---------
23838+
23839+
This software is covered under the following copyright:
23840+
23841+
/*
23842+
* Copyright (c) 2003-2005 Tom Wu
23843+
* All Rights Reserved.
23844+
*
23845+
* Permission is hereby granted, free of charge, to any person obtaining
23846+
* a copy of this software and associated documentation files (the
23847+
* "Software"), to deal in the Software without restriction, including
23848+
* without limitation the rights to use, copy, modify, merge, publish,
23849+
* distribute, sublicense, and/or sell copies of the Software, and to
23850+
* permit persons to whom the Software is furnished to do so, subject to
23851+
* the following conditions:
23852+
*
23853+
* The above copyright notice and this permission notice shall be
23854+
* included in all copies or substantial portions of the Software.
23855+
*
23856+
* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
23857+
* EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
23858+
* WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
23859+
*
23860+
* IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
23861+
* INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
23862+
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
23863+
* THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
23864+
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
23865+
*
23866+
* In addition, the following condition applies:
23867+
*
23868+
* All redistributions must retain an intact copy of this copyright notice
23869+
* and disclaimer.
23870+
*/
23871+
23872+
Address all questions regarding this license to:
23873+
23874+
Tom Wu
23875+
[email protected]
23876+
2380023877
<a id="253e8a44fc188759c5ce35330e4f20aacf1d0253d7e8d7dffd4a1f884a10ce1e"></a>
2380123878

2380223879
### [jsesc](https://www.npmjs.com/package/jsesc) (version 2.5.2)
@@ -38626,9 +38703,9 @@ License files:
3862638703
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
3862738704
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3862838705

38629-
<a id="16837d081453b731932951f203fc17778642c71f7cdc0c4557bc2dbd68a6fd1d"></a>
38706+
<a id="541393e678793f3a0579e0108e39aa91dac4670ed34be0b0989712a70f93ff9f"></a>
3863038707

38631-
### [socks](https://www.npmjs.com/package/socks) (version 2.7.1)
38708+
### [socks](https://www.npmjs.com/package/socks) (version 2.7.3)
3863238709

3863338710
License tags: MIT
3863438711

@@ -39015,6 +39092,41 @@ License files:
3901539092
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
3901639093
THE SOFTWARE.
3901739094

39095+
<a id="d8b6ff1ba6436283de681a756ad453428005e61986c5113a3a8088ced2b36eb7"></a>
39096+
39097+
### [sprintf-js](https://www.npmjs.com/package/sprintf-js) (version 1.1.3)
39098+
39099+
License tags: BSD-3-Clause
39100+
39101+
License files:
39102+
39103+
- LICENSE:
39104+
39105+
Copyright (c) 2007-present, Alexandru Mărășteanu <[email protected]>
39106+
All rights reserved.
39107+
39108+
Redistribution and use in source and binary forms, with or without
39109+
modification, are permitted provided that the following conditions are met:
39110+
* Redistributions of source code must retain the above copyright
39111+
notice, this list of conditions and the following disclaimer.
39112+
* Redistributions in binary form must reproduce the above copyright
39113+
notice, this list of conditions and the following disclaimer in the
39114+
documentation and/or other materials provided with the distribution.
39115+
* Neither the name of this software nor the names of its contributors may be
39116+
used to endorse or promote products derived from this software without
39117+
specific prior written permission.
39118+
39119+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
39120+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
39121+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
39122+
DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
39123+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
39124+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
39125+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
39126+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
39127+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
39128+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39129+
3901839130
<a id="c63a6bebfa83da6f3839f612c84417ced9cf8c00fbd6a4ca387a7e546f569deb"></a>
3901939131

3902039132
### [sprintf](https://www.npmjs.com/package/sprintf) (version 0.1.3)

‎packages/compass-indexes/src/components/search-indexes-modals/base-search-index-modal.spec.tsx‎

Lines changed: 82 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { ATLAS_SEARCH_TEMPLATES } from '@mongodb-js/mongodb-constants';
1+
import {
2+
ATLAS_SEARCH_TEMPLATES,
3+
ATLAS_VECTOR_SEARCH_TEMPLATE,
4+
} from '@mongodb-js/mongodb-constants';
25
import { expect } from 'chai';
36
import { BaseSearchIndexModal } from './base-search-index-modal';
47
import sinon from 'sinon';
@@ -7,7 +10,10 @@ import { render, screen, cleanup, waitFor } from '@testing-library/react';
710
import userEvent from '@testing-library/user-event';
811

912
import React from 'react';
10-
import { getCodemirrorEditorValue } from '@mongodb-js/compass-editor';
13+
import {
14+
getCodemirrorEditorValue,
15+
setCodemirrorEditorValue,
16+
} from '@mongodb-js/compass-editor';
1117

1218
function normalizedTemplateNamed(name: string) {
1319
const snippet =
@@ -19,6 +25,20 @@ function normalizedTemplateNamed(name: string) {
1925
return snippet.replace(/\${\d+:([^}]+)}/gm, '$1');
2026
}
2127

28+
const VALID_ATLAS_SEARCH_INDEX_DEFINITION = {
29+
fields: [
30+
{
31+
type: 'vector',
32+
path: 'pineapple',
33+
numDimensions: 1000,
34+
similarity: 'cosine',
35+
},
36+
],
37+
};
38+
const VALID_ATLAS_SEARCH_INDEX_DEFINITION_STRING = JSON.stringify(
39+
VALID_ATLAS_SEARCH_INDEX_DEFINITION
40+
);
41+
2242
function renderBaseSearchIndexModal(
2343
props?: Partial<React.ComponentProps<typeof BaseSearchIndexModal>>
2444
) {
@@ -113,7 +133,7 @@ describe('Base Search Index Modal', function () {
113133
});
114134
});
115135

116-
it('submits the modal with the correct type on create search index', function () {
136+
it('submits the modal with the correct type on create search index', async function () {
117137
userEvent.click(
118138
screen.getByTestId('search-index-type-vectorSearch-button'),
119139
undefined,
@@ -122,15 +142,73 @@ describe('Base Search Index Modal', function () {
122142
skipPointerEventsCheck: true,
123143
}
124144
);
145+
await waitFor(() => {
146+
const indexDef = getCodemirrorEditorValue(
147+
'definition-of-search-index'
148+
);
149+
expect(indexDef).to.equal(ATLAS_VECTOR_SEARCH_TEMPLATE.snippet);
150+
});
151+
152+
// Set the value to something where the create index button is enabled.
153+
await setCodemirrorEditorValue(
154+
'definition-of-search-index',
155+
VALID_ATLAS_SEARCH_INDEX_DEFINITION_STRING
156+
);
125157
userEvent.click(
126158
screen.getByRole('button', { name: 'Create Search Index' })
127159
);
128160
expect(onSubmitSpy).to.have.been.calledOnceWithExactly({
129161
name: 'default',
130-
definition: {},
162+
definition: VALID_ATLAS_SEARCH_INDEX_DEFINITION,
131163
type: 'vectorSearch',
132164
});
133165
});
166+
167+
it('resets the template on type switch', async function () {
168+
userEvent.click(
169+
screen.getByTestId('search-index-type-vectorSearch-button'),
170+
undefined,
171+
{
172+
// leafygreen adds pointer-events: none on actually clickable elements
173+
skipPointerEventsCheck: true,
174+
}
175+
);
176+
177+
await waitFor(() => {
178+
const indexDef = getCodemirrorEditorValue(
179+
'definition-of-search-index'
180+
);
181+
expect(indexDef).to.equal(ATLAS_VECTOR_SEARCH_TEMPLATE.snippet);
182+
});
183+
184+
userEvent.click(
185+
screen.getByTestId('search-index-type-search-button'),
186+
undefined,
187+
{
188+
// leafygreen adds pointer-events: none on actually clickable elements
189+
skipPointerEventsCheck: true,
190+
}
191+
);
192+
193+
await waitFor(() => {
194+
const indexDef = getCodemirrorEditorValue(
195+
'definition-of-search-index'
196+
);
197+
expect(indexDef).to.equal(
198+
normalizedTemplateNamed('Dynamic field mappings')
199+
);
200+
});
201+
// Ensure the state is updated when the ace snippet changes.
202+
await new Promise((resolve) => setTimeout(resolve, 10));
203+
userEvent.click(
204+
screen.getByRole('button', { name: 'Create Search Index' })
205+
);
206+
expect(onSubmitSpy).to.have.been.calledOnceWithExactly({
207+
name: 'default',
208+
definition: { mappings: { dynamic: true } },
209+
type: 'search',
210+
});
211+
});
134212
});
135213

136214
describe('templates', function () {

‎packages/compass-indexes/src/components/search-indexes-modals/base-search-index-modal.tsx‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import type { Document } from 'mongodb';
3737
import { useTrackOnChange } from '@mongodb-js/compass-logging/provider';
3838
import { SearchIndexTemplateDropdown } from '../search-index-template-dropdown';
3939
import {
40+
ATLAS_SEARCH_TEMPLATES,
4041
ATLAS_VECTOR_SEARCH_TEMPLATE,
4142
type SearchTemplate,
4243
} from '@mongodb-js/mongodb-constants';
@@ -201,6 +202,7 @@ export const BaseSearchIndexModal: React.FunctionComponent<
201202

202203
useEffect(() => {
203204
if (isModalOpen) {
205+
setSearchIndexType('search');
204206
setIndexName(initialIndexName);
205207
setIndexDefinition(initialIndexDefinition);
206208
setParsingError(undefined);
@@ -261,12 +263,14 @@ export const BaseSearchIndexModal: React.FunctionComponent<
261263

262264
// Set the template.
263265
if (value === 'vectorSearch') {
266+
setIndexDefinition(ATLAS_VECTOR_SEARCH_TEMPLATE.snippet);
264267
onChangeTemplate(ATLAS_VECTOR_SEARCH_TEMPLATE);
265268
} else {
266-
onSearchIndexDefinitionChanged(DEFAULT_INDEX_DEFINITION);
269+
setIndexDefinition(ATLAS_SEARCH_TEMPLATES[0].snippet);
270+
onChangeTemplate(ATLAS_SEARCH_TEMPLATES[0]);
267271
}
268272
},
269-
[setSearchIndexType, onChangeTemplate, onSearchIndexDefinitionChanged]
273+
[setSearchIndexType, onChangeTemplate, setIndexDefinition]
270274
);
271275

272276
const fields = useAutocompleteFields(namespace);
@@ -421,7 +425,7 @@ export const BaseSearchIndexModal: React.FunctionComponent<
421425
data-testid="search-index-submit-button"
422426
variant="primary"
423427
onClick={onSubmitIndex}
424-
disabled={isBusy}
428+
disabled={isBusy || !!parsingError}
425429
>
426430
{mode === 'create' ? 'Create Search Index' : 'Save'}
427431
</Button>

0 commit comments

Comments
 (0)