diff --git a/packages/compass-aggregations/src/components/input-builder-toolbar/input-builder-toolbar.less b/packages/compass-aggregations/src/components/input-builder-toolbar/input-builder-toolbar.less index d87588b08d3..6778ac3351f 100644 --- a/packages/compass-aggregations/src/components/input-builder-toolbar/input-builder-toolbar.less +++ b/packages/compass-aggregations/src/components/input-builder-toolbar/input-builder-toolbar.less @@ -2,7 +2,7 @@ .input-builder-toolbar { width: 350px; - margin: 0px 18px 0px 18px; + margin: 0px 15px 0px 18px; flex-shrink: 0; display: flex; flex-direction: row; diff --git a/packages/compass-aggregations/src/components/input-builder/input-builder.jsx b/packages/compass-aggregations/src/components/input-builder/input-builder.jsx index f186ea7b104..c53358ea6b6 100644 --- a/packages/compass-aggregations/src/components/input-builder/input-builder.jsx +++ b/packages/compass-aggregations/src/components/input-builder/input-builder.jsx @@ -1,6 +1,5 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; -import classnames from 'classnames'; import styles from './input-builder.less'; @@ -19,9 +18,9 @@ class InputBuilder extends PureComponent { render() { return ( -
+
Select an operator to construct expressions used in the aggregation pipeline stages. - + Learn more
diff --git a/packages/compass-aggregations/src/components/input-builder/input-builder.less b/packages/compass-aggregations/src/components/input-builder/input-builder.less index c1f8d32f944..753a5b0de02 100644 --- a/packages/compass-aggregations/src/components/input-builder/input-builder.less +++ b/packages/compass-aggregations/src/components/input-builder/input-builder.less @@ -1,12 +1,12 @@ @import (reference) "~less/compass/_theme.less"; .input-builder { - flex-shrink: 0; + flex-grow: 1; position: relative; margin: 15px 18px 15px 18px; padding: 10px 0px 10px 0px; - width: 350px; font-size: 13px; + min-height: 54px; text-align: center; &-link { diff --git a/packages/compass-aggregations/src/components/input-preview/input-preview.jsx b/packages/compass-aggregations/src/components/input-preview/input-preview.jsx index b2449f00fd9..723cfbffc92 100644 --- a/packages/compass-aggregations/src/components/input-preview/input-preview.jsx +++ b/packages/compass-aggregations/src/components/input-preview/input-preview.jsx @@ -1,6 +1,5 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import classnames from 'classnames'; import { Document } from '@mongodb-js/compass-crud'; import HadronDocument from 'hadron-document'; import LoadingOverlay from '../loading-overlay'; @@ -33,12 +32,12 @@ class InputPreview extends Component { key={i} />); }); return ( -
+
{ this.props.isLoading ? : null } -
+
{documents}
diff --git a/packages/compass-aggregations/src/components/input-preview/input-preview.less b/packages/compass-aggregations/src/components/input-preview/input-preview.less index a72251e9f71..6874f2c7ba0 100644 --- a/packages/compass-aggregations/src/components/input-preview/input-preview.less +++ b/packages/compass-aggregations/src/components/input-preview/input-preview.less @@ -4,9 +4,9 @@ display: flex; align-items: center; overflow: auto; + flex-grow: 1; width: 100%; position: relative; - border-left: 1px solid @gray6; &-documents { display: flex; diff --git a/packages/compass-aggregations/src/components/input-toolbar/input-toolbar.jsx b/packages/compass-aggregations/src/components/input-toolbar/input-toolbar.jsx index 0cee54ecf2b..0cc9c1dc2ed 100644 --- a/packages/compass-aggregations/src/components/input-toolbar/input-toolbar.jsx +++ b/packages/compass-aggregations/src/components/input-toolbar/input-toolbar.jsx @@ -1,6 +1,5 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; -import classnames from 'classnames'; import InputBuilderToolbar from '../input-builder-toolbar'; import InputPreviewToolbar from '../input-preview-toolbar'; @@ -26,7 +25,7 @@ class InputToolbar extends PureComponent { */ render() { return ( -
+
- +
+ { this.resizableRef = c; }} + handleWrapperClass={styles['stage-resize-handle-wrapper']} + handleComponent={{ + right: , + }} + > + +
); diff --git a/packages/compass-aggregations/src/components/stage/stage.jsx b/packages/compass-aggregations/src/components/stage/stage.jsx index c103254f632..7b7df4d3bd5 100644 --- a/packages/compass-aggregations/src/components/stage/stage.jsx +++ b/packages/compass-aggregations/src/components/stage/stage.jsx @@ -1,13 +1,13 @@ import React, { Component } from 'react'; import classnames from 'classnames'; import PropTypes from 'prop-types'; +import { Resizable } from 're-resizable'; + +import ResizeHandle from '../resize-handle/resize-handle'; import StageEditorToolbar from '../stage-editor-toolbar'; import StageEditor from '../stage-editor'; import StagePreview from '../stage-preview'; import StagePreviewToolbar from '../stage-preview-toolbar'; -import { Resizable } from 're-resizable'; - -import ResizeHandle from '../resize-handle/resize-handle'; import styles from './stage.less';