Dduvall has submitted this change and it was merged. Change subject: Renamed application to Raita ......................................................................
Renamed application to Raita The name Platter sounded silly. Raita sounds slightly less so and goes great with cucumbers. :) Change-Id: I4da1d432e1be6da3a6fd7e559c35919d43d0b15f --- M index.html M package.json D src/pl-dashboard.tag R src/raita.js R src/rt-build-features.tag R src/rt-build-filter.tag R src/rt-build-info.tag R src/rt-builds.tag A src/rt-dashboard.tag R src/rt-element.tag R src/rt-feature.tag R src/rt-step.tag 12 files changed, 105 insertions(+), 105 deletions(-) Approvals: Dduvall: Verified; Looks good to me, approved diff --git a/index.html b/index.html index af07cfc..722bde7 100644 --- a/index.html +++ b/index.html @@ -20,8 +20,8 @@ <script src="//code.jquery.com/jquery-1.11.2.min.js"></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> <script src="node_modules/riot/riot.js"></script> - <script src="src/platter.js"></script> + <script src="src/raita.js"></script> <script src="build/tags.js"></script> - <script>Platter.dashboard('#dashboard', '/db/builds');</script> + <script>raita.dashboard('#dashboard', '/db/builds');</script> </body> </html> diff --git a/package.json b/package.json index 9c20ff2..c32c7fd 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "platter", + "name": "raita", "version": "0.0.0", "description": "Dashboard for Cucumber test results", "scripts": { diff --git a/src/pl-dashboard.tag b/src/pl-dashboard.tag deleted file mode 100644 index 2926b5a..0000000 --- a/src/pl-dashboard.tag +++ /dev/null @@ -1,68 +0,0 @@ -<pl-dashboard> - <pl-builds></pl-builds> - <pl-build-info></pl-build-info> - <pl-build-filter></pl-build-filter> - <pl-build-features></pl-build-features> - - <script> - var self = this, - dash = opts, - currentBuildId, - currentFeatures; - - self.on('mount', function () { - dash.loadBuilds(); - - self.tags['pl-build-info'].on('pl:status-click', function (status) { - var filter = [ { status: status } ]; - - self.tags['pl-build-filter'].update({ filter: filter }); - }); - - self.tags['pl-build-filter'].on('update', function () { - if (currentBuildId && self.tags['pl-build-filter'].filter) { - dash.loadFeatures(currentBuildId, self.tags['pl-build-filter'].filter); - } - }); - }); - - dash.subscribe(self, { - 'load-build': function (id, build) { - currentBuildId = id; - - // Updating the filter triggers a reload of features - // TODO this is confusing - self.tags['pl-build-filter'].update({ filter: [] }); - - self.tags['pl-build-info'].update({ buildId: id, buildNumber: build.build_number }); - self.tags['pl-builds'].update({ currentBuildId: id }); - }, - - 'load-builds': function (builds) { - self.tags['pl-builds'].update({ builds: builds }); - }, - - 'load-build-features': function (buildId, features) { - currentFeatures = features; - - dash.loadElements( - features.map(function (f) { return f._id; }), - self.tags['pl-build-filter'].filter - ); - }, - - 'load-build-features-elements': function (elements) { - for (var fid in elements) { - for (var i = 0; i < currentFeatures.length; i++) { - if (currentFeatures[i]._id === fid) { - currentFeatures[i].elements = elements[fid]; - } - } - } - - self.tags['pl-build-info'].update({ features: currentFeatures }); - self.tags['pl-build-features'].update({ features: currentFeatures }); - }, - }); - </script> -</pl-dashboard> diff --git a/src/platter.js b/src/raita.js similarity index 91% rename from src/platter.js rename to src/raita.js index 694d17a..cc935bd 100644 --- a/src/platter.js +++ b/src/raita.js @@ -1,18 +1,18 @@ (function (binding, factory) { if (typeof define === 'function' && define.amd) { - define('platter', ['riot', 'jquery'], factory); + define('raita', ['riot', 'jquery'], factory); } else { - binding.Platter = factory(binding.riot, binding.jQuery); + binding.raita = factory(binding.riot, binding.jQuery); } })(this, function (riot, $) { 'use strict'; - var Platter = {}; + var raita = {}; - Platter.VERSION = '0.0.0'; + raita.VERSION = '0.0.0'; - Platter.dashboard = function (selector, dbURL) { - var dash = new Platter.Dashboard(dbURL); + raita.dashboard = function (selector, dbURL) { + var dash = new raita.Dashboard(dbURL); function router() { dash.route.apply(dash, arguments); @@ -29,7 +29,7 @@ return dash; }; - Platter.Database = function (url) { + raita.Database = function (url) { this.url = url; }; @@ -83,10 +83,10 @@ return sources; }; - })(Platter.Database.prototype); + })(raita.Database.prototype); - Platter.Dashboard = function (dbURL) { - this.db = new Platter.Database(dbURL); + raita.Dashboard = function (dbURL) { + this.db = new raita.Database(dbURL); riot.observable(this); }; @@ -218,7 +218,7 @@ }; dash.mount = function (selector) { - riot.mount(selector, 'pl-dashboard', this); + riot.mount(selector, 'rt-dashboard', this); }; dash.pruneFilter = function (filter) { @@ -256,7 +256,7 @@ tag.on('unmount', sub('off')); }; - })(Platter.Dashboard.prototype); + })(raita.Dashboard.prototype); - return Platter; + return raita; }); diff --git a/src/pl-build-features.tag b/src/rt-build-features.tag similarity index 68% rename from src/pl-build-features.tag rename to src/rt-build-features.tag index 20de155..845c875 100644 --- a/src/pl-build-features.tag +++ b/src/rt-build-features.tag @@ -1,6 +1,6 @@ -<pl-build-features> +<rt-build-features> <div class="list-group"> - <pl-feature each={ nonEmptyFeatures() } class="list-group-item"></pl-feature> + <rt-feature each={ nonEmptyFeatures() } class="list-group-item"></rt-feature> </div> <script> @@ -12,4 +12,4 @@ }); }; </script> -</pl-build-features> +</rt-build-features> diff --git a/src/pl-build-filter.tag b/src/rt-build-filter.tag similarity index 97% rename from src/pl-build-filter.tag rename to src/rt-build-filter.tag index 9f1b5fa..d063302 100644 --- a/src/pl-build-filter.tag +++ b/src/rt-build-filter.tag @@ -1,4 +1,4 @@ -<pl-build-filter> +<rt-build-filter> <form onsubmit={ submit }> <div class="input-group"> <span class="input-group-btn"> @@ -56,4 +56,4 @@ self.trigger('pl:filter', self.filter); }; </script> -</pl-build-filter> +</rt-build-filter> diff --git a/src/pl-build-info.tag b/src/rt-build-info.tag similarity index 93% rename from src/pl-build-info.tag rename to src/rt-build-info.tag index 176e346..3f49318 100644 --- a/src/pl-build-info.tag +++ b/src/rt-build-info.tag @@ -1,4 +1,4 @@ -<pl-build-info> +<rt-build-info> <h2 if={ !buildId }>Loading build...</h2> <h2 if={ buildId }>Build { buildNumber }</h2> <div class="progress"> @@ -21,12 +21,12 @@ </div> <style> - pl-build-info .label { + rt-build-info .label { font-size: 100%; background-color: rgba(119, 119, 119, 0.75); } - pl-build-info a { + rt-build-info a { cursor: pointer; } </style> @@ -62,10 +62,10 @@ ['failed', 'skipped', 'passed'].forEach(function (status) { self[status + 'Clicked'] = function () { - self.trigger('pl:status-click', status); + self.trigger('rt:status-click', status); }; }); self.on('update', recalculate); </script> -</pl-build-info> +</rt-build-info> diff --git a/src/pl-builds.tag b/src/rt-builds.tag similarity index 90% rename from src/pl-builds.tag rename to src/rt-builds.tag index 999d6da..c11440e 100644 --- a/src/pl-builds.tag +++ b/src/rt-builds.tag @@ -1,4 +1,4 @@ -<pl-builds> +<rt-builds> <ul class="builds nav nav-pills"> <li each={ builds } role="presentation" class={ active: parent.currentBuildId == _id }> <a href="#builds/{ _id }">Build { build_number }</a> @@ -8,4 +8,4 @@ <script> this.builds = []; </script> -</pl-builds> +</rt-builds> diff --git a/src/rt-dashboard.tag b/src/rt-dashboard.tag new file mode 100644 index 0000000..42430b8 --- /dev/null +++ b/src/rt-dashboard.tag @@ -0,0 +1,68 @@ +<rt-dashboard> + <rt-builds></rt-builds> + <rt-build-info></rt-build-info> + <rt-build-filter></rt-build-filter> + <rt-build-features></rt-build-features> + + <script> + var self = this, + dash = opts, + currentBuildId, + currentFeatures; + + self.on('mount', function () { + dash.loadBuilds(); + + self.tags['rt-build-info'].on('rt:status-click', function (status) { + var filter = [ { status: status } ]; + + self.tags['rt-build-filter'].update({ filter: filter }); + }); + + self.tags['rt-build-filter'].on('update', function () { + if (currentBuildId && self.tags['rt-build-filter'].filter) { + dash.loadFeatures(currentBuildId, self.tags['rt-build-filter'].filter); + } + }); + }); + + dash.subscribe(self, { + 'load-build': function (id, build) { + currentBuildId = id; + + // Updating the filter triggers a reload of features + // TODO this is confusing + self.tags['rt-build-filter'].update({ filter: [] }); + + self.tags['rt-build-info'].update({ buildId: id, buildNumber: build.build_number }); + self.tags['rt-builds'].update({ currentBuildId: id }); + }, + + 'load-builds': function (builds) { + self.tags['rt-builds'].update({ builds: builds }); + }, + + 'load-build-features': function (buildId, features) { + currentFeatures = features; + + dash.loadElements( + features.map(function (f) { return f._id; }), + self.tags['rt-build-filter'].filter + ); + }, + + 'load-build-features-elements': function (elements) { + for (var fid in elements) { + for (var i = 0; i < currentFeatures.length; i++) { + if (currentFeatures[i]._id === fid) { + currentFeatures[i].elements = elements[fid]; + } + } + } + + self.tags['rt-build-info'].update({ features: currentFeatures }); + self.tags['rt-build-features'].update({ features: currentFeatures }); + }, + }); + </script> +</rt-dashboard> diff --git a/src/pl-element.tag b/src/rt-element.tag similarity index 87% rename from src/pl-element.tag rename to src/rt-element.tag index ec17ac3..7025268 100644 --- a/src/pl-element.tag +++ b/src/rt-element.tag @@ -1,10 +1,10 @@ -<pl-element> +<rt-element> <h4 class="list-group-item-heading"><span class="keyword">{ keyword }</span>: { name }</h4> <p><span class="label label-{ statuses[result.status] }">{ result.status }</span></p> <div class="steps list-group"> - <pl-step each={ nonBackgroundSteps() } - class="list-group-item list-group-item-{ parent.statuses[result.status] }"></pl-step> + <rt-step each={ nonBackgroundSteps() } + class="list-group-item list-group-item-{ parent.statuses[result.status] }"></rt-step> </div> <script> @@ -21,4 +21,4 @@ } }; </script> -</pl-element> +</rt-element> diff --git a/src/pl-feature.tag b/src/rt-feature.tag similarity index 73% rename from src/pl-feature.tag rename to src/rt-feature.tag index f3176a1..5d7e7cb 100644 --- a/src/pl-feature.tag +++ b/src/rt-feature.tag @@ -1,8 +1,8 @@ -<pl-feature> +<rt-feature> <h4 class="list-group-item-heading"><span class="keyword">{ keyword }</span>: { name }</h4> <div class="scenarios list-group"> - <pl-element each={ elements } background={ parent.background } class="list-group-item"></pl-element> + <rt-element each={ elements } background={ parent.background } class="list-group-item"></rt-element> </div> <script> @@ -16,4 +16,4 @@ } }); </script> -</pl-feature> +</rt-feature> diff --git a/src/pl-step.tag b/src/rt-step.tag similarity index 91% rename from src/pl-step.tag rename to src/rt-step.tag index eed4f29..aa313cc 100644 --- a/src/pl-step.tag +++ b/src/rt-step.tag @@ -1,8 +1,8 @@ -<pl-step> +<rt-step> <p class="list-group-item-text"> <span class="keyword">{ keyword }</span> <span class="step-name">{ name }</span> </p> <p if={ match.location } class="list-group-item-text"> <small>{ match.location }</small> </p> -</pl-step> +</rt-step> -- To view, visit https://gerrit.wikimedia.org/r/206875 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4da1d432e1be6da3a6fd7e559c35919d43d0b15f Gerrit-PatchSet: 1 Gerrit-Project: integration/raita Gerrit-Branch: master Gerrit-Owner: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits