diff --git a/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6
index d4c488dc3a85e2a752adf34c8f307ef96c9be56c..5f8ff6838608b1ba581cf2c0a804d036f242256b 100644
--- a/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/item_build_component.js.es6
@@ -16,9 +16,19 @@
*/
global.cycleAnalytics.ItemBuildComponent = Vue.extend({
- template: '#item-build-component',
props: {
build: Object,
- }
+ },
+ template: `
+
+ `,
});
}(window.gl || (window.gl = {})));
diff --git a/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6
index 488f6f901ffda2a8d4370d111022294c6080bcb2..0fd0767a3d0c2fe39a58cbd841ccc124acb9fac9 100644
--- a/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6
@@ -15,9 +15,19 @@
*/
global.cycleAnalytics.ItemMergeRequestComponent = Vue.extend({
- template: '#item-merge-request-component',
props: {
mergeRequest: Object,
- }
+ },
+ template: `
+
+ `,
});
}(window.gl || (window.gl = {})));
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6
index bdc9617f463fdaf5ccc9b65f70f09283a13180b5..45bd7c7b9e76a664d9094e26e4126dc7b30bb617 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6
@@ -3,13 +3,24 @@
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageCodeComponent = Vue.extend({
- template: '#stage-code-component',
components: {
'item-merge-request-component': gl.cycleAnalytics.ItemMergeRequestComponent,
},
props: {
items: Array,
- }
+ },
+ template: `
+
+
+ Time spent coding
+
+
+
+ `,
});
})(window.gl || (window.gl = {}));
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6
index fea2e1edacb86d8ee1ad57080229f7f0696e3a8c..0a6650d5c104707c2a066255ef74a89e6889c067 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6
@@ -3,13 +3,24 @@
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageProductionComponent = Vue.extend({
- template: '#stage-production-component',
components: {
'item-issue-component': gl.cycleAnalytics.ItemIssueComponent,
},
props: {
items: Array,
- }
+ },
+ template: `
+
+
+ The total time taken from idea to production
+
+
+
+ `
});
})(window.gl || (window.gl = {}));
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6
index 292f8ada3f47c3e9f88ec16516761de75cd21838..b52ecbb21f3ec4bc2fc3b2e585873d671e16d592 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6
@@ -3,13 +3,24 @@
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageReviewComponent = Vue.extend({
- template: '#stage-review-component',
components: {
'item-merge-request-component': gl.cycleAnalytics.ItemMergeRequestComponent,
},
props: {
items: Array,
- }
+ },
+ template: `
+
+
+ The time taken to review the code
+
+
+
+ `,
});
})(window.gl || (window.gl = {}));
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6
index 2a4cf97386a76572fafa1aabe2a537fe246fab87..c07f556ed84355efff2482026af06ff7d1e74b21 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6
@@ -9,7 +9,19 @@
},
props: {
items: Array,
- }
+ },
+ template: `
+
+
+ The time taken in staging
+
+
+
+ `,
});
})(window.gl || (window.gl = {}));
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6
index 7e16ae67f666ded9ec3769d39b147af68529bd25..e3057c6a507aa3dc7cb9ed64c347715512b169f3 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6
@@ -3,13 +3,24 @@
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageTestComponent = Vue.extend({
- template: '#stage-test-component',
components: {
'item-build-component': gl.cycleAnalytics.ItemBuildComponent,
},
props: {
items: Array,
- }
+ },
+ template: `
+
+
+ The time taken to build and test the application
+
+
+
+ `,
});
})(window.gl || (window.gl = {}));
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index ea3ae13b6d86d7425fa987127fa5f1fbf68a5b68..a4255aceb2a62578b7f7dedb5eafee1af6c2acba 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -93,60 +93,3 @@
%p No results
%template{ "v-if" => "state.items.length && !isLoadingStage && !isEmptyStage" }
%component{ ":is" => "currentStage.component", ":items" => "state.items" }
-
-%script{ type: 'text/x-template', id: 'stage-code-component' }
- %div
- .events-description
- Time spent coding
- %ul
- %li{ "v-for" => "mergeRequest in items" }
- %item-merge-request-component{ ":merge-request" => "mergeRequest" }
-
-%script{ type: 'text/x-template', id: 'stage-test-component' }
- %div
- .events-description
- The time taken to build and test the application
- %ul
- %li{ "v-for" => "build in items" }
- %item-build-component{ ":build" => "build" }
-
-
-%script{ type: 'text/x-template', id: 'stage-review-component' }
- %div
- .events-description
- The time taken to review the code
- %ul
- %li{ "v-for" => "mergeRequest in items" }
- %item-merge-request-component{ ":merge-request" => "mergeRequest" }
-
-%script{ type: 'text/x-template', id: 'stage-staging-component' }
- %div
- .events-description
- The time taken in staging
- %ul
- %li{ "v-for" => "build in items" }
- %item-build-component{ ":build" => "build" }
-
-%script{ type: 'text/x-template', id: 'stage-production-component' }
- %div
- .events-description
- The total time taken from idea to production
- %ul
- %li{ "v-for" => "issue in items" }
- %item-issue-component{ ":issue" => "issue" }
-
-%script{ type: 'text/x-template', id: 'item-merge-request-component' }
- %div
- %p
- %h5
- merge request -
- %a{:href => "mergeRequest.url"}
- {{ mergeRequest.title }}
-
-%script{ type: 'text/x-template', id: 'item-build-component' }
- %div
- %p
- %h5
- build -
- %a{:href => "build.url"}
- {{ build.title }}