Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5f8181b
COMPASS-98 added query bar to schema
Nov 14, 2016
ffb1ae3
COMPASS-98 added collection component
Nov 14, 2016
a7a311f
COMPASS-98 added query bar to CRUD and Explain
Nov 14, 2016
d927098
COMPASS-98 cleaned up collection package
Nov 14, 2016
e9ce0e8
COMPASS-98 fixing index
Nov 14, 2016
777df6e
COMPASS-98 add options to QueryStore and add QueryChangedStore (#590)
rueckstiess Nov 14, 2016
8566953
pass all other query options to QueryChangedStore. (#592)
rueckstiess Nov 14, 2016
4e4e591
COMPASS-98 listening to namespace for crud and indexes init
Nov 14, 2016
1cc8e94
COMPASS-98 crud, schema and explain listens to query changes + remove…
Nov 14, 2016
fc263a2
COMPASS-98 added fix to Explain plan not resetting on collection change
Nov 14, 2016
375e14a
COMPASS-98 tests working and schema sample bug fixed
Nov 15, 2016
14c0163
COMPASS-98 CRUD and explain working
Nov 15, 2016
afac12e
COMPASS-98 switching between collection and db view
Nov 16, 2016
6f826f2
COMPASS-98 set name of collection
Nov 16, 2016
be44ac7
COMPASS-98 document & indexes loading on mount
Nov 16, 2016
8d25d13
COMPASS-98 made no difference on styling :(
Nov 16, 2016
0160dea
COMPASS-98 removed hanging console.log
Nov 16, 2016
b430c6d
COMPASS-98 fix bug where minicharts don’t rerender...
Nov 17, 2016
ad7d380
fix linter issue.
Nov 17, 2016
281f288
Header repositioning fix
Sean-Oh Nov 17, 2016
6d20efd
COMPASS-98 a slightly safer way of preventing double resets for crud
Nov 17, 2016
3dfc08b
COMPASS-98 fix bug where minicharts don’t rerender...
Nov 17, 2016
bb1a984
fix linter issue.
Nov 17, 2016
1c249de
COMPASS-98 minor changes to remove comments
Nov 17, 2016
30de520
COMPASS-98 removed unused files
Nov 17, 2016
3131359
COMPASS-98 removed useless flexbox-fixed class
Nov 18, 2016
44a270b
using collection 'store' method instead
Nov 18, 2016
132281a
removed debugs
Nov 18, 2016
f179b4c
full namespace as title instead of just collection name
Nov 19, 2016
fc4c016
COMPASS-98 adding id to tabs
Nov 19, 2016
aaef99f
5 passing functional tests!
Nov 19, 2016
cc3326b
splitting functional test of query refine and apply
Nov 19, 2016
45fb7bf
supporting more test cases!
Nov 19, 2016
90e5e7d
COMPASS-98 most functional tests working
Nov 19, 2016
f00a7d6
added extra margin top to show the create button
Nov 21, 2016
969b76e
skip reset test instead of commenting out.
Nov 21, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions src/app/home/collection-list-item.js

This file was deleted.

27 changes: 0 additions & 27 deletions src/app/home/collection.jade

This file was deleted.

233 changes: 0 additions & 233 deletions src/app/home/collection.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/home/index.jade
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.page
.content.with-sidebar
div(data-hook='collection-subview')
div(data-hook='collection-view')
div.report-zero-state(data-hook='report-zero-state')
div.state-arrow
img(src='images/zero-state-arrow-collections.png', width="110")
Expand Down
58 changes: 32 additions & 26 deletions src/app/home/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var View = require('ampersand-view');
// var format = require('util').format;
// var IdentifyView = require('../identify');
var CollectionView = require('./collection');
var { NamespaceStore } = require('hadron-reflux-store');
var TourView = require('../tour');
var NetworkOptInView = require('../network-optin');
Expand All @@ -16,6 +15,32 @@ var ReactDOM = require('react-dom');

var indexTemplate = require('./index.jade');

/**
* Ampersand view wrapper around a React component tab view
*/
var WrapperView = View.extend({
template: '<div></div>',
props: {
componentKey: 'string',
visible: {
type: 'boolean',
required: true,
default: false
}
},
bindings: {
visible: {
type: 'booleanClass',
no: 'hidden'
}
},
render: function() {
this.renderWithTemplate();
var component = app.appRegistry.getComponent(this.componentKey);
ReactDOM.render(React.createElement(component), this.query());
}
});

var HomeView = View.extend({
screenName: 'Schema',
props: {
Expand Down Expand Up @@ -184,40 +209,21 @@ var HomeView = View.extend({

return database.collections.get(ns.ns);
},
// onNamespaceChange: function(ns) {
// const model = this._getCollection();
//
// // if (!model) {
// // app.navigate('/');
// // return;
// // }
//
// const collection = app.instance.collections;
// if (!collection.select(model)) {
// return debug('already selected %s', model);
// }
//
// this.updateTitle(model);
// this.showNoCollectionsZeroState = false;
// this.showDefaultZeroState = false;
//
// // app.navigate(format('schema/%s', model.getId()), {
// // silent: true
// // });
// },
onClickShowConnectWindow: function() {
// code to close current connection window and open connect dialog
ipc.call('app:show-connect-window');
window.close();
},
template: indexTemplate,
subviews: {
_collection: {
hook: 'collection-subview',
collectionView: {
hook: 'collection-view',
prepareView: function(el) {
return new CollectionView({
return new WrapperView({
el: el,
parent: this
parent: this,
visible: true,
componentKey: 'Collection.Collection'
});
}
}
Expand Down
Loading