github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Resolve conflicts in bower and less

Browse source
This commit is contained in:
Rashid Khan 2014-02-26 14:11:16 -07:00
commit 54d0da8271
30 changed files with 1033 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bower.json
View file

@ -27,7 +27,8 @@
"d3": "~3.4.1",
"angular-route": "~1.2.12",
"gridster": "~0.5.0",
"font-awesome": "~4.0.3"
"font-awesome": "~4.0.3",
"requirejs-text": "~2.0.10"
},
"devDependencies": {}
}

15
src/bower_components/requirejs-text/.bower.json vendored Normal file
View file

@ -0,0 +1,15 @@
{
"name": "requirejs-text",
"homepage": "https://github.com/requirejs/text",
"version": "2.0.10",
"_release": "2.0.10",
"_resolution": {
"type": "version",
"tag": "2.0.10",
"commit": "1592cbf9c7ffd703b36a3af4002e86457b8ab5dd"
},
"_source": "git://github.com/requirejs/text.git",
"_target": "~2.0.10",
"_originalSource": "requirejs-text",
"_direct": true
}

58
src/bower_components/requirejs-text/LICENSE vendored Normal file
View file

@ -0,0 +1,58 @@
RequireJS is released under two licenses: new BSD, and MIT. You may pick the
license that best suits your development needs. The text of both licenses are
provided below.
The "New" BSD License:
----------------------
Copyright (c) 2010-2011, The Dojo Foundation
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the Dojo Foundation nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
MIT License
-----------
Copyright (c) 2010-2011, The Dojo Foundation
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

198
src/bower_components/requirejs-text/README.md vendored Normal file
View file

@ -0,0 +1,198 @@
# text
A [RequireJS](http://requirejs.org)/AMD loader plugin for loading text
resources.
Known to work in RequireJS, but should work in other AMD loaders that support
the same loader plugin API.
## Docs
See the [RequireJS API text section](http://requirejs.org/docs/api.html#text).
## Latest release
The latest release is always available from [the "latest" tag](https://raw.github.com/requirejs/text/latest/text.js).
It can also be installed using [volo](https://github.com/volojs/volo):
volo add requirejs/text
## Usage
It is nice to build HTML using regular HTML tags, instead of building up DOM
structures in script. However, there is no good way to embed HTML in a
JavaScript file. The best that can be done is using a string of HTML, but that
can be hard to manage, particularly for multi-line HTML.
The text.js AMD loader plugin can help with this issue. It will automatically be
loaded if the text! prefix is used for a dependency. Download the plugin and put
it in the app's [baseUrl](http://requirejs.org/docs/api.html#config-baseUrl)
directory (or use the [paths config](http://requirejs.org/docs/api.html#config-paths) to place it in other areas).
You can specify a text file resource as a dependency like so:
```javascript
require(["some/module", "text!some/module.html", "text!some/module.css"],
function(module, html, css) {
//the html variable will be the text
//of the some/module.html file
//the css variable will be the text
//of the some/module.css file.
}
);
```
Notice the .html and .css suffixes to specify the extension of the file. The
"some/module" part of the path will be resolved according to normal module name
resolution: it will use the **baseUrl** and **paths** [configuration
options](http://requirejs.org/docs/api.html#config) to map that name to a path.
For HTML/XML/SVG files, there is another option. You can pass !strip, which
strips XML declarations so that external SVG and XML documents can be added to a
document without worry. Also, if the string is an HTML document, only the part
inside the body tag is returned. Example:
```javascript
require(["text!some/module.html!strip"],
function(html) {
//the html variable will be the text of the
//some/module.html file, but only the part
//inside the body tag.
}
);
```
The text files are loaded via asynchronous XMLHttpRequest (XHR) calls, so you
can only fetch files from the same domain as the web page (see **XHR
restrictions** below).
However, [the RequireJS optimizer](http://requirejs.org/docs/optimization.html)
will inline any text! references with the actual text file contents into the
modules, so after a build, the modules that have text! dependencies can be used
from other domains.
## Configuration
### XHR restrictions
The text plugin works by using XMLHttpRequest (XHR) to fetch the text for the
resources it handles.
However, XHR calls have some restrictions, due to browser/web security policies:
1) Many browsers do not allow file:// access to just any file. You are better
off serving the application from a local web server than using local file://
URLs. You will likely run into trouble otherwise.
2) There are restrictions for using XHR to access files on another web domain.
While CORS can help enable the server for cross-domain access, doing so must
be done with care (in particular if you also host an API from that domain),
and not all browsers support CORS.
So if the text plugin determines that the request for the resource is on another
domain, it will try to access a ".js" version of the resource by using a
script tag. Script tag GET requests are allowed across domains. The .js version
of the resource should just be a script with a define() call in it that returns
a string for the module value.
Example: if the resource is 'text!example.html' and that resolves to a path
on another web domain, the text plugin will do a script tag load for
'example.html.js'.
The [requirejs optimizer](http://requirejs.org/docs/optimization.html) will
generate these '.js' versions of the text resources if you set this in the
build profile:
optimizeAllPluginResources: true
In some cases, you may want the text plugin to not try the .js resource, maybe
because you have configured CORS on the other server, and you know that only
browsers that support CORS will be used. In that case you can use the
[module config](http://requirejs.org/docs/api.html#config-moduleconfig)
(requires RequireJS 2+) to override some of the basic logic the plugin uses to
determine if the .js file should be requested:
```javascript
requirejs.config({
config: {
text: {
useXhr: function (url, protocol, hostname, port) {
//Override function for determining if XHR should be used.
//url: the URL being requested
//protocol: protocol of page text.js is running on
//hostname: hostname of page text.js is running on
//port: port of page text.js is running on
//Use protocol, hostname, and port to compare against the url
//being requested.
//Return true or false. true means "use xhr", false means
//"fetch the .js version of this resource".
}
}
}
});
```
### Custom XHR hooks
There may be cases where you might want to provide the XHR object to use
in the request, or you may just want to add some custom headers to the
XHR object used to make the request. You can use the following hooks:
```javascript
requirejs.config({
config: {
text: {
onXhr: function (xhr, url) {
//Called after the XHR has been created and after the
//xhr.open() call, but before the xhr.send() call.
//Useful time to set headers.
//xhr: the xhr object
//url: the url that is being used with the xhr object.
},
createXhr: function () {
//Overrides the creation of the XHR object. Return an XHR
//object from this function.
//Available in text.js 2.0.1 or later.
},
onXhrComplete: function (xhr, url) {
//Called whenever an XHR has completed its work. Useful
//if browser-specific xhr cleanup needs to be done.
}
}
}
});
```
### Forcing the environment implemention
The text plugin tries to detect what environment it is available for loading
text resources, Node, XMLHttpRequest (XHR) or Rhino, but sometimes the
Node or Rhino environment may have loaded a library that introduces an XHR
implementation. You can foce the environment implementation to use by passing
an "env" module config to the plugin:
```javascript
requirejs.config({
config: {
text: {
//Valid values are 'node', 'xhr', or 'rhino'
env: 'rhino'
}
}
});
```
## License
Dual-licensed -- new BSD or MIT.
## Where are the tests?
They are in the [requirejs](https://github.com/jrburke/requirejs) and
[r.js](https://github.com/jrburke/r.js) repos.
## History
This plugin was in the [requirejs repo](https://github.com/jrburke/requirejs)
up until the requirejs 2.0 release.

32
src/bower_components/requirejs-text/package.json vendored Normal file
View file

@ -0,0 +1,32 @@
{
"name": "text",
"version": "2.0.10",
"description": "An AMD loader plugin for loading text resources.",
"categories": [
"Loader plugins"
],
"main": "text.js",
"github": "https://github.com/requirejs/text",
"bugs": {
"web": "https://github.com/requirejs/text/issues"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/requirejs/text.git"
}
],
"licenses": [
{
"type": "MIT",
"url": "http://www.opensource.org/licenses/mit-license.php"
},
{
"type": "BSD New",
"url": "http://opensource.org/licenses/BSD-3-Clause"
}
],
"volo": {
"url": "https://raw.github.com/requirejs/text/{version}/text.js"
}
}

386
src/bower_components/requirejs-text/text.js vendored Normal file
View file

@ -0,0 +1,386 @@
/**
* @license RequireJS text 2.0.10 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/requirejs/text for details
*/
/*jslint regexp: true */
/*global require, XMLHttpRequest, ActiveXObject,
define, window, process, Packages,
java, location, Components, FileUtils */
define(['module'], function (module) {
'use strict';
var text, fs, Cc, Ci, xpcIsWindows,
progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'],
xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,
bodyRegExp = /<body[^>]*>\s*([\s\S]+)\s*<\/body>/im,
hasLocation = typeof location !== 'undefined' && location.href,
defaultProtocol = hasLocation && location.protocol && location.protocol.replace(/\:/, ''),
defaultHostName = hasLocation && location.hostname,
defaultPort = hasLocation && (location.port || undefined),
buildMap = {},
masterConfig = (module.config && module.config()) || {};
text = {
version: '2.0.10',
strip: function (content) {
//Strips <?xml ...?> declarations so that external SVG and XML
//documents can be added to a document without worry. Also, if the string
//is an HTML document, only the part inside the body tag is returned.
if (content) {
content = content.replace(xmlRegExp, "");
var matches = content.match(bodyRegExp);
if (matches) {
content = matches[1];
}
} else {
content = "";
}
return content;
},
jsEscape: function (content) {
return content.replace(/(['\\])/g, '\\$1')
.replace(/[\f]/g, "\\f")
.replace(/[\b]/g, "\\b")
.replace(/[\n]/g, "\\n")
.replace(/[\t]/g, "\\t")
.replace(/[\r]/g, "\\r")
.replace(/[\u2028]/g, "\\u2028")
.replace(/[\u2029]/g, "\\u2029");
},
createXhr: masterConfig.createXhr || function () {
//Would love to dump the ActiveX crap in here. Need IE 6 to die first.
var xhr, i, progId;
if (typeof XMLHttpRequest !== "undefined") {
return new XMLHttpRequest();
} else if (typeof ActiveXObject !== "undefined") {
for (i = 0; i < 3; i += 1) {
progId = progIds[i];
try {
xhr = new ActiveXObject(progId);
} catch (e) {}
if (xhr) {
progIds = [progId]; // so faster next time
break;
}
}
}
return xhr;
},
/**
* Parses a resource name into its component parts. Resource names
* look like: module/name.ext!strip, where the !strip part is
* optional.
* @param {String} name the resource name
* @returns {Object} with properties "moduleName", "ext" and "strip"
* where strip is a boolean.
*/
parseName: function (name) {
var modName, ext, temp,
strip = false,
index = name.indexOf("."),
isRelative = name.indexOf('./') === 0 ||
name.indexOf('../') === 0;
if (index !== -1 && (!isRelative || index > 1)) {
modName = name.substring(0, index);
ext = name.substring(index + 1, name.length);
} else {
modName = name;
}
temp = ext || modName;
index = temp.indexOf("!");
if (index !== -1) {
//Pull off the strip arg.
strip = temp.substring(index + 1) === "strip";
temp = temp.substring(0, index);
if (ext) {
ext = temp;
} else {
modName = temp;
}
}
return {
moduleName: modName,
ext: ext,
strip: strip
};
},
xdRegExp: /^((\w+)\:)?\/\/([^\/\\]+)/,
/**
* Is an URL on another domain. Only works for browser use, returns
* false in non-browser environments. Only used to know if an
* optimized .js version of a text resource should be loaded
* instead.
* @param {String} url
* @returns Boolean
*/
useXhr: function (url, protocol, hostname, port) {
var uProtocol, uHostName, uPort,
match = text.xdRegExp.exec(url);
if (!match) {
return true;
}
uProtocol = match[2];
uHostName = match[3];
uHostName = uHostName.split(':');
uPort = uHostName[1];
uHostName = uHostName[0];
return (!uProtocol || uProtocol === protocol) &&
(!uHostName || uHostName.toLowerCase() === hostname.toLowerCase()) &&
((!uPort && !uHostName) || uPort === port);
},
finishLoad: function (name, strip, content, onLoad) {
content = strip ? text.strip(content) : content;
if (masterConfig.isBuild) {
buildMap[name] = content;
}
onLoad(content);
},
load: function (name, req, onLoad, config) {
//Name has format: some.module.filext!strip
//The strip part is optional.
//if strip is present, then that means only get the string contents
//inside a body tag in an HTML string. For XML/SVG content it means
//removing the <?xml ...?> declarations so the content can be inserted
//into the current doc without problems.
// Do not bother with the work if a build and text will
// not be inlined.
if (config.isBuild && !config.inlineText) {
onLoad();
return;
}
masterConfig.isBuild = config.isBuild;
var parsed = text.parseName(name),
nonStripName = parsed.moduleName +
(parsed.ext ? '.' + parsed.ext : ''),
url = req.toUrl(nonStripName),
useXhr = (masterConfig.useXhr) ||
text.useXhr;
// Do not load if it is an empty: url
if (url.indexOf('empty:') === 0) {
onLoad();
return;
}
//Load the text. Use XHR if possible and in a browser.
if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort)) {
text.get(url, function (content) {
text.finishLoad(name, parsed.strip, content, onLoad);
}, function (err) {
if (onLoad.error) {
onLoad.error(err);
}
});
} else {
//Need to fetch the resource across domains. Assume
//the resource has been optimized into a JS module. Fetch
//by the module name + extension, but do not include the
//!strip part to avoid file system issues.
req([nonStripName], function (content) {
text.finishLoad(parsed.moduleName + '.' + parsed.ext,
parsed.strip, content, onLoad);
});
}
},
write: function (pluginName, moduleName, write, config) {
if (buildMap.hasOwnProperty(moduleName)) {
var content = text.jsEscape(buildMap[moduleName]);
write.asModule(pluginName + "!" + moduleName,
"define(function () { return '" +
content +
"';});\n");
}
},
writeFile: function (pluginName, moduleName, req, write, config) {
var parsed = text.parseName(moduleName),
extPart = parsed.ext ? '.' + parsed.ext : '',
nonStripName = parsed.moduleName + extPart,
//Use a '.js' file name so that it indicates it is a
//script that can be loaded across domains.
fileName = req.toUrl(parsed.moduleName + extPart) + '.js';
//Leverage own load() method to load plugin value, but only
//write out values that do not have the strip argument,
//to avoid any potential issues with ! in file names.
text.load(nonStripName, req, function (value) {
//Use own write() method to construct full module value.
//But need to create shell that translates writeFile's
//write() to the right interface.
var textWrite = function (contents) {
return write(fileName, contents);
};
textWrite.asModule = function (moduleName, contents) {
return write.asModule(moduleName, fileName, contents);
};
text.write(pluginName, nonStripName, textWrite, config);
}, config);
}
};
if (masterConfig.env === 'node' || (!masterConfig.env &&
typeof process !== "undefined" &&
process.versions &&
!!process.versions.node &&
!process.versions['node-webkit'])) {
//Using special require.nodeRequire, something added by r.js.
fs = require.nodeRequire('fs');
text.get = function (url, callback, errback) {
try {
var file = fs.readFileSync(url, 'utf8');
//Remove BOM (Byte Mark Order) from utf8 files if it is there.
if (file.indexOf('\uFEFF') === 0) {
file = file.substring(1);
}
callback(file);
} catch (e) {
errback(e);
}
};
} else if (masterConfig.env === 'xhr' || (!masterConfig.env &&
text.createXhr())) {
text.get = function (url, callback, errback, headers) {
var xhr = text.createXhr(), header;
xhr.open('GET', url, true);
//Allow plugins direct access to xhr headers
if (headers) {
for (header in headers) {
if (headers.hasOwnProperty(header)) {
xhr.setRequestHeader(header.toLowerCase(), headers[header]);
}
}
}
//Allow overrides specified in config
if (masterConfig.onXhr) {
masterConfig.onXhr(xhr, url);
}
xhr.onreadystatechange = function (evt) {
var status, err;
//Do not explicitly handle errors, those should be
//visible via console output in the browser.
if (xhr.readyState === 4) {
status = xhr.status;
if (status > 399 && status < 600) {
//An http 4xx or 5xx error. Signal an error.
err = new Error(url + ' HTTP status: ' + status);
err.xhr = xhr;
errback(err);
} else {
callback(xhr.responseText);
}
if (masterConfig.onXhrComplete) {
masterConfig.onXhrComplete(xhr, url);
}
}
};
xhr.send(null);
};
} else if (masterConfig.env === 'rhino' || (!masterConfig.env &&
typeof Packages !== 'undefined' && typeof java !== 'undefined')) {
//Why Java, why is this so awkward?
text.get = function (url, callback) {
var stringBuffer, line,
encoding = "utf-8",
file = new java.io.File(url),
lineSeparator = java.lang.System.getProperty("line.separator"),
input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding)),
content = '';
try {
stringBuffer = new java.lang.StringBuffer();
line = input.readLine();
// Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324
// http://www.unicode.org/faq/utf_bom.html
// Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK:
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058
if (line && line.length() && line.charAt(0) === 0xfeff) {
// Eat the BOM, since we've already found the encoding on this file,
// and we plan to concatenating this buffer with others; the BOM should
// only appear at the top of a file.
line = line.substring(1);
}
if (line !== null) {
stringBuffer.append(line);
}
while ((line = input.readLine()) !== null) {
stringBuffer.append(lineSeparator);
stringBuffer.append(line);
}
//Make sure we return a JavaScript string and not a Java string.
content = String(stringBuffer.toString()); //String
} finally {
input.close();
}
callback(content);
};
} else if (masterConfig.env === 'xpconnect' || (!masterConfig.env &&
typeof Components !== 'undefined' && Components.classes &&
Components.interfaces)) {
//Avert your gaze!
Cc = Components.classes,
Ci = Components.interfaces;
Components.utils['import']('resource://gre/modules/FileUtils.jsm');
xpcIsWindows = ('@mozilla.org/windows-registry-key;1' in Cc);
text.get = function (url, callback) {
var inStream, convertStream, fileObj,
readData = {};
if (xpcIsWindows) {
url = url.replace(/\//g, '\\');
}
fileObj = new FileUtils.File(url);
//XPCOM, you so crazy
try {
inStream = Cc['@mozilla.org/network/file-input-stream;1']
.createInstance(Ci.nsIFileInputStream);
inStream.init(fileObj, 1, 0, false);
convertStream = Cc['@mozilla.org/intl/converter-input-stream;1']
.createInstance(Ci.nsIConverterInputStream);
convertStream.init(inStream, "utf-8", inStream.available(),
Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
convertStream.readString(inStream.available(), readData);
convertStream.close();
inStream.close();
callback(readData.value);
} catch (e) {
throw new Error((fileObj && fileObj.path || '') + ': ' + e);
}
};
}
return text;
});

0
src/courier/calculateIndices.js → src/courier/calculate_indices.js
View file

31
src/courier/courier.js
View file

@ -24,7 +24,11 @@ define(function (require) {
// execute a search right now
search: function (courier) {
if (courier._activeSearchRequest) {
return courier._error(new HastyRefresh());
// ensure that this happens async, otherwise listeners
// might miss error events
return nextTick(function () {
courier._error(new HastyRefresh());
});
}
courier._activeSearchRequest = SearchSource.fetch(
@ -174,19 +178,24 @@ define(function (require) {
}, this);
};
// be default, the courier will throw an error if a fetch
// occurs before a previous fetch finishes. To prevent this, you
// should call abort before calling .fetch()
Courier.prototype.abort = function () {
if (this._activeSearchRequest) {
this._activeSearchRequest.abort();
this._activeSearchRequest = null;
}
};
// force a fetch of all datasources right now, optionally filter by type
Courier.prototype.fetch = function (onlyType) {
var courier = this;
// ensure that onFetch functions always run after the tick
// so that users can will be able to listen after or before the call to
// fetch and always get the same behavior (even if the onFetch runs synchronously)
nextTick(function () {
_.forOwn(onFetch, function (fn, type) {
if (onlyType && onlyType !== type) return;
if (courier._refs[type].length) fn(courier);
courier._refs[type].forEach(function (ref) {
ref.fetchCount ++;
});
_.forOwn(onFetch, function (fn, type) {
if (onlyType && onlyType !== type) return;
if (courier._refs[type].length) fn(courier);
courier._refs[type].forEach(function (ref) {
ref.fetchCount ++;
});
});
};

66
src/courier/data_source/data_source.js
View file

@ -3,7 +3,6 @@ define(function (require) {
var _ = require('lodash');
var EventEmitter = require('utils/event_emitter');
var Mapper = require('courier/mapper');
var IndexPattern = require('courier/index_pattern');
function DataSource(courier, initialState) {
var state;
@ -54,9 +53,6 @@ define(function (require) {
this._methods.forEach(function (name) {
this[name] = function (val) {
state[name] = val;
if (name === 'index' && arguments[1]) {
state.index = new IndexPattern(val, arguments[1]);
}
return this;
};
}, this);
@ -81,8 +77,8 @@ define(function (require) {
* @callback {Error, Array} - calls cb with a possible error or an array of field names
* @todo
*/
DataSource.prototype.getFieldNames = function (cb) {
throw new Error('not implemented');
DataSource.prototype.getFields = function (cb) {
this._courier._mapper.getFields(this, this._wrapcb(cb));
};
/**
@ -114,32 +110,33 @@ define(function (require) {
* @return {this} - chainable
*/
DataSource.prototype.$scope = function ($scope) {
var emitter = this;
var courier = this;
if (emitter._emitter$scope) {
emitter._emitter$scope = $scope;
if (courier._$scope) {
// simply change the scope that callbacks will point to
courier._$scope = $scope;
return this;
}
emitter._emitter$scope = $scope;
var origOn = emitter.on;
courier._$scope = $scope;
emitter.on = function (event, listener) {
var wrapped = function () {
var args = arguments;
// always use the stored ref so that it can be updated if needed
var $scope = emitter._emitter$scope;
$scope[$scope.$$phase ? '$eval' : '$apply'](function () {
listener.apply(emitter, args);
});
};
// wrap the 'on' method so that all listeners
// can be wrapped in calls to $scope.$apply
var origOn = courier.on;
courier.on = function (event, listener) {
var wrapped = courier._wrapcb(listener);
// set .listener so that it can be removed by
// .removeListener() using the original function
wrapped.listener = listener;
return origOn.call(emitter, event, wrapped);
return origOn.call(courier, event, wrapped);
};
emitter.on.restore = function () {
delete emitter._emitter$scope;
emitter.on = origOn;
// make sure the alias is still set
courier.addListener = courier.on;
courier.on.restore = function () {
delete courier._$scope;
courier.on = courier.addListener = origOn;
};
return this;
@ -213,11 +210,22 @@ define(function (require) {
return flatState;
};
DataSource.prototype._resolveIndexPattern = function (start, end) {
if (this._state.indexInterval) {
throw new Error('Not implemented');
}
return this._state.index;
DataSource.prototype._wrapcb = function (cb) {
var courier = this;
var wrapped = function () {
var args = arguments;
// always use the stored ref so that it can be updated if needed
var $scope = courier._$scope;
// don't fall apart if we don't have a scope
if (!$scope) return cb.apply(courier, args);
// use angular's $apply or $eval functions for the given scope
$scope[$scope.$$phase ? '$eval' : '$apply'](function () {
cb.apply(courier, args);
});
};
return wrapped;
};
return DataSource;

7
src/courier/data_source/doc.js
View file

@ -2,7 +2,8 @@ define(function (require) {
var DataSource = require('courier/data_source/data_source');
var inherits = require('utils/inherits');
var nextTick = require('utils/next_tick');
var errors = require('courier/errors');
var VersionConflict = require('courier/errors').VersionConflict;
var FetchFailure = require('courier/errors').FetchFailure;
var listenerCount = require('utils/event_emitter').listenerCount;
var _ = require('lodash');
@ -42,7 +43,7 @@ define(function (require) {
var ref = allRefs[i];
var source = ref.source;
if (resp.error) return source._error(new errors.DocFetchFailure(resp));
if (resp.error) return source._error(new FetchFailure(resp));
if (resp.found) {
if (ref.version === resp._version) return; // no change
ref.version = resp._version;
@ -147,7 +148,7 @@ define(function (require) {
if (err) return cb(err);
if (resp && resp.status === 409) {
err = new errors.VersionConflict(resp);
err = new VersionConflict(resp);
if (listenerCount(source, 'conflict')) {
return source.emit('conflict', err);
} else {

3
src/courier/data_source/search.js
View file

@ -2,6 +2,7 @@ define(function (require) {
var DataSource = require('courier/data_source/data_source');
var inherits = require('utils/inherits');
var errors = require('courier/errors');
var FetchFailure = require('courier/errors').FetchFailure;
var _ = require('lodash');
function SearchSource(courier, initialState) {
@ -44,7 +45,7 @@ define(function (require) {
_.each(resp.responses, function (resp, i) {
var source = allRefs[i];
if (resp.error) return errors.emit(source, courier, resp);
if (resp.error) return source._error(new FetchFailure(resp));
source.emit('results', resp);
});

8
src/courier/errors.js
View file

@ -38,17 +38,17 @@ define(function (require) {
/**
* DocFetchFailure Error - where there is an error getting a doc
* FetchFailure Error - where there is an error getting a doc
* @param {String} [msg] - An error message that will probably end up in a log.
*/
errors.DocFetchFailure = function DocFetchFailure(resp) {
errors.FetchFailure = function FetchFailure(resp) {
CourierError.call(this,
'Failed to get the doc: ' + JSON.stringify(resp),
errors.DocFetchFailure);
errors.FetchFailure);
this.resp = resp;
};
inherits(errors.DocFetchFailure, CourierError);
inherits(errors.FetchFailure, CourierError);
/**

23
src/courier/index_pattern.js
View file

@ -1,23 +0,0 @@
define(function (require) {
function IndexPattern(index, interval) {
this.text = index;
this.interval = interval;
}
IndexPattern.prototype = {
toJSON: function () {
return this.text;
},
toString: function () {
return this.text;
},
forTimeRange: function () {
throw new Error('not implemented');
},
wildcard: function () {
throw new Error('not implemented');
}
};
return IndexPattern;
});

12
src/courier/mapper.js
View file

@ -133,17 +133,15 @@ define(function (require) {
// TODO: Add week/month check
client.indices.getFieldMapping(params, function (err, response, status) {
// TODO: Add error message
var fields = {};
_.each(response, function (index) {
_.each(response, function (index, indexName) {
if (indexName === config.cacheIndex) return;
_.each(index.mappings, function (type) {
_.each(type, function (field, name) {
if (_.isUndefined(field.mapping) || name[0] === '_') return;
if (!_.isUndefined(fields[name]) && fields[name] !== field.mapping[_.keys(field.mapping)[0]])
return courier._error(new Error.MappingConflict());
if (_.size(field.mapping) === 0 || name[0] === '_') return;
if (!_.isUndefined(fields[name]) && fields[name].type !== field.mapping[_.keys(field.mapping)[0]].type)
return courier._error(new Error.MappingConflict(name));
fields[name] = field.mapping[_.keys(field.mapping)[0]];
});
});

0
src/kibana/apps/dashboard/styles/main.html Normal file
View file

44
src/kibana/apps/discover/index.html
View file

@ -1 +1,43 @@
<h1>Discover</h1>
<div ng-controller="discover">
<h1>Discover</h1>
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">Index</label>
<div class="col-sm-10">
<input class="form-control" ng-model="index">
</div>
</div>
<!-- <div class="form-group">
<label class="control-label col-sm-3">Repeat Interval</label>
<div class="col-sm-9">
<select
class="form-control"
ng-model="interval"
ng-options="i.display for i in intervalOptions">
</select>
</div>
</div> -->
<form class="form-group" ng-submit="reset()">
<label class="control-label col-sm-2">Query</label>
<div class="col-sm-10">
<div class="input-group">
<input class="form-control" ng-model="query" >
<span class="input-group-btn">
<button type="button" class="btn" ng-click="reset()">
<i class="glyphicon glyphicon-search"></i>
</button>
</span>
</div>
</div>
</form>
</div>
<div class="input-group">
<label class="control-label col-sm-2">Limit</label>
<select
class="form-control"
ng-model="size"
ng-options="size.display for size in sizeOptions">
</select>
</div>
<kbn-table rows="rows" columns="columns"></kbn-table>
</div>

97
src/kibana/apps/discover/index.js
View file

@ -1,6 +1,103 @@
define(function (require) {
var angular = require('angular');
var _ = require('lodash');
require('directives/table');
require('css!./styles/main.css');
var app = angular.module('app/discover', []);
var sizeOptions = [
{ display: '30', val: 30 },
{ display: '50', val: 50 },
{ display: '80', val: 80 },
{ display: '125', val: 125 },
{ display: '250', val: 250 },
{ display: 'Unlimited', val: null },
];
var intervalOptions = [
{ display: '', val: null },
{ display: 'Hourly', val: 'hourly' },
{ display: 'Daily', val: 'daily' },
{ display: 'Weekly', val: 'weekly' },
{ display: 'Monthly', val: 'monthly' },
{ display: 'Yearly', val: 'yearly' }
];
app.controller('discover', function ($scope, courier, config) {
var source = courier.rootSearchSource.extend()
.size(30)
.$scope($scope)
.on('results', function (res) {
if (!$scope.fields) getFields();
$scope.rows = res.hits.hits;
});
// stores the complete list of fields
$scope.fields = [];
// stores the fields we want to fetch
$scope.columns = [];
// At what interval are your index patterns
$scope.intervalOptions = intervalOptions;
$scope.interval = $scope.intervalOptions[0];
// options to control the size of the queries
$scope.sizeOptions = sizeOptions;
$scope.size = $scope.sizeOptions[0];
// watch the discover.defaultIndex config value for changes
config.$watch('discover.defaultIndex', function (val) {
if (!val) {
config.set('discover.defaultIndex', '_all');
return;
}
// only set if datasource doesn't have an index
if (!source.get('index')) $scope.index = val;
});
$scope.$watch('index', function (val) {
// set the index on the data source
source.index(val);
// clear the columns and fields, then refetch when we so a search
$scope.columns = $scope.fields = null;
});
$scope.$watch('query', function (query) {
if (query) {
source.query({
query_string: {
query: query
}
});
} else {
// clear the query
source.query(null);
}
});
$scope.$watch('size', function (selectedSize) {
source.size(selectedSize.val);
});
$scope.reset = function () {
// the check happens only when the results come in; prevents a race condition
// if (!$scope.fields) getFields();
courier.abort();
courier.fetch();
};
function getFields() {
source.getFields(function (err, fields) {
$scope.fields = fields;
$scope.columns = _.keys(fields);
source.source({
include: $scope.columns
});
});
}
});
});

0
src/kibana/apps/discover/styles/main.html Normal file
View file

0
src/kibana/apps/visualize/styles/main.html Normal file
View file

51
src/kibana/directives/table.js Normal file
View file

@ -0,0 +1,51 @@
define(function (require) {
var html = require('text!partials/table.html');
var angular = require('angular');
var _ = require('lodash');
var module = angular.module('kibana/directives');
/**
* kbnTable directive
*
* displays results in a simple table view. Pass the result object
* via the results attribute on the kbnTable element:
* ```
* <kbn-table results="queryResult"></kbn-table>
* ```
*/
var defaults = {
columns: [],
rows: []
};
module.directive('kbnTable', function () {
return {
restrict: 'E',
template: html,
scope: {
columns: '=',
rows: '='
},
controller: function ($scope) {
_.defaults($scope, defaults);
$scope.makeRowHtml = function (row) {
var html = '<tr>';
_.each($scope.columns, function (col) {
html += '<td>';
if (row[col] !== void 0) {
html += row[col];
} else {
html += row._source[col];
}
html += '</td>';
});
html += '</tr>';
return html;
};
}
};
});
});

0
src/kibana/directives/kbn_view.js → src/kibana/directives/view.js
View file

2
src/kibana/index.js
View file

@ -77,7 +77,7 @@ define(function (require) {
// require global modules
require([
'controllers/kibana',
'directives/kbn_view',
'directives/view',
'constants/base'
], loaded());

12
src/kibana/partials/table.html Normal file
View file

@ -0,0 +1,12 @@
<table class="table">
<thead>
<th ng-repeat="col in columns">{{col}}</th>
</thead>
<tbody>
<tr ng-repeat="row in rows">
<td ng-repeat="col in columns">
{{row._source[col] || row[col]}}
</td>
</tr>
</tbody>
</table>

1
src/kibana/require.config.js
View file

@ -7,6 +7,7 @@ require.config({
'angular-route': '../bower_components/angular-route/angular-route',
async: '../bower_components/async/lib/async',
css: '../bower_components/require-css/css',
text: '../bower_components/requirejs-text/text',
d3: '../bower_components/d3/d3',
elasticsearch: '../bower_components/elasticsearch/elasticsearch.angular',
jquery: '../bower_components/jquery/jquery',

55
src/kibana/styles/_bootstrap.less Normal file
View file

@ -0,0 +1,55 @@
// Core variables and mixins
@import "../../bower_components/bootstrap/less/variables.less";
@icon-font-path: "../../bower_components/bootstrap/fonts/";
@import "../../bower_components/bootstrap/less/mixins.less";
// Reset
@import "../../bower_components/bootstrap/less/normalize.less";
@import "../../bower_components/bootstrap/less/print.less";
// Core CSS
@import "../../bower_components/bootstrap/less/scaffolding.less";
@import "../../bower_components/bootstrap/less/type.less";
@import "../../bower_components/bootstrap/less/code.less";
@import "../../bower_components/bootstrap/less/grid.less";
@import "../../bower_components/bootstrap/less/tables.less";
@import "../../bower_components/bootstrap/less/forms.less";
@import "../../bower_components/bootstrap/less/buttons.less";
// Components
@import "../../bower_components/bootstrap/less/component-animations.less";
@import "../../bower_components/bootstrap/less/glyphicons.less";
@import "../../bower_components/bootstrap/less/dropdowns.less";
@import "../../bower_components/bootstrap/less/button-groups.less";
@import "../../bower_components/bootstrap/less/input-groups.less";
@import "../../bower_components/bootstrap/less/navs.less";
@import "../../bower_components/bootstrap/less/navbar.less";
@import "../../bower_components/bootstrap/less/breadcrumbs.less";
@import "../../bower_components/bootstrap/less/pagination.less";
@import "../../bower_components/bootstrap/less/pager.less";
@import "../../bower_components/bootstrap/less/labels.less";
@import "../../bower_components/bootstrap/less/badges.less";
@import "../../bower_components/bootstrap/less/jumbotron.less";
@import "../../bower_components/bootstrap/less/thumbnails.less";
@import "../../bower_components/bootstrap/less/alerts.less";
@import "../../bower_components/bootstrap/less/progress-bars.less";
@import "../../bower_components/bootstrap/less/media.less";
@import "../../bower_components/bootstrap/less/list-group.less";
@import "../../bower_components/bootstrap/less/panels.less";
@import "../../bower_components/bootstrap/less/wells.less";
@import "../../bower_components/bootstrap/less/close.less";
// Components w/ JavaScript
@import "../../bower_components/bootstrap/less/modals.less";
@import "../../bower_components/bootstrap/less/tooltip.less";
@import "../../bower_components/bootstrap/less/popovers.less";
@import "../../bower_components/bootstrap/less/carousel.less";
// Utility classes
@import "../../bower_components/bootstrap/less/utilities.less";
@import "../../bower_components/bootstrap/less/responsive-utilities.less";
// automatically include the theme file
@import "../../bower_components/bootstrap/less/theme.less";

4
src/kibana/styles/main.css
View file

@ -2367,8 +2367,8 @@ input[type="button"].btn-block {
}
@font-face {
font-family: 'Glyphicons Halflings';
src: url('../fonts/glyphicons-halflings-regular.eot');
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
src: url('../../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot');
src: url('../../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}
.glyphicon {
position: relative;

3
src/kibana/styles/main.less
View file

@ -1,5 +1,4 @@
@import "../../bower_components/bootstrap/less/bootstrap.less";
@import "../../bower_components/bootstrap/less/theme.less";
@import "./_bootstrap.less";
body {
margin: 15px 10px;

2
tasks/config/less.js
View file

@ -3,7 +3,7 @@ module.exports = {
src: [
'<%= app %>/styles/**/*.less',
'<%= app %>/apps/**/*.less',
'!_*.less'
'!<%= src %>/**/_*.less'
],
expand: true,
ext: '.css',

2
test/unit/index.html
View file

@ -14,7 +14,7 @@
}
}
});
require(["/specs/calculateIndices.js","/specs/courier.js","/specs/data_source.js","/specs/mapper.js"], function () {
require(["/specs/calculate_indices.js","/specs/courier.js","/specs/data_source.js","/specs/mapper.js"], function () {
window.mochaRunner = mocha.run().on('end', function () {
window.mochaResults = this.stats;
});

10
test/unit/specs/calculateIndices.js → test/unit/specs/calculate_indices.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var calculateIndices = require('courier/calculateIndices');
var calculateIndices = require('courier/calculate_indices');
var moment = require('moment');
describe('calculateIndices()', function () {
@ -28,7 +28,7 @@ define(function (require) {
'logstash-2014.01.15.02',
'logstash-2014.01.15.03',
'logstash-2014.01.15.04'
]
];
});
it('should return a set of hourly indices', function () {
expect(calculateIndices(this.start, this.end, this.interval, this.pattern))
@ -48,7 +48,7 @@ define(function (require) {
'logstash-2014.01.13',
'logstash-2014.01.14',
'logstash-2014.01.15'
]
];
});
it('should return a set of daily indices', function () {
expect(calculateIndices(this.start, this.end, this.interval, this.pattern))
@ -68,7 +68,7 @@ define(function (require) {
'logstash-2014.01.01',
'logstash-2014.01.08',
'logstash-2014.01.15'
]
];
});
it('should return a set of daily indices', function () {
expect(calculateIndices(this.start, this.end, this.interval, this.pattern))
@ -88,7 +88,7 @@ define(function (require) {
'logstash-2012.01.15',
'logstash-2013.01.15',
'logstash-2014.01.15'
]
];
});
it('should return a set of yearly indices', function () {
expect(calculateIndices(this.start, this.end, this.interval, this.pattern))