From bf240992bb1c953b1d79f8e7f1120d3a6337cd0b Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Mon, 16 Jan 2017 17:30:20 +1100 Subject: [PATCH 01/12] Refactor: CreateCollectionDialog.onOpenDialog requires a databaseName arg Which means it can be reused in other contexts like the sidebar (incoming). --- .../database/lib/components/collections-table.jsx | 3 ++- .../database/lib/components/create-collection-dialog.jsx | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/internal-packages/database/lib/components/collections-table.jsx b/src/internal-packages/database/lib/components/collections-table.jsx index c3b4f548963..3ff7d43b564 100644 --- a/src/internal-packages/database/lib/components/collections-table.jsx +++ b/src/internal-packages/database/lib/components/collections-table.jsx @@ -26,7 +26,8 @@ class CollectionsTable extends React.Component { } onCreateCollectionButtonClicked() { - CollectionsActions.openCreateCollectionDialog(); + const databaseName = this.props.database; + CollectionsActions.openCreateCollectionDialog(databaseName); } onNameClicked(name) { diff --git a/src/internal-packages/database/lib/components/create-collection-dialog.jsx b/src/internal-packages/database/lib/components/create-collection-dialog.jsx index 99963b55612..dd93ea8f635 100644 --- a/src/internal-packages/database/lib/components/create-collection-dialog.jsx +++ b/src/internal-packages/database/lib/components/create-collection-dialog.jsx @@ -3,8 +3,6 @@ const shell = require('electron').shell; const React = require('react'); const Modal = require('react-bootstrap').Modal; const { TextButton } = require('hadron-react-buttons'); -const NamespaceStore = require('hadron-reflux-store').NamespaceStore; -const toNS = require('mongodb-ns'); const Actions = require('../actions/collections-actions'); const CreateCollectionStore = require('../stores/create-collection-store'); const CreateCollectionInput = require('./create-collection-input'); @@ -50,12 +48,14 @@ class CreateCollectionDialog extends React.Component { /** * When the open dialog action is fired. + * + * @param {String} databaseName - The database to create the collection on. */ - onOpenDialog() { + onOpenDialog(databaseName) { this.setState({ open: true, collectionName: '', - databaseName: toNS(NamespaceStore.ns).database, + databaseName: databaseName, capped: false, maxSize: '', error: false, From 0a8a6c2e0ecdad6dc7f7d2f0e9dd70ef0806ad43 Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Thu, 19 Jan 2017 17:43:46 +1100 Subject: [PATCH 02/12] Rename to action/component in home, dropping plurals Plurals just lead to confusion. --- src/internal-packages/home/index.js | 4 ++-- src/internal-packages/home/lib/{actions => action}/index.js | 0 .../home/lib/{components => component}/home.jsx | 0 .../home/lib/{components => component}/index.jsx | 0 src/internal-packages/home/lib/store/index.js | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename src/internal-packages/home/lib/{actions => action}/index.js (100%) rename src/internal-packages/home/lib/{components => component}/home.jsx (100%) rename src/internal-packages/home/lib/{components => component}/index.jsx (100%) diff --git a/src/internal-packages/home/index.js b/src/internal-packages/home/index.js index cf77b3defff..666d773c88e 100644 --- a/src/internal-packages/home/index.js +++ b/src/internal-packages/home/index.js @@ -1,6 +1,6 @@ const app = require('ampersand-app'); -const HomeComponent = require('./lib/components'); -const HomeActions = require('./lib/actions'); +const HomeComponent = require('./lib/component'); +const HomeActions = require('./lib/action'); /** * Activate all the components in the Collection package. diff --git a/src/internal-packages/home/lib/actions/index.js b/src/internal-packages/home/lib/action/index.js similarity index 100% rename from src/internal-packages/home/lib/actions/index.js rename to src/internal-packages/home/lib/action/index.js diff --git a/src/internal-packages/home/lib/components/home.jsx b/src/internal-packages/home/lib/component/home.jsx similarity index 100% rename from src/internal-packages/home/lib/components/home.jsx rename to src/internal-packages/home/lib/component/home.jsx diff --git a/src/internal-packages/home/lib/components/index.jsx b/src/internal-packages/home/lib/component/index.jsx similarity index 100% rename from src/internal-packages/home/lib/components/index.jsx rename to src/internal-packages/home/lib/component/index.jsx diff --git a/src/internal-packages/home/lib/store/index.js b/src/internal-packages/home/lib/store/index.js index a5441643741..052dff0d4df 100644 --- a/src/internal-packages/home/lib/store/index.js +++ b/src/internal-packages/home/lib/store/index.js @@ -1,6 +1,6 @@ const app = require('ampersand-app'); const Reflux = require('reflux'); -const HomeActions = require('../actions'); +const HomeActions = require('../action'); const StateMixin = require('reflux-state-mixin'); const NamespaceStore = require('hadron-reflux-store').NamespaceStore; const toNS = require('mongodb-ns'); From b3b70b3763ec8add8e16fe3bcca819d9d8b1b0c3 Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Fri, 20 Jan 2017 14:25:27 +1100 Subject: [PATCH 03/12] Decouple DDL internal-package from server-stats --- src/app/index.less | 1 + src/internal-packages/ddl/index.js | 37 +++++++++++++++++++ .../lib/action/index.js} | 2 +- .../lib/component/connected-databases.jsx | 0 .../lib/component/create-database-dialog.jsx | 2 +- .../lib/component/databases-table.jsx | 12 +++--- .../lib/component/drop-database-dialog.jsx | 2 +- .../lib/store/create-database-store.js | 2 +- .../lib/store/databases-store.js | 2 +- .../lib/store/drop-database-store.js | 4 +- src/internal-packages/ddl/package.json | 9 +++++ .../styles/create-collection-dialog.less | 6 +-- .../styles/drop-database-dialog.less | 0 src/internal-packages/ddl/styles/index.less | 2 + .../server-stats/lib/component/index.jsx | 4 +- .../server-stats/styles/index.less | 1 - 16 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 src/internal-packages/ddl/index.js rename src/internal-packages/{server-stats/lib/action/databases-actions.js => ddl/lib/action/index.js} (82%) rename src/internal-packages/{server-stats => ddl}/lib/component/connected-databases.jsx (100%) rename src/internal-packages/{server-stats => ddl}/lib/component/create-database-dialog.jsx (99%) rename src/internal-packages/{server-stats => ddl}/lib/component/databases-table.jsx (95%) rename src/internal-packages/{server-stats => ddl}/lib/component/drop-database-dialog.jsx (98%) rename src/internal-packages/{server-stats => ddl}/lib/store/create-database-store.js (95%) rename src/internal-packages/{server-stats => ddl}/lib/store/databases-store.js (97%) rename src/internal-packages/{server-stats => ddl}/lib/store/drop-database-store.js (90%) create mode 100644 src/internal-packages/ddl/package.json rename src/internal-packages/{server-stats => ddl}/styles/create-collection-dialog.less (91%) rename src/internal-packages/{server-stats => ddl}/styles/drop-database-dialog.less (100%) create mode 100644 src/internal-packages/ddl/styles/index.less diff --git a/src/app/index.less b/src/app/index.less index 27d0dc9918f..70b17bb68c5 100644 --- a/src/app/index.less +++ b/src/app/index.less @@ -17,6 +17,7 @@ @import "../internal-packages/app/styles/index.less"; @import "../internal-packages/collection-stats/styles/index.less"; @import "../internal-packages/crud/styles/index.less"; +@import "../internal-packages/ddl/styles/index.less"; @import "../internal-packages/home/styles/index.less"; @import "../internal-packages/status/styles/index.less"; @import "../internal-packages/query/styles/index.less"; diff --git a/src/internal-packages/ddl/index.js b/src/internal-packages/ddl/index.js new file mode 100644 index 00000000000..86d72242e5d --- /dev/null +++ b/src/internal-packages/ddl/index.js @@ -0,0 +1,37 @@ +const app = require('ampersand-app'); +const Actions = require('./lib/action'); +const CreateDatabaseDialog = require('./lib/component/create-database-dialog'); +const DatabasesView = require('./lib/component/connected-databases'); +const DropDatabaseDialog = require('./lib/component/drop-database-dialog'); +const CreateDatabaseStore = require('./lib/store/create-database-store'); +const DatabasesStore = require('./lib/store/databases-store'); +const DropDatabaseStore = require('./lib/store/drop-database-store'); + +/** + * Activate all the components in the DDL package. + */ +function activate() { + app.appRegistry.registerAction('DDL.Actions', Actions); + app.appRegistry.registerComponent('DDL.CreateDatabase', CreateDatabaseDialog); + app.appRegistry.registerComponent('DDL.DatabasesView', DatabasesView); + app.appRegistry.registerComponent('DDL.DropDatabase', DropDatabaseDialog); + app.appRegistry.registerStore('DDL.CreateDatabaseStore', CreateDatabaseStore); + app.appRegistry.registerStore('DDL.DatabasesStore', DatabasesStore); + app.appRegistry.registerStore('DDL.DropDatabaseStore', DropDatabaseStore); +} + +/** + * Deactivate all the components in the DDL package. + */ +function deactivate() { + app.appRegistry.deregisterAction('DDL.Actions'); + app.appRegistry.deregisterComponent('DDL.CreateDatabase'); + app.appRegistry.deregisterComponent('DDL.DatabasesView'); + app.appRegistry.deregisterComponent('DDL.DropDatabase'); + app.appRegistry.deregisterStore('DDL.CreateDatabaseStore'); + app.appRegistry.deregisterStore('DDL.DatabasesStore'); + app.appRegistry.deregisterStore('DDL.DropDatabaseStore'); +} + +module.exports.activate = activate; +module.exports.deactivate = deactivate; diff --git a/src/internal-packages/server-stats/lib/action/databases-actions.js b/src/internal-packages/ddl/lib/action/index.js similarity index 82% rename from src/internal-packages/server-stats/lib/action/databases-actions.js rename to src/internal-packages/ddl/lib/action/index.js index 42bc5671796..aefdec4a0b7 100644 --- a/src/internal-packages/server-stats/lib/action/databases-actions.js +++ b/src/internal-packages/ddl/lib/action/index.js @@ -1,7 +1,7 @@ const Reflux = require('reflux'); /** - * The actions used by the database components. + * The actions used by the DDL components. */ const Actions = Reflux.createActions([ 'sortDatabases', diff --git a/src/internal-packages/server-stats/lib/component/connected-databases.jsx b/src/internal-packages/ddl/lib/component/connected-databases.jsx similarity index 100% rename from src/internal-packages/server-stats/lib/component/connected-databases.jsx rename to src/internal-packages/ddl/lib/component/connected-databases.jsx diff --git a/src/internal-packages/server-stats/lib/component/create-database-dialog.jsx b/src/internal-packages/ddl/lib/component/create-database-dialog.jsx similarity index 99% rename from src/internal-packages/server-stats/lib/component/create-database-dialog.jsx rename to src/internal-packages/ddl/lib/component/create-database-dialog.jsx index c66f8f227f6..7679f59dfdb 100644 --- a/src/internal-packages/server-stats/lib/component/create-database-dialog.jsx +++ b/src/internal-packages/ddl/lib/component/create-database-dialog.jsx @@ -3,7 +3,7 @@ const shell = require('electron').shell; const React = require('react'); const Modal = require('react-bootstrap').Modal; const { TextButton } = require('hadron-react-buttons'); -const Actions = require('../action/databases-actions'); +const Actions = require('../action'); const CreateDatabaseStore = require('../store/create-database-store'); /** diff --git a/src/internal-packages/server-stats/lib/component/databases-table.jsx b/src/internal-packages/ddl/lib/component/databases-table.jsx similarity index 95% rename from src/internal-packages/server-stats/lib/component/databases-table.jsx rename to src/internal-packages/ddl/lib/component/databases-table.jsx index 6a9f6e47ea4..82f81138dbc 100644 --- a/src/internal-packages/server-stats/lib/component/databases-table.jsx +++ b/src/internal-packages/ddl/lib/component/databases-table.jsx @@ -2,12 +2,11 @@ const React = require('react'); const app = require('ampersand-app'); const { shell } = require('electron'); const ipc = require('hadron-ipc'); -const DatabasesActions = require('../action/databases-actions'); -const CreateDatabaseDialog = require('./create-database-dialog'); -const DropDatabaseDialog = require('./drop-database-dialog'); const { NamespaceStore } = require('hadron-reflux-store'); const numeral = require('numeral'); const _ = require('lodash'); +const CreateDatabaseDialog = require('./create-database-dialog'); +const DropDatabaseDialog = require('./drop-database-dialog'); // const debug = require('debug')('mongodb-compass:server-stats:databases'); @@ -20,21 +19,22 @@ class DatabasesTable extends React.Component { constructor(props) { super(props); + this.DDLAction = app.appRegistry.getAction('DDL.Actions'); this.SortableTable = app.appRegistry.getComponent('App.SortableTable'); this.CollectionStore = app.appRegistry.getStore('App.CollectionStore'); this.Tooltip = app.appRegistry.getComponent('App.Tooltip'); } onColumnHeaderClicked(column, order) { - DatabasesActions.sortDatabases(column, order); + this.DDLAction.sortDatabases(column, order); } onRowDeleteButtonClicked(index, dbName) { - DatabasesActions.openDropDatabaseDialog(dbName); + this.DDLAction.openDropDatabaseDialog(dbName); } onCreateDatabaseButtonClicked() { - DatabasesActions.openCreateDatabaseDialog(); + this.DDLAction.openCreateDatabaseDialog(); } onAuthHelpClicked(evt) { diff --git a/src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx b/src/internal-packages/ddl/lib/component/drop-database-dialog.jsx similarity index 98% rename from src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx rename to src/internal-packages/ddl/lib/component/drop-database-dialog.jsx index 180bfa9143f..b29a51ca9dd 100644 --- a/src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx +++ b/src/internal-packages/ddl/lib/component/drop-database-dialog.jsx @@ -2,7 +2,7 @@ const app = require('ampersand-app'); const React = require('react'); const Modal = require('react-bootstrap').Modal; const { TextButton } = require('hadron-react-buttons'); -const Actions = require('../action/databases-actions'); +const Actions = require('../action'); const DropDatabaseStore = require('../store/drop-database-store'); /** diff --git a/src/internal-packages/server-stats/lib/store/create-database-store.js b/src/internal-packages/ddl/lib/store/create-database-store.js similarity index 95% rename from src/internal-packages/server-stats/lib/store/create-database-store.js rename to src/internal-packages/ddl/lib/store/create-database-store.js index bb58abea71f..570c370ac72 100644 --- a/src/internal-packages/server-stats/lib/store/create-database-store.js +++ b/src/internal-packages/ddl/lib/store/create-database-store.js @@ -1,6 +1,6 @@ const Reflux = require('reflux'); const app = require('ampersand-app'); -const Actions = require('../action/databases-actions'); +const Actions = require('../action'); /** * The reflux store for creating databases. diff --git a/src/internal-packages/server-stats/lib/store/databases-store.js b/src/internal-packages/ddl/lib/store/databases-store.js similarity index 97% rename from src/internal-packages/server-stats/lib/store/databases-store.js rename to src/internal-packages/ddl/lib/store/databases-store.js index 48176927249..f5e7ecffb75 100644 --- a/src/internal-packages/server-stats/lib/store/databases-store.js +++ b/src/internal-packages/ddl/lib/store/databases-store.js @@ -1,6 +1,6 @@ const Reflux = require('reflux'); const StateMixin = require('reflux-state-mixin'); -const DatabasesActions = require('../action/databases-actions'); +const DatabasesActions = require('../action'); const _ = require('lodash'); diff --git a/src/internal-packages/server-stats/lib/store/drop-database-store.js b/src/internal-packages/ddl/lib/store/drop-database-store.js similarity index 90% rename from src/internal-packages/server-stats/lib/store/drop-database-store.js rename to src/internal-packages/ddl/lib/store/drop-database-store.js index ab359185823..2fef6c167b7 100644 --- a/src/internal-packages/server-stats/lib/store/drop-database-store.js +++ b/src/internal-packages/ddl/lib/store/drop-database-store.js @@ -1,9 +1,9 @@ const Reflux = require('reflux'); const app = require('ampersand-app'); -const Actions = require('../action/databases-actions'); +const Actions = require('../action'); /** - * The reflux store for dropping datbases. + * The reflux store for dropping databases. */ const DropDatabaseStore = Reflux.createStore({ diff --git a/src/internal-packages/ddl/package.json b/src/internal-packages/ddl/package.json new file mode 100644 index 00000000000..e3bead35409 --- /dev/null +++ b/src/internal-packages/ddl/package.json @@ -0,0 +1,9 @@ +{ + "name": "ddl", + "productName": "Compass Data Definition Language", + "description": "Data Definition Language (DDL) operations for Compass", + "version": "0.0.1", + "authors": "MongoDB Inc.", + "private": true, + "main": "./index.js" +} diff --git a/src/internal-packages/server-stats/styles/create-collection-dialog.less b/src/internal-packages/ddl/styles/create-collection-dialog.less similarity index 91% rename from src/internal-packages/server-stats/styles/create-collection-dialog.less rename to src/internal-packages/ddl/styles/create-collection-dialog.less index 0bcd05afc99..81b93f5709b 100644 --- a/src/internal-packages/server-stats/styles/create-collection-dialog.less +++ b/src/internal-packages/ddl/styles/create-collection-dialog.less @@ -6,7 +6,7 @@ } label { - margin: 0px; + margin: 0; } &-capped { @@ -25,8 +25,8 @@ padding: 6px 12px; color: @gray0; border: 1px solid rgba(0,0,0,0.1); - border-radius: 0px; - margin-bottom: 0px; + border-radius: 0; + margin-bottom: 0; font-weight: normal !important; } diff --git a/src/internal-packages/server-stats/styles/drop-database-dialog.less b/src/internal-packages/ddl/styles/drop-database-dialog.less similarity index 100% rename from src/internal-packages/server-stats/styles/drop-database-dialog.less rename to src/internal-packages/ddl/styles/drop-database-dialog.less diff --git a/src/internal-packages/ddl/styles/index.less b/src/internal-packages/ddl/styles/index.less new file mode 100644 index 00000000000..2c2dc9d1fa0 --- /dev/null +++ b/src/internal-packages/ddl/styles/index.less @@ -0,0 +1,2 @@ +@import './create-collection-dialog.less'; +@import './drop-database-dialog.less'; diff --git a/src/internal-packages/server-stats/lib/component/index.jsx b/src/internal-packages/server-stats/lib/component/index.jsx index a13e4e10133..23033daadf6 100644 --- a/src/internal-packages/server-stats/lib/component/index.jsx +++ b/src/internal-packages/server-stats/lib/component/index.jsx @@ -1,7 +1,6 @@ const React = require('react'); const Actions = require('../action'); const Performance = require('./performance-component'); -const Databases = require('./connected-databases'); const app = require('ampersand-app'); // const debug = require('debug')('mongodb-compass:server-stats-RTSSComponent'); @@ -18,6 +17,7 @@ class RTSSComponent extends React.Component { constructor(props) { super(props); this.state = {activeTab: 0}; + this.DatabasesView = app.appRegistry.getComponent('DDL.DatabasesView'); this.TabNavBar = app.appRegistry.getComponent('App.TabNavBar'); } @@ -40,7 +40,7 @@ class RTSSComponent extends React.Component { */ render() { const performanceView = ; - const databasesView = ; + const databasesView = ; return (
Date: Fri, 20 Jan 2017 15:27:16 +1100 Subject: [PATCH 04/12] Promote Create/DropDatabaseDialog to Home Tooltips finally work (when integrated with COMPASS 558). --- src/internal-packages/ddl/index.js | 8 ++++---- .../ddl/lib/component/databases-table.jsx | 4 ---- src/internal-packages/home/lib/component/home.jsx | 4 ++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/internal-packages/ddl/index.js b/src/internal-packages/ddl/index.js index 86d72242e5d..9b4cb5a6d48 100644 --- a/src/internal-packages/ddl/index.js +++ b/src/internal-packages/ddl/index.js @@ -12,9 +12,9 @@ const DropDatabaseStore = require('./lib/store/drop-database-store'); */ function activate() { app.appRegistry.registerAction('DDL.Actions', Actions); - app.appRegistry.registerComponent('DDL.CreateDatabase', CreateDatabaseDialog); + app.appRegistry.registerComponent('DDL.CreateDatabaseDialog', CreateDatabaseDialog); app.appRegistry.registerComponent('DDL.DatabasesView', DatabasesView); - app.appRegistry.registerComponent('DDL.DropDatabase', DropDatabaseDialog); + app.appRegistry.registerComponent('DDL.DropDatabaseDialog', DropDatabaseDialog); app.appRegistry.registerStore('DDL.CreateDatabaseStore', CreateDatabaseStore); app.appRegistry.registerStore('DDL.DatabasesStore', DatabasesStore); app.appRegistry.registerStore('DDL.DropDatabaseStore', DropDatabaseStore); @@ -25,9 +25,9 @@ function activate() { */ function deactivate() { app.appRegistry.deregisterAction('DDL.Actions'); - app.appRegistry.deregisterComponent('DDL.CreateDatabase'); + app.appRegistry.deregisterComponent('DDL.CreateDatabaseDialog'); app.appRegistry.deregisterComponent('DDL.DatabasesView'); - app.appRegistry.deregisterComponent('DDL.DropDatabase'); + app.appRegistry.deregisterComponent('DDL.DropDatabaseDialog'); app.appRegistry.deregisterStore('DDL.CreateDatabaseStore'); app.appRegistry.deregisterStore('DDL.DatabasesStore'); app.appRegistry.deregisterStore('DDL.DropDatabaseStore'); diff --git a/src/internal-packages/ddl/lib/component/databases-table.jsx b/src/internal-packages/ddl/lib/component/databases-table.jsx index 82f81138dbc..c60611fb1af 100644 --- a/src/internal-packages/ddl/lib/component/databases-table.jsx +++ b/src/internal-packages/ddl/lib/component/databases-table.jsx @@ -5,8 +5,6 @@ const ipc = require('hadron-ipc'); const { NamespaceStore } = require('hadron-reflux-store'); const numeral = require('numeral'); const _ = require('lodash'); -const CreateDatabaseDialog = require('./create-database-dialog'); -const DropDatabaseDialog = require('./drop-database-dialog'); // const debug = require('debug')('mongodb-compass:server-stats:databases'); @@ -119,8 +117,6 @@ class DatabasesTable extends React.Component {
{this.props.databases.length === 0 ? this.renderNoCollections(isWritable) : null} - - ); } diff --git a/src/internal-packages/home/lib/component/home.jsx b/src/internal-packages/home/lib/component/home.jsx index c4ebbc48602..d3227b22289 100644 --- a/src/internal-packages/home/lib/component/home.jsx +++ b/src/internal-packages/home/lib/component/home.jsx @@ -13,6 +13,8 @@ class Home extends React.Component { * TODO (imlucas) Handle state when rtss permissions not available. */ this.serverStatsView = app.appRegistry.getComponent('RTSS.ServerStats'); + this.CreateDatabaseDialog = app.appRegistry.getComponent('DDL.CreateDatabaseDialog'); + this.DropDatabaseDialog = app.appRegistry.getComponent('DDL.DropDatabaseDialog'); } getContentClasses() { @@ -59,6 +61,8 @@ class Home extends React.Component { {isNotWritableTooltip} + + ); } From 651c9c1f695010c1f416c65e1dc81c1259987fca Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Fri, 20 Jan 2017 15:33:26 +1100 Subject: [PATCH 05/12] Promote Create/DropCollectionDialog to Home MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tooltips almost finally work (when integrated with COMPASS 558). Incoming soon: The drop collection assumes you are managing the current database, shouldn’t be too hard to refactor :) --- src/internal-packages/database/index.js | 6 ++++++ .../database/lib/components/collections-table.jsx | 4 ---- src/internal-packages/home/lib/component/home.jsx | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/internal-packages/database/index.js b/src/internal-packages/database/index.js index 44c3bd5d3cf..bdb190c42de 100644 --- a/src/internal-packages/database/index.js +++ b/src/internal-packages/database/index.js @@ -3,6 +3,8 @@ const CollectionsTable = require('./lib/components'); const CreateCollectionCheckbox = require('./lib/components/create-collection-checkbox'); const CreateCollectionInput = require('./lib/components/create-collection-input'); const CreateCollectionSizeInput = require('./lib/components/create-collection-size-input'); +const CreateCollectionDialog = require('./lib/components/create-collection-dialog'); +const DropCollectionDialog = require('./lib/components/drop-collection-dialog'); /** * Activate all the components in the Schema package. @@ -12,6 +14,8 @@ function activate() { app.appRegistry.registerComponent('Database.CreateCollectionCheckbox', CreateCollectionCheckbox); app.appRegistry.registerComponent('Database.CreateCollectionInput', CreateCollectionInput); app.appRegistry.registerComponent('Database.CreateCollectionSizeInput', CreateCollectionSizeInput); + app.appRegistry.registerComponent('Database.CreateCollectionDialog', CreateCollectionDialog); + app.appRegistry.registerComponent('Database.DropCollectionDialog', DropCollectionDialog); } /** @@ -22,6 +26,8 @@ function deactivate() { app.appRegistry.deregisterComponent('Database.CreateCollectionCheckbox'); app.appRegistry.deregisterComponent('Database.CreateCollectionInput'); app.appRegistry.deregisterComponent('Database.CreateCollectionSizeInput'); + app.appRegistry.deregisterComponent('Database.CreateCollectionDialog'); + app.appRegistry.deregisterComponent('Database.DropCollectionDialog'); } module.exports.activate = activate; diff --git a/src/internal-packages/database/lib/components/collections-table.jsx b/src/internal-packages/database/lib/components/collections-table.jsx index 3ff7d43b564..8c08f859384 100644 --- a/src/internal-packages/database/lib/components/collections-table.jsx +++ b/src/internal-packages/database/lib/components/collections-table.jsx @@ -1,8 +1,6 @@ const React = require('react'); const app = require('ampersand-app'); const CollectionsActions = require('../actions/collections-actions'); -const CreateCollectionDialog = require('./create-collection-dialog'); -const DropCollectionDialog = require('./drop-collection-dialog'); const numeral = require('numeral'); const ipc = require('hadron-ipc'); const _ = require('lodash'); @@ -95,8 +93,6 @@ class CollectionsTable extends React.Component { /> - - ); } diff --git a/src/internal-packages/home/lib/component/home.jsx b/src/internal-packages/home/lib/component/home.jsx index d3227b22289..5d3980ba0fb 100644 --- a/src/internal-packages/home/lib/component/home.jsx +++ b/src/internal-packages/home/lib/component/home.jsx @@ -15,6 +15,8 @@ class Home extends React.Component { this.serverStatsView = app.appRegistry.getComponent('RTSS.ServerStats'); this.CreateDatabaseDialog = app.appRegistry.getComponent('DDL.CreateDatabaseDialog'); this.DropDatabaseDialog = app.appRegistry.getComponent('DDL.DropDatabaseDialog'); + this.CreateCollectionDialog = app.appRegistry.getComponent('Database.CreateCollectionDialog'); + this.DropCollectionDialog = app.appRegistry.getComponent('Database.DropCollectionDialog'); } getContentClasses() { @@ -63,6 +65,8 @@ class Home extends React.Component { {isNotWritableTooltip} + + ); } From 7dc65459956ea63907f30744b43eedafc9058277 Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Fri, 20 Jan 2017 16:10:05 +1100 Subject: [PATCH 06/12] Generalise drop collection modal to require the databaseName --- .../lib/components/collections-table.jsx | 2 +- .../lib/components/drop-collection-dialog.jsx | 24 +++++++++---------- .../styles/drop-collection-dialog.less | 11 +++++++++ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/internal-packages/database/lib/components/collections-table.jsx b/src/internal-packages/database/lib/components/collections-table.jsx index 8c08f859384..1b6eb92f3c4 100644 --- a/src/internal-packages/database/lib/components/collections-table.jsx +++ b/src/internal-packages/database/lib/components/collections-table.jsx @@ -20,7 +20,7 @@ class CollectionsTable extends React.Component { } onRowDeleteButtonClicked(index, collection) { - CollectionsActions.openDropCollectionDialog(collection); + CollectionsActions.openDropCollectionDialog(this.props.database, collection); } onCreateCollectionButtonClicked() { diff --git a/src/internal-packages/database/lib/components/drop-collection-dialog.jsx b/src/internal-packages/database/lib/components/drop-collection-dialog.jsx index b348ac8fe02..1d9d421ea5e 100644 --- a/src/internal-packages/database/lib/components/drop-collection-dialog.jsx +++ b/src/internal-packages/database/lib/components/drop-collection-dialog.jsx @@ -1,8 +1,6 @@ const app = require('ampersand-app'); const React = require('react'); const Modal = require('react-bootstrap').Modal; -const NamespaceStore = require('hadron-reflux-store').NamespaceStore; -const toNS = require('mongodb-ns'); const { TextButton } = require('hadron-react-buttons'); const Actions = require('../actions/collections-actions'); const DropCollectionStore = require('../stores/drop-collection-store'); @@ -19,7 +17,7 @@ class DropCollectionDialog extends React.Component { */ constructor(props) { super(props); - this.state = { name: '', confirmName: '' }; + this.state = { collectionName: '', confirmName: '' }; this.ModalStatusMessage = app.appRegistry.getComponent('App.ModalStatusMessage'); } @@ -42,14 +40,15 @@ class DropCollectionDialog extends React.Component { /** * When the open dialog action is fired. * - * @param {String} name - The name of the database to drop. + * @param {String} databaseName - The name of the database to drop the collection from. + * @param {String} collectionName - The name of the collection to drop. */ - onOpenDialog(name) { + onOpenDialog(databaseName, collectionName) { this.setState({ open: true, - name: name, + collectionName: collectionName, confirmName: '', - databaseName: toNS(NamespaceStore.ns).database + databaseName: databaseName }); } @@ -74,7 +73,7 @@ class DropCollectionDialog extends React.Component { } this.setState({ inProgress: true, error: false, errorMessage: '' }); - Actions.dropCollection(this.state.databaseName, this.state.name); + Actions.dropCollection(this.state.databaseName, this.state.collectionName); } /** @@ -116,9 +115,10 @@ class DropCollectionDialog extends React.Component {

- Type the collection name - {this.state.name} - to drop + To drop + {this.state.databaseName}.{this.state.collectionName} + type the collection name + {this.state.collectionName}

Drop Collection diff --git a/src/internal-packages/database/styles/drop-collection-dialog.less b/src/internal-packages/database/styles/drop-collection-dialog.less index 309ac7d0157..edd17c8fce9 100644 --- a/src/internal-packages/database/styles/drop-collection-dialog.less +++ b/src/internal-packages/database/styles/drop-collection-dialog.less @@ -1,3 +1,14 @@ .drop-collection-dialog { width: 500px; } +.drop-confirm-namespace { + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-size: 90%; + margin: 0.5ex; +} + +.drop-confirm-collection { + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-weight: bold; + margin: 0.5ex; +} From fc96c9b4d55de2ae4f2667d1559672c1d5753a7d Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Mon, 23 Jan 2017 13:56:48 +1100 Subject: [PATCH 07/12] Fix bug: Drop collection not working --- .../database/lib/components/drop-collection-dialog.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internal-packages/database/lib/components/drop-collection-dialog.jsx b/src/internal-packages/database/lib/components/drop-collection-dialog.jsx index 1d9d421ea5e..4e05301ff93 100644 --- a/src/internal-packages/database/lib/components/drop-collection-dialog.jsx +++ b/src/internal-packages/database/lib/components/drop-collection-dialog.jsx @@ -68,7 +68,7 @@ class DropCollectionDialog extends React.Component { evt.stopPropagation(); // prevent drop of collection if names don't match - if (this.state.confirmName !== this.state.name) { + if (this.state.confirmName !== this.state.collectionName) { return; } From ffbea63e01c28adb4bf4793bbce524227f477f3e Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Fri, 20 Jan 2017 16:27:51 +1100 Subject: [PATCH 08/12] Update tests for decoupled DDL package --- test/enzyme/databases-table-component.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/enzyme/databases-table-component.test.js b/test/enzyme/databases-table-component.test.js index d8e91f0454f..72b7fec81e5 100644 --- a/test/enzyme/databases-table-component.test.js +++ b/test/enzyme/databases-table-component.test.js @@ -57,7 +57,7 @@ describe('', () => { app.appRegistry.registerComponent('Database.CreateCollectionInput', CreateCollectionInput); app.appRegistry.registerComponent('Database.CreateCollectionSizeInput', CreateCollectionSizeInput); - this.DatabasesTable = require('../../src/internal-packages/server-stats/lib/component/databases-table'); + this.DatabasesTable = require('../../src/internal-packages/ddl/lib/component/databases-table'); }); afterEach(() => { // Restore properties on the global app object, From 8b447d02d0d75db8d0acdd2623c4ad25b496883b Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Fri, 20 Jan 2017 16:42:41 +1100 Subject: [PATCH 09/12] Restyle drop database modal For consistency with drop collection. --- .../ddl/lib/component/drop-database-dialog.jsx | 7 ++++--- .../ddl/styles/drop-database-dialog.less | 12 ++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/internal-packages/ddl/lib/component/drop-database-dialog.jsx b/src/internal-packages/ddl/lib/component/drop-database-dialog.jsx index b29a51ca9dd..9b5688df585 100644 --- a/src/internal-packages/ddl/lib/component/drop-database-dialog.jsx +++ b/src/internal-packages/ddl/lib/component/drop-database-dialog.jsx @@ -108,9 +108,10 @@ class DropDatabaseDialog extends React.Component {

- Type the database name - {this.state.name} - to drop + To drop + {this.state.name} + type the database name + {this.state.name}

Date: Mon, 23 Jan 2017 11:53:24 +1100 Subject: [PATCH 10/12] Use fixed font size recommended in code review --- .../database/styles/drop-collection-dialog.less | 2 +- src/internal-packages/ddl/styles/drop-database-dialog.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal-packages/database/styles/drop-collection-dialog.less b/src/internal-packages/database/styles/drop-collection-dialog.less index edd17c8fce9..edaf6b4a1bb 100644 --- a/src/internal-packages/database/styles/drop-collection-dialog.less +++ b/src/internal-packages/database/styles/drop-collection-dialog.less @@ -3,7 +3,7 @@ } .drop-confirm-namespace { font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 90%; + font-size: 13px; margin: 0.5ex; } diff --git a/src/internal-packages/ddl/styles/drop-database-dialog.less b/src/internal-packages/ddl/styles/drop-database-dialog.less index ae3b9083797..0b09b685b47 100644 --- a/src/internal-packages/ddl/styles/drop-database-dialog.less +++ b/src/internal-packages/ddl/styles/drop-database-dialog.less @@ -4,7 +4,7 @@ .drop-confirm-namespace { font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 90%; + font-size: 13px; margin: 0.5ex; } From 43050163e57d52a4b1446d9b80f8e04e8561da4c Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Mon, 23 Jan 2017 11:57:17 +1100 Subject: [PATCH 11/12] Rename ddl to database-ddl Plurals are confusing and explicit is preferred over implicit, as we already have a database internal-package and the modals are no longer hard-wired to the database-table as they will shortly be able to be triggered from the sidebar. --- src/app/index.less | 2 +- src/internal-packages/{ddl => database-ddl}/index.js | 0 .../{ddl => database-ddl}/lib/action/index.js | 0 .../lib/component/connected-databases.jsx | 0 .../lib/component/create-database-dialog.jsx | 0 .../lib/component/databases-table.jsx | 0 .../lib/component/drop-database-dialog.jsx | 0 .../lib/store/create-database-store.js | 0 .../{ddl => database-ddl}/lib/store/databases-store.js | 0 .../lib/store/drop-database-store.js | 0 src/internal-packages/database-ddl/package.json | 9 +++++++++ .../styles/create-collection-dialog.less | 0 .../styles/drop-database-dialog.less | 0 .../{ddl => database-ddl}/styles/index.less | 0 src/internal-packages/ddl/package.json | 9 --------- test/enzyme/databases-table-component.test.js | 2 +- 16 files changed, 11 insertions(+), 11 deletions(-) rename src/internal-packages/{ddl => database-ddl}/index.js (100%) rename src/internal-packages/{ddl => database-ddl}/lib/action/index.js (100%) rename src/internal-packages/{ddl => database-ddl}/lib/component/connected-databases.jsx (100%) rename src/internal-packages/{ddl => database-ddl}/lib/component/create-database-dialog.jsx (100%) rename src/internal-packages/{ddl => database-ddl}/lib/component/databases-table.jsx (100%) rename src/internal-packages/{ddl => database-ddl}/lib/component/drop-database-dialog.jsx (100%) rename src/internal-packages/{ddl => database-ddl}/lib/store/create-database-store.js (100%) rename src/internal-packages/{ddl => database-ddl}/lib/store/databases-store.js (100%) rename src/internal-packages/{ddl => database-ddl}/lib/store/drop-database-store.js (100%) create mode 100644 src/internal-packages/database-ddl/package.json rename src/internal-packages/{ddl => database-ddl}/styles/create-collection-dialog.less (100%) rename src/internal-packages/{ddl => database-ddl}/styles/drop-database-dialog.less (100%) rename src/internal-packages/{ddl => database-ddl}/styles/index.less (100%) delete mode 100644 src/internal-packages/ddl/package.json diff --git a/src/app/index.less b/src/app/index.less index 70b17bb68c5..0f12a792d4a 100644 --- a/src/app/index.less +++ b/src/app/index.less @@ -17,7 +17,7 @@ @import "../internal-packages/app/styles/index.less"; @import "../internal-packages/collection-stats/styles/index.less"; @import "../internal-packages/crud/styles/index.less"; -@import "../internal-packages/ddl/styles/index.less"; +@import "../internal-packages/database-ddl/styles/index.less"; @import "../internal-packages/home/styles/index.less"; @import "../internal-packages/status/styles/index.less"; @import "../internal-packages/query/styles/index.less"; diff --git a/src/internal-packages/ddl/index.js b/src/internal-packages/database-ddl/index.js similarity index 100% rename from src/internal-packages/ddl/index.js rename to src/internal-packages/database-ddl/index.js diff --git a/src/internal-packages/ddl/lib/action/index.js b/src/internal-packages/database-ddl/lib/action/index.js similarity index 100% rename from src/internal-packages/ddl/lib/action/index.js rename to src/internal-packages/database-ddl/lib/action/index.js diff --git a/src/internal-packages/ddl/lib/component/connected-databases.jsx b/src/internal-packages/database-ddl/lib/component/connected-databases.jsx similarity index 100% rename from src/internal-packages/ddl/lib/component/connected-databases.jsx rename to src/internal-packages/database-ddl/lib/component/connected-databases.jsx diff --git a/src/internal-packages/ddl/lib/component/create-database-dialog.jsx b/src/internal-packages/database-ddl/lib/component/create-database-dialog.jsx similarity index 100% rename from src/internal-packages/ddl/lib/component/create-database-dialog.jsx rename to src/internal-packages/database-ddl/lib/component/create-database-dialog.jsx diff --git a/src/internal-packages/ddl/lib/component/databases-table.jsx b/src/internal-packages/database-ddl/lib/component/databases-table.jsx similarity index 100% rename from src/internal-packages/ddl/lib/component/databases-table.jsx rename to src/internal-packages/database-ddl/lib/component/databases-table.jsx diff --git a/src/internal-packages/ddl/lib/component/drop-database-dialog.jsx b/src/internal-packages/database-ddl/lib/component/drop-database-dialog.jsx similarity index 100% rename from src/internal-packages/ddl/lib/component/drop-database-dialog.jsx rename to src/internal-packages/database-ddl/lib/component/drop-database-dialog.jsx diff --git a/src/internal-packages/ddl/lib/store/create-database-store.js b/src/internal-packages/database-ddl/lib/store/create-database-store.js similarity index 100% rename from src/internal-packages/ddl/lib/store/create-database-store.js rename to src/internal-packages/database-ddl/lib/store/create-database-store.js diff --git a/src/internal-packages/ddl/lib/store/databases-store.js b/src/internal-packages/database-ddl/lib/store/databases-store.js similarity index 100% rename from src/internal-packages/ddl/lib/store/databases-store.js rename to src/internal-packages/database-ddl/lib/store/databases-store.js diff --git a/src/internal-packages/ddl/lib/store/drop-database-store.js b/src/internal-packages/database-ddl/lib/store/drop-database-store.js similarity index 100% rename from src/internal-packages/ddl/lib/store/drop-database-store.js rename to src/internal-packages/database-ddl/lib/store/drop-database-store.js diff --git a/src/internal-packages/database-ddl/package.json b/src/internal-packages/database-ddl/package.json new file mode 100644 index 00000000000..e4555cade5c --- /dev/null +++ b/src/internal-packages/database-ddl/package.json @@ -0,0 +1,9 @@ +{ + "name": "database-ddl", + "productName": "Compass Database Data Definition Language", + "description": "Database-level Data Definition Language (DDL) operations for Compass", + "version": "0.0.1", + "authors": "MongoDB Inc.", + "private": true, + "main": "./index.js" +} diff --git a/src/internal-packages/ddl/styles/create-collection-dialog.less b/src/internal-packages/database-ddl/styles/create-collection-dialog.less similarity index 100% rename from src/internal-packages/ddl/styles/create-collection-dialog.less rename to src/internal-packages/database-ddl/styles/create-collection-dialog.less diff --git a/src/internal-packages/ddl/styles/drop-database-dialog.less b/src/internal-packages/database-ddl/styles/drop-database-dialog.less similarity index 100% rename from src/internal-packages/ddl/styles/drop-database-dialog.less rename to src/internal-packages/database-ddl/styles/drop-database-dialog.less diff --git a/src/internal-packages/ddl/styles/index.less b/src/internal-packages/database-ddl/styles/index.less similarity index 100% rename from src/internal-packages/ddl/styles/index.less rename to src/internal-packages/database-ddl/styles/index.less diff --git a/src/internal-packages/ddl/package.json b/src/internal-packages/ddl/package.json deleted file mode 100644 index e3bead35409..00000000000 --- a/src/internal-packages/ddl/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "ddl", - "productName": "Compass Data Definition Language", - "description": "Data Definition Language (DDL) operations for Compass", - "version": "0.0.1", - "authors": "MongoDB Inc.", - "private": true, - "main": "./index.js" -} diff --git a/test/enzyme/databases-table-component.test.js b/test/enzyme/databases-table-component.test.js index 72b7fec81e5..0c3432a88a2 100644 --- a/test/enzyme/databases-table-component.test.js +++ b/test/enzyme/databases-table-component.test.js @@ -57,7 +57,7 @@ describe('', () => { app.appRegistry.registerComponent('Database.CreateCollectionInput', CreateCollectionInput); app.appRegistry.registerComponent('Database.CreateCollectionSizeInput', CreateCollectionSizeInput); - this.DatabasesTable = require('../../src/internal-packages/ddl/lib/component/databases-table'); + this.DatabasesTable = require('../../src/internal-packages/database-ddl/lib/component/databases-table'); }); afterEach(() => { // Restore properties on the global app object, From 3678088510ffbeb4421a9463a032fe933f34744f Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Mon, 23 Jan 2017 15:39:00 +1100 Subject: [PATCH 12/12] More DDL -> DatabaseDDL renaming #retry COMPASS-635 https://travis-ci.com/10gen/compass/jobs/62828516 --- src/internal-packages/database-ddl/index.js | 32 +++++++++---------- .../database-ddl/lib/action/index.js | 2 +- .../lib/component/databases-table.jsx | 8 ++--- .../home/lib/component/home.jsx | 4 +-- .../server-stats/lib/component/index.jsx | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/internal-packages/database-ddl/index.js b/src/internal-packages/database-ddl/index.js index 9b4cb5a6d48..bbcff32f140 100644 --- a/src/internal-packages/database-ddl/index.js +++ b/src/internal-packages/database-ddl/index.js @@ -8,29 +8,29 @@ const DatabasesStore = require('./lib/store/databases-store'); const DropDatabaseStore = require('./lib/store/drop-database-store'); /** - * Activate all the components in the DDL package. + * Activate all the components in the Database DDL package. */ function activate() { - app.appRegistry.registerAction('DDL.Actions', Actions); - app.appRegistry.registerComponent('DDL.CreateDatabaseDialog', CreateDatabaseDialog); - app.appRegistry.registerComponent('DDL.DatabasesView', DatabasesView); - app.appRegistry.registerComponent('DDL.DropDatabaseDialog', DropDatabaseDialog); - app.appRegistry.registerStore('DDL.CreateDatabaseStore', CreateDatabaseStore); - app.appRegistry.registerStore('DDL.DatabasesStore', DatabasesStore); - app.appRegistry.registerStore('DDL.DropDatabaseStore', DropDatabaseStore); + app.appRegistry.registerAction('DatabaseDDL.Actions', Actions); + app.appRegistry.registerComponent('DatabaseDDL.CreateDatabaseDialog', CreateDatabaseDialog); + app.appRegistry.registerComponent('DatabaseDDL.DatabasesView', DatabasesView); + app.appRegistry.registerComponent('DatabaseDDL.DropDatabaseDialog', DropDatabaseDialog); + app.appRegistry.registerStore('DatabaseDDL.CreateDatabaseStore', CreateDatabaseStore); + app.appRegistry.registerStore('DatabaseDDL.DatabasesStore', DatabasesStore); + app.appRegistry.registerStore('DatabaseDDL.DropDatabaseStore', DropDatabaseStore); } /** - * Deactivate all the components in the DDL package. + * Deactivate all the components in the Database DDL package. */ function deactivate() { - app.appRegistry.deregisterAction('DDL.Actions'); - app.appRegistry.deregisterComponent('DDL.CreateDatabaseDialog'); - app.appRegistry.deregisterComponent('DDL.DatabasesView'); - app.appRegistry.deregisterComponent('DDL.DropDatabaseDialog'); - app.appRegistry.deregisterStore('DDL.CreateDatabaseStore'); - app.appRegistry.deregisterStore('DDL.DatabasesStore'); - app.appRegistry.deregisterStore('DDL.DropDatabaseStore'); + app.appRegistry.deregisterAction('DatabaseDDL.Actions'); + app.appRegistry.deregisterComponent('DatabaseDDL.CreateDatabaseDialog'); + app.appRegistry.deregisterComponent('DatabaseDDL.DatabasesView'); + app.appRegistry.deregisterComponent('DatabaseDDL.DropDatabaseDialog'); + app.appRegistry.deregisterStore('DatabaseDDL.CreateDatabaseStore'); + app.appRegistry.deregisterStore('DatabaseDDL.DatabasesStore'); + app.appRegistry.deregisterStore('DatabaseDDL.DropDatabaseStore'); } module.exports.activate = activate; diff --git a/src/internal-packages/database-ddl/lib/action/index.js b/src/internal-packages/database-ddl/lib/action/index.js index aefdec4a0b7..05700d745b8 100644 --- a/src/internal-packages/database-ddl/lib/action/index.js +++ b/src/internal-packages/database-ddl/lib/action/index.js @@ -1,7 +1,7 @@ const Reflux = require('reflux'); /** - * The actions used by the DDL components. + * The actions used by the Database DDL components. */ const Actions = Reflux.createActions([ 'sortDatabases', diff --git a/src/internal-packages/database-ddl/lib/component/databases-table.jsx b/src/internal-packages/database-ddl/lib/component/databases-table.jsx index c60611fb1af..3a9c5f216e1 100644 --- a/src/internal-packages/database-ddl/lib/component/databases-table.jsx +++ b/src/internal-packages/database-ddl/lib/component/databases-table.jsx @@ -17,22 +17,22 @@ class DatabasesTable extends React.Component { constructor(props) { super(props); - this.DDLAction = app.appRegistry.getAction('DDL.Actions'); + this.DatabaseDDLAction = app.appRegistry.getAction('DatabaseDDL.Actions'); this.SortableTable = app.appRegistry.getComponent('App.SortableTable'); this.CollectionStore = app.appRegistry.getStore('App.CollectionStore'); this.Tooltip = app.appRegistry.getComponent('App.Tooltip'); } onColumnHeaderClicked(column, order) { - this.DDLAction.sortDatabases(column, order); + this.DatabaseDDLAction.sortDatabases(column, order); } onRowDeleteButtonClicked(index, dbName) { - this.DDLAction.openDropDatabaseDialog(dbName); + this.DatabaseDDLAction.openDropDatabaseDialog(dbName); } onCreateDatabaseButtonClicked() { - this.DDLAction.openCreateDatabaseDialog(); + this.DatabaseDDLAction.openCreateDatabaseDialog(); } onAuthHelpClicked(evt) { diff --git a/src/internal-packages/home/lib/component/home.jsx b/src/internal-packages/home/lib/component/home.jsx index 5d3980ba0fb..edbdaaaeefa 100644 --- a/src/internal-packages/home/lib/component/home.jsx +++ b/src/internal-packages/home/lib/component/home.jsx @@ -13,8 +13,8 @@ class Home extends React.Component { * TODO (imlucas) Handle state when rtss permissions not available. */ this.serverStatsView = app.appRegistry.getComponent('RTSS.ServerStats'); - this.CreateDatabaseDialog = app.appRegistry.getComponent('DDL.CreateDatabaseDialog'); - this.DropDatabaseDialog = app.appRegistry.getComponent('DDL.DropDatabaseDialog'); + this.CreateDatabaseDialog = app.appRegistry.getComponent('DatabaseDDL.CreateDatabaseDialog'); + this.DropDatabaseDialog = app.appRegistry.getComponent('DatabaseDDL.DropDatabaseDialog'); this.CreateCollectionDialog = app.appRegistry.getComponent('Database.CreateCollectionDialog'); this.DropCollectionDialog = app.appRegistry.getComponent('Database.DropCollectionDialog'); } diff --git a/src/internal-packages/server-stats/lib/component/index.jsx b/src/internal-packages/server-stats/lib/component/index.jsx index 23033daadf6..501a9222b1d 100644 --- a/src/internal-packages/server-stats/lib/component/index.jsx +++ b/src/internal-packages/server-stats/lib/component/index.jsx @@ -17,7 +17,7 @@ class RTSSComponent extends React.Component { constructor(props) { super(props); this.state = {activeTab: 0}; - this.DatabasesView = app.appRegistry.getComponent('DDL.DatabasesView'); + this.DatabasesView = app.appRegistry.getComponent('DatabaseDDL.DatabasesView'); this.TabNavBar = app.appRegistry.getComponent('App.TabNavBar'); }