From db77c14804a5989819feaf7cb84794fd6e630b53 Mon Sep 17 00:00:00 2001 From: Anemy Date: Wed, 9 Mar 2022 15:17:27 -0500 Subject: [PATCH 1/4] fix bootstrap style changing zero state styles --- .../explain-states/explain-states.jsx | 39 ++++++++--------- .../explain-states/explain-states.module.less | 13 ++---- .../compass-schema-validation/package.json | 2 + .../validation-states/validation-states.jsx | 42 +++++++++---------- .../validation-states.module.less | 13 ++---- .../compass-schema/compass-schema.jsx | 20 ++++----- .../compass-schema/compass-schema.module.less | 5 --- .../compass/src/app/styles/zero-state.less | 4 +- .../src/zero-state.jsx | 7 +++- 9 files changed, 66 insertions(+), 79 deletions(-) diff --git a/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx b/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx index 27d3adfbfd5..1219b744014 100644 --- a/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx +++ b/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; +import { Button, ButtonSize, ButtonVariant, Link } from '@mongodb-js/compass-components'; import { ZeroState, StatusRow, ViewSwitcher } from 'hadron-react-components'; import { TextButton } from 'hadron-react-buttons'; import { ZeroGraphic } from '../zero-graphic'; @@ -118,13 +119,6 @@ class ExplainStates extends Component { ); } - /** - * Opens the documentation. - */ - openDocumentation() { - this.props.openLink(DOCUMENTATION_LINK); - } - /** * Render banner with information. * @@ -155,23 +149,24 @@ class ExplainStates extends Component {
-
-
- -
- +
+ + Learn more about explain plans +
); diff --git a/packages/compass-explain-plan/src/components/explain-states/explain-states.module.less b/packages/compass-explain-plan/src/components/explain-states/explain-states.module.less index 2addbe36c6a..abb1f242abe 100644 --- a/packages/compass-explain-plan/src/components/explain-states/explain-states.module.less +++ b/packages/compass-explain-plan/src/components/explain-states/explain-states.module.less @@ -32,14 +32,9 @@ text-align: center; padding-top: 70px; - .zero-state-action { - display: flex; - flex-direction: column; - - .zero-state-link { - display: block; - padding-top: 20px; - font-size: 16px; - } + .zero-state-link { + display: block; + margin-top: 20px; + font-size: 16px; } } diff --git a/packages/compass-schema-validation/package.json b/packages/compass-schema-validation/package.json index b0ebae3847d..67aa67e8308 100644 --- a/packages/compass-schema-validation/package.json +++ b/packages/compass-schema-validation/package.json @@ -32,6 +32,7 @@ }, "license": "SSPL", "peerDependencies": { + "@mongodb-js/compass-components": "^0.12.0", "@mongodb-js/compass-crud": "^12.21.0", "bson": "*", "hadron-react-buttons": "^5.7.0", @@ -59,6 +60,7 @@ "@babel/preset-react": "^7.13.13", "@babel/register": "^7.13.16", "@hot-loader/react-dom": "^16.9.0", + "@mongodb-js/compass-components": "^0.12.0", "@mongodb-js/compass-crud": "^12.21.0", "@mongodb-js/compass-logging": "^0.9.0", "ace-builds": "^1.4.3", diff --git a/packages/compass-schema-validation/src/components/validation-states/validation-states.jsx b/packages/compass-schema-validation/src/components/validation-states/validation-states.jsx index 12289130abf..90ece6f8184 100644 --- a/packages/compass-schema-validation/src/components/validation-states/validation-states.jsx +++ b/packages/compass-schema-validation/src/components/validation-states/validation-states.jsx @@ -1,8 +1,7 @@ import React, { Component } from 'react'; -import classnames from 'classnames'; import PropTypes from 'prop-types'; +import { Button, ButtonSize, ButtonVariant, Link } from '@mongodb-js/compass-components'; import { ZeroState, StatusRow } from 'hadron-react-components'; -import { TextButton } from 'hadron-react-buttons'; import ValidationEditor from '../validation-editor'; import SampleDocuments from '../sample-documents'; import { ZeroGraphic } from '../zero-graphic'; @@ -114,7 +113,7 @@ class ValidationStates extends Component { {READ_ONLY_WARNING.oldServerReadOnly}
 
upgrade to MongoDB 3.2. @@ -142,25 +141,26 @@ class ValidationStates extends Component { } return ( -
+
-
-
- -
- - Learn more about validations - +
+
+ + Learn more about validations +
); @@ -181,7 +181,7 @@ class ValidationStates extends Component { } return ( -
+
@@ -195,7 +195,7 @@ class ValidationStates extends Component { */ render() { return ( -
+
{this.renderBanner()} {this.renderZeroState()} {this.renderContent()} diff --git a/packages/compass-schema-validation/src/components/validation-states/validation-states.module.less b/packages/compass-schema-validation/src/components/validation-states/validation-states.module.less index e36cd3809e4..fbde83a321e 100644 --- a/packages/compass-schema-validation/src/components/validation-states/validation-states.module.less +++ b/packages/compass-schema-validation/src/components/validation-states/validation-states.module.less @@ -22,15 +22,10 @@ text-align: center; padding-top: 135px; - .zero-state-action { - display: flex; - flex-direction: column; - - .zero-state-link { - display: block; - padding-top: 20px; - font-size: 16px; - } + .zero-state-link { + display: block; + margin-top: 20px; + font-size: 16px; } } } diff --git a/packages/compass-schema/src/components/compass-schema/compass-schema.jsx b/packages/compass-schema/src/components/compass-schema/compass-schema.jsx index 2b4e9b98c4f..be5896ee3a9 100644 --- a/packages/compass-schema/src/components/compass-schema/compass-schema.jsx +++ b/packages/compass-schema/src/components/compass-schema/compass-schema.jsx @@ -2,8 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { StatusRow, ZeroState } from 'hadron-react-components'; -import { TextButton } from 'hadron-react-buttons'; -import { CancelLoader, Link } from '@mongodb-js/compass-components'; +import { Button, ButtonSize, ButtonVariant, CancelLoader, Link } from '@mongodb-js/compass-components'; import Field from '../field'; import AnalysisCompleteMessage from '../analysis-complete-message'; import ZeroGraphic from '../zero-graphic'; @@ -141,14 +140,15 @@ class Schema extends Component { -
-
- -
+
+
-

{this.props.header}

-

{this.props.subtext}

+

{this.props.header}

+ {this.props.subtext} + {/*

{this.props.header}

+

{this.props.subtext}

*/}
{this.props.children}
From 70d57794e9eff0fe8a4080ca453bd33f93b2283f Mon Sep 17 00:00:00 2001 From: Anemy Date: Wed, 9 Mar 2022 15:46:55 -0500 Subject: [PATCH 2/4] remove comment --- packages/hadron-react-components/src/zero-state.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/hadron-react-components/src/zero-state.jsx b/packages/hadron-react-components/src/zero-state.jsx index cf4b8a7bab2..9e4cf9fd241 100644 --- a/packages/hadron-react-components/src/zero-state.jsx +++ b/packages/hadron-react-components/src/zero-state.jsx @@ -21,8 +21,6 @@ class ZeroState extends React.Component {

{this.props.header}

{this.props.subtext} - {/*

{this.props.header}

-

{this.props.subtext}

*/}
{this.props.children}
From 3847344eb361d6cbe5f06014fd0e2e1255359756 Mon Sep 17 00:00:00 2001 From: Anemy Date: Wed, 9 Mar 2022 17:23:04 -0500 Subject: [PATCH 3/4] update url options -> URI options in connection form advanced tab, start ci commit --- .../advanced-options-tabs/advanced-tab/url-options.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options.tsx b/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options.tsx index dd62cb47d89..d1077685ca7 100644 --- a/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options.tsx +++ b/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options.tsx @@ -30,9 +30,9 @@ function UrlOptions({ }): React.ReactElement { return (
- + - Add additional MongoDB url options to customize your connection.  + Add additional MongoDB URI options to customize your connection.  Date: Thu, 10 Mar 2022 10:30:34 -0500 Subject: [PATCH 4/4] Fix test failures from older url stub --- .../src/components/explain-states/explain-states.jsx | 1 - .../src/components/zero-graphic/zero-graphic.jsx | 3 +-- packages/compass-explain-plan/test/setup.js | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx b/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx index 1219b744014..9c66e4eda35 100644 --- a/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx +++ b/packages/compass-explain-plan/src/components/explain-states/explain-states.jsx @@ -2,7 +2,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Button, ButtonSize, ButtonVariant, Link } from '@mongodb-js/compass-components'; import { ZeroState, StatusRow, ViewSwitcher } from 'hadron-react-components'; -import { TextButton } from 'hadron-react-buttons'; import { ZeroGraphic } from '../zero-graphic'; import { ExplainBody } from '../explain-body'; diff --git a/packages/compass-explain-plan/src/components/zero-graphic/zero-graphic.jsx b/packages/compass-explain-plan/src/components/zero-graphic/zero-graphic.jsx index 2d8a6bf62bb..e4f82976d18 100644 --- a/packages/compass-explain-plan/src/components/zero-graphic/zero-graphic.jsx +++ b/packages/compass-explain-plan/src/components/zero-graphic/zero-graphic.jsx @@ -1,5 +1,4 @@ import React, { Component } from 'react'; -import classnames from 'classnames'; import styles from './zero-graphic.module.less'; @@ -17,7 +16,7 @@ class ZeroGraphic extends Component { render() { return ( diff --git a/packages/compass-explain-plan/test/setup.js b/packages/compass-explain-plan/test/setup.js index 9f72722cd5d..eff61d2f587 100644 --- a/packages/compass-explain-plan/test/setup.js +++ b/packages/compass-explain-plan/test/setup.js @@ -13,9 +13,6 @@ virtualConsole.sendTo(console, { omitJSDOMErrors: true }); require('jsdom-global')('', { virtualConsole: virtualConsole, - beforeParse(win) { - win.URL = { createObjectURL: () => {} }; - }, runScripts: 'dangerously' });