Skip to content

Commit 046ed8d

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents 4f758e4 + 5eaad24 commit 046ed8d

File tree

159 files changed

+5339
-4254
lines changed

Some content is hidden

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

159 files changed

+5339
-4254
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
2828
- [**@mongodb-js/compass-export-to-language**](packages/compass-export-to-language): Export MongoDB queries and aggregations to various languages
2929
- [**@mongodb-js/compass-field-store**](packages/compass-field-store): FieldStore keeps track of available fields in a collection
3030
- [**@mongodb-js/compass-find-in-page**](packages/compass-find-in-page): cmd-f UI for Compass
31-
- [**@mongodb-js/compass-home**](packages/compass-home): Home
3231
- [**@mongodb-js/compass-import-export**](packages/compass-import-export): Import/Export feature for Compass
3332
- [**@mongodb-js/compass-indexes**](packages/compass-indexes): Collection index management for Compass
3433
- [**@mongodb-js/compass-instance**](packages/compass-instance): Compass instance plugin

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 236 additions & 141 deletions
Large diffs are not rendered by default.

‎configs/webpack-config-compass/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",
7676
"css-loader": "^4.3.0",
77-
"electron": "^28.2.9",
77+
"electron": "^28.2.10",
7878
"html-webpack-plugin": "^5.3.2",
7979
"less-loader": "^10.0.1",
8080
"mini-css-extract-plugin": "^2.3.0",

‎package-lock.json‎

Lines changed: 1798 additions & 1299 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/atlas-service/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@mongodb-js/oidc-plugin": "^0.4.0",
8282
"hadron-app-registry": "^9.1.8",
8383
"compass-preferences-model": "^2.18.1",
84-
"electron": "^28.2.9",
84+
"electron": "^28.2.10",
8585
"hadron-ipc": "^3.2.12",
8686
"lodash": "^4.17.21",
8787
"node-fetch": "^2.7.0",

‎packages/atlas-service/src/components/ai-signin-modal.tsx‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from 'react';
22
import { connect } from 'react-redux';
33
import {
4+
Badge,
45
Body,
56
Disclaimer,
67
Icon,
78
Link,
89
MarketingModal,
910
SpinLoader,
1011
css,
11-
cx,
1212
spacing,
1313
useDarkMode,
1414
} from '@mongodb-js/compass-components';
@@ -26,28 +26,22 @@ type SignInModalProps = {
2626
};
2727

2828
const titleStyles = css({
29-
marginBottom: spacing[3],
30-
});
31-
32-
// For whatever reason leafygreen marketing modal doesn't have the same spacing
33-
// between image and title in dark mode
34-
const titleDarkModeStyles = css({
35-
marginTop: spacing[4],
36-
});
37-
38-
const descriptionDarkModeStyles = css({
39-
// Same as above, adjusting dark mode that is for no good reason is different
40-
// from light mode
41-
marginLeft: -10,
42-
marginRight: -10,
29+
marginBottom: spacing[400],
30+
display: 'flex',
31+
flexDirection: 'column',
32+
alignItems: 'center',
4333
});
4434

4535
const paragraphStyles = css({
46-
marginBottom: spacing[2],
36+
marginBottom: spacing[200],
4737
});
4838

4939
const disclaimer = css({
50-
marginTop: spacing[3],
40+
marginTop: spacing[400],
41+
});
42+
43+
const previewBadgeStyles = css({
44+
marginBottom: spacing[400],
5145
});
5246

5347
const AISignInModal: React.FunctionComponent<SignInModalProps> = ({
@@ -63,7 +57,10 @@ const AISignInModal: React.FunctionComponent<SignInModalProps> = ({
6357
darkMode={darkMode}
6458
graphic={<AISignInImageBanner></AISignInImageBanner>}
6559
title={
66-
<div className={cx(titleStyles, darkMode && titleDarkModeStyles)}>
60+
<div className={titleStyles}>
61+
<Badge variant="blue" className={previewBadgeStyles}>
62+
Preview
63+
</Badge>
6764
Use natural language to generate queries and pipelines
6865
</div>
6966
}
@@ -96,7 +93,7 @@ const AISignInModal: React.FunctionComponent<SignInModalProps> = ({
9693
linkText="Not now"
9794
onLinkClick={onSignInModalClose}
9895
>
99-
<div className={cx(darkMode && descriptionDarkModeStyles)}>
96+
<div>
10097
<Body className={paragraphStyles}>
10198
Atlas users can now quickly create queries and aggregations with
10299
MongoDB&apos;s&nbsp; intelligent AI-powered feature, available today

‎packages/compass-aggregations/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ application can be listened to via [hadron-app-registry][hadron-app-registry].
206206

207207
- **'import-finished'**: When import data was successful, refresh plugin's input
208208
data.
209-
- **'fields-changed', fields**: Received when schema fields change. Updates
210-
plugin's fields.
211209
- **'refresh-data'**: Received when Compass data was refreshed. Refreshes input
212210
data in the plugin.
213211
- **'open-create-view', { meta: { source, pipeline }}**: Received when `Create View` is to be opened. Opens a Create View modal.

‎packages/compass-aggregations/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@mongodb-js/explain-plan-helper": "^1.1.10",
7676
"@mongodb-js/mongodb-constants": "^0.9.0",
7777
"@mongodb-js/my-queries-storage": "^0.5.1",
78-
"bson": "^6.5.0",
78+
"bson": "^6.6.0",
7979
"compass-preferences-model": "^2.18.1",
8080
"ejson-shell-parser": "^2.0.1",
8181
"hadron-app-registry": "^9.1.8",

‎packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-header/index.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { usePipelineStorage } from '@mongodb-js/my-queries-storage/provider';
1717

1818
const containerStyles = css({
1919
display: 'flex',
20-
gap: spacing[4],
20+
gap: spacing[200],
2121
alignItems: 'center',
2222
});
2323

@@ -113,11 +113,11 @@ export const PipelineHeader: React.FunctionComponent<PipelineHeaderProps> = ({
113113
const isSavingAggregationsEnabled = !!usePipelineStorage();
114114
return (
115115
<div className={containerStyles} data-testid="pipeline-header">
116-
<div data-testid="saved-pipelines-popover">
117-
{isOpenPipelineVisible && isSavingAggregationsEnabled && (
116+
{isOpenPipelineVisible && isSavingAggregationsEnabled && (
117+
<div data-testid="saved-pipelines-popover">
118118
<SavedPipelinesButton></SavedPipelinesButton>
119-
)}
120-
</div>
119+
</div>
120+
)}
121121
<div className={pipelineStagesStyles}>
122122
<PipelineStages />
123123
</div>

‎packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-header/pipeline-stages.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ const aiExperienceContainerStyles = css({
3333

3434
const descriptionStyles = css({
3535
padding: 0,
36+
// This aligns the pipeline description with the query bar input placeholder.
37+
marginLeft: spacing[200] + spacing[100],
3638
});
3739

3840
const addStageStyles = css({

0 commit comments

Comments
 (0)