You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2016/08/18 12:55:49 UTC
fauxton commit: updated refs/heads/master to da1b45b
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 2f9df630e -> da1b45bf5
React Breadcrumbs port: let mango use the new header
PR: #763
PR-URL: https://github.com/apache/couchdb-fauxton/pull/763
Reviewed-By: garren smith <ga...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/da1b45bf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/da1b45bf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/da1b45bf
Branch: refs/heads/master
Commit: da1b45bf54ad6fce47ce02aff3cb6905bd0bf979
Parents: 2f9df63
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Aug 17 19:46:20 2016 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Thu Aug 18 14:55:37 2016 +0200
----------------------------------------------------------------------
app/addons/documents/routes-mango.js | 96 +++++++++-----------
.../tests/nightwatch/previousButton.js | 8 +-
2 files changed, 48 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/da1b45bf/app/addons/documents/routes-mango.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-mango.js b/app/addons/documents/routes-mango.js
index f29402a..7839d82 100644
--- a/app/addons/documents/routes-mango.js
+++ b/app/addons/documents/routes-mango.js
@@ -29,7 +29,7 @@ import IndexResultsComponents from "./index-results/index-results.components.rea
import SidebarActions from "./sidebar/actions";
import RightAllDocsHeader from './components/rightalldocsheader.react';
-var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
+const MangoIndexEditorAndQueryEditor = FauxtonAPI.RouteObject.extend({
layout: 'two_pane',
routes: {
'database/:database/_index': {
@@ -42,37 +42,33 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
},
},
+ disableLoader: true,
+
initialize: function (route, masterLayout, options) {
var databaseName = options[0];
this.databaseName = databaseName;
this.database = new Databases.Model({id: databaseName});
- // magic methods
- this.allDatabases = this.getAllDatabases();
- this.createDesignDocsCollection();
- this.addLeftHeader();
-
MangoActions.setDatabase({
database: this.database
});
},
- findUsingIndex: function () {
- var params = this.createParams(),
- urlParams = params.urlParams,
- mangoResultCollection = new Resources.MangoDocumentCollection(null, {
- database: this.database,
- paging: {
- pageSize: IndexResultStores.indexResultsStore.getPerPage()
- }
- }),
- mangoIndexList = new Resources.MangoIndexCollection(null, {
- database: this.database,
- params: null,
- paging: {
- pageSize: IndexResultStores.indexResultsStore.getPerPage()
- }
- });
+ findUsingIndex: function (database) {
+ const mangoResultCollection = new Resources.MangoDocumentCollection(null, {
+ database: this.database,
+ paging: {
+ pageSize: IndexResultStores.indexResultsStore.getPerPage()
+ }
+ });
+
+ const mangoIndexList = new Resources.MangoIndexCollection(null, {
+ database: this.database,
+ params: null,
+ paging: {
+ pageSize: IndexResultStores.indexResultsStore.getPerPage()
+ }
+ });
SidebarActions.selectNavItem('mango-query');
this.setComponent('#react-headerbar', ReactHeader.BulkDocumentHeaderController, {showIncludeAllDocs: false});
@@ -88,15 +84,6 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
indexList: mangoIndexList
});
- var url = FauxtonAPI.urls('allDocs', 'app', this.database.safeID(), '?limit=' + FauxtonAPI.constants.DATABASES.DOCUMENT_LIMIT);
- this.breadcrumbs = this.setView('#breadcrumbs', new Components.Breadcrumbs({
- toggleDisabled: true,
- crumbs: [
- {'type': 'back', 'link': url},
- {'name': app.i18n.en_US['mango-title-editor'], 'link': url}
- ]
- }));
-
this.setComponent('#left-content', MangoComponents.MangoQueryEditorController, {
description: app.i18n.en_US['mango-descripton'],
editorTitle: app.i18n.en_US['mango-title-editor'],
@@ -105,20 +92,27 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
this.setComponent('#dashboard-lower-content', IndexResultsComponents.List);
this.apiUrl = function () {
- return [mangoResultCollection.urlRef('query-apiurl', urlParams), FauxtonAPI.constants.DOC_URLS.MANGO_SEARCH];
+ return [mangoResultCollection.urlRef('query-apiurl', ''), FauxtonAPI.constants.DOC_URLS.MANGO_SEARCH];
};
+
+ const url = FauxtonAPI.urls(
+ 'allDocs', 'app', this.database.safeID(), '?limit=' + FauxtonAPI.constants.DATABASES.DOCUMENT_LIMIT
+ );
+
+ this.crumbs = [
+ {name: database, link: url},
+ {name: app.i18n.en_US['mango-title-editor']}
+ ];
},
createIndex: function (database) {
- var params = this.createParams(),
- urlParams = params.urlParams,
- mangoIndexCollection = new Resources.MangoIndexCollection(null, {
- database: this.database,
- params: null,
- paging: {
- pageSize: IndexResultStores.indexResultsStore.getPerPage()
- }
- });
+ const mangoIndexCollection = new Resources.MangoIndexCollection(null, {
+ database: this.database,
+ params: null,
+ paging: {
+ pageSize: IndexResultStores.indexResultsStore.getPerPage()
+ }
+ });
IndexResultsActions.newResultsList({
collection: mangoIndexCollection,
@@ -126,15 +120,6 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
typeOfIndex: 'mango'
});
- var url = FauxtonAPI.urls('allDocs', 'app', this.database.safeID(), '?limit=' + FauxtonAPI.constants.DATABASES.DOCUMENT_LIMIT);
- this.breadcrumbs = this.setView('#breadcrumbs', new Components.Breadcrumbs({
- toggleDisabled: true,
- crumbs: [
- {'type': 'back', 'link': url},
- {'name': app.i18n.en_US['mango-indexeditor-title'], 'link': url }
- ]
- }));
-
this.setComponent('#react-headerbar', ReactHeader.BulkDocumentHeaderController, {showIncludeAllDocs: false});
this.setComponent('#footer', ReactPagination.Footer);
@@ -144,8 +129,17 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
});
this.apiUrl = function () {
- return [mangoIndexCollection.urlRef('index-apiurl', urlParams), FauxtonAPI.constants.DOC_URLS.MANGO_INDEX];
+ return [mangoIndexCollection.urlRef('index-apiurl', ''), FauxtonAPI.constants.DOC_URLS.MANGO_INDEX];
};
+
+ const url = FauxtonAPI.urls(
+ 'allDocs', 'app', this.database.safeID(), '?limit=' + FauxtonAPI.constants.DATABASES.DOCUMENT_LIMIT
+ );
+
+ this.crumbs = [
+ {name: database, link: url},
+ {name: app.i18n.en_US['mango-indexeditor-title']}
+ ];
}
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/da1b45bf/app/addons/documents/tests/nightwatch/previousButton.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/previousButton.js b/app/addons/documents/tests/nightwatch/previousButton.js
index 53993c8..25c770a 100644
--- a/app/addons/documents/tests/nightwatch/previousButton.js
+++ b/app/addons/documents/tests/nightwatch/previousButton.js
@@ -10,18 +10,16 @@
// License for the specific language governing permissions and limitations under
// the License.
-
-
module.exports = {
'Mango: Navigate back to _all_docs': function (client) {
- var newDatabaseName = client.globals.testDatabaseName,
- baseUrl = client.globals.test_settings.launch_url;
+ const newDatabaseName = client.globals.testDatabaseName;
+ const baseUrl = client.globals.test_settings.launch_url;
client
.populateDatabase(newDatabaseName, 3)
.loginToGUI()
.url(baseUrl + '/#/database/' + newDatabaseName + '/_index')
- .clickWhenVisible('.breadcrumb-back-link .fonticon-left-open')
+ .clickWhenVisible('.faux-header__breadcrumbs-link')
.assert.urlContains('_all_docs')
.end();
}