Skip to content

Commit 01c8627

Browse files
authored
[es] scripts.inline -> scripts.source (#30457)
1 parent 9fa9e08 commit 01c8627

File tree

20 files changed

+34
-34
lines changed

20 files changed

+34
-34
lines changed

packages/kbn-es-query/src/filters/__tests__/phrase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('Filter Manager', function () {
5353
const field = getField(indexPattern, 'script number');
5454
expected.meta.field = 'script number';
5555
_.set(expected, 'script.script', {
56-
inline: '(' + field.script + ') == value',
56+
source: '(' + field.script + ') == value',
5757
lang: 'expression',
5858
params: {
5959
value: 5,

packages/kbn-es-query/src/filters/__tests__/range.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('Filter Manager', function () {
5151
expected.meta.field = 'script number';
5252
_.set(expected, 'script.script', {
5353
lang: 'expression',
54-
inline: '(' + field.script + ')>=gte && (' + field.script + ')<=lte',
54+
source: '(' + field.script + ')>=gte && (' + field.script + ')<=lte',
5555
params: {
5656
value: '>=1 <=3',
5757
gte: 1,
@@ -68,7 +68,7 @@ describe('Filter Manager', function () {
6868
`gte(() -> { ${field.script} }, params.gte) && ` +
6969
`lte(() -> { ${field.script} }, params.lte)`;
7070

71-
const inlineScript = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern).script.script.inline;
71+
const inlineScript = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern).script.script.source;
7272
expect(inlineScript).to.be(expected);
7373
});
7474

@@ -89,7 +89,7 @@ describe('Filter Manager', function () {
8989
params[key] = 5;
9090
const filter = buildRangeFilter(field, params, indexPattern);
9191

92-
expect(filter.script.script.inline).to.be(
92+
expect(filter.script.script.source).to.be(
9393
'(' + field.script + ')' + operator + key);
9494
expect(filter.script.script.params[key]).to.be(5);
9595
expect(filter.script.script.params.value).to.be(operator + 5);
@@ -120,7 +120,7 @@ describe('Filter Manager', function () {
120120
it('does not contain a script condition for the infinite side', function () {
121121
const field = getField(indexPattern, 'script number');
122122
const script = field.script;
123-
expect(filter.script.script.inline).to.equal(`(${script})>=gte`);
123+
expect(filter.script.script.source).to.equal(`(${script})>=gte`);
124124
});
125125
});
126126
});

packages/kbn-es-query/src/filters/phrase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function getPhraseScript(field, value) {
4141

4242
return {
4343
script: {
44-
inline: script,
44+
source: script,
4545
lang: field.lang,
4646
params: {
4747
value: convertedValue

packages/kbn-es-query/src/filters/range.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function getRangeScript(field, params) {
9898

9999
return {
100100
script: {
101-
inline: script,
101+
source: script,
102102
params: knownParams,
103103
lang: field.lang
104104
}

src/legacy/core_plugins/console/api_server/es_6_0/globals.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ export default function (api) {
6262

6363
api.addGlobalAutocompleteRules('script', {
6464
__template: {
65-
inline: 'SCRIPT'
65+
source: 'SCRIPT'
6666
},
67-
inline: 'SCRIPT',
67+
source: 'SCRIPT',
6868
file: 'FILE_SCRIPT_NAME',
6969
id: 'SCRIPT_ID',
7070
lang: '',

src/legacy/core_plugins/console/api_server/es_6_0/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export default function (api) {
207207
api.addEndpointDescription('render_search_template', {
208208
data_autocomplete_rules: {
209209
__one_of: [
210-
{ inline: { __scope_link: 'search' } },
210+
{ source: { __scope_link: 'search' } },
211211
{ __scope_link: 'GLOBAL.script' },
212212
],
213213
params: {},

src/legacy/core_plugins/console/public/tests/src/input_tokenization.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ describe('Input Tokenization', () => {
322322
['start', 'json', 'json', 'start'],
323323
'POST _search\n' +
324324
'{\n' +
325-
' "script": { "inline": "" }\n' +
325+
' "script": { "source": "" }\n' +
326326
'}'
327327
);
328328

src/legacy/core_plugins/console/public/tests/src/utils_string_expanding.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
Scripts in requests
33
-------------------------------------
44
{
5-
"f": { "script" : { "inline": "test\ntest\\2" } },
5+
"f": { "script" : { "source": "test\ntest\\2" } },
66
"g": { "script" : "second + \"\\\";" },
77
"f": "short with \\",
88
"h": 1,
99
"script": "a + 2"
1010
}
1111
-------------------------------------
1212
{
13-
"f": { "script" : { "inline": """
13+
"f": { "script" : { "source": """
1414
test
1515
test\2
1616
""" } },

src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const termsAgg = ({ field, size, direction, query }) => {
4545

4646
if (field.scripted) {
4747
terms.script = {
48-
inline: field.script,
48+
source: field.script,
4949
lang: field.lang
5050
};
5151
terms.valueType = field.type === 'number' ? 'float' : field.type;

src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const minMaxAgg = (field) => {
3131
const aggBody = {};
3232
if (field.scripted) {
3333
aggBody.script = {
34-
inline: field.script,
34+
source: field.script,
3535
lang: field.lang
3636
};
3737
} else {

0 commit comments

Comments
 (0)