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

[indexPattern/field] move isMetaField consideration into Field

Browse source
This commit is contained in:
spalger 2016-01-21 09:22:52 -07:00 • committed by Stéphane Campinas
parent c3c1d4823b
commit 5b0b00adfb
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
View file

@ -35,6 +35,7 @@ uiModules.get('apps/settings')
// clear and destroy row scopes
_.invoke(rowScopes.splice(0), '$destroy');
<<<<<<< HEAD
const metaFields = config.get('metaFields');
const sourceFiltering = $scope.indexPattern.getSourceFiltering();
const fields = filter($scope.indexPattern.getNonScriptedFields(), $scope.fieldFilter);
@ -42,7 +43,6 @@ uiModules.get('apps/settings')
$scope.rows = fields.map(function (field) {
const childScope = _.assign($scope.$new(), { field: field });
const isMetaField = _.contains(metaFields, field.name);
rowScopes.push(childScope);
return [
@ -66,8 +66,8 @@ uiModules.get('apps/settings')
value: field.indexed
},
{
markup: isMetaField || !!field.exclude ? noTemplate : yesTemplate,
value: isMetaField || !!field.exclude
markup: !field.exclude ? yesTemplate : noTemplate,
value: !field.exclude
},
{
markup: controlsHtml,

6
src/ui/public/index_patterns/_field.js
View file

@ -1,8 +1,9 @@
<<<<<<< HEAD
import ObjDefine from 'ui/utils/obj_define';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) {
export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier, config) {
let notify = new Notifier({ location: 'IndexPattern Field' });
let FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
let fieldTypes = Private(IndexPatternsFieldTypesProvider);
@ -42,11 +43,12 @@ export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope
let scripted = !!spec.scripted;
let sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
let filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
let isMetaField = config.get('metaFields').includes(spec.name);
obj.fact('name');
obj.fact('type');
obj.writ('count', spec.count || 0);
obj.writ('exclude', spec.exclude);
obj.fact('exclude', Boolean(!isMetaField && spec.exclude));
// scripted objs
obj.fact('scripted', scripted);