From 8b5c95d190aed06504e41830b7940ecf6600405e Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 30 Dec 2015 14:17:59 -0500 Subject: [PATCH] demonstrating flow of data through the wizard steps (cherry picked from commit 4bcc5a1) --- .../data/directives/install_filebeat_step.html | 11 ++++++++++- .../sections/data/directives/install_filebeat_step.js | 8 +++++++- .../sections/data/directives/paste_samples_step.html | 4 +++- .../sections/data/directives/paste_samples_step.js | 5 ++++- .../sections/data/directives/pattern_review_step.html | 8 +++++++- .../sections/data/directives/pattern_review_step.js | 6 +++++- .../sections/data/directives/pipeline_step.html | 8 +++++++- .../sections/data/directives/pipeline_step.js | 6 +++++- .../public/settings/sections/data/filebeat/index.html | 8 ++++---- .../public/settings/sections/data/filebeat/index.js | 7 +++++-- 10 files changed, 57 insertions(+), 14 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html index 48b974b48a474..e2de5be0d5357 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html @@ -1 +1,10 @@ -Install filebeat step +

Install filebeat step

+ +
+Results: + +
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js index 4eed9ae61a55a..c615e76c3752a 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js @@ -4,7 +4,13 @@ var template = require('plugins/kibana/settings/sections/data/directives/install modules.get('apps/settings') .directive('installFilebeatStep', function () { return { - template: template + template: template, + scope: { + results: '=' + }, + controller: function ($scope) { + var results = $scope.results; + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html index 31f41b0b76f7c..af6875cd35242 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html @@ -1 +1,3 @@ -Paste samples step +

Paste samples step

+ + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js index 7b033ecbf7707..42b14e1417d2e 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js @@ -4,7 +4,10 @@ var template = require('plugins/kibana/settings/sections/data/directives/paste_s modules.get('apps/settings') .directive('pasteSamplesStep', function () { return { - template: template + template: template, + scope: { + save: '&onSave' + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index c113af3185f89..75d8dc49dab09 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -1 +1,7 @@ -Pattern review step +

Pattern review step

+ +
+ Docs: {{docs}} +
+ + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index ddfba97e52a3d..6ceb1ecb03a13 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -4,7 +4,11 @@ var template = require('plugins/kibana/settings/sections/data/directives/pattern modules.get('apps/settings') .directive('patternReviewStep', function () { return { - template: template + template: template, + scope: { + docs: '=', + save: '&onSave' + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html index 0447d428d6b17..d2140d708bf6f 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html @@ -1 +1,7 @@ -Build pipeline step +

Build pipeline step

+ +
+ Logs: {{logs}} +
+ + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js index ff18fe60b32f6..9336d94da507e 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js @@ -4,7 +4,11 @@ var template = require('plugins/kibana/settings/sections/data/directives/pipelin modules.get('apps/settings') .directive('pipelineStep', function () { return { - template: template + template: template, + scope: { + logs: '=', + save: '&onSave' + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html index bfeacb0f96f19..bd9f6703347ba 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html @@ -20,10 +20,10 @@
- - - - + + + +
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js index 07b3198b99b24..dc6a8863cafb2 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js @@ -15,9 +15,9 @@ routes.when('/settings/data/filebeat', { modules.get('apps/settings') .controller('kbnSettingsDataFilebeat', function ($scope) { var totalSteps = 4; - var currentStep = 0; + $scope.currentStep = 0; + $scope.stepResults = []; - $scope.currentStep = currentStep; $scope.nextStep = function () { if ($scope.currentStep + 1 < totalSteps) { ++$scope.currentStep; @@ -32,4 +32,7 @@ modules.get('apps/settings') $scope.currentStep = step; }; + $scope.saveStepResults = function (step, results) { + $scope.stepResults[step] = results; + }; });