Yoji SHIDARA
null+****@clear*****
Tue Nov 6 16:48:02 JST 2012
Yoji SHIDARA 2012-11-06 16:48:02 +0900 (Tue, 06 Nov 2012) New Revision: 6e158eb17836a7bb6668987a56b488c49dbdb267 https://github.com/groonga/gcs-console/commit/6e158eb17836a7bb6668987a56b488c49dbdb267 Log: Move index fields into a tab Added files: test/index-fields.test.js views/domain-index-fields.jade Modified files: app.js routes/index.js views/domain-show.jade views/domain.jade Modified: app.js (+1 -0) =================================================================== --- app.js 2012-11-06 13:16:18 +0900 (ae4e8a0) +++ app.js 2012-11-06 16:48:02 +0900 (fb3506a) @@ -42,6 +42,7 @@ function setupApplication(app) { app.get('/', auth, routes.index); app.get('/domain/:name', auth, routes.domain); app.get('/domain/:name/search', auth, routes.domainSearch); + app.get('/domain/:name/index_fields', auth, routes.domainIndexFields); app.get('/domain_create', auth, routes.domainCreate); app.post('/domain_create', auth, routes.domainCreatePost); app.delete('/domain/:name', auth, routes.domainDelete); Modified: routes/index.js (+9 -0) =================================================================== --- routes/index.js 2012-11-06 13:16:18 +0900 (7f1e5c2) +++ routes/index.js 2012-11-06 16:48:02 +0900 (ad82ca0) @@ -46,6 +46,15 @@ exports.domain = function(req, res) { withDomain(req, res, function(req, res) { res.render('domain-show', { action: 'domain_show', + domain: req.domain + }); + }); +}; + +exports.domainIndexFields = function(req, res) { + withDomain(req, res, function(req, res) { + res.render('domain-index-fields', { + action: 'domain_index_fields', domain: req.domain, indexFields: req.indexFields }); Added: test/index-fields.test.js (+33 -0) 100644 =================================================================== --- /dev/null +++ test/index-fields.test.js 2012-11-06 16:48:02 +0900 (fa74e65) @@ -0,0 +1,33 @@ +var assert = require('chai').assert; +var Browser = require('zombie'); +var Target = require('./test-utils').Target; + +suite('dashboard', function() { + var target = new Target(); + setup(function(done) { + target.setup(done) + }); + teardown(function() { + target.teardown() + }); + + test('Create domain and navigate to index fields tab', function(done) { + var browser = new Browser(); + browser + .visit(target.rootURL) + .then(function() { + return browser.clickLink('Create New Domain'); + }) + .then(function() { + browser.fill('domain_name', 'test'); + return browser.pressButton('Create') + }) + .then(function() { + return browser.clickLink('Index Fields'); + }) + .then(function() { + assert.equal(browser.location.pathname, "/domain/test/index_fields"); + }) + .then(done, done); + }); +}); Added: views/domain-index-fields.jade (+24 -0) 100644 =================================================================== --- /dev/null +++ views/domain-index-fields.jade 2012-11-06 16:48:02 +0900 (ff93ffb) @@ -0,0 +1,24 @@ +extends domain + +block domain-content + h2 Index Fields + table.table.table-bordered + tr + th Name + th Type + th Facet + th Result + for indexField in indexFields + tr + th= indexField.Options.IndexFieldName + td= indexField.Options.IndexFieldType + case indexField.Options.IndexFieldType + when 'text' + td= indexField.Options.TextOptions.FacetEnabled + td= indexField.Options.TextOptions.ResultEnabled + when 'literal' + td= indexField.Options.LiteralOptions.FacetEnabled + td= indexField.Options.LiteralOptions.ResultEnabled + default + td + td Modified: views/domain-show.jade (+0 -22) =================================================================== --- views/domain-show.jade 2012-11-06 13:16:18 +0900 (83122a3) +++ views/domain-show.jade 2012-11-06 16:48:02 +0900 (f02a023) @@ -16,28 +16,6 @@ block domain-content th Search service endpoint td= domain.SearchService.Endpoint - h2 Index Fields - table.table.table-bordered - tr - th Name - th Type - th Facet - th Result - for indexField in indexFields - tr - th= indexField.Options.IndexFieldName - td= indexField.Options.IndexFieldType - case indexField.Options.IndexFieldType - when 'text' - td= indexField.Options.TextOptions.FacetEnabled - td= indexField.Options.TextOptions.ResultEnabled - when 'literal' - td= indexField.Options.LiteralOptions.FacetEnabled - td= indexField.Options.LiteralOptions.ResultEnabled - default - td - td - a.btn.btn-danger.pull-right(role="button", data-toggle="modal", data-target="#deleteDialog") i.icon-trash.icon-white | Delete this domain Modified: views/domain.jade (+2 -0) =================================================================== --- views/domain.jade 2012-11-06 13:16:18 +0900 (ae2db2d) +++ views/domain.jade 2012-11-06 16:48:02 +0900 (de6117d) @@ -8,5 +8,7 @@ block content a(href="/domain/"+domain.DomainName) About li(class=(action == "domain_search" ? "active" : "")) a(href="/domain/"+domain.DomainName+"/search") Search + li(class=(action == "domain_index_fields" ? "active" : "")) + a(href="/domain/"+domain.DomainName+"/index_fields") Index Fields block domain-content -------------- next part -------------- HTML����������������������������...Download